This is an automated email from the ASF dual-hosted git repository.

Caideyipi pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/dev/1.3 by this push:
     new 2bbcb3df686 Fix JDBC batch failure reporting and database sync 
(#19245) (#19261)
2bbcb3df686 is described below

commit 2bbcb3df686b6dfbf0b761be021555b38308db3e
Author: Caideyipi <[email protected]>
AuthorDate: Mon Nov 16 11:39:35 2026 +0800

    Fix JDBC batch failure reporting and database sync (#19245) (#19261)
    
    * Fix JDBC batch failure status handling
    
    * Fix invalid integration test fixtures exposed by batch error reporting
    
    * Fix legacy table IT setup data
    
    (cherry picked from commit 594a237e79c55533591ef60f7773a9dbb3dc9316)
---
 .../iotdb/db/it/builtinfunction/scalar/IoTDBReplaceFunctionIT.java    | 2 +-
 .../iotdb/db/it/builtinfunction/scalar/IoTDBSubStringFunctionIT.java  | 2 +-
 .../apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java    | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBReplaceFunctionIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBReplaceFunctionIT.java
index 12c60856234..19cf720ef73 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBReplaceFunctionIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBReplaceFunctionIT.java
@@ -55,7 +55,7 @@ public class IoTDBReplaceFunctionIT {
         "CREATE TIMESERIES root.sg.s8 WITH DATATYPE=TIMESTAMP, ENCODING=PLAIN",
         "CREATE TIMESERIES root.sg.s9 WITH DATATYPE=STRING, ENCODING=PLAIN",
         "CREATE TIMESERIES root.sg.s10 WITH DATATYPE=BLOB, ENCODING=PLAIN",
-        "INSERT INTO root.sg(timestamp,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10) 
values(1, 'abcd', 1, 1, 1, 1, true, '2021-10-01', 1633046400000, 
'abcd','abcd')",
+        "INSERT INTO root.sg(timestamp,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10) 
values(1, 'abcd', 1, 1, 1, 1, true, '2021-10-01', 1633046400000, 'abcd', 
X'61626364')",
         "INSERT INTO root.sg(timestamp,s1) values(2, 'test\\\\')",
         "INSERT INTO root.sg(timestamp,s1) values(3, 'abcd\\\\')",
         "INSERT INTO root.sg(timestamp,s9) values(2, 'test\\\\')",
diff --git 
a/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBSubStringFunctionIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBSubStringFunctionIT.java
index cf4d8bb84ff..328fd707b42 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBSubStringFunctionIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBSubStringFunctionIT.java
@@ -56,7 +56,7 @@ public class IoTDBSubStringFunctionIT {
         "CREATE TIMESERIES root.sg.s8 WITH DATATYPE=TIMESTAMP, ENCODING=PLAIN",
         "CREATE TIMESERIES root.sg.s9 WITH DATATYPE=STRING, ENCODING=PLAIN",
         "CREATE TIMESERIES root.sg.s10 WITH DATATYPE=BLOB, ENCODING=PLAIN",
-        "INSERT INTO root.sg(timestamp,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10) 
values(1, 'abcd', 1, 1, 1, 1, true, '2021-10-01', 1633046400000, 'abcd', 
'abcd')",
+        "INSERT INTO root.sg(timestamp,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10) 
values(1, 'abcd', 1, 1, 1, 1, true, '2021-10-01', 1633046400000, 'abcd', 
X'61626364')",
         "INSERT INTO root.sg(timestamp,s1) values(2, 'test')",
         "INSERT INTO root.sg(timestamp,s1) values(3, 'abcdefg')",
         "INSERT INTO root.sg(timestamp,s9) values(2, 'test')",
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
index 8333b77d0cd..9607e51e7e7 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
@@ -1682,6 +1682,10 @@ public class ClientRPCServiceImpl implements 
IClientRPCServiceWithHandler {
                     false,
                     s.isDebug());
           }
+          if (result.status.getCode() != 
TSStatusCode.SUCCESS_STATUS.getStatusCode()
+              && result.status.getCode() != 
TSStatusCode.REDIRECTION_RECOMMEND.getStatusCode()) {
+            isAllSuccessful = false;
+          }
           results.add(result.status);
         } catch (Exception e) {
           LOGGER.warn("Error occurred when executing executeBatchStatement: ", 
e);

Reply via email to