Merge pull request #258 from taosdata/main

sync from main

Author: sheyanjie-qq

.github/workflows/build.yml

@@ -56,7 +56,9 @@ jobs:
         run: sudo taosadapter &
 
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          path: 'jdbc-workspace'
 
       - name: set up java
         uses: actions/setup-java@v3
@@ -66,6 +68,7 @@ jobs:
           java-package: jdk
 
       - name: Test
+        working-directory: jdbc-workspace
         env:
           TDENGINE_CLOUD_URL: ${{ secrets.TDENGINE_CLOUD_URL }}
         run: mvn -B clean verify --file pom.xml
@@ -74,7 +77,7 @@ jobs:
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: target/site/jacoco/jacoco.xml
+          files: jdbc-workspace/target/site/jacoco/jacoco.xml
           flags: unittests
           name: codecov-umbrella
           fail_ci_if_error: false

.github/workflows/compatibility-3360.yml

@@ -0,0 +1,72 @@
+name: build
+
+on:
+  push:
+    branches:
+      - main
+      - '3.0'
+    paths-ignore:
+      - 'LICENSE'
+      - '*.md'
+      - '*.txt'
+  pull_request:
+    branches:
+      - main
+      - '3.0'
+    paths-ignore:
+      - 'LICENSE'
+      - '*.md'
+      - '*.txt'
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        #        os: [ ubuntu-latest,macos-latest,windows-latest ]
+        os: [ Ubuntu-22.04 ]
+        java: [ 8 ]
+        maven: [ '3.6.3' ]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: get TDengine
+        run: |
+          wget https://github.com/taosdata/TDengine/releases/download/ver-3.3.6.0/TDengine-server-3.3.6.0-Linux-x64.tar.gz
+
+      - name: install
+        run: |
+          tar -zxf TDengine-server-3.3.6.0-Linux-x64.tar.gz
+          cd TDengine-server-3.3.6.0
+          sudo ./install.sh -e no
+
+      - name: shell
+        run: |
+          cat >start.sh<<EOF 
+          ulimit -n 65535 && TAOS_SUPPORT_VNODES=256 taosd
+          EOF
+
+      - name: taosd
+        run: nohup sudo sh ./start.sh &
+
+      - name: start taosadapter
+        run: sudo taosadapter &
+
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          path: 'jdbc-workspace'
+
+      - name: set up java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: ${{ matrix.java }}
+          java-package: jdk
+
+      - name: Test
+        working-directory: jdbc-workspace
+        env:
+          TDENGINE_CLOUD_URL: ${{ secrets.TDENGINE_CLOUD_URL }}
+        run: mvn -B clean verify --file pom.xml
+
+
+

CHANGELOG.md

@@ -5,12 +5,12 @@
 
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>3.5.3</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>JDBCDriver</name>
   <url>https://github.com/taosdata/taos-connector-jdbc</url>
-  <description>TDengine JDBC Driver</description>
+  <description>The official TDengine JDBC connector</description>
 
   <licenses>
     <license>

cliff.toml

@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.taosdata.jdbc</groupId>
     <artifactId>taos-jdbcdriver</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>JDBCDriver</name>
     <url>https://github.com/taosdata/taos-connector-jdbc</url>
 
-    <description>TDengine JDBC Driver</description>
+    <description>The official TDengine JDBC connector</description>
     <licenses>
         <license>
             <name>MIT License</name>
@@ -40,8 +40,9 @@
         <jackson.version>2.18.0</jackson.version>
         <httpclient.version>4.5.13</httpclient.version>
         <guava.version>32.1.3-jre</guava.version>
-        <Java-WebSocket.version>1.5.4</Java-WebSocket.version>
+        <netty-all.version>4.1.119.Final</netty-all.version>
         <junit.version>4.13.2</junit.version>
+        <slf4j.version>1.7.36</slf4j.version>
     </properties>
     <dependencies>
         <dependency>
