You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2025/12/08 02:10:57 UTC
(iotdb) 09/14: may-c (#16859)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty/object_type
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit bb55dd6ee7c49bf7be713fa193fbbcde2dd3ac7f
Author: Caideyipi <87...@users.noreply.github.com>
AuthorDate: Thu Dec 4 10:56:29 2025 +0800
may-c (#16859)
(cherry picked from commit 5cf60df3afc469b40db9486dd63670b482ca27df)
---
.../db/queryengine/plan/statement/crud/InsertTabletStatement.java | 7 ++++++-
.../iotdb/commons/pipe/receiver/PipeReceiverStatusHandler.java | 6 ++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java
index 588b0e02515..d2c1d2a783a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.statement.crud;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
@@ -702,11 +703,15 @@ public class InsertTabletStatement extends InsertBaseStatement implements ISchem
@Override
public String toString() {
+ final int size = CommonDescriptor.getInstance().getConfig().getPathLogMaxSize();
return "InsertTabletStatement{"
+ "deviceIDs="
+ Arrays.toString(deviceIDs)
+ ", measurements="
- + Arrays.toString(measurements)
+ + Arrays.toString(
+ Objects.nonNull(measurements) && measurements.length > size
+ ? Arrays.copyOf(measurements, size)
+ : measurements)
+ ", rowCount="
+ rowCount
+ ", timeRange=["
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/receiver/PipeReceiverStatusHandler.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/receiver/PipeReceiverStatusHandler.java
index 886d387f60c..fb997d0b14a 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/receiver/PipeReceiverStatusHandler.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/receiver/PipeReceiverStatusHandler.java
@@ -35,6 +35,8 @@ import org.apache.iotdb.rpc.TSStatusCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Nullable;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -106,7 +108,7 @@ public class PipeReceiverStatusHandler {
*/
public void handle(
final TSStatus status,
- final String exceptionMessage,
+ final @Nullable String exceptionMessage,
final String recordMessage,
final boolean log4NoPrivileges) {
@@ -206,7 +208,7 @@ public class PipeReceiverStatusHandler {
break;
default:
// Some auth error may be wrapped in other codes
- if (exceptionMessage.contains(NO_PERMISSION_STR)) {
+ if (Objects.nonNull(exceptionMessage) && exceptionMessage.contains(NO_PERMISSION_STR)) {
if (skipIfNoPrivileges) {
if (log4NoPrivileges && LOGGER.isWarnEnabled()) {
LOGGER.warn(