This is an automated email from the ASF dual-hosted git repository. liuxun pushed a commit to branch fix-cache in repository https://gitbox.apache.org/repos/asf/gravitino.git
commit e05e13b038ea3d3fc2d66f78ebe7d472811b8548 Author: Eric Chang <[email protected]> AuthorDate: Fri Aug 22 15:29:57 2025 +0800 feat: add -PenableEntityCache=true to enable entity cache in test --- build.gradle.kts | 5 +++++ .../test/authorization/BaseRestApiAuthorizationIT.java | 2 -- conf/gravitino.conf.template | 2 +- core/src/main/java/org/apache/gravitino/Configs.java | 2 +- .../org/apache/gravitino/integration/test/util/BaseIT.java | 12 ++++++++++++ .../org/apache/gravitino/integration/test/util/ITUtils.java | 2 ++ 6 files changed, 21 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9b32b35ba5..d4d17d28d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -204,6 +204,11 @@ allprojects { "[-PtestMode=embedded] or [-PtestMode=deploy]." ) } + + // enable entity cache or not + val enableEntityCache = project.properties["enableEntityCache"] as? String ?: "false" + param.systemProperty("enableEntityCache", enableEntityCache) + param.useJUnitPlatform() val skipUTs = project.hasProperty("skipTests") if (skipUTs) { diff --git a/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/BaseRestApiAuthorizationIT.java b/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/BaseRestApiAuthorizationIT.java index 0616ce8d36..c03395a595 100644 --- a/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/BaseRestApiAuthorizationIT.java +++ b/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/BaseRestApiAuthorizationIT.java @@ -52,8 +52,6 @@ public class BaseRestApiAuthorizationIT extends BaseIT { USER, Configs.ENABLE_AUTHORIZATION.getKey(), "true", - Configs.CACHE_ENABLED.getKey(), - "false", Configs.AUTHENTICATORS.getKey(), "simple")); putServiceAdmin(); diff --git a/conf/gravitino.conf.template b/conf/gravitino.conf.template index 418d14f14c..546b591f0c 100644 --- a/conf/gravitino.conf.template +++ b/conf/gravitino.conf.template @@ -61,7 +61,7 @@ gravitino.catalog.cache.evictionIntervalMs = 3600000 # THE CONFIGURATION FOR Gravitino Entity Cache # Whether to enable the cached Entity store. -gravitino.cache.enabled = true +gravitino.cache.enabled = false # Maximum number of entries allowed in the cache (effective only when weighted eviction is disabled). gravitino.cache.maxEntries = 10000 # Time-to-live (TTL) for each cache entry after it is written, in milliseconds. diff --git a/core/src/main/java/org/apache/gravitino/Configs.java b/core/src/main/java/org/apache/gravitino/Configs.java index 63681fec1d..e3547ad67e 100644 --- a/core/src/main/java/org/apache/gravitino/Configs.java +++ b/core/src/main/java/org/apache/gravitino/Configs.java @@ -358,7 +358,7 @@ public class Configs { .doc("Whether to enable the cached Entity store.") .version(ConfigConstants.VERSION_1_0_0) .booleanConf() - .createWithDefault(true); + .createWithDefault(false); // Maximum number of entries in the cache public static final ConfigEntry<Integer> CACHE_MAX_ENTRIES = diff --git a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/BaseIT.java b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/BaseIT.java index 72923341b9..42c74c7d32 100644 --- a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/BaseIT.java +++ b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/BaseIT.java @@ -100,6 +100,8 @@ public class BaseIT { public String testMode = ""; + public String enableEntityCache = ""; + protected Map<String, String> customConfigs = new HashMap<>(); protected boolean ignoreIcebergRestService = true; @@ -297,6 +299,16 @@ public class BaseIT { LOG.info("Running Gravitino Server in {} mode", testMode); + enableEntityCache = + System.getProperty(ITUtils.ENABLE_ENTITY_CACHE) == null + ? "false" + : System.getProperty(ITUtils.ENABLE_ENTITY_CACHE); + if (enableEntityCache.equals("true")) { + customConfigs.put(Configs.CACHE_ENABLED.getKey(), "true"); + } + + LOG.info("Cache Enabled ? {}", enableEntityCache); + if ("MySQL".equalsIgnoreCase(System.getenv("jdbcBackend"))) { // Start MySQL docker instance. String jdbcURL = startAndInitMySQLBackend(); diff --git a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/ITUtils.java b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/ITUtils.java index 508c5fb42e..902c17e4d9 100644 --- a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/ITUtils.java +++ b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/ITUtils.java @@ -52,6 +52,8 @@ public class ITUtils { public static final String TEST_MODE = "testMode"; public static final String EMBEDDED_TEST_MODE = "embedded"; public static final String DEPLOY_TEST_MODE = "deploy"; + /** Enable entity cache or not */ + public static final String ENABLE_ENTITY_CACHE = "enableEntityCache"; public static String joinPath(String... dirs) { return String.join(File.separator, dirs);
