(backport) skip remaining response when ping (#224)

housepower · Nov 20, 2020 · 8125c99 · 8125c99
1 parent bd52274
commit 8125c99
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/...ouse-native-jdbc/src/main/java/com/github/housepower/jdbc/connect/PhysicalConnection.java b/...ouse-native-jdbc/src/main/java/com/github/housepower/jdbc/connect/PhysicalConnection.java
@@ -17,16 +17,7 @@
 import com.github.housepower.jdbc.buffer.SocketBuffedWriter;
 import com.github.housepower.jdbc.data.Block;
 import com.github.housepower.jdbc.misc.Validate;
-import com.github.housepower.jdbc.protocol.DataRequest;
-import com.github.housepower.jdbc.protocol.DataResponse;
-import com.github.housepower.jdbc.protocol.EOFStreamResponse;
-import com.github.housepower.jdbc.protocol.HelloRequest;
-import com.github.housepower.jdbc.protocol.HelloResponse;
-import com.github.housepower.jdbc.protocol.PingRequest;
-import com.github.housepower.jdbc.protocol.PongResponse;
-import com.github.housepower.jdbc.protocol.ProgressResponse;
-import com.github.housepower.jdbc.protocol.QueryRequest;
-import com.github.housepower.jdbc.protocol.RequestOrResponse;
+import com.github.housepower.jdbc.protocol.*;
 import com.github.housepower.jdbc.serializer.BinaryDeserializer;
 import com.github.housepower.jdbc.serializer.BinarySerializer;
 import com.github.housepower.jdbc.settings.ClickHouseConfig;
@@ -42,6 +33,7 @@
 import java.util.UUID;
 
 public class PhysicalConnection {
+
     private final Socket socket;
     private final SocketAddress address;
     private final BinarySerializer serializer;
@@ -59,8 +51,6 @@ public boolean ping(int soTimeout, PhysicalInfo.ServerInfo info) {
             sendRequest(new PingRequest());
             for (; ; ) {
                 RequestOrResponse response = receiveResponse(soTimeout, info);
-                Validate.isTrue(response instanceof ProgressResponse || response instanceof PongResponse,
-                    "Expect Pong Response.");
 
                 if (response instanceof PongResponse)
                     return true;
@@ -128,7 +118,7 @@ public void disPhysicalConnection() throws SQLException {
     }
 
     private void sendQuery(String id, int stage, QueryRequest.ClientInfo info, String query,
-        Map<SettingKey, Object> settings) throws SQLException {
+                           Map<SettingKey, Object> settings) throws SQLException {
         sendRequest(new QueryRequest(id, info, stage, true, query, settings));
     }
 

diff --git a/clickhouse-native-jdbc/src/test/resources/simplelogger.properties b/clickhouse-native-jdbc/src/test/resources/simplelogger.properties
@@ -0,0 +1,4 @@
+org.slf4j.simpleLogger.defaultLogLevel=DEBUG
+org.slf4j.simpleLogger.showDateTime=true
+org.slf4j.simpleLogger.showThreadName=true
+org.slf4j.simpleLogger.showShortLogName=true