Skip to content

Catalog: Use ImmutableMap for catalog properties #4803

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
rdblue merged 2 commits into from
May 18, 2022
Merged

Catalog: Use ImmutableMap for catalog properties #4803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22a8dd3
Catalog: Use ImmutableMap for catalog properties
rajarshisarkar May 18, 2022
2efde0e
Catalog: Add loggers for table default and table override catalog pro…
rajarshisarkar May 18, 2022
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
17 changes: 11 additions & 6 deletions aws/src/main/java/org/apache/iceberg/aws/glue/GlueCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

import java.io.Closeable;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -93,7 +92,7 @@ public class GlueCatalog extends BaseMetastoreCatalog
private FileIO fileIO;
private LockManager lockManager;
private CloseableGroup closeableGroup;
private Map<String, String> catalogProperties = Collections.emptyMap();
private Map<String, String> catalogProperties;

// Attempt to set versionId if available on the path
private static final DynMethods.UnboundMethod SET_VERSION_ID = DynMethods.builder("versionId")
Expand All @@ -111,7 +110,7 @@ public GlueCatalog() {

@Override
public void initialize(String name, Map<String, String> properties) {
this.catalogProperties = properties;
this.catalogProperties = ImmutableMap.copyOf(properties);
AwsClientFactory awsClientFactory;
FileIO catalogFileIO;
if (PropertyUtil.propertyAsBoolean(
Expand Down Expand Up @@ -165,8 +164,14 @@ private FileIO initializeFileIO(Map<String, String> properties) {
}

@VisibleForTesting
void initialize(String name, String path, AwsProperties properties, GlueClient client,
LockManager lock, FileIO io, Map<String, String> catalogProps) {
void initialize(
String name,
String path,
AwsProperties properties,
GlueClient client,
LockManager lock,
FileIO io,
Map<String, String> catalogProps) {
this.catalogProperties = catalogProps;
initialize(name, path, properties, client, lock, io);
}
Expand Down Expand Up @@ -507,6 +512,6 @@ public void setConf(Configuration conf) {

@Override
protected Map<String, String> properties() {
return catalogProperties;
return catalogProperties == null ? ImmutableMap.of() : catalogProperties;
}
}
14 changes: 10 additions & 4 deletions core/src/main/java/org/apache/iceberg/BaseMetastoreCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

package org.apache.iceberg;

import java.util.Collections;
import java.util.Map;
import org.apache.iceberg.catalog.Catalog;
import org.apache.iceberg.catalog.TableIdentifier;
Expand All @@ -28,6 +27,7 @@
import org.apache.iceberg.exceptions.NoSuchTableException;
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.ImmutableMap;
import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.util.PropertyUtil;
import org.slf4j.Logger;
Expand Down Expand Up @@ -97,7 +97,7 @@ protected boolean isValidIdentifier(TableIdentifier tableIdentifier) {
}

protected Map<String, String> properties() {
return Collections.emptyMap();
return ImmutableMap.of();
}

@Override
Expand Down Expand Up @@ -229,7 +229,10 @@ private Transaction newReplaceTableTransaction(boolean orCreate) {
* @return default table properties specified in catalog properties
*/
private Map<String, String> tableDefaultProperties() {
return PropertyUtil.propertiesWithPrefix(properties(), CatalogProperties.TABLE_DEFAULT_PREFIX);
Map<String, String> tableDefaultProperties =
PropertyUtil.propertiesWithPrefix(properties(), CatalogProperties.TABLE_DEFAULT_PREFIX);
LOG.info("Table properties set at catalog level through catalog properties: {}", tableDefaultProperties);
return tableDefaultProperties;
}

/**
Expand All @@ -238,7 +241,10 @@ private Map<String, String> tableDefaultProperties() {
* @return default table properties enforced through catalog properties
*/
private Map<String, String> tableOverrideProperties() {
return PropertyUtil.propertiesWithPrefix(properties(), CatalogProperties.TABLE_OVERRIDE_PREFIX);
Map<String, String> tableOverrideProperties =
PropertyUtil.propertiesWithPrefix(properties(), CatalogProperties.TABLE_OVERRIDE_PREFIX);
LOG.info("Table properties enforced at catalog level through catalog properties: {}", tableOverrideProperties);
return tableOverrideProperties;
}
}

Expand Down
7 changes: 3 additions & 4 deletions core/src/main/java/org/apache/iceberg/hadoop/HadoopCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.io.UncheckedIOException;
import java.nio.file.AccessDeniedException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -94,14 +93,14 @@ public class HadoopCatalog extends BaseMetastoreCatalog implements Closeable, Su
private FileIO fileIO;
private LockManager lockManager;
private boolean suppressPermissionError = false;
private Map<String, String> catalogProperties = Collections.emptyMap();
private Map<String, String> catalogProperties;

public HadoopCatalog() {
}

@Override
public void initialize(String name, Map<String, String> properties) {
this.catalogProperties = properties;
this.catalogProperties = ImmutableMap.copyOf(properties);
String inputWarehouseLocation = properties.get(CatalogProperties.WAREHOUSE_LOCATION);
Preconditions.checkArgument(inputWarehouseLocation != null && inputWarehouseLocation.length() > 0,
"Cannot initialize HadoopCatalog because warehousePath must not be null or empty");
Expand Down Expand Up @@ -398,7 +397,7 @@ public Configuration getConf() {

@Override
protected Map<String, String> properties() {
return catalogProperties;
return catalogProperties == null ? ImmutableMap.of() : catalogProperties;
}

private class HadoopCatalogTableBuilder extends BaseMetastoreCatalogTableBuilder {
Expand Down
8 changes: 4 additions & 4 deletions hive-metastore/src/main/java/org/apache/iceberg/hive/HiveCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

package org.apache.iceberg.hive;

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -57,6 +56,7 @@
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.ImmutableList;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.util.LocationUtil;
import org.apache.thrift.TException;
Expand All @@ -74,14 +74,14 @@ public class HiveCatalog extends BaseMetastoreCatalog implements SupportsNamespa
private FileIO fileIO;
private ClientPool<IMetaStoreClient, TException> clients;
private boolean listAllTables = false;
private Map<String, String> catalogProperties = Collections.emptyMap();
private Map<String, String> catalogProperties;

public HiveCatalog() {
}

@Override
public void initialize(String inputName, Map<String, String> properties) {
this.catalogProperties = properties;
this.catalogProperties = ImmutableMap.copyOf(properties);
this.name = inputName;
if (conf == null) {
LOG.warn("No Hadoop Configuration was set, using the default environment Configuration");
Expand Down Expand Up @@ -544,7 +544,7 @@ public Configuration getConf() {

@Override
protected Map<String, String> properties() {
return catalogProperties;
return catalogProperties == null ? ImmutableMap.of() : catalogProperties;
}

@VisibleForTesting
Expand Down