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

Fix read chunk compaction performer null pointer exception #11960

Merged
merged 3 commits into from
Jan 24, 2024
Merged

Fix read chunk compaction performer null pointer exception #11960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41ba41d
fix read chunk compaction performer null pointer exception
shuwenwei Jan 23, 2024
1c252e9
remove sout
shuwenwei Jan 23, 2024
23bd5a8
remove logger
shuwenwei Jan 23, 2024
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
1 change: 0 additions & 1 deletion ...compaction/execute/utils/executor/readchunk/ReadChunkAlignedSeriesCompactionExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ private void collectValueColumnSchemaList() throws IOException {
chunkHeader.getCompressionType());
measurementSchemaMap.put(chunkMetadata.getMeasurementUid(), schema);
}
break;
}
}

Expand Down
53 changes: 53 additions & 0 deletions ...ine/dataregion/compaction/inner/NewReadChunkCompactionPerformerWithAlignedSeriesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,59 @@ public void testSimpleCompactionWithNotExistColumnByFlushChunk()
CompactionCheckerUtils.readFiles(Collections.singletonList(targetResource)));
}

@Test
public void testSimpleCompactionWithNullColumn()
throws IOException, StorageEngineException, InterruptedException, MetadataException,
PageException {
TsFileResource seqResource1 = createEmptyFileAndResource(true);
try (CompactionTestFileWriter writer = new CompactionTestFileWriter(seqResource1)) {
writer.startChunkGroup("d0");
writer.generateSimpleAlignedSeriesToCurrentDeviceWithNullValue(
Arrays.asList("s0", "s1", "s2"),
new TimeRange[] {new TimeRange(100000, 200000)},
TSEncoding.PLAIN,
CompressionType.LZ4,
Arrays.asList(false, false, true));
writer.generateSimpleAlignedSeriesToCurrentDeviceWithNullValue(
Arrays.asList("s0", "s1", "s2"),
new TimeRange[] {new TimeRange(300000, 500000)},
TSEncoding.PLAIN,
CompressionType.LZ4,
Arrays.asList(false, false, false));
writer.endChunkGroup();
writer.endFile();
}
seqResources.add(seqResource1);

TsFileResource seqResource2 =
generateSingleAlignedSeriesFile(
"d0",
Arrays.asList("s0", "s1"),
new TimeRange[] {new TimeRange(600000, 700000), new TimeRange(800000, 900000)},
TSEncoding.PLAIN,
CompressionType.LZ4,
Arrays.asList(false, false),
true);
seqResources.add(seqResource2);

tsFileManager.addAll(seqResources, true);
TsFileResource targetResource =
TsFileNameGenerator.getInnerCompactionTargetFileResource(seqResources, true);

ReadChunkCompactionPerformer performer = new ReadChunkCompactionPerformer();
CompactionTaskSummary summary = new CompactionTaskSummary();
performer.setSummary(summary);
performer.setSourceFiles(seqResources);
performer.setTargetFiles(Collections.singletonList(targetResource));
performer.perform();
CompactionUtils.moveTargetFile(
Collections.singletonList(targetResource), true, COMPACTION_TEST_SG);
TsFileResourceUtils.validateTsFileDataCorrectness(targetResource);
Assert.assertEquals(
CompactionCheckerUtils.readFiles(seqResources),
CompactionCheckerUtils.readFiles(Collections.singletonList(targetResource)));
}

@Test
public void testSimpleCompactionWithPartialDeletedColumnByFlushChunk()
throws IOException, StorageEngineException, InterruptedException, MetadataException,
Expand Down