Skip to content
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

[To rc/1.1] Fixed the issue that the time of the first data item written to TSFile by measurement cannot be a negative number (#297) #298

Merged
merged 1 commit into from
Nov 8, 2024
+118 −5
Merged

[To rc/1.1] Fixed the issue that the time of the first data item written to TSFile by measurement cannot be a negative number (#297) #298

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
2 changes: 1 addition & 1 deletion java/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ private IChunkGroupWriter tryToInitialGroupWriter(IDeviceID deviceId, boolean is
groupWriter = new AlignedChunkGroupWriterImpl(deviceId);
if (!isUnseq) { // Sequence File
((AlignedChunkGroupWriterImpl) groupWriter)
.setLastTime(alignedDeviceLastTimeMap.getOrDefault(deviceId, -1L));
.setLastTime(alignedDeviceLastTimeMap.get(deviceId));
}
} else {
groupWriter = new NonAlignedChunkGroupWriterImpl(deviceId);
Expand Down
12 changes: 9 additions & 3 deletions 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 @@ -58,7 +58,8 @@ public class AlignedChunkGroupWriterImpl implements IChunkGroupWriter {

private final TimeChunkWriter timeChunkWriter;

private long lastTime = -1;
private long lastTime = Long.MIN_VALUE;
private boolean isInitLastTime = false;

public AlignedChunkGroupWriterImpl(IDeviceID deviceId) {
this.deviceId = deviceId;
Expand Down Expand Up @@ -150,6 +151,7 @@ public int write(long time, List<DataPoint> data) throws WriteProcessException,
}
timeChunkWriter.write(time);
lastTime = time;
isInitLastTime = true;
if (checkPageSizeAndMayOpenANewPage()) {
writePageToPageBuffer();
}
Expand Down Expand Up @@ -224,6 +226,7 @@ public int write(Tablet tablet) throws WriteProcessException, IOException {
}
timeChunkWriter.write(time);
lastTime = time;
isInitLastTime = true;
if (checkPageSizeAndMayOpenANewPage()) {
writePageToPageBuffer();
}
Expand Down Expand Up @@ -340,7 +343,7 @@ private void sealAllChunks() {
}

private void checkIsHistoryData(long time) throws WriteProcessException {
if (time <= lastTime) {
if (isInitLastTime && time <= lastTime) {
throw new WriteProcessException(
"Not allowed to write out-of-order data in timeseries "
+ ((PlainDeviceID) deviceId).toStringID()
Expand All @@ -360,6 +363,9 @@ public Long getLastTime() {
}

public void setLastTime(Long lastTime) {
this.lastTime = lastTime;
if (lastTime != null) {
this.lastTime = lastTime;
isInitLastTime = true;
}
}
}
3 changes: 2 additions & 1 deletion java/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ private void sealAllChunks() {
}

private void checkIsHistoryData(String measurementId, long time) throws WriteProcessException {
if (time <= lastTimeMap.getOrDefault(measurementId, -1L)) {
final Long lastTime = lastTimeMap.get(measurementId);
if (lastTime != null && time <= lastTime) {
throw new WriteProcessException(
"Not allowed to write out-of-order data in timeseries "
+ ((PlainDeviceID) deviceId).toStringID()
Expand Down
106 changes: 106 additions & 0 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 @@ -403,6 +403,59 @@ public void writeNonAlignedWithTabletWithNullValue() {
}
}

@Test
public void writeNonAlignedWithTabletWithNegativeTimestamps() {
setEnv(100, 30);
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
measurementSchemas.add(new MeasurementSchema("s1", 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);

Tablet tablet = new Tablet(deviceId, measurementSchemas);
long[] timestamps = tablet.timestamps;
Object[] values = tablet.values;
tablet.initBitMaps();
int sensorNum = measurementSchemas.size();
long startTime = -100;
for (long r = 0; r < 10000; r++) {
int row = tablet.rowSize++;
timestamps[row] = startTime++;
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);
tablet.reset();
}
}
// write
if (tablet.rowSize != 0) {
tsFileWriter.write(tablet);
tablet.reset();
}

} catch (Throwable e) {
e.printStackTrace();
Assert.fail("Meet errors in test: " + e.getMessage());
}
}

@Test
public void writeAlignedWithTabletWithNullValue() {
setEnv(100, 30);
Expand Down Expand Up @@ -456,6 +509,59 @@ public void writeAlignedWithTabletWithNullValue() {
}
}

@Test
public void writeDataToTabletsWithNegativeTimestamps() {
setEnv(100, 30);
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
measurementSchemas.add(new MeasurementSchema("s1", 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);

Tablet tablet = new Tablet(deviceId, measurementSchemas);
long[] timestamps = tablet.timestamps;
Object[] values = tablet.values;
tablet.initBitMaps();
int sensorNum = measurementSchemas.size();
long startTime = -1000;
for (long r = 0; r < 10000; r++) {
int row = tablet.rowSize++;
timestamps[row] = startTime++;
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);
tablet.reset();
}
}
// write
if (tablet.rowSize != 0) {
tsFileWriter.writeAligned(tablet);
tablet.reset();
}

} catch (Throwable e) {
e.printStackTrace();
Assert.fail("Meet errors in test: " + e.getMessage());
}
}

/** Write an empty page and then write a nonEmpty page. */
@Test
public void writeAlignedTimeseriesWithEmptyPage() throws IOException, WriteProcessException {
Expand Down