-
Notifications
You must be signed in to change notification settings - Fork 35
Support reading tables with only Hive metadata #23
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
88bff7d
Support reading tables with Hive metadata if Iceberg metadata is not …
shardulm94 0f9bd27
Address RB comments
shardulm94 cb15c65
Address PR comments Take 2
shardulm94 162125f
Adress PR comments [Take 3]
shardulm94 0f0c4d9
Address PR comments
shardulm94 ce52e3e
Address PR comments
shardulm94 c2a3f44
Address PR comments
shardulm94 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
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
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
51 changes: 51 additions & 0 deletions
51
hive/src/main/java/org/apache/iceberg/hive/legacy/DirectoryInfo.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,51 @@ | ||
| /* | ||
| * 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.hive.legacy; | ||
|
|
||
| import org.apache.iceberg.FileFormat; | ||
| import org.apache.iceberg.StructLike; | ||
|
|
||
|
|
||
| /** | ||
| * Metadata for a data directory referenced by either a Hive table or a partition | ||
| */ | ||
| class DirectoryInfo { | ||
| private final String location; | ||
| private final FileFormat format; | ||
| private final StructLike partitionData; | ||
|
|
||
| DirectoryInfo(String location, FileFormat format, StructLike partitionData) { | ||
| this.location = location; | ||
| this.format = format; | ||
| this.partitionData = partitionData; | ||
| } | ||
|
|
||
| public String location() { | ||
| return location; | ||
| } | ||
|
|
||
| public FileFormat format() { | ||
| return format; | ||
| } | ||
|
|
||
| public StructLike partitionData() { | ||
| return partitionData; | ||
| } | ||
| } |
61 changes: 61 additions & 0 deletions
61
hive/src/main/java/org/apache/iceberg/hive/legacy/FileSystemUtils.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,61 @@ | ||
| /* | ||
| * 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.hive.legacy; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.fs.FileStatus; | ||
| import org.apache.hadoop.fs.FileSystem; | ||
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.hadoop.fs.PathFilter; | ||
| import org.apache.iceberg.exceptions.RuntimeIOException; | ||
|
|
||
|
|
||
| class FileSystemUtils { | ||
|
|
||
| private FileSystemUtils() {} | ||
|
|
||
| /** | ||
| * Lists all non-hidden files for the given directory | ||
| */ | ||
| static List<FileStatus> listFiles(String directory, Configuration conf) { | ||
|
|
||
| final Path directoryPath = new Path(directory); | ||
| final FileStatus[] files; | ||
| try { | ||
| FileSystem fs = directoryPath.getFileSystem(conf); | ||
| files = fs.listStatus(directoryPath, HiddenPathFilter.INSTANCE); | ||
| } catch (IOException e) { | ||
| throw new RuntimeIOException(e, "Error listing files for directory: " + directory); | ||
| } | ||
| return Arrays.asList(files); | ||
| } | ||
|
|
||
| private enum HiddenPathFilter implements PathFilter { | ||
| INSTANCE; | ||
|
|
||
| @Override | ||
| public boolean accept(Path path) { | ||
| return !path.getName().startsWith("_") && !path.getName().startsWith("."); | ||
| } | ||
| } | ||
| } | ||
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.
Already a fs util in Icceberg. Move to that?
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.
Which class are you referring to? Could not find it.