Skip to content

Commit 889b158

Browse files
Fixes post rebase
1 parent 7dd1865 commit 889b158

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingTableTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void testInvalidSetupsForObjectStorageLocation(
340340
"true",
341341
"SUPPORTED_CATALOG_STORAGE_TYPES",
342342
List.of("FILE", "S3"),
343-
OPTIMIZED_SIBLING_CHECK.key,
343+
OPTIMIZED_SIBLING_CHECK.key(),
344344
"false");
345345

346346
TestServices services =
@@ -369,7 +369,7 @@ public void testHashedTableLocations(@TempDir Path tempDir) {
369369
"true",
370370
"SUPPORTED_CATALOG_STORAGE_TYPES",
371371
List.of("FILE", "S3"),
372-
OPTIMIZED_SIBLING_CHECK.key,
372+
OPTIMIZED_SIBLING_CHECK.key(),
373373
"true");
374374
Map<String, String> hashedAndOverlapButNoOptimizedCatalog =
375375
Map.of(

service/common/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -949,8 +949,8 @@ private String applyDefaultLocationObjectStoragePrefix(
949949
throw new IllegalStateException(
950950
String.format(
951951
"The configuration %s is enabled, but %s is not enabled",
952-
FeatureConfiguration.DEFAULT_LOCATION_OBJECT_STORAGE_PREFIX_ENABLED.key,
953-
FeatureConfiguration.ALLOW_UNSTRUCTURED_TABLE_LOCATION.key));
952+
FeatureConfiguration.DEFAULT_LOCATION_OBJECT_STORAGE_PREFIX_ENABLED.key(),
953+
FeatureConfiguration.ALLOW_UNSTRUCTURED_TABLE_LOCATION.key()));
954954
} else if (!allowTableLocationOverlap) {
955955
// TODO consider doing this check any time ALLOW_EXTERNAL_TABLE_LOCATION is enabled, not just
956956
// here
@@ -961,17 +961,17 @@ private String applyDefaultLocationObjectStoragePrefix(
961961
+ " performed, but only within each namespace. However, %s is enabled, which indicates"
962962
+ " that tables may be created outside of their parent namespace. This is not a safe"
963963
+ " combination of configurations.",
964-
FeatureConfiguration.ALLOW_TABLE_LOCATION_OVERLAP.key,
965-
FeatureConfiguration.OPTIMIZED_SIBLING_CHECK.key,
966-
FeatureConfiguration.ALLOW_UNSTRUCTURED_TABLE_LOCATION.key));
964+
FeatureConfiguration.ALLOW_TABLE_LOCATION_OVERLAP.key(),
965+
FeatureConfiguration.OPTIMIZED_SIBLING_CHECK.key(),
966+
FeatureConfiguration.ALLOW_UNSTRUCTURED_TABLE_LOCATION.key()));
967967
} else if (!loggedPrefixOverlapWarning.getAndSet(true)) {
968968
LOGGER.warn(
969969
"A table is being created with {} and {} enabled, but with {} disabled. "
970970
+ "This is a safe combination of configurations which may prevent table overlap, but only if the "
971971
+ "underlying persistence actually implements %s. Exercise caution.",
972-
FeatureConfiguration.DEFAULT_LOCATION_OBJECT_STORAGE_PREFIX_ENABLED.key,
973-
FeatureConfiguration.OPTIMIZED_SIBLING_CHECK.key,
974-
FeatureConfiguration.ALLOW_TABLE_LOCATION_OVERLAP.key);
972+
FeatureConfiguration.DEFAULT_LOCATION_OBJECT_STORAGE_PREFIX_ENABLED.key(),
973+
FeatureConfiguration.OPTIMIZED_SIBLING_CHECK.key(),
974+
FeatureConfiguration.ALLOW_TABLE_LOCATION_OVERLAP.key());
975975
}
976976
return buildPrefixedLocation(tableIdentifier);
977977
} else {

0 commit comments

Comments
 (0)