Skip to content

Commit d8668fc

Browse files
Address review feedback
1 parent 2e25d39 commit d8668fc

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -811,9 +811,8 @@ Optional<Optional<String>> hasOverlappingSiblings(
811811
if (!results.isEmpty()) {
812812
StorageLocation entityLocation = StorageLocation.of(entity.getBaseLocation());
813813
for (PolarisBaseEntity result : results) {
814-
// JDBC materializes persisted rows as PolarisBaseEntity; resolve location via entity
815-
// utils
816-
// instead of casting to LocationBasedEntity.
814+
// JDBC materializes persisted rows as PolarisBaseEntity. Resolve the sibling location
815+
// via PolarisEntityUtils instead of casting to LocationBasedEntity.
817816
Optional<String> overlappingSiblingLocation =
818817
PolarisEntityUtils.asLocationBasedEntity(PolarisEntity.of(result))
819818
.map(LocationBasedEntity::getBaseLocation)

persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.apache.polaris.core.persistence.BasePolarisMetaStoreManagerTest;
4141
import org.apache.polaris.core.persistence.PolarisTestMetaStoreManager;
4242
import org.assertj.core.api.Assertions;
43+
import org.assertj.core.api.Assumptions;
4344
import org.h2.jdbcx.JdbcConnectionPool;
4445
import org.junit.jupiter.api.Test;
4546
import org.mockito.Mockito;
@@ -92,9 +93,7 @@ protected PolarisTestMetaStoreManager createPolarisTestMetaStoreManager() {
9293
@Test
9394
void testHasOverlappingSiblingsUsesStoredBaseLocation() {
9495
// The optimized check relies on the location_without_scheme column added in schema v2.
95-
if (schemaVersion() < 2) {
96-
return;
97-
}
96+
Assumptions.assumeThat(schemaVersion()).isGreaterThanOrEqualTo(2);
9897

9998
var metaStoreManager = polarisTestMetaStoreManager.polarisMetaStoreManager();
10099
var callContext = polarisTestMetaStoreManager.polarisCallContext();

0 commit comments

Comments
 (0)