You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2022/12/21 22:26:44 UTC
[iceberg] branch master updated: AWS, Core, Nessie: Expose catalog properties (#6471)
This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new e3a7b160e7 AWS, Core, Nessie: Expose catalog properties (#6471)
e3a7b160e7 is described below
commit e3a7b160e7087b6331ea28d9ad421755e5b59f33
Author: Eduard Tudenhöfner <et...@gmail.com>
AuthorDate: Wed Dec 21 23:26:37 2022 +0100
AWS, Core, Nessie: Expose catalog properties (#6471)
---
.../java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalog.java | 7 +++++++
core/src/main/java/org/apache/iceberg/jdbc/JdbcCatalog.java | 5 +++++
dell/src/main/java/org/apache/iceberg/dell/ecs/EcsCatalog.java | 8 ++++++++
nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java | 5 +++++
4 files changed, 25 insertions(+)
diff --git a/aws/src/main/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalog.java b/aws/src/main/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalog.java
index 130fc921de..4f93613cd5 100644
--- a/aws/src/main/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalog.java
+++ b/aws/src/main/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalog.java
@@ -111,11 +111,13 @@ public class DynamoDbCatalog extends BaseMetastoreCatalog
private AwsProperties awsProperties;
private FileIO fileIO;
private CloseableGroup closeableGroup;
+ private Map<String, String> catalogProperties;
public DynamoDbCatalog() {}
@Override
public void initialize(String name, Map<String, String> properties) {
+ this.catalogProperties = ImmutableMap.copyOf(properties);
initialize(
name,
properties.get(CatalogProperties.WAREHOUSE_LOCATION),
@@ -686,4 +688,9 @@ public class DynamoDbCatalog extends BaseMetastoreCatalog
return false;
}
}
+
+ @Override
+ protected Map<String, String> properties() {
+ return catalogProperties == null ? ImmutableMap.of() : catalogProperties;
+ }
}
diff --git a/core/src/main/java/org/apache/iceberg/jdbc/JdbcCatalog.java b/core/src/main/java/org/apache/iceberg/jdbc/JdbcCatalog.java
index 58cb65f918..56b49f9cba 100644
--- a/core/src/main/java/org/apache/iceberg/jdbc/JdbcCatalog.java
+++ b/core/src/main/java/org/apache/iceberg/jdbc/JdbcCatalog.java
@@ -588,4 +588,9 @@ public class JdbcCatalog extends BaseMetastoreCatalog
return execute(JdbcUtil.deletePropertiesStatement(properties), args) > 0;
}
+
+ @Override
+ protected Map<String, String> properties() {
+ return catalogProperties == null ? ImmutableMap.of() : catalogProperties;
+ }
}
diff --git a/dell/src/main/java/org/apache/iceberg/dell/ecs/EcsCatalog.java b/dell/src/main/java/org/apache/iceberg/dell/ecs/EcsCatalog.java
index 20831f1473..bf16e1b07f 100644
--- a/dell/src/main/java/org/apache/iceberg/dell/ecs/EcsCatalog.java
+++ b/dell/src/main/java/org/apache/iceberg/dell/ecs/EcsCatalog.java
@@ -55,6 +55,7 @@ import org.apache.iceberg.hadoop.Configurable;
import org.apache.iceberg.io.CloseableGroup;
import org.apache.iceberg.io.FileIO;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.relocated.com.google.common.io.ByteStreams;
import org.apache.iceberg.util.LocationUtil;
@@ -84,6 +85,7 @@ public class EcsCatalog extends BaseMetastoreCatalog
private FileIO fileIO;
private CloseableGroup closeableGroup;
+ private Map<String, String> catalogProperties;
/**
* No-arg constructor to load the catalog dynamically.
@@ -94,6 +96,7 @@ public class EcsCatalog extends BaseMetastoreCatalog
@Override
public void initialize(String name, Map<String, String> properties) {
+ this.catalogProperties = ImmutableMap.copyOf(properties);
String inputWarehouseLocation = properties.get(CatalogProperties.WAREHOUSE_LOCATION);
Preconditions.checkArgument(
inputWarehouseLocation != null && inputWarehouseLocation.length() > 0,
@@ -495,4 +498,9 @@ public class EcsCatalog extends BaseMetastoreCatalog
public void setConf(Object conf) {
this.hadoopConf = conf;
}
+
+ @Override
+ protected Map<String, String> properties() {
+ return catalogProperties == null ? ImmutableMap.of() : catalogProperties;
+ }
}
diff --git a/nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java b/nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java
index 4c6b4035ed..cd92661c3f 100644
--- a/nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java
+++ b/nessie/src/main/java/org/apache/iceberg/nessie/NessieCatalog.java
@@ -331,4 +331,9 @@ public class NessieCatalog extends BaseMetastoreCatalog
}
return identifier;
}
+
+ @Override
+ protected Map<String, String> properties() {
+ return catalogOptions == null ? ImmutableMap.of() : catalogOptions;
+ }
}