Skip to content

Pipe: Fixed the problem of null pointer and incorrect Tablet format being modified during TSFile construction #15602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SteveYurongSu merged 2 commits into from
May 29, 2025
Merged

Pipe: Fixed the problem of null pointer and incorrect Tablet format being modified during TSFile construction #15602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af79e19
Pipe: Fixed the problem of null pointer and incorrect Tablet format b…
luoluoyuyu May 29, 2025
3dd00f4
fix
luoluoyuyu May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ...n/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilderV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.io.IOException;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Expand Down Expand Up @@ -163,10 +164,12 @@ 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<>();
Expand All @@ -193,10 +196,9 @@ private void writeTabletsIntoOneFile(
for (int i = 0, size = tabletList.size(); i < size; ++i) {
final Tablet tablet = tabletList.get(i);

// convert date value to int
// refer to
// convert date value to int refer to
// org.apache.iotdb.db.storageengine.dataregion.memtable.WritableMemChunk.writeNonAlignedTablet
final Object[] values = tablet.getValues();
final Object[] values = Arrays.copyOf(tablet.getValues(), tablet.getValues().length);
for (int j = 0; j < tablet.getSchemas().size(); ++j) {
final IMeasurementSchema schema = tablet.getSchemas().get(j);
if (Objects.nonNull(schema)
Expand All @@ -220,20 +222,23 @@ private void writeTabletsIntoOneFile(
// the data of the table model is aligned
true,
tablet.getSchemas().stream()
.filter(Objects::nonNull)
.map(IMeasurementSchema::getMeasurementName)
.toArray(String[]::new),
tablet.getSchemas().stream()
.map(IMeasurementSchema::getType)
.toArray(TSDataType[]::new),
// TODO: cast
tablet.getSchemas().stream()
.filter(Objects::nonNull)
.map(schema -> (MeasurementSchema) schema)
.toArray(MeasurementSchema[]::new),
tablet.getTimestamps(),
tablet.getBitMaps(),
tablet.getValues(),
values,
tablet.getRowSize(),
tablet.getColumnTypes().stream()
.filter(Objects::nonNull)
.map(TsTableColumnCategory::fromTsFileColumnCategory)
.toArray(TsTableColumnCategory[]::new));

Expand Down
11 changes: 7 additions & 4 deletions ...in/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTreeModelTsFileBuilderV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import java.io.IOException;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong;
Expand Down Expand Up @@ -138,10 +139,9 @@ private void writeTabletsIntoOneFile(
for (int i = 0, size = tabletList.size(); i < size; ++i) {
final Tablet tablet = tabletList.get(i);

// convert date value to int
// refer to
// convert date value to int refer to
// org.apache.iotdb.db.storageengine.dataregion.memtable.WritableMemChunk.writeNonAlignedTablet
final Object[] values = tablet.getValues();
final Object[] values = Arrays.copyOf(tablet.getValues(), tablet.getValues().length);
for (int j = 0; j < tablet.getSchemas().size(); ++j) {
final IMeasurementSchema schema = tablet.getSchemas().get(j);
if (Objects.nonNull(schema)
Expand All @@ -162,18 +162,21 @@ private void writeTabletsIntoOneFile(
new PartialPath(tablet.getDeviceId()),
isTabletAlignedList.get(i),
tablet.getSchemas().stream()
.filter(Objects::nonNull)
.map(IMeasurementSchema::getMeasurementName)
.toArray(String[]::new),
tablet.getSchemas().stream()
.filter(Objects::nonNull)
.map(IMeasurementSchema::getType)
.toArray(TSDataType[]::new),
// TODO: cast
tablet.getSchemas().stream()
.filter(Objects::nonNull)
.map(schema -> (MeasurementSchema) schema)
.toArray(MeasurementSchema[]::new),
tablet.getTimestamps(),
tablet.getBitMaps(),
tablet.getValues(),
values,
tablet.getRowSize());

final int start = 0;
Expand Down
Loading