chore: add 3.3.6.0 test case with env

Author: sheyanjie-qq

.github/workflows/compatibility-3360.yml

@@ -66,6 +66,7 @@ jobs:
         working-directory: jdbc-workspace
         env:
           TDENGINE_CLOUD_URL: ${{ secrets.TDENGINE_CLOUD_URL }}
+          TD_3360_TEST: 'true'
         run: mvn -B clean verify --file pom.xml
 
 

deploy-pom.xml

@@ -41,7 +41,7 @@
     <product.version>3.0.0.0</product.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>1.8</java.version>
-    <jackson.version>2.18.0</jackson.version>
+    <jackson.version>2.18.4</jackson.version>
     <httpclient.version>4.5.13</httpclient.version>
     <guava.version>32.1.3-jre</guava.version>
     <netty-all.version>4.1.119.Final</netty-all.version>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.taosdata.jdbc</groupId>
     <artifactId>taos-jdbcdriver</artifactId>
-    <version>3.7.0-NOENCODE</version>
+    <version>3.7.0</version>
 
     <packaging>jar</packaging>
     <name>JDBCDriver</name>
@@ -187,7 +187,10 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M6</version>
                 <configuration>
-                    <parallel>classes</parallel>
+                    <forkCount>1</forkCount>
+                    <reuseForks>false</reuseForks>
+
+                    <parallel>none</parallel>
                     <threadCount>1</threadCount>
                     <useUnlimitedThreads>false</useUnlimitedThreads>
                     <perCoreThreadCount>false</perCoreThreadCount>
@@ -210,7 +213,7 @@
                         <exclude>**/TimeZoneTest.java</exclude>
                     </excludes>
                     <testFailureIgnore>false</testFailureIgnore>
-                    <argLine>${argLine}</argLine>
+                    <argLine>${argLine} -Duser.timezone=UTC</argLine>
                 </configuration>
             </plugin>
         </plugins>

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

@@ -2,6 +2,7 @@
 
 import com.taosdata.jdbc.enums.SchemalessProtocolType;
 import com.taosdata.jdbc.enums.SchemalessTimestampType;
+import com.taosdata.jdbc.utils.VersionUtil;
 
 import java.sql.*;
 import java.util.*;
@@ -17,13 +18,22 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
     protected volatile boolean isClosed;
     protected volatile String catalog;
     protected final Properties clientInfoProps = new Properties();
+    protected final boolean supportBlob;
+    protected final boolean supportLineBind;
 
-    protected AbstractConnection(Properties properties) {
+    protected final String serverVersion;
+
+    protected AbstractConnection(Properties properties, String version) {
         Set<String> propNames = properties.stringPropertyNames();
         for (String propName : propNames) {
             clientInfoProps.setProperty(propName, properties.getProperty(propName));
         }
+        serverVersion = version;
+        supportBlob = VersionUtil.surpportBlob(serverVersion);
+        supportLineBind = supportBlob;
     }
+
+    public boolean isSupportBlob(){return supportBlob;}
     public void unregisterStatement(Long stmtId) {
         this.statementsMap.remove(stmtId);
     }

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

@@ -106,9 +106,18 @@ protected Connection getWSConnection(String url, ConnectionParam param, Properti
             throw new SQLException("(0x" + Integer.toHexString(auth.getCode()) + "):" + "auth failure:" + auth.getMessage());
         }
 
-        VersionUtil.checkVersion(auth.getVersion(), transport);
+        String version = auth.getVersion();
+        if (version == null){
+            version = VersionUtil.getVersion(transport);
+        }
+
+        if (!VersionUtil.checkVersion(version)) {
+            transport.close();
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_VERSION_INCOPMATIABLE, "minimal supported version is " + MIN_SUPPORT_VERSION + ", but got " + version);
+        }
+
         TaosGlobalConfig.setCharset(StandardCharsets.UTF_8.name());
-        return new WSConnection(url, props, transport, param);
+        return new WSConnection(url, props, transport, param, version);
     }
 
 }

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

