fixbug/#432: The insert exception also sets the state to idle (#435)

housepower · Feb 17, 2023 · 21f2906 · 21f2906
1 parent ffd0a65
commit 21f2906
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/clickhouse-native-jdbc/src/main/java/com/github/housepower/jdbc/ClickHouseConnection.java b/clickhouse-native-jdbc/src/main/java/com/github/housepower/jdbc/ClickHouseConnection.java
@@ -287,16 +287,18 @@ public QueryResult sendQueryRequest(final String query, ClickHouseConfig cfg) th
 
     public int sendInsertRequest(Block block) throws SQLException {
         Validate.isTrue(this.state.get() == SessionState.WAITING_INSERT, "Call getSampleBlock before insert.");
-
-        NativeClient nativeClient = getNativeClient();
-        nativeClient.sendData(block);
-        nativeClient.sendData(new Block());
-        nativeClient.receiveEndOfStream(cfg.get().queryTimeout(), nativeCtx.serverCtx());
-        Validate.isTrue(this.state.compareAndSet(SessionState.WAITING_INSERT, SessionState.IDLE));
+        try {
+            NativeClient nativeClient = getNativeClient();
+            nativeClient.sendData(block);
+            nativeClient.sendData(new Block());
+            nativeClient.receiveEndOfStream(cfg.get().queryTimeout(), nativeCtx.serverCtx());
+        } finally {
+            Validate.isTrue(this.state.compareAndSet(SessionState.WAITING_INSERT, SessionState.IDLE));
+        }
         return block.rowCnt();
     }
-
-    synchronized private NativeClient getHealthyNativeClient() throws SQLException {
+    
+    private synchronized NativeClient getHealthyNativeClient() throws SQLException {
         NativeContext oldCtx = nativeCtx;
         if (!oldCtx.nativeClient().ping(cfg.get().queryTimeout(), nativeCtx.serverCtx())) {
             LOG.warn("connection loss with state[{}], create new connection and reset state", state);