Skip to content

Hive: removed Iceberg props should be removed from HMS table props too #2252

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
pvary merged 3 commits into from
Feb 19, 2021
Merged

Hive: removed Iceberg props should be removed from HMS table props too #2252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5150f3
Hive: removed Iceberg props should be removed from HMS table props too
marton-bod Feb 18, 2021
b69c422
Change from list to set
marton-bod Feb 18, 2021
e91c8b1
adjust method header whitespace
marton-bod Feb 19, 2021
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: 15 additions & 2 deletions hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.common.StatsSetupConst;
import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
Expand Down Expand Up @@ -186,7 +188,15 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
baseMetadataLocation, metadataLocation, database, tableName);
}

setHmsTableParameters(newMetadataLocation, tbl, metadata.properties(), hiveEngineEnabled);
// get Iceberg props that have been removed
Set<String> removedProps = Collections.emptySet();
if (base != null) {
removedProps = base.properties().keySet().stream()
.filter(key -> !metadata.properties().containsKey(key))
.collect(Collectors.toSet());
}

setHmsTableParameters(newMetadataLocation, tbl, metadata.properties(), removedProps, hiveEngineEnabled);

persistTable(tbl, updateHiveTable);
threw = false;
Expand Down Expand Up @@ -258,7 +268,7 @@ private Table newHmsTable() {
}

private void setHmsTableParameters(String newMetadataLocation, Table tbl, Map<String, String> icebergTableProps,
boolean hiveEngineEnabled) {
Set<String> obsoleteProps, boolean hiveEngineEnabled) {
Map<String, String> parameters = tbl.getParameters();

if (parameters == null) {
Expand All @@ -268,6 +278,9 @@ private void setHmsTableParameters(String newMetadataLocation, Table tbl, Map<St
// push all Iceberg table properties into HMS
icebergTableProps.forEach(parameters::put);

// remove any props from HMS that are no longer present in Iceberg table props
obsoleteProps.forEach(parameters::remove);

parameters.put(TABLE_TYPE_PROP, ICEBERG_TABLE_TYPE_VALUE.toUpperCase(Locale.ENGLISH));
parameters.put(METADATA_LOCATION_PROP, newMetadataLocation);

Expand Down
15 changes: 15 additions & 0 deletions mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,21 @@ public void testIcebergAndHmsTableProperties() throws TException, InterruptedExc
} else {
Assert.assertEquals(7, hmsParams.size());
}

// Remove some Iceberg props and see if they're removed from HMS table props as well
if (Catalogs.hiveCatalog(shell.getHiveConf())) {
icebergTable.updateProperties()
.remove("custom_property")
.remove("new_prop_1")
.commit();
hmsParams = shell.metastore().getTable("default", "customers").getParameters()
.entrySet().stream()
.filter(e -> !IGNORED_PARAMS.contains(e.getKey()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
Assert.assertFalse(hmsParams.containsKey("custom_property"));
Assert.assertFalse(hmsParams.containsKey("new_prop_1"));
Assert.assertTrue(hmsParams.containsKey("new_prop_2"));
}
}

@Test
Expand Down