fix

luoluoyuyu · luoluoyuyu · commit 7b8e946e519d · 2025-05-30T15:41:17.000+08:00
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilderV2.java
@@ -164,19 +164,22 @@ private void writeTabletsIntoOneFile(
       List<IMeasurementSchema> aggregatedSchemas =
           tablets.stream()
               .flatMap(tablet -> tablet.getSchemas().stream())
-              .filter(Objects::nonNull)
               .collect(Collectors.toList());
       List<ColumnCategory> aggregatedColumnCategories =
           tablets.stream()
               .flatMap(tablet -> tablet.getColumnTypes().stream())
-              .filter(Objects::nonNull)
               .collect(Collectors.toList());
 
       final Set<IMeasurementSchema> seen = new HashSet<>();
       final List<Integer> distinctIndices =
           IntStream.range(0, aggregatedSchemas.size())
               .filter(
-                  i -> seen.add(aggregatedSchemas.get(i))) // Only keep the first occurrence index
+                  i -> {
+                    if (Objects.nonNull(aggregatedSchemas.get(i))) {
+                      return seen.add(aggregatedSchemas.get(i));
+                    }
+                    return false;
+                  }) // Only keep the first occurrence index
               .boxed()
               .collect(Collectors.toList());
 
@@ -222,24 +225,25 @@ private void writeTabletsIntoOneFile(
               // the data of the table model is aligned
               true,
               tablet.getSchemas().stream()
-                  .filter(Objects::nonNull)
-                  .map(IMeasurementSchema::getMeasurementName)
+                  .map(m -> Objects.nonNull(m) ? m.getMeasurementName() : null)
                   .toArray(String[]::new),
               tablet.getSchemas().stream()
-                  .map(IMeasurementSchema::getType)
+                  .map(m -> Objects.nonNull(m) ? m.getType() : null)
                   .toArray(TSDataType[]::new),
               // TODO: cast
               tablet.getSchemas().stream()
-                  .filter(Objects::nonNull)
                   .map(schema -> (MeasurementSchema) schema)
                   .toArray(MeasurementSchema[]::new),
               tablet.getTimestamps(),
               tablet.getBitMaps(),
               values,
               tablet.getRowSize(),
               tablet.getColumnTypes().stream()
-                  .filter(Objects::nonNull)
-                  .map(TsTableColumnCategory::fromTsFileColumnCategory)
+                  .map(
+                      c ->
+                          Objects.nonNull(c)
+                              ? TsTableColumnCategory.fromTsFileColumnCategory(c)
+                              : null)
                   .toArray(TsTableColumnCategory[]::new));
 
       final int start = 0;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTreeModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTreeModelTsFileBuilderV2.java
@@ -162,16 +162,13 @@ private void writeTabletsIntoOneFile(
               new PartialPath(tablet.getDeviceId()),
               isTabletAlignedList.get(i),
               tablet.getSchemas().stream()
-                  .filter(Objects::nonNull)
-                  .map(IMeasurementSchema::getMeasurementName)
+                  .map(m -> Objects.nonNull(m) ? m.getMeasurementName() : null)
                   .toArray(String[]::new),
               tablet.getSchemas().stream()
-                  .filter(Objects::nonNull)
-                  .map(IMeasurementSchema::getType)
+                  .map(m -> Objects.nonNull(m) ? m.getType() : null)
                   .toArray(TSDataType[]::new),
               // TODO: cast
               tablet.getSchemas().stream()
-                  .filter(Objects::nonNull)
                   .map(schema -> (MeasurementSchema) schema)
                   .toArray(MeasurementSchema[]::new),
               tablet.getTimestamps(),
