-
Notifications
You must be signed in to change notification settings - Fork 3.4k
API, Core: Support column files through TrackedFileAdapter for data files #17127
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
Open
gaborkaszab
wants to merge
2
commits into
apache:main
Choose a base branch
from
gaborkaszab:main_column_file_in_trackedfile_adapter
base: main
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.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 hidden or 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,54 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.iceberg; | ||
|
|
||
| import java.util.List; | ||
| import org.apache.iceberg.types.Types; | ||
|
|
||
| /** Information about a column file. */ | ||
| public interface ColumnFile { | ||
| Types.NestedField FIELD_IDS = | ||
| Types.NestedField.required( | ||
| 161, | ||
| "field_ids", | ||
| Types.ListType.ofRequired(162, Types.IntegerType.get()), | ||
| "Field IDs this column file contains"); | ||
| Types.NestedField LOCATION = | ||
| Types.NestedField.required( | ||
| 163, "location", Types.StringType.get(), "Location of the column file"); | ||
| Types.NestedField FILE_SIZE_IN_BYTES = | ||
| Types.NestedField.required( | ||
| 164, "file_size_in_bytes", Types.LongType.get(), "Total column file size in bytes"); | ||
|
|
||
| static Types.StructType schema() { | ||
| return Types.StructType.of(FIELD_IDS, LOCATION, FILE_SIZE_IN_BYTES); | ||
| } | ||
|
|
||
| /** Returns the field IDs contained in this column file. */ | ||
| List<Integer> fieldIds(); | ||
|
|
||
| /** Returns the location of the column file. */ | ||
| String location(); | ||
|
|
||
| /** Returns the total size of the column file in bytes. */ | ||
| long fileSizeInBytes(); | ||
|
|
||
| /** Copies this column file. */ | ||
| ColumnFile copy(); | ||
| } | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -164,4 +164,8 @@ default FileContent content() { | |
| default List<Integer> equalityFieldIds() { | ||
| return null; | ||
| } | ||
|
|
||
| default List<ColumnFile> columnFiles() { | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| return null; | ||
| } | ||
| } | ||
176 changes: 176 additions & 0 deletions
176
core/src/main/java/org/apache/iceberg/ColumnFileStruct.java
This file contains hidden or 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,176 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.iceberg; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import org.apache.iceberg.avro.SupportsIndexProjection; | ||
| import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; | ||
| import org.apache.iceberg.relocated.com.google.common.base.Preconditions; | ||
| import org.apache.iceberg.relocated.com.google.common.collect.Sets; | ||
| import org.apache.iceberg.types.Types; | ||
| import org.apache.iceberg.util.ArrayUtil; | ||
|
|
||
| /** Mutable {@link StructLike} implementation of {@link ColumnFile}. */ | ||
| class ColumnFileStruct extends SupportsIndexProjection implements ColumnFile, Serializable { | ||
| private static final Types.StructType BASE_TYPE = | ||
| Types.StructType.of(ColumnFile.FIELD_IDS, ColumnFile.LOCATION, ColumnFile.FILE_SIZE_IN_BYTES); | ||
|
|
||
| private int[] fieldIds = null; | ||
| private String location = null; | ||
| private long fileSizeInBytes = -1L; | ||
|
|
||
| /** Used by internal readers to instantiate this class with a projection schema. */ | ||
| ColumnFileStruct(Types.StructType projection) { | ||
| super(BASE_TYPE, projection); | ||
| } | ||
|
|
||
| ColumnFileStruct(List<Integer> fieldIds, String location, long fileSizeInBytes) { | ||
| super(BASE_TYPE.fields().size()); | ||
| this.fieldIds = ArrayUtil.toIntArray(fieldIds); | ||
| this.location = location; | ||
| this.fileSizeInBytes = fileSizeInBytes; | ||
| } | ||
|
|
||
| /** Copy constructor. */ | ||
| private ColumnFileStruct(ColumnFileStruct toCopy) { | ||
| super(toCopy); | ||
| this.fieldIds = | ||
| toCopy.fieldIds != null ? Arrays.copyOf(toCopy.fieldIds, toCopy.fieldIds.length) : null; | ||
| this.location = toCopy.location; | ||
| this.fileSizeInBytes = toCopy.fileSizeInBytes; | ||
| } | ||
|
|
||
| /** Constructor for Java serialization. */ | ||
| ColumnFileStruct() { | ||
| super(BASE_TYPE.fields().size()); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Integer> fieldIds() { | ||
| return fieldIds != null ? ArrayUtil.toUnmodifiableIntList(fieldIds) : null; | ||
| } | ||
|
|
||
| @Override | ||
| public String location() { | ||
| return location; | ||
| } | ||
|
|
||
| @Override | ||
| public long fileSizeInBytes() { | ||
| return fileSizeInBytes; | ||
| } | ||
|
|
||
| @Override | ||
| public ColumnFile copy() { | ||
| return new ColumnFileStruct(this); | ||
| } | ||
|
|
||
| @Override | ||
| protected <T> T internalGet(int pos, Class<T> javaClass) { | ||
| return javaClass.cast(getByPos(pos)); | ||
| } | ||
|
|
||
| private Object getByPos(int pos) { | ||
| switch (pos) { | ||
| case 0: | ||
| return fieldIds(); | ||
| case 1: | ||
| return location; | ||
| case 2: | ||
| return fileSizeInBytes; | ||
| default: | ||
| throw new UnsupportedOperationException("Unknown field ordinal: " + pos); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| @SuppressWarnings("unchecked") | ||
| protected <T> void internalSet(int pos, T value) { | ||
| switch (pos) { | ||
| case 0: | ||
| this.fieldIds = ArrayUtil.toIntArray((List<Integer>) value); | ||
| break; | ||
| case 1: | ||
| // always coerce to String for Serializable | ||
| this.location = value.toString(); | ||
| break; | ||
| case 2: | ||
| this.fileSizeInBytes = (long) value; | ||
| break; | ||
| default: | ||
| // ignore the object, it must be from a newer version of the format | ||
| } | ||
| } | ||
|
|
||
| static Builder builder() { | ||
| return new Builder(); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return MoreObjects.toStringHelper(this) | ||
| .add("field_ids", fieldIds) | ||
| .add("location", location) | ||
| .add("file_size_in_bytes", fileSizeInBytes) | ||
| .toString(); | ||
| } | ||
|
|
||
| static class Builder { | ||
| private List<Integer> fieldIds = null; | ||
| private String location = null; | ||
| private Long fileSizeInBytes = null; | ||
|
|
||
| Builder fieldIds(List<Integer> newFieldIds) { | ||
| Preconditions.checkArgument(newFieldIds != null, "Invalid field IDs: null"); | ||
| Preconditions.checkArgument(!newFieldIds.isEmpty(), "Invalid field IDs: empty"); | ||
| Preconditions.checkArgument( | ||
| Sets.newHashSet(newFieldIds).size() == newFieldIds.size(), | ||
| "Invalid field IDs: duplicateD IDs found: %s", | ||
| newFieldIds); | ||
| this.fieldIds = newFieldIds; | ||
| return this; | ||
| } | ||
|
|
||
| Builder location(String newLocation) { | ||
| Preconditions.checkArgument(newLocation != null, "Invalid location: null"); | ||
| Preconditions.checkArgument(!newLocation.isEmpty(), "Invalid location: empty"); | ||
| this.location = newLocation; | ||
| return this; | ||
| } | ||
|
|
||
| Builder fileSizeInBytes(long newFileSizeInBytes) { | ||
| Preconditions.checkArgument( | ||
| newFileSizeInBytes >= 0, | ||
| "Invalid file size in bytes: %s (must be >= 0)", | ||
| newFileSizeInBytes); | ||
| this.fileSizeInBytes = newFileSizeInBytes; | ||
| return this; | ||
| } | ||
|
|
||
| ColumnFile build() { | ||
| Preconditions.checkArgument(fieldIds != null, "Missing required value: fieldIds"); | ||
| Preconditions.checkArgument(location != null, "Missing required value: location"); | ||
| Preconditions.checkArgument( | ||
| fileSizeInBytes != null, "Missing required value: fileSizeInBytes"); | ||
| return new ColumnFileStruct(fieldIds, location, fileSizeInBytes); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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.
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.
To return List from DataFile, we have to move this class to API and make it public.