You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by ad...@apache.org on 2026/06/26 10:07:52 UTC
(polaris) branch main updated: Remove unused field in JdbcBasePersistenceImpl (#4892)
This is an automated email from the ASF dual-hosted git repository.
adutra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new 594fff637e Remove unused field in JdbcBasePersistenceImpl (#4892)
594fff637e is described below
commit 594fff637e0bb416db288f02534bc7a1f864f489
Author: Alexandre Dutra <ad...@apache.org>
AuthorDate: Fri Jun 26 12:07:47 2026 +0200
Remove unused field in JdbcBasePersistenceImpl (#4892)
---
.../relational/jdbc/JdbcBasePersistenceImpl.java | 4 ----
.../relational/jdbc/JdbcMetaStoreManagerFactory.java | 3 ---
...omicMetastoreManagerWithJdbcBasePersistenceImplTest.java | 2 --
.../relational/jdbc/JdbcGrantRecordsIdempotencyTest.java | 4 ----
.../relational/jdbc/MetricsReportPersistenceTest.java | 13 -------------
5 files changed, 26 deletions(-)
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java
index fcc59c8e67..cc711cc646 100644
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java
+++ b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java
@@ -68,7 +68,6 @@ import org.apache.polaris.core.policy.PolicyEntity;
import org.apache.polaris.core.policy.PolicyType;
import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
import org.apache.polaris.core.storage.PolarisStorageIntegration;
-import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.apache.polaris.core.storage.StorageLocation;
import org.apache.polaris.persistence.relational.jdbc.models.EntityNameLookupRecordConverter;
import org.apache.polaris.persistence.relational.jdbc.models.ModelCommitMetricsReport;
@@ -92,7 +91,6 @@ public class JdbcBasePersistenceImpl
private final PolarisDiagnostics diagnostics;
private final DatasourceOperations datasourceOperations;
private final PrincipalSecretsGenerator secretsGenerator;
- private final PolarisStorageIntegrationProvider storageIntegrationProvider;
private final String realmId;
private final int schemaVersion;
@@ -103,13 +101,11 @@ public class JdbcBasePersistenceImpl
PolarisDiagnostics diagnostics,
DatasourceOperations databaseOperations,
PrincipalSecretsGenerator secretsGenerator,
- PolarisStorageIntegrationProvider storageIntegrationProvider,
String realmId,
int schemaVersion) {
this.diagnostics = diagnostics;
this.datasourceOperations = databaseOperations;
this.secretsGenerator = secretsGenerator;
- this.storageIntegrationProvider = storageIntegrationProvider;
this.realmId = realmId;
this.schemaVersion = schemaVersion;
}
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
index 1a4c7b5ba8..e88aac882a 100644
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
+++ b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
@@ -56,7 +56,6 @@ import org.apache.polaris.core.persistence.cache.InMemoryEntityCache;
import org.apache.polaris.core.persistence.dao.entity.BaseResult;
import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult;
import org.apache.polaris.core.persistence.metrics.MetricsPersistence;
-import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,7 +86,6 @@ public class JdbcMetaStoreManagerFactory implements MetaStoreManagerFactory {
@Inject Clock clock;
@Inject PolarisDiagnostics diagnostics;
- @Inject PolarisStorageIntegrationProvider storageIntegrationProvider;
@Inject DatasourceOperations datasourceOperations;
@Inject RealmConfigurationSource realmConfigurationSource;
@@ -128,7 +126,6 @@ public class JdbcMetaStoreManagerFactory implements MetaStoreManagerFactory {
diagnostics,
datasourceOperations,
secretsGenerator(realmId, rootCredentialsSet),
- storageIntegrationProvider,
realmId,
schemaVersion);
}
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplTest.java
index 3a78ca39ba..4ccee4483c 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplTest.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplTest.java
@@ -44,7 +44,6 @@ import org.assertj.core.api.Assertions;
import org.assertj.core.api.Assumptions;
import org.h2.jdbcx.JdbcConnectionPool;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
public abstract class AtomicMetastoreManagerWithJdbcBasePersistenceImplTest
extends BasePolarisMetaStoreManagerTest {
@@ -101,7 +100,6 @@ public abstract class AtomicMetastoreManagerWithJdbcBasePersistenceImplTest
diagServices,
datasourceOperations,
RANDOM_SECRETS,
- Mockito.mock(),
realmContext.getRealmIdentifier(),
schemaVersion());
AtomicOperationMetaStoreManager metaStoreManager =
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcGrantRecordsIdempotencyTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcGrantRecordsIdempotencyTest.java
index 41e9182296..6d01f2d9cd 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcGrantRecordsIdempotencyTest.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcGrantRecordsIdempotencyTest.java
@@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.IOException;
@@ -35,7 +34,6 @@ import org.apache.polaris.core.PolarisCallContext;
import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.entity.PolarisGrantRecord;
-import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.h2.jdbcx.JdbcConnectionPool;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -76,7 +74,6 @@ class JdbcGrantRecordsIdempotencyTest {
new PolarisDefaultDiagServiceImpl(),
datasourceOperations,
RANDOM_SECRETS,
- mock(PolarisStorageIntegrationProvider.class),
REALM_CONTEXT.getRealmIdentifier(),
schemaVersion);
PolarisCallContext callCtx = new PolarisCallContext(REALM_CONTEXT, basePersistence);
@@ -119,7 +116,6 @@ class JdbcGrantRecordsIdempotencyTest {
new PolarisDefaultDiagServiceImpl(),
datasourceOperations,
RANDOM_SECRETS,
- mock(PolarisStorageIntegrationProvider.class),
REALM_CONTEXT.getRealmIdentifier(),
schemaVersion);
PolarisCallContext callCtx = new PolarisCallContext(REALM_CONTEXT, basePersistence);
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/MetricsReportPersistenceTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/MetricsReportPersistenceTest.java
index ec016b8b6f..37c7bb5391 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/MetricsReportPersistenceTest.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/MetricsReportPersistenceTest.java
@@ -21,18 +21,14 @@ package org.apache.polaris.persistence.relational.jdbc;
import java.io.InputStream;
import java.sql.SQLException;
import java.time.Instant;
-import java.util.List;
import java.util.Optional;
import java.util.UUID;
import javax.sql.DataSource;
import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
import org.apache.polaris.core.PolarisDiagnostics;
-import org.apache.polaris.core.entity.PolarisEntity;
import org.apache.polaris.core.persistence.PrincipalSecretsGenerator;
import org.apache.polaris.core.persistence.metrics.CommitMetricsRecord;
import org.apache.polaris.core.persistence.metrics.ScanMetricsRecord;
-import org.apache.polaris.core.storage.PolarisStorageIntegration;
-import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.h2.jdbcx.JdbcConnectionPool;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -61,21 +57,12 @@ class MetricsReportPersistenceTest {
datasourceOperations.executeScript(schemaStream);
PolarisDiagnostics diagnostics = new PolarisDefaultDiagServiceImpl();
- PolarisStorageIntegrationProvider storageProvider =
- new PolarisStorageIntegrationProvider() {
- @Override
- public PolarisStorageIntegration getStorageIntegration(
- List<PolarisEntity> resolvedEntityPath) {
- return null;
- }
- };
metricsPersistence =
new JdbcBasePersistenceImpl(
diagnostics,
datasourceOperations,
PrincipalSecretsGenerator.RANDOM_SECRETS,
- storageProvider,
"TEST_REALM",
4);
}