3.0

.gitignore

@@ -2,4 +2,7 @@
 target
 .vscode
 .DS_Store
-*.iml
+*.iml
+htmlReport/
+src/test/java/com/taosdata/jdbc/manual/
+src/test/resources/logback.xml

deploy-pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>3.2.5</version>
+  <version>3.2.7</version>
   <packaging>jar</packaging>
 
   <name>JDBCDriver</name>
@@ -40,13 +40,14 @@
     <product.name>TDengine</product.name>
     <product.version>3.0.0.0</product.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <java.version>1.8</java.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -63,12 +64,12 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>30.1.1-jre</version>
+      <version>32.1.3-jre</version>
     </dependency>
     <dependency>
       <groupId>org.java-websocket</groupId>
       <artifactId>Java-WebSocket</artifactId>
-      <version>1.5.2</version>
+      <version>1.5.4</version>
     </dependency>
   </dependencies>
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.taosdata.jdbc</groupId>
     <artifactId>taos-jdbcdriver</artifactId>
-    <version>3.2.6</version>
+    <version>3.2.7</version>
     <packaging>jar</packaging>
     <name>JDBCDriver</name>
     <url>https://github.com/taosdata/taos-connector-jdbc</url>
@@ -52,17 +52,17 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.0.0-jre</version>
+            <version>32.1.3-jre</version>
         </dependency>
         <dependency>
             <groupId>org.java-websocket</groupId>
             <artifactId>Java-WebSocket</artifactId>
-            <version>1.5.2</version>
+            <version>1.5.4</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/main/java/com/taosdata/jdbc/AbstractDatabaseMetaData.java

@@ -1,8 +1,11 @@
 package com.taosdata.jdbc;
 
 import com.taosdata.jdbc.enums.DataType;
+import com.taosdata.jdbc.rs.ConnectionParam;
 import com.taosdata.jdbc.utils.StringUtils;