@@ -65,30 +66,22 @@
             <version>${guava.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.java-websocket</groupId>
-            <artifactId>Java-WebSocket</artifactId>
-            <version>${Java-WebSocket.version}</version>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>${netty-all.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>org.slf4j</groupId>-->
-<!--            <artifactId>slf4j-api</artifactId>-->
-<!--            <version>1.7.25</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash; logback依赖 &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>ch.qos.logback</groupId>-->
-<!--            <artifactId>logback-classic</artifactId>-->
-<!--            <version>1.2.3</version>-->
-<!--        </dependency>-->
-
     </dependencies>
 
     <build>
@@ -194,7 +187,11 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M6</version>
                 <configuration>
-                    <forkMode>pertest</forkMode>
+                    <parallel>classes</parallel>
+                    <threadCount>1</threadCount>
+                    <useUnlimitedThreads>false</useUnlimitedThreads>
+                    <perCoreThreadCount>false</perCoreThreadCount>
+
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>

deploy-pom.xml

@@ -6,24 +6,25 @@
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.taosdata.jdbc.enums.WSFunction;
 import com.taosdata.jdbc.rs.ConnectionParam;
-import com.taosdata.jdbc.utils.JsonUtil;
-import com.taosdata.jdbc.utils.StringUtils;
+import com.taosdata.jdbc.utils.*;
 import com.taosdata.jdbc.ws.FutureResponse;
 import com.taosdata.jdbc.ws.InFlightRequest;
 import com.taosdata.jdbc.ws.Transport;
 import com.taosdata.jdbc.ws.WSConnection;
 import com.taosdata.jdbc.ws.entity.*;
 import org.slf4j.LoggerFactory;
 
-import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
 import java.util.Properties;
 
+import static com.taosdata.jdbc.TSDBConstants.MIN_SUPPORT_VERSION;
+
 public abstract class AbstractDriver implements Driver {
-    private final org.slf4j.Logger log = LoggerFactory.getLogger(AbstractDriver.class);
+    private static final org.slf4j.Logger log = LoggerFactory.getLogger(AbstractDriver.class);
 
     protected DriverPropertyInfo[] getPropertyInfo(Properties info) {
         DriverPropertyInfo hostProp = new DriverPropertyInfo(TSDBDriver.PROPERTY_KEY_HOST, info.getProperty(TSDBDriver.PROPERTY_KEY_HOST));
@@ -54,28 +55,18 @@ protected DriverPropertyInfo[] getPropertyInfo(Properties info) {
         propertyInfo[4] = passwordProp;
         return propertyInfo;
     }
-
-    protected Properties parseURL(String url, Properties defaults) {
-        return StringUtils.parseUrl(url, defaults);
-    }
-
-
-
     protected Connection getWSConnection(String url, ConnectionParam param, Properties props) throws SQLException {
         if (log.isDebugEnabled()){
             log.debug("getWSConnection, url = {}", StringUtils.getBasicUrl(url));
             try {
-                ObjectMapper objectMapper = new ObjectMapper();
+                ObjectMapper objectMapper = JsonUtil.getObjectMapper();
                 log.debug("getWSConnection, ConnectionParam = {}", objectMapper.writeValueAsString(param));
             } catch (JsonProcessingException e) {
                 log.error("Error serializing ConnectionParam", e);
             }
         }
-
         InFlightRequest inFlightRequest = new InFlightRequest(param.getRequestTimeout(), param.getMaxRequest());
-        Transport transport = new Transport(WSFunction.WS, param, inFlightRequest);
-
-        transport.setTextMessageHandler(message -> {
+        param.setTextMessageHandler(message -> {
             try {
                 log.trace("received message: {}", message);
                 JsonNode jsonObject = JsonUtil.getObjectReader().readTree(message);
@@ -90,17 +81,20 @@ protected Connection getWSConnection(String url, ConnectionParam param, Properti
                 log.error("Error processing message", e);
             }
         });
-        transport.setBinaryMessageHandler(byteBuffer -> {
-            byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
-            byteBuffer.position(26);
-            long id = byteBuffer.getLong();
-            byteBuffer.position(8);
+
+        param.setBinaryMessageHandler(byteBuf -> {
+            byteBuf.readerIndex(26);
+            long id = byteBuf.readLongLE();
+            byteBuf.readerIndex(8);
+
             FutureResponse remove = inFlightRequest.remove(Action.FETCH_BLOCK_NEW.getAction(), id);
             if (null != remove) {
-                FetchBlockNewResp fetchBlockResp = new FetchBlockNewResp(byteBuffer);
+                Utils.retainByteBuf(byteBuf);
+                FetchBlockNewResp fetchBlockResp = new FetchBlockNewResp(byteBuf);
                 remove.getFuture().complete(fetchBlockResp);
             }
         });
+        Transport transport = new Transport(WSFunction.WS, param, inFlightRequest);
 
         transport.checkConnection(param.getConnectTimeout());
 
@@ -112,7 +106,8 @@ protected Connection getWSConnection(String url, ConnectionParam param, Properti
             throw new SQLException("(0x" + Integer.toHexString(auth.getCode()) + "):" + "auth failure:" + auth.getMessage());
         }
 
-        TaosGlobalConfig.setCharset(props.getProperty(TSDBDriver.PROPERTY_KEY_CHARSET));
+        VersionUtil.checkVersion(auth.getVersion(), transport);
+        TaosGlobalConfig.setCharset(StandardCharsets.UTF_8.name());
         return new WSConnection(url, props, transport, param);
     }