Skip to content

Commit d8706af

Browse files
XN137XN137
committed
Add TestServices.newCallContext
also add local `newCallContext` helper in some test classes
1 parent a3849fe commit d8706af

File tree

6 files changed

+33
-61
lines changed

6 files changed

+33
-61
lines changed

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,6 @@ private PolarisMetaStoreManager setupMetaStoreManager() {
173173
return metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext);
174174
}
175175

176-
private PolarisCallContext setupCallContext(PolarisMetaStoreManager metaStoreManager) {
177-
MetaStoreManagerFactory metaStoreManagerFactory = services.metaStoreManagerFactory();
178-
RealmContext realmContext = services.realmContext();
179-
return new PolarisCallContext(
180-
realmContext,
181-
metaStoreManagerFactory.getOrCreateSession(realmContext),
182-
services.polarisDiagnostics());
183-
}
184-
185176
private PolarisAdminService setupPolarisAdminService(
186177
PolarisMetaStoreManager metaStoreManager, PolarisCallContext callContext) {
187178
return new PolarisAdminService(
@@ -255,7 +246,7 @@ private PrincipalRoleEntity createRole(
255246
@Test
256247
public void testCannotAssignFederatedEntities() {
257248
PolarisMetaStoreManager metaStoreManager = setupMetaStoreManager();
258-
PolarisCallContext callContext = setupCallContext(metaStoreManager);
249+
PolarisCallContext callContext = services.newCallContext();
259250
PolarisAdminService polarisAdminService =
260251
setupPolarisAdminService(metaStoreManager, callContext);
261252

@@ -275,7 +266,7 @@ public void testCannotAssignFederatedEntities() {
275266
@Test
276267
public void testCatalogNotReturnedWhenDeletedAfterListBeforeGet() {
277268
TestPolarisMetaStoreManager metaStoreManager = new TestPolarisMetaStoreManager();
278-
PolarisCallContext callContext = setupCallContext(metaStoreManager);
269+
PolarisCallContext callContext = services.newCallContext();
279270
PolarisAdminService polarisAdminService =
280271
setupPolarisAdminService(metaStoreManager, callContext);
281272

‎runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/BatchFileCleanupTaskHandlerTest.java‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@
4343
import org.apache.iceberg.inmemory.InMemoryFileIO;
4444
import org.apache.iceberg.io.FileIO;
4545
import org.apache.polaris.core.PolarisCallContext;
46-
import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
46+
import org.apache.polaris.core.PolarisDiagnostics;
4747
import org.apache.polaris.core.context.RealmContext;
4848
import org.apache.polaris.core.entity.AsyncTaskType;
4949
import org.apache.polaris.core.entity.TaskEntity;
50+
import org.apache.polaris.core.persistence.BasePersistence;
5051
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
5152
import org.apache.polaris.service.TestFileIOFactory;
5253
import org.apache.polaris.service.task.BatchFileCleanupTaskHandler;
@@ -56,20 +57,22 @@
5657

5758
@QuarkusTest
5859
public class BatchFileCleanupTaskHandlerTest {
60+
@Inject PolarisDiagnostics diagnostics;
5961
@Inject MetaStoreManagerFactory metaStoreManagerFactory;
6062
private final RealmContext realmContext = () -> "realmName";
6163

6264
private TaskFileIOSupplier buildTaskFileIOSupplier(FileIO fileIO) {
6365
return new TaskFileIOSupplier(new TestFileIOFactory(fileIO));
6466
}
6567

68+
private PolarisCallContext newCallContext() {
69+
BasePersistence metaStore = metaStoreManagerFactory.getOrCreateSession(realmContext);
70+
return new PolarisCallContext(realmContext, metaStore, diagnostics);
71+
}
72+
6673
@Test
6774
public void testMetadataFileCleanup() throws IOException {
68-
PolarisCallContext polarisCallContext =
69-
new PolarisCallContext(
70-
realmContext,
71-
metaStoreManagerFactory.getOrCreateSession(realmContext),
72-
new PolarisDefaultDiagServiceImpl());
75+
PolarisCallContext polarisCallContext = newCallContext();
7376
FileIO fileIO =
7477
new InMemoryFileIO() {
7578
@Override
@@ -178,11 +181,7 @@ public void close() {
178181

179182
@Test
180183
public void testMetadataFileCleanupIfFileNotExist() throws IOException {
181-
PolarisCallContext polarisCallContext =
182-
new PolarisCallContext(
183-
realmContext,
184-
metaStoreManagerFactory.getOrCreateSession(realmContext),
185-
new PolarisDefaultDiagServiceImpl());
184+
PolarisCallContext polarisCallContext = newCallContext();
186185
FileIO fileIO = new InMemoryFileIO();
187186
TableIdentifier tableIdentifier = TableIdentifier.of(Namespace.of("db1", "schema1"), "table1");
188187
BatchFileCleanupTaskHandler handler =
@@ -222,11 +221,7 @@ public void testMetadataFileCleanupIfFileNotExist() throws IOException {
222221

223222
@Test
224223
public void testCleanupWithRetries() throws IOException {
225-
PolarisCallContext polarisCallContext =
226-
new PolarisCallContext(
227-
realmContext,
228-
metaStoreManagerFactory.getOrCreateSession(realmContext),
229-
new PolarisDefaultDiagServiceImpl());
224+
PolarisCallContext polarisCallContext = newCallContext();
230225
Map<String, AtomicInteger> retryCounter = new HashMap<>();
231226
FileIO fileIO =
232227
new InMemoryFileIO() {

‎runtime/service/src/test/java/org/apache/polaris/service/quarkus/task/ManifestFileCleanupTaskHandlerTest.java‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@
4141
import org.apache.iceberg.io.OutputFile;
4242
import org.apache.iceberg.io.PositionOutputStream;
4343
import org.apache.polaris.core.PolarisCallContext;
44-
import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
44+
import org.apache.polaris.core.PolarisDiagnostics;
4545
import org.apache.polaris.core.context.RealmContext;
4646
import org.apache.polaris.core.entity.AsyncTaskType;
4747
import org.apache.polaris.core.entity.TaskEntity;
48+
import org.apache.polaris.core.persistence.BasePersistence;
4849
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
4950
import org.apache.polaris.service.TestFileIOFactory;
5051
import org.apache.polaris.service.task.ManifestFileCleanupTaskHandler;
@@ -54,6 +55,7 @@
5455

5556
@QuarkusTest
5657
class ManifestFileCleanupTaskHandlerTest {
58+
@Inject PolarisDiagnostics diagnostics;
5759
@Inject MetaStoreManagerFactory metaStoreManagerFactory;
5860

5961
private final RealmContext realmContext = () -> "realmName";
@@ -62,13 +64,14 @@ private TaskFileIOSupplier buildTaskFileIOSupplier(FileIO fileIO) {
6264
return new TaskFileIOSupplier(new TestFileIOFactory(fileIO));
6365
}
6466

67+
private PolarisCallContext newCallContext() {
68+
BasePersistence metaStore = metaStoreManagerFactory.getOrCreateSession(realmContext);
69+
return new PolarisCallContext(realmContext, metaStore, diagnostics);
70+
}
71+
6572
@Test
6673
public void testCleanupFileNotExists() throws IOException {
67-
PolarisCallContext polarisCallContext =
68-
new PolarisCallContext(
69-
realmContext,
70-
metaStoreManagerFactory.getOrCreateSession(realmContext),
71-
new PolarisDefaultDiagServiceImpl());
74+
PolarisCallContext polarisCallContext = newCallContext();
7275
FileIO fileIO = new InMemoryFileIO();
7376
TableIdentifier tableIdentifier = TableIdentifier.of(Namespace.of("db1", "schema1"), "table1");
7477

@@ -94,11 +97,7 @@ public void testCleanupFileNotExists() throws IOException {
9497

9598
@Test
9699
public void testCleanupFileManifestExistsDataFilesDontExist() throws IOException {
97-
PolarisCallContext polarisCallContext =
98-
new PolarisCallContext(
99-
realmContext,
100-
metaStoreManagerFactory.getOrCreateSession(realmContext),
101-
new PolarisDefaultDiagServiceImpl());
100+
PolarisCallContext polarisCallContext = newCallContext();
102101
FileIO fileIO = new InMemoryFileIO();
103102
TableIdentifier tableIdentifier = TableIdentifier.of(Namespace.of("db1", "schema1"), "table1");
104103
ManifestFileCleanupTaskHandler handler =
@@ -122,11 +121,7 @@ public void testCleanupFileManifestExistsDataFilesDontExist() throws IOException
122121

123122
@Test
124123
public void testCleanupFiles() throws IOException {
125-
PolarisCallContext polarisCallContext =
126-
new PolarisCallContext(
127-
realmContext,
128-
metaStoreManagerFactory.getOrCreateSession(realmContext),
129-
new PolarisDefaultDiagServiceImpl());
124+
PolarisCallContext polarisCallContext = newCallContext();
130125
FileIO fileIO =
131126
new InMemoryFileIO() {
132127
@Override
@@ -167,11 +162,7 @@ public void close() {
167162

168163
@Test
169164
public void testCleanupFilesWithRetries() throws IOException {
170-
PolarisCallContext polarisCallContext =
171-
new PolarisCallContext(
172-
realmContext,
173-
metaStoreManagerFactory.getOrCreateSession(realmContext),
174-
new PolarisDefaultDiagServiceImpl());
165+
PolarisCallContext polarisCallContext = newCallContext();
175166
Map<String, AtomicInteger> retryCounter = new HashMap<>();
176167
FileIO fileIO =
177168
new InMemoryFileIO() {

‎service/common/src/test/java/org/apache/polaris/service/catalog/io/FileIOFactoryTest.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.google.common.collect.ImmutableMap;
2626
import jakarta.annotation.Nonnull;
2727
import java.lang.reflect.Method;
28-
import java.time.Clock;
2928
import java.util.List;
3029
import java.util.Map;
3130
import org.apache.iceberg.Schema;
@@ -35,7 +34,6 @@
3534
import org.apache.iceberg.inmemory.InMemoryFileIO;
3635
import org.apache.iceberg.io.FileIO;
3736
import org.apache.iceberg.types.Types;
38-
import org.apache.polaris.core.PolarisCallContext;
3937
import org.apache.polaris.core.admin.model.AwsStorageConfigInfo;
4038
import org.apache.polaris.core.admin.model.Catalog;
4139
import org.apache.polaris.core.admin.model.CatalogProperties;
@@ -136,13 +134,7 @@ FileIO loadFileIOInternal(
136134
.fileIOFactorySupplier(fileIOFactorySupplier)
137135
.build();
138136

139-
callContext =
140-
new PolarisCallContext(
141-
realmContext,
142-
testServices.metaStoreManagerFactory().getOrCreateSession(realmContext),
143-
testServices.polarisDiagnostics(),
144-
testServices.configurationStore(),
145-
Clock.systemUTC());
137+
callContext = testServices.newCallContext();
146138
}
147139

148140
@AfterEach

‎service/common/src/test/java/org/apache/polaris/service/task/TaskExecutorImplTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.apache.polaris.core.context.CallContext;
2323
import org.apache.polaris.core.context.RealmContext;
2424
import org.apache.polaris.core.entity.TaskEntity;
25-
import org.apache.polaris.core.persistence.BasePersistence;
2625
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
2726
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
2827
import org.apache.polaris.service.TestServices;
@@ -47,10 +46,8 @@ void testEventsAreEmitted() {
4746
MetaStoreManagerFactory metaStoreManagerFactory = testServices.metaStoreManagerFactory();
4847
PolarisMetaStoreManager metaStoreManager =
4948
metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext);
50-
BasePersistence bp = metaStoreManagerFactory.getOrCreateSession(realmContext);
5149

52-
PolarisCallContext polarisCallCtx =
53-
new PolarisCallContext(realmContext, bp, testServices.polarisDiagnostics());
50+
PolarisCallContext polarisCallCtx = testServices.newCallContext();
5451

5552
// This task doesn't have a type so it won't be handle-able by a real handler. We register a
5653
// test TaskHandler below that can handle any task.

‎service/common/src/testFixtures/java/org/apache/polaris/service/TestServices.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,4 +297,10 @@ public String getAuthenticationScheme() {
297297
polarisEventListener);
298298
}
299299
}
300+
301+
public PolarisCallContext newCallContext() {
302+
BasePersistence metaStore = metaStoreManagerFactory.getOrCreateSession(realmContext);
303+
return new PolarisCallContext(
304+
realmContext, metaStore, polarisDiagnostics, configurationStore, Clock.systemUTC());
305+
}
300306
}

0 commit comments

Comments
 (0)