@@ -20,7 +20,7 @@ public class TSDBConnection extends AbstractConnection {
     private final TSDBDatabaseMetaData databaseMetaData;
 
     public TSDBConnection(Properties info, TSDBDatabaseMetaData meta) throws SQLException {
-        super(info);
+        super(info, TSDBConstants.UNKNOWN_VERSION);
         this.databaseMetaData = meta;
         connect(info.getProperty(TSDBDriver.PROPERTY_KEY_HOST),
                 Integer.parseInt(info.getProperty(TSDBDriver.PROPERTY_KEY_PORT, "0")),

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

@@ -99,6 +99,8 @@ public abstract class TSDBConstants {
     public static final long MAX_UNSIGNED_INT = 4294967295L;
     public static final String MAX_UNSIGNED_LONG = "18446744073709551615";
     public static final String MIN_SUPPORT_VERSION = "3.3.6.0";
+    public static final String MIN_BLOB_SUPPORT_VERSION = "3.3.7.0.alpha";
+    public static final String UNKNOWN_VERSION = "unknown";
 
     public static String jdbcType2TaosTypeName(int jdbcType) throws SQLException {
         switch (jdbcType) {

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

@@ -44,6 +44,8 @@ public class TSDBError {
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_TYPE_CONVERT_EXCEPTION, "type convert exception");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_VERSION_INCOPMATIABLE, "TDengine version incompatible");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_RESOURCE_FREEED, "resource has been freed");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_BLOB_UNSUPPORTED_IN_SERVER, "BLOB is unsupported on the server");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_LINE_BIND_MODE_UNSUPPORTED_IN_SERVER, "line bind mode is unsupported on the server");
 
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNKNOWN, "unknown error");
 

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

@@ -40,6 +40,9 @@ public class TSDBErrorNumbers {
     public static final int ERROR_VERSION_INCOPMATIABLE = 0x2321;
     public static final int ERROR_RESOURCE_FREEED = 0x2322;
 
+    public static final int ERROR_BLOB_UNSUPPORTED_IN_SERVER = 0x2323;
+    public static final int ERROR_LINE_BIND_MODE_UNSUPPORTED_IN_SERVER = 0x2324;
+
     public static final int ERROR_UNKNOWN = 0x2350;    //unknown error
 
     public static final int ERROR_SUBSCRIBE_FAILED = 0x2351;     // failed to create subscription
@@ -103,6 +106,8 @@ public class TSDBErrorNumbers {
         errorNumbers.add(ERROR_TYPE_CONVERT_EXCEPTION);
         errorNumbers.add(ERROR_VERSION_INCOPMATIABLE);
         errorNumbers.add(ERROR_RESOURCE_FREEED);
+        errorNumbers.add(ERROR_BLOB_UNSUPPORTED_IN_SERVER);
+        errorNumbers.add(ERROR_LINE_BIND_MODE_UNSUPPORTED_IN_SERVER);
 
         errorNumbers.add(ERROR_RESTFul_Client_Protocol_Exception);
 

src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java

@@ -1,9 +1,6 @@
 package com.taosdata.jdbc.rs;
 
-import com.taosdata.jdbc.AbstractConnection;
-import com.taosdata.jdbc.TSDBDriver;
-import com.taosdata.jdbc.TSDBError;
-import com.taosdata.jdbc.TSDBErrorNumbers;
+import com.taosdata.jdbc.*;
 import com.taosdata.jdbc.enums.SchemalessProtocolType;
 import com.taosdata.jdbc.enums.SchemalessTimestampType;
 
@@ -29,7 +26,7 @@ public class RestfulConnection extends AbstractConnection {
     private final DatabaseMetaData metadata;
 
     public RestfulConnection(String host, String port, Properties props, String database, String url, String auth, boolean useSsl, String token, String tz) {
-        super(props);
+        super(props, TSDBConstants.UNKNOWN_VERSION);
         this.host = host;
         this.port = port;
         this.database = database;