Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -740,6 +741,143 @@ public void testSkipAddEntriesThroughPartitionPruning()
assertThat(addEntryIteratorWithRangePartitionFilter.getCompletedPositions().orElseThrow()).isEqualTo(3L);
}

@Test
public void testSkipAddEntriesThroughComposedPartitionPruning()
throws IOException
{
MetadataEntry metadataEntry = new MetadataEntry(
"metadataId",
"metadataName",
"metadataDescription",
new MetadataEntry.Format(
"metadataFormatProvider",
ImmutableMap.of()),
"{\"type\":\"struct\",\"fields\":" +
"[{\"name\":\"ts\",\"type\":\"timestamp\",\"nullable\":true,\"metadata\":{}}," +
"{\"name\":\"part_day\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}," +
"{\"name\":\"part_hour\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]}",
ImmutableList.of(
"part_day",
"part_hour"),
ImmutableMap.of(),
1000);
ProtocolEntry protocolEntry = new ProtocolEntry(1, 1, Optional.empty(), Optional.empty());
LocalDateTime date = LocalDateTime.of(2023, 12, 1, 0, 0);
DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
DateTimeFormatter hourFormatter = DateTimeFormatter.ofPattern("HH");
int numAddEntries = 100;
Set<AddFileEntry> addFileEntries = IntStream.rangeClosed(1, numAddEntries).mapToObj(index ->
new AddFileEntry(
"addFilePath",
ImmutableMap.of(
"part_day", date.plusHours(index).format(dayFormatter),
"part_hour", date.plusHours(index).format(hourFormatter)),
1000,
1001,
true,
Optional.of("{" +
"\"numRecords\":20," +
"\"minValues\":{" +
"\"ts\":\"1990-10-31T01:00:00.000Z\"" +
"}," +
"\"maxValues\":{" +
"\"ts\":\"1990-10-31T02:00:00.000Z\"" +
"}," +
"\"nullCount\":{" +
"\"ts\":1" +
"}}"),
Optional.empty(),
ImmutableMap.of(),
Optional.empty()))
.collect(toImmutableSet());

CheckpointEntries entries = new CheckpointEntries(
metadataEntry,
protocolEntry,
ImmutableSet.of(),
addFileEntries,
ImmutableSet.of());

CheckpointWriter writer = new CheckpointWriter(
TESTING_TYPE_MANAGER,
checkpointSchemaManager,
"test",
ParquetWriterOptions.builder() // approximately 2 rows per row group
.setMaxBlockSize(DataSize.ofBytes(128L))
.setMaxPageSize(DataSize.ofBytes(128L))
.build());

File targetFile = File.createTempFile("testSkipAddEntries-", ".checkpoint.parquet");
targetFile.deleteOnExit();

String targetPath = "file://" + targetFile.getAbsolutePath();
targetFile.delete(); // file must not exist when writer is called
writer.write(entries, createOutputFile(targetPath));

CheckpointEntryIterator metadataAndProtocolEntryIterator = createCheckpointEntryIterator(
URI.create(targetPath),
ImmutableSet.of(METADATA, PROTOCOL),
Optional.empty(),
Optional.empty(),
TupleDomain.all(),
Optional.empty());

DeltaLakeColumnHandle partitionDayField = new DeltaLakeColumnHandle(
"part_day",
VARCHAR,
OptionalInt.empty(),
"part_day",
VARCHAR,
REGULAR,
Optional.empty());
DeltaLakeColumnHandle partitionHourField = new DeltaLakeColumnHandle(
"part_hour",
VARCHAR,
OptionalInt.empty(),
"part_hour",
VARCHAR,
REGULAR,
Optional.empty());

CheckpointEntryIterator addEntryIterator = createCheckpointEntryIterator(
URI.create(targetPath),
ImmutableSet.of(ADD),
Optional.of(metadataEntry),
Optional.of(protocolEntry),
TupleDomain.all(),
Optional.of(alwaysTrue()));

CheckpointEntryIterator addEntryIteratorEqualityDayPartitionFilter = createCheckpointEntryIterator(
URI.create(targetPath),
ImmutableSet.of(ADD),
Optional.of(metadataEntry),
Optional.of(protocolEntry),
TupleDomain.withColumnDomains(ImmutableMap.of(partitionDayField, singleValue(VARCHAR, utf8Slice("20231202")))),
Optional.of(alwaysTrue()));

CheckpointEntryIterator addEntryIteratorWithDayAndHourEqualityPartitionFilter = createCheckpointEntryIterator(
URI.create(targetPath),
ImmutableSet.of(ADD),
Optional.of(metadataEntry),
Optional.of(protocolEntry),
TupleDomain.withColumnDomains(ImmutableMap.of(
partitionDayField, singleValue(VARCHAR, utf8Slice("20231202")),
partitionHourField, singleValue(VARCHAR, utf8Slice("10")))),
Optional.of(alwaysTrue()));

assertThat(Iterators.size(metadataAndProtocolEntryIterator)).isEqualTo(2);
assertThat(metadataAndProtocolEntryIterator.getCompletedPositions().orElseThrow()).isEqualTo(3L);

assertThat(Iterators.size(addEntryIterator)).isEqualTo(numAddEntries);
assertThat(addEntryIterator.getCompletedPositions().orElseThrow()).isEqualTo(101L);

assertThat(Iterators.size(addEntryIteratorEqualityDayPartitionFilter)).isEqualTo(24);
assertThat(addEntryIteratorEqualityDayPartitionFilter.getCompletedPositions().orElseThrow()).isEqualTo(24L);

assertThat(Iterators.size(addEntryIteratorWithDayAndHourEqualityPartitionFilter)).isEqualTo(1);
assertThat(addEntryIteratorWithDayAndHourEqualityPartitionFilter.getCompletedPositions().orElseThrow()).isEqualTo(1L);
}

@Test
public void testSkipRemoveEntries()
throws IOException
Expand Down