Skip to content

[To rc/1.1] Fix error when write aligned tablet with null date #251

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
jt2594838 merged 1 commit into from
Sep 24, 2024
Merged

[To rc/1.1] Fix error when write aligned tablet with null date #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,10 @@ public int write(Tablet tablet) throws WriteProcessException, IOException {
case DATE:
valueChunkWriter.write(
time,
DateUtils.parseDateExpressionToInt(((LocalDate[]) tablet.values[columnIndex])[row]),
isNull
? 0
: DateUtils.parseDateExpressionToInt(
((LocalDate[]) tablet.values[columnIndex])[row]),
isNull);
break;
case INT64:
Expand Down
31 changes: 23 additions & 8 deletions java/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriteApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -354,8 +355,9 @@ public void writeNonAlignedWithTabletWithNullValue() {
setEnv(100, 30);
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
measurementSchemas.add(new MeasurementSchema("s1", TSDataType.TEXT, TSEncoding.PLAIN));
measurementSchemas.add(new MeasurementSchema("s2", TSDataType.TEXT, TSEncoding.PLAIN));
measurementSchemas.add(new MeasurementSchema("s3", TSDataType.TEXT, TSEncoding.PLAIN));
measurementSchemas.add(new MeasurementSchema("s2", TSDataType.STRING, TSEncoding.PLAIN));
measurementSchemas.add(new MeasurementSchema("s3", TSDataType.BLOB, TSEncoding.PLAIN));
measurementSchemas.add(new MeasurementSchema("s4", TSDataType.DATE, TSEncoding.PLAIN));

// register nonAligned timeseries
tsFileWriter.registerTimeseries(new Path(deviceId), measurementSchemas);
Expand All @@ -364,19 +366,25 @@ public void writeNonAlignedWithTabletWithNullValue() {
long[] timestamps = tablet.timestamps;
Object[] values = tablet.values;
tablet.initBitMaps();
long sensorNum = measurementSchemas.size();
int sensorNum = measurementSchemas.size();
long startTime = 0;
for (long r = 0; r < 10000; r++) {
int row = tablet.rowSize++;
timestamps[row] = startTime++;
for (int i = 0; i < sensorNum; i++) {
for (int i = 0; i < sensorNum - 1; i++) {
if (i == 1 && r > 1000) {
tablet.bitMaps[i].mark((int) r % tablet.getMaxRowNumber());
continue;
}
Binary[] textSensor = (Binary[]) values[i];
textSensor[row] = new Binary("testString.........", TSFileConfig.STRING_CHARSET);
}
if (r > 1000) {
tablet.bitMaps[sensorNum - 1].mark((int) r % tablet.getMaxRowNumber());
} else {
LocalDate[] dateSensor = (LocalDate[]) values[sensorNum - 1];
dateSensor[row] = LocalDate.of(2024, 4, 1);
}
// write
if (tablet.rowSize == tablet.getMaxRowNumber()) {
tsFileWriter.write(tablet);
Expand All @@ -400,8 +408,9 @@ public void writeAlignedWithTabletWithNullValue() {
setEnv(100, 30);
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
measurementSchemas.add(new MeasurementSchema("s1", TSDataType.TEXT, TSEncoding.PLAIN));
measurementSchemas.add(new MeasurementSchema("s2", TSDataType.TEXT, TSEncoding.PLAIN));
measurementSchemas.add(new MeasurementSchema("s3", TSDataType.TEXT, TSEncoding.PLAIN));
measurementSchemas.add(new MeasurementSchema("s2", TSDataType.STRING, TSEncoding.PLAIN));
measurementSchemas.add(new MeasurementSchema("s3", TSDataType.BLOB, TSEncoding.PLAIN));
measurementSchemas.add(new MeasurementSchema("s4", TSDataType.DATE, TSEncoding.PLAIN));

// register aligned timeseries
tsFileWriter.registerAlignedTimeseries(new Path(deviceId), measurementSchemas);
Expand All @@ -410,19 +419,25 @@ public void writeAlignedWithTabletWithNullValue() {
long[] timestamps = tablet.timestamps;
Object[] values = tablet.values;
tablet.initBitMaps();
long sensorNum = measurementSchemas.size();
int sensorNum = measurementSchemas.size();
long startTime = 0;
for (long r = 0; r < 10000; r++) {
int row = tablet.rowSize++;
timestamps[row] = startTime++;
for (int i = 0; i < sensorNum; i++) {
for (int i = 0; i < sensorNum - 1; i++) {
if (i == 1 && r > 1000) {
tablet.bitMaps[i].mark((int) r % tablet.getMaxRowNumber());
continue;
}
Binary[] textSensor = (Binary[]) values[i];
textSensor[row] = new Binary("testString.........", TSFileConfig.STRING_CHARSET);
}
if (r > 1000) {
tablet.bitMaps[sensorNum - 1].mark((int) r % tablet.getMaxRowNumber());
} else {
LocalDate[] dateSensor = (LocalDate[]) values[sensorNum - 1];
dateSensor[row] = LocalDate.of(2024, 4, 1);
}
// write
if (tablet.rowSize == tablet.getMaxRowNumber()) {
tsFileWriter.writeAligned(tablet);
Expand Down