Merge pull request #164 from taosdata/feat/TD-30089

Feat/td 30089
taosdata · May 28, 2024 · ae66e9c · ae66e9c
2 parents 6af531c + b260a12
commit ae66e9c
Show file tree

Hide file tree

Showing 26 changed files with 81 additions and 378 deletions.
diff --git a/src/main/java/com/taosdata/jdbc/SchemalessWriter.java b/src/main/java/com/taosdata/jdbc/SchemalessWriter.java
@@ -16,7 +16,7 @@
 import com.taosdata.jdbc.ws.entity.Code;
 import com.taosdata.jdbc.ws.entity.Request;
 import com.taosdata.jdbc.ws.entity.Response;
-import com.taosdata.jdbc.ws.schemaless.CommonResp;
+import com.taosdata.jdbc.ws.entity.CommonResp;
 import com.taosdata.jdbc.ws.schemaless.ConnReq;
 import com.taosdata.jdbc.ws.schemaless.InsertReq;
 import com.taosdata.jdbc.ws.schemaless.SchemalessAction;

diff --git a/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java b/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java
@@ -124,6 +124,7 @@ private Connection getWSConnection(String url, ConnectionParam param, Properties
             byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
             byteBuffer.position(8);
             long id = byteBuffer.getLong();
+
             FutureResponse remove = inFlightRequest.remove(Action.FETCH_BLOCK.getAction(), id);
             if (null != remove) {
                 FetchBlockResp fetchBlockResp = new FetchBlockResp(id, byteBuffer);

diff --git a/src/main/java/com/taosdata/jdbc/ws/AbstractWSResultSet.java b/src/main/java/com/taosdata/jdbc/ws/AbstractWSResultSet.java
@@ -101,7 +101,7 @@ public void close() throws SQLException {
                     FetchReq closeReq = new FetchReq();
                     closeReq.setReqId(queryId);
                     closeReq.setId(queryId);
-                    transport.sendWithoutRep(new Request(Action.FREE_RESULT.getAction(), closeReq));
+                    transport.sendWithoutResponse(new Request(Action.FREE_RESULT.getAction(), closeReq));
                 }
             }
         }

diff --git a/src/main/java/com/taosdata/jdbc/ws/TSWSPreparedStatement.java b/src/main/java/com/taosdata/jdbc/ws/TSWSPreparedStatement.java
@@ -239,7 +239,7 @@ public int executeUpdate() throws SQLException {
         }
         // close
         Request close = RequestFactory.generateClose(stmtId, reqId);
-        transport.sendWithoutRep(close);
+        transport.sendWithoutResponse(close);
         return resp.getAffected();
     }
 
