From bb53cd78c0fc0209ebc9231f2d2a0898d124b321 Mon Sep 17 00:00:00 2001 From: Caideyipi <87789683+Caideyipi@users.noreply.github.com> Date: Fri, 13 Nov 2026 14:33:05 +0800 Subject: [PATCH] Fix JDBC batch failure reporting and database sync (#19245) * 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) --- .../db/it/builtinfunction/scalar/IoTDBReplaceFunctionIT.java | 2 +- .../it/builtinfunction/scalar/IoTDBSubStringFunctionIT.java | 2 +- .../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 12c608562348a..19cf720ef7342 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 cf4d8bb84ffae..328fd707b42de 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 8333b77d0cd91..9607e51e7e73c 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 TSStatus executeBatchStatement(TSExecuteBatchStatementReq req) { 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);