Skip to content

Upgrade Iceberg version to 0.11.1 #16603

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
zhenxiao merged 1 commit into from
Aug 13, 2021
Merged

Upgrade Iceberg version to 0.11.1 #16603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions presto-iceberg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
<dep.iceberg.version>0.9.0</dep.iceberg.version>
<dep.iceberg.version>0.11.1</dep.iceberg.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -274,7 +274,7 @@

<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-hive</artifactId>
<artifactId>iceberg-hive-metastore</artifactId>
<version>${dep.iceberg.version}</version>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions presto-iceberg/src/main/java/com/facebook/presto/iceberg/HiveTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.apache.iceberg.TableMetadataParser;
import org.apache.iceberg.TableOperations;
import org.apache.iceberg.exceptions.CommitFailedException;
import org.apache.iceberg.hive.HiveTypeConverter;
import org.apache.iceberg.hive.HiveSchemaUtil;
import org.apache.iceberg.io.FileIO;
import org.apache.iceberg.io.LocationProvider;
import org.apache.iceberg.io.OutputFile;
Expand Down Expand Up @@ -394,7 +394,7 @@ private static List<Column> toHiveColumns(List<NestedField> columns)
return columns.stream()
.map(column -> new Column(
column.name(),
HiveType.valueOf(HiveTypeConverter.convert(column.type())),
HiveType.toHiveType(HiveSchemaUtil.convert(column.type())),
Optional.empty()))
.collect(toImmutableList());
}
Expand Down
3 changes: 2 additions & 1 deletion presto-iceberg/src/main/java/com/facebook/presto/iceberg/PartitionTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,9 @@ private Map<StructLikeWrapper, Partition> getPartitions(TableScan tableScan)

for (FileScanTask fileScanTask : fileScanTasks) {
DataFile dataFile = fileScanTask.file();
Types.StructType structType = fileScanTask.spec().partitionType();
StructLike partitionStruct = dataFile.partition();
StructLikeWrapper partitionWrapper = StructLikeWrapper.wrap(partitionStruct);
StructLikeWrapper partitionWrapper = StructLikeWrapper.forType(structType).set(partitionStruct);

if (!partitions.containsKey(partitionWrapper)) {
Partition partition = new Partition(
Expand Down