Skip to content

[core] Fix parquet nextRowPosition bug #4636

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
leaves12138 merged 3 commits into from
Dec 4, 2024
Merged

[core] Fix parquet nextRowPosition bug #4636

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
016d63a
fix bug
Dec 4, 2024
aa01bdc
add test
Dec 4, 2024
892cf4d
delete debug msg
Dec 4, 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
61 changes: 58 additions & 3 deletions paimon-core/src/test/java/org/apache/paimon/table/PrimaryKeyFileStoreTableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,27 @@ public void testDeletionVectorsWithFileIndexInFile() throws Exception {

@Test
public void testDeletionVectorsWithParquetFilter() throws Exception {
// RowGroup record range [pk] :
//
// RowGroup-0 : [0-93421)
// RowGroup-1 : [93421-187794)
// RowGroup-2 : [187794-200000)
//
// ColumnPage record count :
//
// col-0 : 300
// col-1 : 200
// col-2 : 300
// col-3 : 300
// col-4 : 300
// col-5 : 200
// col-6 : 100
// col-7 : 100
// col-8 : 100
// col-9 : 100
// col-10 : 100
// col-11 : 300

FileStoreTable table =
createFileStoreTable(
conf -> {
Expand Down Expand Up @@ -842,7 +863,11 @@ public void testDeletionVectorsWithParquetFilter() throws Exception {
writeBuilder
.newWrite()
.withIOManager(new IOManagerImpl(tempDir.toString()));
for (int i = 180000; i < 200000; i++) {
for (int i = 110000; i < 115000; i++) {
write.write(rowDataWithKind(RowKind.DELETE, 1, i, i * 100L));
}

for (int i = 130000; i < 135000; i++) {
write.write(rowDataWithKind(RowKind.DELETE, 1, i, i * 100L));
}

Expand All @@ -854,8 +879,10 @@ public void testDeletionVectorsWithParquetFilter() throws Exception {
List<Split> splits = toSplits(table.newSnapshotReader().read().dataSplits());
Random random = new Random();

// point filter

for (int i = 0; i < 10; i++) {
int value = random.nextInt(180000);
int value = random.nextInt(110000);
TableRead read = table.newRead().withFilter(builder.equal(1, value)).executeFilter();
assertThat(getResult(read, splits, BATCH_ROW_TO_STRING))
.isEqualTo(
Expand All @@ -866,10 +893,38 @@ public void testDeletionVectorsWithParquetFilter() throws Exception {
}

for (int i = 0; i < 10; i++) {
int value = 180000 + random.nextInt(20000);
int value = 130000 + random.nextInt(5000);
TableRead read = table.newRead().withFilter(builder.equal(1, value)).executeFilter();
assertThat(getResult(read, splits, BATCH_ROW_TO_STRING)).isEmpty();
}

TableRead tableRead =
table.newRead()
.withFilter(
PredicateBuilder.and(
builder.greaterOrEqual(1, 100000),
builder.lessThan(1, 150000)))
.executeFilter();

List<String> result = getResult(tableRead, splits, BATCH_ROW_TO_STRING);

assertThat(result.size()).isEqualTo(40000); // filter 10000

assertThat(result)
.doesNotContain("1|110000|11000000|binary|varbinary|mapKey:mapVal|multiset");
assertThat(result)
.doesNotContain("1|114999|11499900|binary|varbinary|mapKey:mapVal|multiset");
assertThat(result)
.doesNotContain("1|130000|13000000|binary|varbinary|mapKey:mapVal|multiset");
assertThat(result)
.doesNotContain("1|134999|13499900|binary|varbinary|mapKey:mapVal|multiset");
assertThat(result).contains("1|100000|10000000|binary|varbinary|mapKey:mapVal|multiset");
assertThat(result).contains("1|149999|14999900|binary|varbinary|mapKey:mapVal|multiset");

assertThat(result).contains("1|101099|10109900|binary|varbinary|mapKey:mapVal|multiset");
assertThat(result).contains("1|115000|11500000|binary|varbinary|mapKey:mapVal|multiset");
assertThat(result).contains("1|129999|12999900|binary|varbinary|mapKey:mapVal|multiset");
assertThat(result).contains("1|135000|13500000|binary|varbinary|mapKey:mapVal|multiset");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetReaderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ private long getNextRowPosition(int num) {
nextIndex = this.currentRowGroupReadState.currentRangeStart();
}

return nextIndex;
return this.currentRowGroupFirstRowIndex + nextIndex;
}
}

Expand Down
Loading