Skip to content

Commit 89a28ee

Browse files
XN137XN137
committed
review: make field private
1 parent 89bf06e commit 89a28ee

File tree

3 files changed

+86
-71
lines changed

3 files changed

+86
-71
lines changed

‎persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ static void clearEntityManagerFactories() {
162162
@Override
163163
public <T> T runInTransaction(
164164
@Nonnull PolarisCallContext callCtx, @Nonnull Supplier<T> transactionCode) {
165-
diagnostics.check(localSession.get() == null, "cannot nest transaction");
165+
getDiagnostics().check(localSession.get() == null, "cannot nest transaction");
166166

167167
try (EntityManager session = emf.createEntityManager()) {
168168
localSession.set(session);
@@ -209,7 +209,7 @@ public <T> T runInTransaction(
209209
@Override
210210
public void runActionInTransaction(
211211
@Nonnull PolarisCallContext callCtx, @Nonnull Runnable transactionCode) {
212-
diagnostics.check(localSession.get() == null, "cannot nest transaction");
212+
getDiagnostics().check(localSession.get() == null, "cannot nest transaction");
213213

214214
try (EntityManager session = emf.createEntityManager()) {
215215
localSession.set(session);
@@ -563,20 +563,22 @@ public int lookupEntityGrantRecordsVersionInCurrentTxn(
563563
this.store.lookupPrincipalSecrets(localSession.get(), clientId));
564564

565565
// should be found
566-
diagnostics.checkNotNull(
567-
principalSecrets,
568-
"cannot_find_secrets",
569-
"client_id={} principalId={}",
570-
clientId,
571-
principalId);
566+
getDiagnostics()
567+
.checkNotNull(
568+
principalSecrets,
569+
"cannot_find_secrets",
570+
"client_id={} principalId={}",
571+
clientId,
572+
principalId);
572573

573574
// ensure principal id is matching
574-
diagnostics.check(
575-
principalId == principalSecrets.getPrincipalId(),
576-
"principal_id_mismatch",
577-
"expectedId={} id={}",
578-
principalId,
579-
principalSecrets.getPrincipalId());
575+
getDiagnostics()
576+
.check(
577+
principalId == principalSecrets.getPrincipalId(),
578+
"principal_id_mismatch",
579+
"expectedId={} id={}",
580+
principalId,
581+
principalSecrets.getPrincipalId());
580582

581583
// rotate the secrets
582584
principalSecrets.rotateSecrets(oldSecretHash);
@@ -600,20 +602,22 @@ public void deletePrincipalSecretsInCurrentTxn(
600602
this.store.lookupPrincipalSecrets(localSession.get(), clientId);
601603

602604
// should be found
603-
diagnostics.checkNotNull(
604-
principalSecrets,
605-
"cannot_find_secrets",
606-
"client_id={} principalId={}",
607-
clientId,
608-
principalId);
605+
getDiagnostics()
606+
.checkNotNull(
607+
principalSecrets,
608+
"cannot_find_secrets",
609+
"client_id={} principalId={}",
610+
clientId,
611+
principalId);
609612

610613
// ensure principal id is matching
611-
diagnostics.check(
612-
principalId == principalSecrets.getPrincipalId(),
613-
"principal_id_mismatch",
614-
"expectedId={} id={}",
615-
principalId,
616-
principalSecrets.getPrincipalId());
614+
getDiagnostics()
615+
.check(
616+
principalId == principalSecrets.getPrincipalId(),
617+
"principal_id_mismatch",
618+
"expectedId={} id={}",
619+
principalId,
620+
principalSecrets.getPrincipalId());
617621

618622
// delete these secrets
619623
this.store.deletePrincipalSecrets(localSession.get(), clientId);
@@ -637,7 +641,7 @@ PolarisStorageIntegration<T> createStorageIntegrationInCurrentTxn(
637641
PolarisStorageIntegration<T> loadPolarisStorageIntegrationInCurrentTxn(
638642
@Nonnull PolarisCallContext callCtx, @Nonnull PolarisBaseEntity entity) {
639643
PolarisStorageConfigurationInfo storageConfig =
640-
BaseMetaStoreManager.extractStorageConfiguration(diagnostics, entity);
644+
BaseMetaStoreManager.extractStorageConfiguration(getDiagnostics(), entity);
641645
return storageIntegrationProvider.getStorageIntegrationForConfig(storageConfig);
642646
}
643647

‎polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/AbstractTransactionalPersistence.java‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,16 @@
5353
*/
5454
public abstract class AbstractTransactionalPersistence implements TransactionalPersistence {
5555

56-
protected final PolarisDiagnostics diagnostics;
56+
private final PolarisDiagnostics diagnostics;
5757

5858
protected AbstractTransactionalPersistence(PolarisDiagnostics diagnostics) {
5959
this.diagnostics = diagnostics;
6060
}
6161

62+
protected PolarisDiagnostics getDiagnostics() {
63+
return diagnostics;
64+
}
65+
6266
//
6367
// New abstract methods specific to this slice-based transactional persistence that subclasses
6468
// must implement to inherit implementations of lookup/write/delete
@@ -218,12 +222,13 @@ public void writeEntities(
218222
@Nonnull List<PolarisBaseEntity> entities,
219223
@Nullable List<PolarisBaseEntity> originalEntities) {
220224
if (originalEntities != null) {
221-
diagnostics.check(
222-
entities.size() == originalEntities.size(),
223-
"mismatched_entities_and_original_entities_size",
224-
"entities.size()={}, originalEntities.size()={}",
225-
entities.size(),
226-
originalEntities.size());
225+
getDiagnostics()
226+
.check(
227+
entities.size() == originalEntities.size(),
228+
"mismatched_entities_and_original_entities_size",
229+
"entities.size()={}, originalEntities.size()={}",
230+
entities.size(),
231+
originalEntities.size());
227232
}
228233
runActionInTransaction(
229234
callCtx,
@@ -586,12 +591,13 @@ public void writeEntitiesInCurrentTxn(
586591
@Nonnull List<PolarisBaseEntity> entities,
587592
@Nullable List<PolarisBaseEntity> originalEntities) {
588593
if (originalEntities != null) {
589-
diagnostics.check(
590-
entities.size() == originalEntities.size(),
591-
"mismatched_entities_and_original_entities_size",
592-
"entities.size()={}, originalEntities.size()={}",
593-
entities.size(),
594-
originalEntities.size());
594+
getDiagnostics()
595+
.check(
596+
entities.size() == originalEntities.size(),
597+
"mismatched_entities_and_original_entities_size",
598+
"entities.size()={}, originalEntities.size()={}",
599+
entities.size(),
600+
originalEntities.size());
595601
}
596602
for (int i = 0; i < entities.size(); ++i) {
597603
PolarisBaseEntity entity = entities.get(i);
@@ -647,8 +653,9 @@ public PolarisBaseEntity lookupEntityByNameInCurrentTxn(
647653
entityActiveRecord.getCatalogId(),
648654
entityActiveRecord.getId(),
649655
entityActiveRecord.getTypeCode());
650-
diagnostics.checkNotNull(
651-
entity, "unexpected_not_found_entity", "entityActiveRecord={}", entityActiveRecord);
656+
getDiagnostics()
657+
.checkNotNull(
658+
entity, "unexpected_not_found_entity", "entityActiveRecord={}", entityActiveRecord);
652659

653660
// return it now
654661
return entity;

‎polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TreeMapTransactionalPersistenceImpl.java‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public <T> T runInTransaction(
7979
@Nonnull PolarisCallContext callCtx, @Nonnull Supplier<T> transactionCode) {
8080

8181
// run transaction on our underlying store
82-
return store.runInTransaction(diagnostics, transactionCode);
82+
return store.runInTransaction(getDiagnostics(), transactionCode);
8383
}
8484

8585
/** {@inheritDoc} */
@@ -88,15 +88,15 @@ public void runActionInTransaction(
8888
@Nonnull PolarisCallContext callCtx, @Nonnull Runnable transactionCode) {
8989

9090
// run transaction on our underlying store
91-
store.runActionInTransaction(diagnostics, transactionCode);
91+
store.runActionInTransaction(getDiagnostics(), transactionCode);
9292
}
9393

9494
/** {@inheritDoc} */
9595
@Override
9696
public <T> T runInReadTransaction(
9797
@Nonnull PolarisCallContext callCtx, @Nonnull Supplier<T> transactionCode) {
9898
// run transaction on our underlying store
99-
return store.runInReadTransaction(diagnostics, transactionCode);
99+
return store.runInReadTransaction(getDiagnostics(), transactionCode);
100100
}
101101

102102
/** {@inheritDoc} */
@@ -105,7 +105,7 @@ public void runActionInReadTransaction(
105105
@Nonnull PolarisCallContext callCtx, @Nonnull Runnable transactionCode) {
106106

107107
// run transaction on our underlying store
108-
store.runActionInReadTransaction(diagnostics, transactionCode);
108+
store.runActionInReadTransaction(getDiagnostics(), transactionCode);
109109
}
110110

111111
/**
@@ -463,20 +463,22 @@ public int lookupEntityGrantRecordsVersionInCurrentTxn(
463463
PolarisPrincipalSecrets principalSecrets = this.store.getSlicePrincipalSecrets().read(clientId);
464464

465465
// should be found
466-
diagnostics.checkNotNull(
467-
principalSecrets,
468-
"cannot_find_secrets",
469-
"client_id={} principalId={}",
470-
clientId,
471-
principalId);
466+
getDiagnostics()
467+
.checkNotNull(
468+
principalSecrets,
469+
"cannot_find_secrets",
470+
"client_id={} principalId={}",
471+
clientId,
472+
principalId);
472473

473474
// ensure principal id is matching
474-
diagnostics.check(
475-
principalId == principalSecrets.getPrincipalId(),
476-
"principal_id_mismatch",
477-
"expectedId={} id={}",
478-
principalId,
479-
principalSecrets.getPrincipalId());
475+
getDiagnostics()
476+
.check(
477+
principalId == principalSecrets.getPrincipalId(),
478+
"principal_id_mismatch",
479+
"expectedId={} id={}",
480+
principalId,
481+
principalSecrets.getPrincipalId());
480482

481483
// rotate the secrets
482484
principalSecrets.rotateSecrets(oldSecretHash);
@@ -499,20 +501,22 @@ public void deletePrincipalSecretsInCurrentTxn(
499501
PolarisPrincipalSecrets principalSecrets = this.store.getSlicePrincipalSecrets().read(clientId);
500502

501503
// should be found
502-
diagnostics.checkNotNull(
503-
principalSecrets,
504-
"cannot_find_secrets",
505-
"client_id={} principalId={}",
506-
clientId,
507-
principalId);
504+
getDiagnostics()
505+
.checkNotNull(
506+
principalSecrets,
507+
"cannot_find_secrets",
508+
"client_id={} principalId={}",
509+
clientId,
510+
principalId);
508511

509512
// ensure principal id is matching
510-
diagnostics.check(
511-
principalId == principalSecrets.getPrincipalId(),
512-
"principal_id_mismatch",
513-
"expectedId={} id={}",
514-
principalId,
515-
principalSecrets.getPrincipalId());
513+
getDiagnostics()
514+
.check(
515+
principalId == principalSecrets.getPrincipalId(),
516+
"principal_id_mismatch",
517+
"expectedId={} id={}",
518+
principalId,
519+
principalSecrets.getPrincipalId());
516520

517521
// delete these secrets
518522
this.store.getSlicePrincipalSecrets().delete(clientId);
@@ -536,7 +540,7 @@ PolarisStorageIntegration<T> createStorageIntegrationInCurrentTxn(
536540
PolarisStorageIntegration<T> loadPolarisStorageIntegrationInCurrentTxn(
537541
@Nonnull PolarisCallContext callCtx, @Nonnull PolarisBaseEntity entity) {
538542
PolarisStorageConfigurationInfo storageConfig =
539-
BaseMetaStoreManager.extractStorageConfiguration(diagnostics, entity);
543+
BaseMetaStoreManager.extractStorageConfiguration(getDiagnostics(), entity);
540544
return storageIntegrationProvider.getStorageIntegrationForConfig(storageConfig);
541545
}
542546

0 commit comments

Comments
 (0)