Skip to content

Commit 9ac3708

Browse files
XN137XN137
committed
review: remove filter + transformer params
1 parent 239978b commit 9ac3708

File tree

8 files changed

+31
-71
lines changed

8 files changed

+31
-71
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import java.util.Set;
3232
import java.util.concurrent.atomic.AtomicInteger;
3333
import java.util.function.Function;
34-
import java.util.function.Predicate;
3534
import java.util.stream.Collectors;
3635
import org.apache.polaris.core.PolarisCallContext;
3736
import org.apache.polaris.core.entity.AsyncTaskType;
@@ -723,13 +722,11 @@ private void revokeGrantRecord(
723722

724723
/** {@inheritDoc} */
725724
@Override
726-
public @Nonnull <T> Page<T> loadEntities(
725+
public @Nonnull Page<PolarisBaseEntity> loadEntities(
727726
@Nonnull PolarisCallContext callCtx,
728727
@Nullable List<PolarisEntityCore> catalogPath,
729728
@Nonnull PolarisEntityType entityType,
730729
@Nonnull PolarisEntitySubType entitySubType,
731-
@Nonnull Predicate<PolarisBaseEntity> entityFilter,
732-
@Nonnull Function<PolarisBaseEntity, T> transformer,
733730
@Nonnull PageToken pageToken) {
734731
// get meta store we should be using
735732
BasePersistence ms = callCtx.getMetaStore();
@@ -754,8 +751,8 @@ private void revokeGrantRecord(
754751
parentId,
755752
entityType,
756753
entitySubType,
757-
entityFilter,
758-
transformer,
754+
entity -> true,
755+
Function.identity(),
759756
pageToken);
760757
}
761758

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

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import java.util.List;
2424
import java.util.Map;
2525
import java.util.Optional;
26-
import java.util.function.Function;
27-
import java.util.function.Predicate;
2826
import org.apache.polaris.core.PolarisCallContext;
2927
import org.apache.polaris.core.auth.PolarisGrantManager;
3028
import org.apache.polaris.core.auth.PolarisSecretsManager;
@@ -133,55 +131,39 @@ ListEntitiesResult listEntities(
133131
@Nonnull PageToken pageToken);
134132

135133
/**
136-
* Load entities where some predicate returns true and transform the entities with a function
134+
* Load entities with pagination
137135
*
138136
* @param callCtx call context
139137
* @param catalogPath path inside a catalog. If null or empty, the entities to list are top-level,
140138
* like catalogs
141139
* @param entityType type of entities to list
142140
* @param entitySubType subType of entities to list (or ANY_SUBTYPE)
143-
* @param entityFilter the filter to be applied to each entity. Only entities where the predicate
144-
* returns true are returned in the list
145-
* @param transformer the transformation function applied to the {@link PolarisBaseEntity} before
146-
* returning
147-
* @return the paged list of entities for which the predicate returns true
141+
* @return the paged list of entities
148142
*/
149143
@Nonnull
150-
<T> Page<T> loadEntities(
144+
Page<PolarisBaseEntity> loadEntities(
151145
@Nonnull PolarisCallContext callCtx,
152146
@Nullable List<PolarisEntityCore> catalogPath,
153147
@Nonnull PolarisEntityType entityType,
154148
@Nonnull PolarisEntitySubType entitySubType,
155-
@Nonnull Predicate<PolarisBaseEntity> entityFilter,
156-
@Nonnull Function<PolarisBaseEntity, T> transformer,
157149
@Nonnull PageToken pageToken);
158150

159151
/**
160-
* Load all entities and transform the entities with a function into an unpaged list
152+
* Load all entities into an unpaged list
161153
*
162154
* @param callCtx call context
163155
* @param catalogPath path inside a catalog. If null or empty, the entities to list are top-level,
164156
* like catalogs
165157
* @param entityType type of entities to list
166158
* @param entitySubType subType of entities to list (or ANY_SUBTYPE)
167-
* @param transformer the transformation function applied to the {@link PolarisBaseEntity} before
168-
* returning
169159
* @return the full list of entities
170160
*/
171-
default @Nonnull <T> List<T> loadEntitiesAll(
161+
default @Nonnull List<PolarisBaseEntity> loadEntitiesAll(
172162
@Nonnull PolarisCallContext callCtx,
173163
@Nullable List<PolarisEntityCore> catalogPath,
174164
@Nonnull PolarisEntityType entityType,
175-
@Nonnull PolarisEntitySubType entitySubType,
176-
@Nonnull Function<PolarisBaseEntity, T> transformer) {
177-
return loadEntities(
178-
callCtx,
179-
catalogPath,
180-
entityType,
181-
entitySubType,
182-
e -> true,
183-
transformer,
184-
PageToken.readEverything())
165+
@Nonnull PolarisEntitySubType entitySubType) {
166+
return loadEntities(callCtx, catalogPath, entityType, entitySubType, PageToken.readEverything())
185167
.items();
186168
}
187169

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import java.util.Map;
2727
import java.util.Optional;
2828
import java.util.Set;
29-
import java.util.function.Function;
30-
import java.util.function.Predicate;
3129
import org.apache.polaris.core.PolarisCallContext;
3230
import org.apache.polaris.core.PolarisDiagnostics;
3331
import org.apache.polaris.core.entity.LocationBasedEntity;
@@ -133,13 +131,11 @@ public EntityResult readEntityByName(
133131
}
134132

135133
@Override
136-
public @Nonnull <T> Page<T> loadEntities(
134+
public @Nonnull Page<PolarisBaseEntity> loadEntities(
137135
@Nonnull PolarisCallContext callCtx,
138136
@Nullable List<PolarisEntityCore> catalogPath,
139137
@Nonnull PolarisEntityType entityType,
140138
@Nonnull PolarisEntitySubType entitySubType,
141-
@Nonnull Predicate<PolarisBaseEntity> entityFilter,
142-
@Nonnull Function<PolarisBaseEntity, T> transformer,
143139
@Nonnull PageToken pageToken) {
144140
callCtx.getDiagServices().fail("illegal_method_in_transaction_workspace", "loadEntities");
145141
return null;

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

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.Optional;
3131
import java.util.Set;
3232
import java.util.function.Function;
33-
import java.util.function.Predicate;
3433
import java.util.stream.Collectors;
3534
import org.apache.polaris.core.PolarisCallContext;
3635
import org.apache.polaris.core.PolarisDiagnostics;
@@ -722,16 +721,14 @@ private void bootstrapPolarisService(
722721

723722
/**
724723
* See {@link PolarisMetaStoreManager#loadEntities(PolarisCallContext, List, PolarisEntityType,
725-
* PolarisEntitySubType, Predicate, Function, PageToken)}
724+
* PolarisEntitySubType, PageToken)}
726725
*/
727-
private @Nonnull <T> Page<T> loadEntities(
726+
private @Nonnull Page<PolarisBaseEntity> loadEntities(
728727
@Nonnull PolarisCallContext callCtx,
729728
@Nonnull TransactionalPersistence ms,
730729
@Nullable List<PolarisEntityCore> catalogPath,
731730
@Nonnull PolarisEntityType entityType,
732731
@Nonnull PolarisEntitySubType entitySubType,
733-
@Nonnull Predicate<PolarisBaseEntity> entityFilter,
734-
@Nonnull Function<PolarisBaseEntity, T> transformer,
735732
@Nonnull PageToken pageToken) {
736733
// first resolve again the catalogPath to that entity
737734
PolarisEntityResolver resolver = new PolarisEntityResolver(callCtx, ms, catalogPath);
@@ -748,37 +745,26 @@ private void bootstrapPolarisService(
748745
resolver.getParentId(),
749746
entityType,
750747
entitySubType,
751-
entityFilter,
752-
transformer,
748+
entity -> true,
749+
Function.identity(),
753750
pageToken);
754751
}
755752

756753
/** {@inheritDoc} */
757754
@Override
758-
public @Nonnull <T> Page<T> loadEntities(
755+
public @Nonnull Page<PolarisBaseEntity> loadEntities(
759756
@Nonnull PolarisCallContext callCtx,
760757
@Nullable List<PolarisEntityCore> catalogPath,
761758
@Nonnull PolarisEntityType entityType,
762759
@Nonnull PolarisEntitySubType entitySubType,
763-
@Nonnull Predicate<PolarisBaseEntity> entityFilter,
764-
@Nonnull Function<PolarisBaseEntity, T> transformer,
765760
@Nonnull PageToken pageToken) {
766761
// get meta store we should be using
767762
TransactionalPersistence ms = ((TransactionalPersistence) callCtx.getMetaStore());
768763

769764
// run operation in a read transaction
770765
return ms.runInReadTransaction(
771766
callCtx,
772-
() ->
773-
loadEntities(
774-
callCtx,
775-
ms,
776-
catalogPath,
777-
entityType,
778-
entitySubType,
779-
entityFilter,
780-
transformer,
781-
pageToken));
767+
() -> loadEntities(callCtx, ms, catalogPath, entityType, entitySubType, pageToken));
782768
}
783769

784770
/** {@link #createPrincipal(PolarisCallContext, PolarisBaseEntity)} */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ List<PolarisChangeTrackingVersions> lookupEntityVersionsInCurrentTxn(
225225
pageToken);
226226
}
227227

228-
/** See {@link org.apache.polaris.core.persistence.BasePersistence#listEntities} */
228+
/** See {@link org.apache.polaris.core.persistence.BasePersistence#loadEntities} */
229229
@Nonnull
230230
<T> Page<T> loadEntitiesInCurrentTxn(
231231
@Nonnull PolarisCallContext callCtx,

‎polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/BasePolarisMetaStoreManagerTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,12 @@ protected void testCreateEntities() {
117117
.extracting(PolarisEntity::toCore)
118118
.containsExactly(PolarisEntity.toCore(task1), PolarisEntity.toCore(task2));
119119

120-
List<TaskEntity> listedEntities =
120+
List<PolarisBaseEntity> listedEntities =
121121
metaStoreManager.loadEntitiesAll(
122122
polarisTestMetaStoreManager.polarisCallContext,
123123
null,
124124
PolarisEntityType.TASK,
125-
PolarisEntitySubType.NULL_SUBTYPE,
126-
TaskEntity::of);
125+
PolarisEntitySubType.NULL_SUBTYPE);
127126
Assertions.assertThat(listedEntities)
128127
.isNotNull()
129128
.hasSize(2)

‎runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -950,9 +950,9 @@ private Stream<CatalogEntity> listCatalogsUnsafe() {
950950
getCurrentPolarisContext(),
951951
null,
952952
PolarisEntityType.CATALOG,
953-
PolarisEntitySubType.ANY_SUBTYPE,
954-
CatalogEntity::of)
955-
.stream();
953+
PolarisEntitySubType.ANY_SUBTYPE)
954+
.stream()
955+
.map(CatalogEntity::of);
956956
}
957957

958958
public PrincipalWithCredentials createPrincipal(PolarisEntity entity) {
@@ -1125,9 +1125,9 @@ public List<Principal> listPrincipals() {
11251125
getCurrentPolarisContext(),
11261126
null,
11271127
PolarisEntityType.PRINCIPAL,
1128-
PolarisEntitySubType.NULL_SUBTYPE,
1129-
PrincipalEntity::of)
1128+
PolarisEntitySubType.NULL_SUBTYPE)
11301129
.stream()
1130+
.map(PrincipalEntity::of)
11311131
.map(PrincipalEntity::asPrincipal)
11321132
.toList();
11331133
}
@@ -1233,9 +1233,9 @@ public List<PrincipalRole> listPrincipalRoles() {
12331233
getCurrentPolarisContext(),
12341234
null,
12351235
PolarisEntityType.PRINCIPAL_ROLE,
1236-
PolarisEntitySubType.NULL_SUBTYPE,
1237-
PrincipalRoleEntity::of)
1236+
PolarisEntitySubType.NULL_SUBTYPE)
12381237
.stream()
1238+
.map(PrincipalRoleEntity::of)
12391239
.map(PrincipalRoleEntity::asPrincipalRole)
12401240
.toList();
12411241
}
@@ -1361,9 +1361,9 @@ public List<CatalogRole> listCatalogRoles(String catalogName) {
13611361
getCurrentPolarisContext(),
13621362
catalogPath,
13631363
PolarisEntityType.CATALOG_ROLE,
1364-
PolarisEntitySubType.NULL_SUBTYPE,
1365-
CatalogRoleEntity::of)
1364+
PolarisEntitySubType.NULL_SUBTYPE)
13661365
.stream()
1366+
.map(CatalogRoleEntity::of)
13671367
.map(CatalogRoleEntity::asCatalogRole)
13681368
.toList();
13691369
}

‎runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalog.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ public List<PolicyIdentifier> listPolicies(Namespace namespace, PolicyType polic
166166
callContext.getPolarisCallContext(),
167167
PolarisEntity.toCoreList(catalogPath),
168168
PolarisEntityType.POLICY,
169-
PolarisEntitySubType.NULL_SUBTYPE,
170-
PolicyEntity::of)
169+
PolarisEntitySubType.NULL_SUBTYPE)
171170
.stream()
171+
.map(PolicyEntity::of)
172172
.filter(policyEntity -> policyType == null || policyEntity.getPolicyType() == policyType)
173173
.map(
174174
entity ->

0 commit comments

Comments
 (0)