-
Notifications
You must be signed in to change notification settings - Fork 5.4k
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.
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
[Iceberg] Add Iceberg metadata table $metadata_log_entries #24302
Draft
agrawalreetika
wants to merge
1
commit into
prestodb:master
Choose a base branch
from
agrawalreetika:metadata_log_entries
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 145 additions & 0 deletions
145
presto-iceberg/src/main/java/com/facebook/presto/iceberg/MetadataLogTable.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.facebook.presto.iceberg; | ||
|
|
||
| import com.facebook.presto.common.predicate.TupleDomain; | ||
| import com.facebook.presto.common.type.Type; | ||
| import com.facebook.presto.spi.ColumnMetadata; | ||
| import com.facebook.presto.spi.ConnectorSession; | ||
| import com.facebook.presto.spi.ConnectorTableMetadata; | ||
| import com.facebook.presto.spi.InMemoryRecordSet; | ||
| import com.facebook.presto.spi.RecordCursor; | ||
| import com.facebook.presto.spi.SchemaTableName; | ||
| import com.facebook.presto.spi.SystemTable; | ||
| import com.facebook.presto.spi.connector.ConnectorTransactionHandle; | ||
| import com.google.common.collect.ImmutableList; | ||
| import org.apache.iceberg.BaseTable; | ||
| import org.apache.iceberg.Snapshot; | ||
| import org.apache.iceberg.Table; | ||
| import org.apache.iceberg.TableMetadata; | ||
| import org.apache.iceberg.TableMetadata.MetadataLogEntry; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static com.facebook.presto.common.type.BigintType.BIGINT; | ||
| import static com.facebook.presto.common.type.DateTimeEncoding.packDateTimeWithZone; | ||
| import static com.facebook.presto.common.type.IntegerType.INTEGER; | ||
| import static com.facebook.presto.common.type.TimestampWithTimeZoneType.TIMESTAMP_WITH_TIME_ZONE; | ||
| import static com.facebook.presto.common.type.VarcharType.VARCHAR; | ||
| import static java.util.Collections.emptyList; | ||
| import static java.util.Objects.requireNonNull; | ||
| import static org.apache.iceberg.util.SnapshotUtil.snapshotIdAsOfTime; | ||
|
|
||
| public class MetadataLogTable | ||
| implements SystemTable | ||
| { | ||
| private final ConnectorTableMetadata tableMetadata; | ||
| private final Table icebergTable; | ||
|
|
||
| private static final List<ColumnMetadata> COLUMN_DEFINITIONS = ImmutableList.<ColumnMetadata>builder() | ||
| .add(new ColumnMetadata("timestamp", TIMESTAMP_WITH_TIME_ZONE)) | ||
| .add(new ColumnMetadata("file", VARCHAR)) | ||
| .add(new ColumnMetadata("latest_snapshot_id", BIGINT)) | ||
| .add(new ColumnMetadata("latest_schema_id", INTEGER)) | ||
| .add(new ColumnMetadata("latest_sequence_number", BIGINT)) | ||
| .build(); | ||
|
|
||
| private static final List<Type> COLUMN_TYPES = COLUMN_DEFINITIONS.stream() | ||
| .map(ColumnMetadata::getType) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| public MetadataLogTable(SchemaTableName tableName, Table icebergTable) | ||
| { | ||
| tableMetadata = new ConnectorTableMetadata(requireNonNull(tableName, "tableName is null"), COLUMN_DEFINITIONS); | ||
| this.icebergTable = requireNonNull(icebergTable, "icebergTable is null"); | ||
| } | ||
|
|
||
| @Override | ||
| public Distribution getDistribution() | ||
| { | ||
| return Distribution.SINGLE_COORDINATOR; | ||
| } | ||
|
|
||
| @Override | ||
| public ConnectorTableMetadata getTableMetadata() | ||
| { | ||
| return tableMetadata; | ||
| } | ||
|
|
||
| @Override | ||
| public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, ConnectorSession session, TupleDomain<Integer> constraint) | ||
| { | ||
| Iterable<List<?>> rowIterable = () -> new Iterator<List<?>>() | ||
| { | ||
| private final Iterator<MetadataLogEntry> metadataLogEntriesIterator = ((BaseTable) icebergTable).operations().current().previousFiles().iterator(); | ||
| private boolean addedLatestEntry; | ||
|
|
||
| @Override | ||
| public boolean hasNext() | ||
| { | ||
| return metadataLogEntriesIterator.hasNext() || !addedLatestEntry; | ||
| } | ||
|
|
||
| @Override | ||
| public List<?> next() | ||
| { | ||
| if (metadataLogEntriesIterator.hasNext()) { | ||
| return processMetadataLogEntries(session, metadataLogEntriesIterator.next()); | ||
| } | ||
| if (!addedLatestEntry) { | ||
| addedLatestEntry = true; | ||
| TableMetadata currentMetadata = ((BaseTable) icebergTable).operations().current(); | ||
| return buildLatestMetadataRow(session, currentMetadata); | ||
| } | ||
| return emptyList(); | ||
| } | ||
| }; | ||
| return new InMemoryRecordSet(COLUMN_TYPES, rowIterable).cursor(); | ||
| } | ||
|
|
||
| private List<?> processMetadataLogEntries(ConnectorSession session, MetadataLogEntry metadataLogEntry) | ||
| { | ||
| Long snapshotId = null; | ||
| Snapshot snapshot = null; | ||
| try { | ||
| snapshotId = snapshotIdAsOfTime(icebergTable, metadataLogEntry.timestampMillis()); | ||
| snapshot = icebergTable.snapshot(snapshotId); | ||
| } | ||
| catch (IllegalArgumentException ignored) { | ||
| // Implies this metadata file was created during table creation | ||
| } | ||
| return addRow(session, metadataLogEntry.timestampMillis(), metadataLogEntry.file(), snapshotId, snapshot); | ||
| } | ||
|
|
||
| private List<?> buildLatestMetadataRow(ConnectorSession session, TableMetadata metadata) | ||
| { | ||
| Snapshot latestSnapshot = icebergTable.currentSnapshot(); | ||
| Long latestSnapshotId = (latestSnapshot != null) ? latestSnapshot.snapshotId() : null; | ||
|
|
||
| return addRow(session, metadata.lastUpdatedMillis(), metadata.metadataFileLocation(), latestSnapshotId, latestSnapshot); | ||
| } | ||
|
|
||
| private List<?> addRow(ConnectorSession session, long timestampMillis, String fileLocation, Long snapshotId, Snapshot snapshot) | ||
| { | ||
| return Arrays.asList( | ||
| packDateTimeWithZone(timestampMillis, session.getSqlFunctionProperties().getTimeZoneKey()), | ||
| fileLocation, | ||
| snapshotId, | ||
| snapshot != null ? snapshot.schemaId() : null, | ||
| snapshot != null ? snapshot.sequenceNumber() : null); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it convenient to add some test cases considering different
timezoneandlegacyTimestamp, and verify the output columntimestamp?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hantangwangd Could you please provide me some example around which type of testcases would fit in here considering different timezone?
I just looked at other metadata tables with
timestampcolumn, but couldn't find any example around same.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Refer to Iceberg's test case, I think we can add some tests similar with the following code:
And test it under different zoneIds.