+import com.taosdata.jdbc.ws.WSConnection;
 
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -35,7 +38,7 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
 
     private static InputStream loadProperties() throws IOException {
         String currentJar = AbstractDatabaseMetaData.class.getProtectionDomain().getCodeSource().getLocation().getFile();
-        Enumeration<URL> urls = AbstractDatabaseMetaData.class.getClassLoader().getResources("version.properties");
+        Enumeration<URL> urls = AbstractDatabaseMetaData.class.getClassLoader().getResources("taos-jdbc-version.properties");
         while (urls.hasMoreElements()) {
             URL url = urls.nextElement();
             if (url.getFile().contains(currentJar)) {
@@ -599,8 +602,21 @@ private ColumnMetaData buildRefGenerationMeta(int colIndex) {
     }
 
     protected ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types, Connection connection) throws SQLException {
-        if (!StringUtils.isEmpty(catalog) && !isAvailableCatalog(connection, catalog))
+        String dbHelperStr = "";
+        String tableHelperStr = "";
+
+        if (connection instanceof WSConnection) {
+            WSConnection wsConnection = (WSConnection) connection;
+            //BI模式，只查询用户表，只查表，不查询子表
+            if (wsConnection.getParam().getConnectMode() == ConnectionParam.CONNECT_MODE_BI){
+                dbHelperStr = " user ";
+                tableHelperStr = " normal ";
+            }
+        }
+
+        if (!StringUtils.isEmpty(catalog) && !isAvailableCatalog(connection, catalog)){
             return new EmptyResultSet();
+        }
 
         DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet();
         // set column metadata list
@@ -612,7 +628,7 @@ protected ResultSet getTables(String catalog, String schemaPattern, String table
             if (!StringUtils.isEmpty(catalog)) {
                 dbs.add(catalog);
             } else {
-                try (ResultSet dbRs = stmt.executeQuery("show databases")) {
+                try (ResultSet dbRs = stmt.executeQuery("show " + dbHelperStr + " databases")) {
                     while (dbRs.next()) {
                         dbs.add(dbRs.getString("name"));
                     }
@@ -622,7 +638,7 @@ protected ResultSet getTables(String catalog, String schemaPattern, String table
                 return new EmptyResultSet();
             }
             for (String db : dbs) {
-                StringBuilder sql = new StringBuilder().append("show ").append(db).append(".tables ");
+                StringBuilder sql = new StringBuilder().append("show ").append(tableHelperStr).append(db).append(".tables ");
                 StringBuilder Ssql = new StringBuilder().append("show ").append(db).append(".stables ");
                 if (!StringUtils.isEmpty(tableNamePattern)) {
                     sql.append("like '").append(tableNamePattern).append("'");
@@ -1514,8 +1530,18 @@ protected ResultSet getCatalogs(Connection conn) throws SQLException {
         columnMetaDataList.add(buildTableCatalogMeta(1));       // 1. TABLE_CAT
         resultSet.setColumnMetaDataList(columnMetaDataList);
 
+        String dbHelperStr = "";
+
+        if (conn instanceof WSConnection) {
+            WSConnection wsConnection = (WSConnection) conn;
+            //BI模式，只查询用户表，只查表，不查询子表
+            if (wsConnection.getParam().getConnectMode() == 1){
+                dbHelperStr = " user ";
+            }
+        }
+
         try (Statement stmt = conn.createStatement();
-             ResultSet rs = stmt.executeQuery("show databases")) {
+             ResultSet rs = stmt.executeQuery("show " + dbHelperStr + " databases")) {
             List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
             while (rs.next()) {
                 TSDBResultSetRowData rowData = new TSDBResultSetRowData(1);

src/main/java/com/taosdata/jdbc/TSDBConnection.java

@@ -1,6 +1,7 @@
 package com.taosdata.jdbc;
 
 import java.sql.*;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -9,6 +10,7 @@ public class TSDBConnection extends AbstractConnection {
     private TSDBJNIConnector connector;
     private final TSDBDatabaseMetaData databaseMetaData;
     private boolean batchFetch;
+
     private CopyOnWriteArrayList<Statement> statements = new CopyOnWriteArrayList<>();
 
     public Boolean getBatchFetch() {

src/main/java/com/taosdata/jdbc/TSDBConstants.java

@@ -68,6 +68,8 @@ public abstract class TSDBConstants {
     public static final int TSDB_DATA_TYPE_UBIGINT = 14;        //unsigned bigint
     public static final int TSDB_DATA_TYPE_JSON = 15;           //json
     public static final int TSDB_DATA_TYPE_VARBINARY = 16;     //varbinary
+    public static final int TSDB_DATA_TYPE_GEOMETRY = 20;     //geometry
+
     // nchar column max length
     public static final int maxFieldSize = 16 * 1024;
 

src/main/java/com/taosdata/jdbc/TSDBDriver.java

@@ -103,6 +103,11 @@ public class TSDBDriver extends AbstractDriver {
      */
     public static final String PROPERTY_KEY_MESSAGE_WAIT_TIMEOUT = "messageWaitTimeout";
 
+    /**
+     * connect mode
+     */
+    public static final String PROPERTY_KEY_CONNECT_MODE = "conmode";
+
     /**
      * max message number send to server concurrently
      */

src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java

@@ -9,8 +9,13 @@
 import java.nio.ByteBuffer;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
+import java.time.ZoneId;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
+import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import static com.taosdata.jdbc.TSDBErrorNumbers.ERROR_INVALID_VARIABLE;
 
@@ -52,16 +57,64 @@ public static void init(Properties props) throws SQLWarning {
                 if (setOptions(1, charset) < 0) {
                     throw TSDBError.createSQLWarning("Failed to set charset: " + charset + ". System default will be used.");
                 }
+
                 String timezone = props.getProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE);
                 if (setOptions(2, timezone) < 0) {
                     throw TSDBError.createSQLWarning("Failed to set timezone: " + timezone + ". System default will be used.");
                 }
+
+                try{
+                    handleTimeZone(timezone.trim());
+                } catch (Exception e){
+                }
                 isInitialized = true;
                 TaosGlobalConfig.setCharset(getTsCharset());
             }
         }
     }
 
+
+    private static void handleTimeZone(String posixTimeZoneStr){
+        //争取向前兼容POSIX 接口规范，只处理能处理的情况
+        // 1. UTC 和 GMT，只处理小时情况，加号变减号，减号变加号
+        if (posixTimeZoneStr.startsWith("UTC") || posixTimeZoneStr.startsWith("GMT")){
+            if (posixTimeZoneStr.length() == 3){
+                //标准时间
+                TimeZone.setDefault(TimeZone.getTimeZone(ZoneId.of("GMT")));
+                return;
+            }
+
+            // 只处理UTC-8，UTC+8, GMT+8, GMT-8这样的格式
+            String regex = "^(UTC|GMT)([+-])(\\d+)$";
+            Pattern pattern = Pattern.compile(regex);
+            Matcher matcher = pattern.matcher(posixTimeZoneStr);
+            if (matcher.matches()) {
+                String op = matcher.group(2);
+                String hourStr = matcher.group(3);
+                if (op.equals("+")){
+                    op = "-";
+                }else{
+                    op = "+";
+                }
+
+                //只处理java可以处理的情况
+                int hour = Integer.parseInt(hourStr);
+                if (hour > 18){
+                    return;
+                }
+
+                String timezone = String.format("GMT%s%02d:00", op, hour);
+                TimeZone.setDefault(TimeZone.getTimeZone(ZoneId.of(timezone)));
+                return;
+            }
+            // 不支持的格式，不处理
+        }
+
+        // 2. 尝试处理Asia/Shanghai这种情况
+        if (posixTimeZoneStr.contains("/")){
+            TimeZone.setDefault(TimeZone.getTimeZone(ZoneId.of(posixTimeZoneStr)));
+        }
+    }
     private static native void initImp(String configDir);
 
     private static native int setOptions(int optionIndex, String optionValue);