Upgrade Iceberg client version to 0.13.1

Netflix · Mar 23, 2022 · 2b64ec1 · 2b64ec1
1 parent 60886d7
commit 2b64ec1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -32,6 +32,6 @@ elasticsearch.version=5.4.1
 
 hive_version=1.2.1
 
-iceberg_version=0.9.0
+iceberg_version=0.13.1
 
 org.gradle.jvmargs=-Xmx1g
diff --git a/...or-hive/src/main/java/com/netflix/metacat/connector/hive/iceberg/IcebergTableHandler.java b/...or-hive/src/main/java/com/netflix/metacat/connector/hive/iceberg/IcebergTableHandler.java
@@ -173,7 +173,7 @@ public IcebergTableWrapper getIcebergTable(final QualifiedName tableName, final
  this.icebergTableCriteria.checkCriteria(tableName, tableMetadataLocation);
  log.debug("Loading icebergTable {} from {}", tableName, tableMetadataLocation);
  final IcebergMetastoreTables icebergMetastoreTables = new IcebergMetastoreTables(
- new IcebergTableOps(conf, tableMetadataLocation,
+ new IcebergTableOps(conf, tableMetadataLocation, tableName.getTableName(),
  connectorContext.getConfig(),
  icebergTableOpsProxy));
  final Table table = icebergMetastoreTables.loadTable(
@@ -214,7 +214,7 @@ public boolean update(final TableInfo tableInfo) {
  throw new MetacatBadRequestException(message);
  }
  final IcebergMetastoreTables icebergMetastoreTables = new IcebergMetastoreTables(
- new IcebergTableOps(conf, tableMetadataLocation,
+ new IcebergTableOps(conf, tableMetadataLocation, tableName.getTableName(),
  connectorContext.getConfig(),
  icebergTableOpsProxy));
  final Table table = icebergMetastoreTables.loadTable(

diff --git a/...nector-hive/src/main/java/com/netflix/metacat/connector/hive/iceberg/IcebergTableOps.java b/...nector-hive/src/main/java/com/netflix/metacat/connector/hive/iceberg/IcebergTableOps.java
@@ -15,6 +15,7 @@
  */
 public class IcebergTableOps extends BaseMetastoreTableOperations {
  private String location;
+ private String tableName;
  private final Configuration conf;
  private final Config config;
  private final IcebergTableOpsProxy icebergTableOpsProxy;
@@ -24,19 +25,27 @@ public class IcebergTableOps extends BaseMetastoreTableOperations {
  * Constructor.
  * @param conf hive configuration
  * @param location table manifest location
+ * @param tableName table name
  * @param config server config
  * @param icebergTableOpsProxy IcebergTableOps proxy
  */
  public IcebergTableOps(final Configuration conf,
  final String location,
+ final String tableName,
  final Config config,
  final IcebergTableOpsProxy icebergTableOpsProxy) {
  this.location = location;
+ this.tableName = tableName;
  this.conf = conf;
  this.config = config;
  this.icebergTableOpsProxy = icebergTableOpsProxy;
  }
 
+ @Override
+ protected String tableName() {
+ return tableName;
+ }
+
  @Override
  public TableMetadata current() {
  if (tableMetadata == null) {