Skip to content

[#9429] improvement(core): Use join to improve query performance on table, topic and so on. #9430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuqi1129 merged 53 commits into from
Jan 9, 2026
Merged

[#9429] improvement(core): Use join to improve query performance on table, topic and so on. #9430

Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
059b82c
Fix bypass error in `LocalFileSystemProvider`
yuqi1129 Nov 26, 2025
8222866
feat(metadata): add indexes for improved query performance on metalak…
yuqi1129 Dec 9, 2025
46972c6
fix
yuqi1129 Dec 9, 2025
7759aa0
fix
yuqi1129 Dec 9, 2025
f14fa0a
fix
yuqi1129 Dec 9, 2025
d17009a
fix sql syntax problem
yuqi1129 Dec 9, 2025
3588943
Fix bugs
yuqi1129 Dec 9, 2025
61cdf41
fix
yuqi1129 Dec 10, 2025
202d36c
fix
yuqi1129 Dec 10, 2025
61cdc4c
Merge branch 'main' of github.com:datastrato/graviton into issue_9429
yuqi1129 Dec 23, 2025
02f4c95
Merge branch 'issue_9429' of github.com:yuqi1129/gravitino into issue…
yuqi1129 Dec 23, 2025
e251d20
fix
yuqi1129 Dec 23, 2025
0b76784
Polish the code.
yuqi1129 Dec 23, 2025
0d7b2b4
fix
yuqi1129 Dec 23, 2025
3d192ec
fix
yuqi1129 Dec 24, 2025
ac9aea4
fix
yuqi1129 Dec 24, 2025
b96155a
fix
yuqi1129 Dec 24, 2025
5b72cfb
fix
yuqi1129 Dec 24, 2025
fe1b70a
fix
yuqi1129 Dec 24, 2025
8920e84
fix
yuqi1129 Dec 24, 2025
29ac6fa
fix
yuqi1129 Dec 24, 2025
afdd63b
fix
yuqi1129 Dec 24, 2025
45d50b4
fix
yuqi1129 Dec 29, 2025
bbb28cb
Fix ci problem
yuqi1129 Dec 29, 2025
415dec6
Polish code.
yuqi1129 Dec 30, 2025
9c4e6b8
fix
yuqi1129 Dec 31, 2025
7bdfa0b
Fix
yuqi1129 Jan 4, 2026
5f93a66
Merge remote-tracking branch 'me/issue_9429' into issue_9429
yuqi1129 Jan 4, 2026
d077091
revert
yuqi1129 Jan 4, 2026
6d204be
fix
yuqi1129 Jan 4, 2026
156eaf9
Merge branch 'main' into issue_9429
yuqi1129 Jan 4, 2026
c555744
fix
yuqi1129 Jan 4, 2026
3fe94dc
Merge branch 'main' of github.com:apache/gravitino into issue_9429
yuqi1129 Jan 4, 2026
b74beb0
Merge remote-tracking branch 'me/issue_9429' into issue_9429
yuqi1129 Jan 4, 2026
2cdb7b9
Merge branch 'main' into issue_9429
yuqi1129 Jan 4, 2026
9bb993d
fix
yuqi1129 Jan 4, 2026
5bcfbbf
fix
yuqi1129 Jan 4, 2026
1b78a02
fix
yuqi1129 Jan 4, 2026
5275bc7
fix
yuqi1129 Jan 4, 2026
caecad6
fix
yuqi1129 Jan 4, 2026
135ac3f
fix
yuqi1129 Jan 5, 2026
6fc53c6
fix
yuqi1129 Jan 5, 2026
3f1d272
fix
yuqi1129 Jan 5, 2026
9c1c3d8
fix
yuqi1129 Jan 5, 2026
6ea5f26
fix
yuqi1129 Jan 5, 2026
6b72177
fix
yuqi1129 Jan 5, 2026
a029a2d
fix
yuqi1129 Jan 5, 2026
885195b
fix test error
yuqi1129 Jan 7, 2026
4b7d7dd
fix
yuqi1129 Jan 8, 2026
0457b9d
Merge branch 'issue_9249' of github.com:yuqi1129/gravitino into issue…
yuqi1129 Jan 8, 2026
1e05018
Fix.
yuqi1129 Jan 8, 2026
53b39da
fix format problem
yuqi1129 Jan 8, 2026
696a1c9
Merge branch 'issue_9429' of github.com:yuqi1129/gravitino into issue…
yuqi1129 Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions authorizations/authorization-chain/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ dependencies {
testImplementation(project(":integration-test-common", "testArtifacts"))
testImplementation(project(":authorizations:authorization-ranger"))
testImplementation(project(":authorizations:authorization-ranger", "testArtifacts"))
testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.mockito.core)
testImplementation(libs.testcontainers)
Expand Down
1 change: 1 addition & 0 deletions authorizations/authorization-ranger/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ dependencies {
testImplementation(project(":clients:client-java"))
testImplementation(project(":server"))
testImplementation(project(":integration-test-common", "testArtifacts"))
testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.mockito.core)
testImplementation(libs.mockito.inline)
Expand Down
5 changes: 5 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ allprojects {
"import\\s+.*\\.(Logger|LoggerFactory);",
"import org.slf4j.${'$'}1;"
)
replaceRegex(
"Remove Testcontainers shading",
"import\\s+org\\.testcontainers\\.shaded\\.([^;]+);",
"import $1;"
)

targetExclude("**/build/**", "**/.pnpm/***")
}
Expand Down
6 changes: 4 additions & 2 deletions ...eset/src/test/java/org/apache/gravitino/catalog/fileset/TestFilesetCatalogOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
Expand All @@ -121,7 +122,6 @@
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.testcontainers.shaded.org.awaitility.Awaitility;

public class TestFilesetCatalogOperations {

Expand Down Expand Up @@ -216,7 +216,7 @@ private static CatalogInfo randomCatalogInfo(
}

@BeforeAll
public static void setUp() {
public static void setUp() throws IllegalAccessException {
Config config = Mockito.mock(Config.class);
when(config.get(ENTITY_STORE)).thenReturn(RELATIONAL_ENTITY_STORE);
when(config.get(ENTITY_RELATIONAL_STORE)).thenReturn(DEFAULT_ENTITY_RELATIONAL_STORE);
Expand Down Expand Up @@ -336,6 +336,8 @@ public static void setUp() {
schemaMetaServiceMockedStatic
.when(SchemaMetaService::getInstance)
.thenReturn(spySchemaMetaService);

FieldUtils.writeField(GravitinoEnv.getInstance(), "config", config, true);
}

@AfterAll
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/org/apache/gravitino/catalog/fileset/integration/test/FilesetS3CatalogIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
Expand All @@ -46,7 +47,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Container;
import org.testcontainers.shaded.org.awaitility.Awaitility;

@Tag("gravitino-docker-test")
public class FilesetS3CatalogIT extends FilesetCatalogIT {
Expand Down
1 change: 1 addition & 0 deletions catalogs/catalog-hive/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ dependencies {
annotationProcessor(libs.immutables.value)
annotationProcessor(libs.lombok)

testImplementation(libs.awaitility)
testImplementation(project(":catalogs:hive-metastore-common", "testArtifacts"))
testImplementation(project(":common"))
testImplementation(project(":clients:client-java"))
Expand Down
2 changes: 1 addition & 1 deletion ...ive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveS3IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.spark.sql.SparkSession;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.TestInstance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Container;
import org.testcontainers.shaded.org.awaitility.Awaitility;

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class CatalogHiveS3IT extends CatalogHive3IT {
Expand Down
1 change: 1 addition & 0 deletions catalogs/catalog-jdbc-doris/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ dependencies {
testImplementation(project(":server"))
testImplementation(project(":server-common"))

testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.mysql.driver)
Expand Down
2 changes: 1 addition & 1 deletion ...ris/src/test/java/org/apache/gravitino/catalog/doris/integration/test/CatalogDorisIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@
import org.apache.gravitino.rel.partitions.RangePartition;
import org.apache.gravitino.rel.types.Types;
import org.apache.gravitino.utils.RandomNameUtils;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;

@Tag("gravitino-docker-test")
public class CatalogDorisIT extends BaseIT {
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/org/apache/gravitino/catalog/doris/operation/TestDorisTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
import org.apache.gravitino.rel.types.Type;
import org.apache.gravitino.rel.types.Types;
import org.apache.gravitino.utils.RandomNameUtils;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;

@Tag("gravitino-docker-test")
public class TestDorisTableOperations extends TestDoris {
Expand Down
1 change: 1 addition & 0 deletions catalogs/catalog-jdbc-mysql/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ dependencies {
testImplementation(project(":server"))
testImplementation(project(":server-common"))

testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.mysql.driver)
Expand Down
1 change: 1 addition & 0 deletions catalogs/catalog-jdbc-oceanbase/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ dependencies {
testImplementation(project(":server"))
testImplementation(project(":server-common"))

testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.mysql.driver)
Expand Down
1 change: 1 addition & 0 deletions catalogs/catalog-jdbc-postgresql/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ dependencies {
testImplementation(project(":server"))
testImplementation(project(":server-common"))

testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.mysql.driver)
Expand Down
1 change: 1 addition & 0 deletions catalogs/catalog-jdbc-starrocks/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ dependencies {
testImplementation(project(":server"))
testImplementation(project(":server-common"))

testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.mysql.driver)
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/apache/gravitino/catalog/starrocks/integration/test/CatalogStarRocksIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@
import org.apache.gravitino.rel.partitions.RangePartition;
import org.apache.gravitino.rel.types.Types;
import org.apache.gravitino.utils.RandomNameUtils;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;

@Tag("gravitino-docker-test")
public class CatalogStarRocksIT extends BaseIT {
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/org/apache/gravitino/catalog/starrocks/operation/TestStarRocksTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@
import org.apache.gravitino.rel.types.Type;
import org.apache.gravitino.rel.types.Types;
import org.apache.gravitino.utils.RandomNameUtils;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;

@Tag("gravitino-docker-test")
public class TestStarRocksTableOperations extends TestStarRocks {
Expand Down
2 changes: 2 additions & 0 deletions catalogs/catalog-kafka/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ dependencies {
implementation(libs.kafka.clients)
implementation(libs.slf4j.api)

testImplementation(libs.awaitility)
testImplementation(libs.commons.io)
testImplementation(libs.curator.test)
testImplementation(libs.commons.lang3)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.kafka)
testImplementation(libs.mockito.core)
Expand Down
6 changes: 5 additions & 1 deletion ...og-kafka/src/test/java/org/apache/gravitino/catalog/kafka/TestKafkaCatalogOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@
import java.time.Instant;
import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.gravitino.Config;
import org.apache.gravitino.Configs;
import org.apache.gravitino.EntityStore;
import org.apache.gravitino.EntityStoreFactory;
import org.apache.gravitino.GravitinoEnv;
import org.apache.gravitino.NameIdentifier;
import org.apache.gravitino.Namespace;
import org.apache.gravitino.Schema;
Expand Down Expand Up @@ -134,7 +136,7 @@ public PropertiesMetadata modelVersionPropertiesMetadata()
private static KafkaCatalogOperations kafkaCatalogOperations;

@BeforeAll
public static void setUp() {
public static void setUp() throws IllegalAccessException {
Config config = Mockito.mock(Config.class);
Mockito.when(config.get(STORE_TRANSACTION_MAX_SKEW_TIME)).thenReturn(1000L);
Mockito.when(config.get(STORE_DELETE_AFTER_TIME)).thenReturn(20 * 60 * 1000L);
Expand Down Expand Up @@ -210,6 +212,8 @@ public static void setUp() {
.build())
.build();

FieldUtils.writeField(GravitinoEnv.getInstance(), "config", config, true);

kafkaCatalogOperations = new KafkaCatalogOperations(store, idGenerator);
kafkaCatalogOperations.initialize(
MOCK_CATALOG_PROPERTIES, kafkaCatalogEntity.toCatalogInfo(), KAFKA_PROPERTIES_METADATA);
Expand Down
1 change: 1 addition & 0 deletions catalogs/catalog-lakehouse-generic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ dependencies {
testImplementation(project(":server"))
testImplementation(project(":server-common"))

testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.lance) // Included in the test runtime classpath for test only
Expand Down
6 changes: 5 additions & 1 deletion ...est/java/org/apache/gravitino/catalog/lakehouse/generic/TestGenericCatalogOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@
import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.gravitino.Catalog;
import org.apache.gravitino.Config;
import org.apache.gravitino.Configs;
import org.apache.gravitino.EntityStore;
import org.apache.gravitino.EntityStoreFactory;
import org.apache.gravitino.GravitinoEnv;
import org.apache.gravitino.NameIdentifier;
import org.apache.gravitino.Namespace;
import org.apache.gravitino.Schema;
Expand Down Expand Up @@ -79,7 +81,7 @@ public class TestGenericCatalogOperations {
private static GenericCatalogOperations ops;

@BeforeAll
public static void setUp() throws IOException {
public static void setUp() throws IOException, IllegalAccessException {
Config config = Mockito.mock(Config.class);
when(config.get(ENTITY_STORE)).thenReturn(RELATIONAL_ENTITY_STORE);
when(config.get(ENTITY_RELATIONAL_STORE)).thenReturn(DEFAULT_ENTITY_RELATIONAL_STORE);
Expand Down Expand Up @@ -132,6 +134,8 @@ public static void setUp() throws IOException {
.build();
store.put(catalog, false);

FieldUtils.writeField(GravitinoEnv.getInstance(), "config", config, true);

ops = new GenericCatalogOperations(store, idGenerator);
}

Expand Down
1 change: 1 addition & 0 deletions catalogs/catalog-lakehouse-hudi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ dependencies {
exclude("org.apache.logging.log4j")
}

testImplementation(libs.awaitility)
testImplementation(libs.bundles.jetty)
testImplementation(libs.bundles.jersey)
testImplementation(libs.commons.collections3)
Expand Down
1 change: 1 addition & 0 deletions catalogs/catalog-lakehouse-iceberg/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ dependencies {
exclude("org.rocksdb")
}

testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.mockito.core)
Expand Down
3 changes: 3 additions & 0 deletions catalogs/catalog-lakehouse-paimon/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,10 @@ dependencies {
testImplementation("org.apache.paimon:paimon-spark-$sparkMajorVersion:$paimonVersion") {
exclude("org.apache.hadoop")
}

testImplementation(libs.awaitility)
testImplementation(libs.slf4j.api)
testImplementation(libs.awaitility)
Copy link

@tedyu tedyu Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be the same as line 152. Is it intentional?

Copy link
Contributor

@roryqi roryqi Feb 11, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be a mistake. Could u raise a pull request to fix this issue?

Copy link

@tedyu tedyu Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am still going over the code.
This change can be bundled with other changes.

testImplementation(libs.junit.jupiter.api)
testImplementation(libs.mysql.driver)
testImplementation(libs.postgresql.driver)
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/apache/gravitino/catalog/lakehouse/paimon/integration/test/CatalogPaimonS3IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
import org.apache.gravitino.integration.test.util.ITUtils;
import org.apache.gravitino.storage.S3Properties;
import org.apache.spark.sql.SparkSession;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Tag;
import org.testcontainers.containers.Container;
import org.testcontainers.shaded.org.awaitility.Awaitility;

@Tag("gravitino-docker-test")
public class CatalogPaimonS3IT extends CatalogPaimonBaseIT {
Expand Down
1 change: 1 addition & 0 deletions catalogs/catalog-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ dependencies {
testImplementation(project(":integration-test-common", "testArtifacts"))
testImplementation(project(":server"))
testImplementation(project(":server-common"))
testImplementation(libs.awaitility)
testImplementation(libs.bundles.log4j)
testImplementation(libs.commons.io)
testImplementation(libs.commons.lang3)
Expand Down
6 changes: 5 additions & 1 deletion ...g-model/src/test/java/org/apache/gravtitino/catalog/model/TestModelCatalogOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@
import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.gravitino.Catalog;
import org.apache.gravitino.Config;
import org.apache.gravitino.Configs;
import org.apache.gravitino.EntityStore;
import org.apache.gravitino.EntityStoreFactory;
import org.apache.gravitino.GravitinoEnv;
import org.apache.gravitino.NameIdentifier;
import org.apache.gravitino.Namespace;
import org.apache.gravitino.Schema;
Expand Down Expand Up @@ -100,7 +102,7 @@ public class TestModelCatalogOperations {
private static ModelCatalogOperations ops;

@BeforeAll
public static void setUp() throws IOException {
public static void setUp() throws IOException, IllegalAccessException {
Config config = Mockito.mock(Config.class);
when(config.get(ENTITY_STORE)).thenReturn(RELATIONAL_ENTITY_STORE);
when(config.get(ENTITY_RELATIONAL_STORE)).thenReturn(DEFAULT_ENTITY_RELATIONAL_STORE);
Expand Down Expand Up @@ -158,6 +160,8 @@ public static void setUp() throws IOException {
.build();
store.put(catalog, false);

FieldUtils.writeField(GravitinoEnv.getInstance(), "config", config, true);

ops = new ModelCatalogOperations(store);
ops.initialize(
Collections.emptyMap(),
Expand Down
1 change: 1 addition & 0 deletions clients/cli/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies {
implementation(project(":clients:client-java"))
implementation(project(":common"))

testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.mockito.core)
Expand Down
1 change: 1 addition & 0 deletions clients/client-java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ dependencies {
testImplementation(project(":server"))
testImplementation(project(":server-common"))

testImplementation(libs.awaitility)
testImplementation(libs.bundles.jersey)
testImplementation(libs.bundles.jwt)
testImplementation(libs.commons.lang3)
Expand Down
2 changes: 1 addition & 1 deletion clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/JobIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
import org.apache.gravitino.job.JobTemplate;
import org.apache.gravitino.job.JobTemplateChange;
import org.apache.gravitino.job.ShellJobTemplate;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;

public class JobIT extends BaseIT {

Expand Down
Loading