Skip to content

Fix value and time chunk misalignment when rewriting with time deletion #719

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
JackieTien97 merged 1 commit into from
Feb 3, 2026
Merged

Fix value and time chunk misalignment when rewriting with time deletion #719

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
11 changes: 10 additions & 1 deletion java/tsfile/src/main/java/org/apache/tsfile/read/common/Chunk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,16 @@ public Chunk rewrite(TSDataType newType, Chunk timeChunk) throws IOException {
encryptParam);
List<Chunk> valueChunks = new ArrayList<>();
valueChunks.add(this);
TableChunkReader chunkReader = new TableChunkReader(timeChunk, valueChunks, null);
TableChunkReader chunkReader =
new TableChunkReader(
new Chunk(
timeChunk.getHeader(),
timeChunk.getData(),
null,
timeChunk.getChunkStatistic(),
timeChunk.getEncryptParam()),
valueChunks,
null);
List<IPageReader> pages = chunkReader.loadPageReaderList();
for (IPageReader page : pages) {
IPointReader pointReader = page.getAllSatisfiedPageData().getBatchDataIterator();
Expand Down
72 changes: 72 additions & 0 deletions java/tsfile/src/test/java/org/apache/tsfile/write/ChunkRewriteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.tsfile.read.TimeValuePair;
import org.apache.tsfile.read.common.BatchData;
import org.apache.tsfile.read.common.Chunk;
import org.apache.tsfile.read.common.TimeRange;
import org.apache.tsfile.read.reader.IPageReader;
import org.apache.tsfile.read.reader.IPointReader;
import org.apache.tsfile.read.reader.chunk.AlignedChunkReader;
Expand All @@ -43,6 +44,7 @@
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -118,6 +120,76 @@ public void AlignedChunkSinglePageTest() throws IOException {

}

@Test
public void AlignedChunkSinglePageWithTimeDeletionTest() throws IOException {
String[] measurements = new String[] {"s1", "s2", "s3"};
TSDataType[] types = new TSDataType[] {TSDataType.FLOAT, TSDataType.INT32, TSDataType.DOUBLE};
VectorMeasurementSchema measurementSchema =
new VectorMeasurementSchema("table1.d1", measurements, types);
AlignedChunkWriterImpl chunkWriter = new AlignedChunkWriterImpl(measurementSchema);

for (int time = 1; time <= 20; time++) {
chunkWriter.write(time, (float) time, false);
chunkWriter.write(time, time, false);
chunkWriter.write(time, (double) time, false);
chunkWriter.write(time);
}
chunkWriter.sealCurrentPage();

TimeChunkWriter timeChunkWriter = chunkWriter.getTimeChunkWriter();
List<ValueChunkWriter> valueChunkWriters = chunkWriter.getValueChunkWriterList();

Chunk timeChunk = getTimeChunk(measurementSchema, timeChunkWriter);

List<Chunk> valueChunks = getValueChunks(valueChunkWriters);

AlignedChunkReader chunkReader = new AlignedChunkReader(timeChunk, valueChunks);
List<IPageReader> pageReaders = chunkReader.loadPageReaderList();
for (IPageReader page : pageReaders) {
IPointReader pointReader = ((AlignedPageReader) page).getLazyPointReader();
int i = 1;
while (pointReader.hasNextTimeValuePair()) {
TimeValuePair point = pointReader.nextTimeValuePair();
assertEquals((long) i, point.getTimestamp());
assertEquals((float) i, point.getValue().getVector()[0].getValue());
assertEquals(i, point.getValue().getVector()[1].getValue());
assertEquals((double) i, point.getValue().getVector()[2].getValue());
i++;
}
}
timeChunk.getData().flip();
valueChunks.get(0).getData().flip();
valueChunks.get(1).getData().flip();
valueChunks.get(2).getData().flip();
// delete
timeChunk.setDeleteIntervalList(Collections.singletonList(new TimeRange(0, 9)));
// rewrite INT32->DOUBLE
Chunk newValueChunk = valueChunks.get(1).rewrite(TSDataType.DOUBLE, timeChunk);
valueChunks.set(1, newValueChunk);
TableChunkReader newChunkReader = new TableChunkReader(timeChunk, valueChunks, null);
List<IPageReader> newPageReaders = newChunkReader.loadPageReaderList();
for (IPageReader page : newPageReaders) {
IPointReader pointReader = page.getAllSatisfiedPageData().getBatchDataIterator();
int i = 1;
while (pointReader.hasNextTimeValuePair()) {
TimeValuePair point = pointReader.nextTimeValuePair();
assertEquals((long) i + 9, point.getTimestamp());
assertEquals((float) (i + 9), point.getValue().getVector()[0].getValue());
assertEquals((double) (i + 9), point.getValue().getVector()[1].getValue());
assertEquals((double) (i + 9), point.getValue().getVector()[2].getValue());
i++;
}
assertEquals(11, i - 1);
}
timeChunk.getData().flip();
valueChunks.get(0).getData().flip();
valueChunks.get(1).getData().flip();
valueChunks.get(2).getData().flip();

//

}

@Test
public void AlignedChunkMultiPagesTest() throws IOException {
String[] measurements = new String[] {"s1", "s2", "s3"};
Expand Down
Loading