@@ -728,7 +728,7 @@ public int[] executeBatch() throws SQLException {
     public void close() throws SQLException {
         super.close();
         Request close = RequestFactory.generateClose(stmtId, reqId);
-        transport.sendWithoutRep(close);
+        transport.sendWithoutResponse(close);
     }
 
     @Override

diff --git a/src/main/java/com/taosdata/jdbc/ws/Transport.java b/src/main/java/com/taosdata/jdbc/ws/Transport.java
@@ -33,6 +33,11 @@ public class Transport implements AutoCloseable {
 
     public static final int DEFAULT_MESSAGE_WAIT_TIMEOUT = 60_000;
 
+    public static final int TSDB_CODE_RPC_NETWORK_UNAVAIL = 0x0B;
+    public static final int TSDB_CODE_RPC_SOMENODE_NOT_CONNECTED = 0x20;
+
+
+
     private final ArrayList<WSClient> clientArr = new ArrayList<>();;
     private final InFlightRequest inFlightRequest;
     private long timeout;
@@ -130,6 +135,7 @@ public Response send(Request request) throws SQLException {
                 completableFuture, timeout, TimeUnit.MILLISECONDS, reqString);
         try {
             response = responseFuture.get();
+            handleErrInMasterSlaveMode(response);
         } catch (InterruptedException | ExecutionException e) {
             inFlightRequest.remove(request.getAction(), request.id());
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_QUERY_TIMEOUT, e.getMessage());
@@ -177,13 +183,21 @@ public Response send(String action, long reqId, long stmtId, long type, byte[] r
         CompletableFuture<Response> responseFuture = CompletableFutureTimeout.orTimeout(completableFuture, timeout, TimeUnit.MILLISECONDS, reqString);
         try {
             response = responseFuture.get();
+            handleErrInMasterSlaveMode(response);
         } catch (InterruptedException | ExecutionException e) {
             inFlightRequest.remove(action, reqId);
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_QUERY_TIMEOUT, e.getMessage());
         }
         return response;
     }
-
+    private void handleErrInMasterSlaveMode(Response response) throws InterruptedException{
+        if (clientArr.size() > 1 && response instanceof CommonResp){
+            CommonResp commonResp = (CommonResp) response;
+            if (TSDB_CODE_RPC_NETWORK_UNAVAIL == commonResp.getCode() || TSDB_CODE_RPC_SOMENODE_NOT_CONNECTED == commonResp.getCode()) {
+                clientArr.get(currentNodeIndex).closeBlocking();
+            }
+        }
+    }
 
     public Response sendWithoutRetry(Request request) throws SQLException {
         if (isClosed()){
@@ -218,7 +232,7 @@ public Response sendWithoutRetry(Request request) throws SQLException {
         return response;
     }
 
-    public void sendWithoutRep(Request request) throws SQLException  {
+    public void sendWithoutResponse(Request request) throws SQLException  {
         if (isClosed()){
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED, "Websocket Not Connected Exception");
         }
@@ -334,25 +348,36 @@ public boolean doReconnectCurNode() throws SQLException {
     }
 
     public boolean reconnectCurNode() throws SQLException {
-        boolean reconnected = doReconnectCurNode();
-        if (!reconnected){
-            return false;
-        }
+        for (int retryTimes = 0; retryTimes < connectionParam.getReconnectRetryCount(); retryTimes++) {
+            try {
+                boolean reconnected = clientArr.get(currentNodeIndex).reconnectBlocking();
+                if (reconnected) {
+                    // send con msgs
+                    ConnectReq connectReq = new ConnectReq();
+                    connectReq.setReqId(ReqId.getReqID());
+                    connectReq.setUser(connectionParam.getUser());
+                    connectReq.setPassword(connectionParam.getPassword());
+                    connectReq.setDb(connectionParam.getDatabase());
+
+                    if (connectionParam.getConnectMode() != 0) {
+                        connectReq.setMode(connectionParam.getConnectMode());
+                    }
 
-        // send con msgs
-        ConnectReq connectReq = new ConnectReq();
-        connectReq.setReqId(ReqId.getReqID());
-        connectReq.setUser(connectionParam.getUser());
-        connectReq.setPassword(connectionParam.getPassword());
-        connectReq.setDb(connectionParam.getDatabase());
+                    ConnectResp auth;
+                    auth = (ConnectResp) sendWithoutRetry(new Request(Action.CONN.getAction(), connectReq));
 
-        if (connectionParam.getConnectMode() != 0){
-            connectReq.setMode(connectionParam.getConnectMode());
+                    if (Code.SUCCESS.getCode() == auth.getCode()) {
+                        return true;
+                    } else {
+                        clientArr.get(currentNodeIndex).closeBlocking();
+                        log.error("reconnect failed, code: {}, msg: {}", auth.getCode(), auth.getMessage());
+                    }
+                }
+                Thread.sleep(connectionParam.getReconnectIntervalMs());
+            } catch (Exception e) {
+                log.error("try connect remote server failed!", e);
+            }
         }
-
-        ConnectResp auth;
-        auth = (ConnectResp) sendWithoutRetry(new Request(Action.CONN.getAction(), connectReq));
-
-        return Code.SUCCESS.getCode() == auth.getCode();
+        return false;
     }
 }
diff --git a/src/main/java/com/taosdata/jdbc/ws/WSConnection.java b/src/main/java/com/taosdata/jdbc/ws/WSConnection.java
@@ -10,7 +10,7 @@
 import com.taosdata.jdbc.rs.RestfulDatabaseMetaData;
 import com.taosdata.jdbc.utils.ReqId;
 import com.taosdata.jdbc.ws.entity.*;
-import com.taosdata.jdbc.ws.schemaless.CommonResp;
+import com.taosdata.jdbc.ws.entity.CommonResp;
 import com.taosdata.jdbc.ws.schemaless.InsertReq;
 import com.taosdata.jdbc.ws.schemaless.SchemalessAction;
 

diff --git a/src/main/java/com/taosdata/jdbc/ws/entity/Action.java b/src/main/java/com/taosdata/jdbc/ws/entity/Action.java
@@ -1,6 +1,5 @@
 package com.taosdata.jdbc.ws.entity;
 
-import com.taosdata.jdbc.ws.schemaless.CommonResp;
 import com.taosdata.jdbc.ws.stmt.entity.ExecResp;
 import com.taosdata.jdbc.ws.stmt.entity.StmtResp;
 
@@ -14,7 +13,6 @@ public enum Action {
     CONN("conn", ConnectResp.class),
     QUERY("query", QueryResp.class),
     FETCH("fetch", FetchResp.class),
-    FETCH_JSON("fetch_json", FetchJsonResp.class),
     FETCH_BLOCK("fetch_block", FetchBlockResp.class),
     // free_result's class is meaningless
     FREE_RESULT("free_result", Response.class),

diff --git a/...osdata/jdbc/ws/schemaless/CommonResp.java → ...m/taosdata/jdbc/ws/entity/CommonResp.java b/...osdata/jdbc/ws/schemaless/CommonResp.java → ...m/taosdata/jdbc/ws/entity/CommonResp.java
@@ -1,6 +1,4 @@
-package com.taosdata.jdbc.ws.schemaless;
-
-import com.taosdata.jdbc.ws.entity.Response;
+package com.taosdata.jdbc.ws.entity;
 
 public class CommonResp extends Response {
 

diff --git a/src/main/java/com/taosdata/jdbc/ws/entity/ConnectResp.java b/src/main/java/com/taosdata/jdbc/ws/entity/ConnectResp.java
@@ -3,23 +3,5 @@
 /**
  * connection result pojo
  */
-public class ConnectResp extends Response {
-    private int code;
-    private String message;
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
+public class ConnectResp extends CommonResp {
 }
diff --git a/src/main/java/com/taosdata/jdbc/ws/entity/FetchJsonResp.java b/src/main/java/com/taosdata/jdbc/ws/entity/FetchJsonResp.java
diff --git a/src/main/java/com/taosdata/jdbc/ws/entity/FetchResp.java b/src/main/java/com/taosdata/jdbc/ws/entity/FetchResp.java
@@ -3,30 +3,12 @@
 /**
  * fetch result pojo
  */
-public class FetchResp extends Response{
-    private int code;
-    private String message;
+public class FetchResp extends CommonResp{
     private long id;
     private boolean completed;
     private Integer[] lengths;
     private int rows;
 
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
     public long getId() {
         return id;
     }

diff --git a/src/main/java/com/taosdata/jdbc/ws/entity/QueryResp.java b/src/main/java/com/taosdata/jdbc/ws/entity/QueryResp.java
@@ -6,18 +6,8 @@
 /**
  * query result pojo
  */
-public class QueryResp extends Response {
-    private int code;
+public class QueryResp extends CommonResp {
 
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    private String message;
 
     @JSONField(deserializeUsing = UInt64Codec.class)
     private long id;
@@ -42,14 +32,6 @@ public void setCode(int code) {
 
     private int precision;
 
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
     public long getId() {
         return id;
     }

diff --git a/src/main/java/com/taosdata/jdbc/ws/schemaless/SchemalessAction.java b/src/main/java/com/taosdata/jdbc/ws/schemaless/SchemalessAction.java
@@ -1,5 +1,6 @@
 package com.taosdata.jdbc.ws.schemaless;
 
+import com.taosdata.jdbc.ws.entity.CommonResp;
 import com.taosdata.jdbc.ws.entity.Response;
 
 public enum SchemalessAction {

diff --git a/src/main/java/com/taosdata/jdbc/ws/stmt/entity/ExecResp.java b/src/main/java/com/taosdata/jdbc/ws/stmt/entity/ExecResp.java
@@ -2,31 +2,12 @@
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.taosdata.jdbc.utils.UInt64Codec;
-import com.taosdata.jdbc.ws.entity.Response;
+import com.taosdata.jdbc.ws.entity.CommonResp;
 
-public class ExecResp extends Response {
-    private int code;
-    private String message;
+public class ExecResp extends CommonResp {
     @JSONField(name = "stmt_id", deserializeUsing = UInt64Codec.class)
     private long stmtId;
     private int affected;
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
     public long getStmtId() {
         return stmtId;
     }

diff --git a/src/main/java/com/taosdata/jdbc/ws/stmt/entity/StmtResp.java b/src/main/java/com/taosdata/jdbc/ws/stmt/entity/StmtResp.java
@@ -2,31 +2,12 @@
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.taosdata.jdbc.utils.UInt64Codec;
-import com.taosdata.jdbc.ws.entity.Response;
+import com.taosdata.jdbc.ws.entity.CommonResp;
 
 // init | prepare | set_table_name | set_tags | bind | add_batch
-public class StmtResp extends Response {
-    private int code;
-    private String message;
+public class StmtResp extends CommonResp {
     @JSONField(name = "stmt_id", deserializeUsing = UInt64Codec.class)
     private long stmtId;
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
     public long getStmtId() {
         return stmtId;
     }