Skip to content

[Bug] use snapshot when SnapshotReaderImpl.toChangesPlan #4841

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
JingsongLi merged 3 commits into from
Jan 7, 2025
Merged

[Bug] use snapshot when SnapshotReaderImpl.toChangesPlan #4841

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
a1a37cc
use snapshot when SnapshotReaderImpl.toChangesPlan
jerry-024 Jan 6, 2025
30ef1ee
add IT
jerry-024 Jan 6, 2025
d777508
update IT make two tags snapshot all expire
jerry-024 Jan 7, 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
10 changes: 5 additions & 5 deletions paimon-core/src/main/java/org/apache/paimon/table/source/snapshot/SnapshotReaderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,14 +391,14 @@ public Plan readChanges() {
groupByPartFiles(plan.files(FileKind.DELETE));
Map<BinaryRow, Map<Integer, List<DataFileMeta>>> dataFiles =
groupByPartFiles(plan.files(FileKind.ADD));

return toChangesPlan(true, plan, plan.snapshot().id() - 1, beforeFiles, dataFiles);
Snapshot beforeSnapshot = snapshotManager.snapshot(plan.snapshot().id() - 1);
return toChangesPlan(true, plan, beforeSnapshot, beforeFiles, dataFiles);
}

private Plan toChangesPlan(
boolean isStreaming,
FileStoreScan.Plan plan,
long beforeSnapshotId,
Snapshot beforeSnapshot,
Map<BinaryRow, Map<Integer, List<DataFileMeta>>> beforeFiles,
Map<BinaryRow, Map<Integer, List<DataFileMeta>>> dataFiles) {
Snapshot snapshot = plan.snapshot();
Expand All @@ -416,7 +416,7 @@ private Plan toChangesPlan(
Map<Pair<BinaryRow, Integer>, List<IndexFileMeta>> beforDeletionIndexFilesMap =
deletionVectors
? indexFileHandler.scan(
beforeSnapshotId, DELETION_VECTORS_INDEX, beforeFiles.keySet())
beforeSnapshot, DELETION_VECTORS_INDEX, beforeFiles.keySet())
: Collections.emptyMap();
Map<Pair<BinaryRow, Integer>, List<IndexFileMeta>> deletionIndexFilesMap =
deletionVectors
Expand Down Expand Up @@ -476,7 +476,7 @@ public Plan readIncrementalDiff(Snapshot before) {
groupByPartFiles(plan.files(FileKind.ADD));
Map<BinaryRow, Map<Integer, List<DataFileMeta>>> beforeFiles =
groupByPartFiles(scan.withSnapshot(before).plan().files(FileKind.ADD));
return toChangesPlan(false, plan, before.id(), beforeFiles, dataFiles);
return toChangesPlan(false, plan, before, beforeFiles, dataFiles);
}

private RecordComparator partitionComparator() {
Expand Down
28 changes: 28 additions & 0 deletions ...flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/BatchFileStoreITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,34 @@ public void testTimeTravelReadWithSnapshotExpiration() throws Exception {
.containsExactlyInAnyOrder(Row.of(1, 11, 111), Row.of(2, 22, 222));
}

@Test
public void testIncrementBetweenReadWithSnapshotExpiration() throws Exception {
String tableName = "T";
batchSql(String.format("INSERT INTO %s VALUES (1, 11, 111)", tableName));

paimonTable(tableName).createTag("tag1", 1);

batchSql(String.format("INSERT INTO %s VALUES (2, 22, 222)", tableName));
paimonTable(tableName).createTag("tag2", 2);
batchSql(String.format("INSERT INTO %s VALUES (3, 33, 333)", tableName));
paimonTable(tableName).createTag("tag3", 3);

// expire snapshot 1
Map<String, String> expireOptions = new HashMap<>();
expireOptions.put(CoreOptions.SNAPSHOT_NUM_RETAINED_MAX.key(), "1");
expireOptions.put(CoreOptions.SNAPSHOT_NUM_RETAINED_MIN.key(), "1");
FileStoreTable table = (FileStoreTable) paimonTable(tableName);
table.copy(expireOptions).newCommit("").expireSnapshots();
assertThat(table.snapshotManager().snapshotCount()).isEqualTo(1);

assertThat(
batchSql(
String.format(
"SELECT * FROM %s /*+ OPTIONS('incremental-between' = 'tag1,tag2', 'deletion-vectors.enabled' = 'true') */",
tableName)))
.containsExactlyInAnyOrder(Row.of(2, 22, 222));
}

@Test
public void testSortSpillMerge() {
sql(
Expand Down
Loading