Skip to content

Commit bb55dd6

Browse files
CaideyipiJackieTien97
authored andcommitted
may-c (#16859)
(cherry picked from commit 5cf60df)
1 parent 5523601 commit bb55dd6

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package org.apache.iotdb.db.queryengine.plan.statement.crud;
2121

2222
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
23+
import org.apache.iotdb.commons.conf.CommonDescriptor;
2324
import org.apache.iotdb.commons.exception.MetadataException;
2425
import org.apache.iotdb.commons.path.PartialPath;
2526
import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
@@ -702,11 +703,15 @@ protected void subRemoveAttributeColumns(List<Integer> columnsToKeep) {
702703

703704
@Override
704705
public String toString() {
706+
final int size = CommonDescriptor.getInstance().getConfig().getPathLogMaxSize();
705707
return "InsertTabletStatement{"
706708
+ "deviceIDs="
707709
+ Arrays.toString(deviceIDs)
708710
+ ", measurements="
709-
+ Arrays.toString(measurements)
711+
+ Arrays.toString(
712+
Objects.nonNull(measurements) && measurements.length > size
713+
? Arrays.copyOf(measurements, size)
714+
: measurements)
710715
+ ", rowCount="
711716
+ rowCount
712717
+ ", timeRange=["

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/receiver/PipeReceiverStatusHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import org.slf4j.Logger;
3636
import org.slf4j.LoggerFactory;
3737

38+
import javax.annotation.Nullable;
39+
3840
import java.util.Arrays;
3941
import java.util.Collections;
4042
import java.util.List;
@@ -106,7 +108,7 @@ public void handle(
106108
*/
107109
public void handle(
108110
final TSStatus status,
109-
final String exceptionMessage,
111+
final @Nullable String exceptionMessage,
110112
final String recordMessage,
111113
final boolean log4NoPrivileges) {
112114

@@ -206,7 +208,7 @@ public void handle(
206208
break;
207209
default:
208210
// Some auth error may be wrapped in other codes
209-
if (exceptionMessage.contains(NO_PERMISSION_STR)) {
211+
if (Objects.nonNull(exceptionMessage) && exceptionMessage.contains(NO_PERMISSION_STR)) {
210212
if (skipIfNoPrivileges) {
211213
if (log4NoPrivileges && LOGGER.isWarnEnabled()) {
212214
LOGGER.warn(

0 commit comments

Comments
 (0)