Change default value of metadata cache expiration time (#2274)

scalar-labs · Oct 10, 2024 · d3251d3 · d3251d3
1 parent d1adea6
commit d3251d3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/core/src/main/java/com/scalar/db/config/DatabaseConfig.java b/core/src/main/java/com/scalar/db/config/DatabaseConfig.java
@@ -57,6 +57,7 @@ public class DatabaseConfig {
  public static final String CROSS_PARTITION_SCAN_ORDERING = SCAN_PREFIX + "ordering.enabled";
  public static final String SYSTEM_NAMESPACE_NAME = PREFIX + "system_namespace_name";
 
+ public static final int DEFAULT_METADATA_CACHE_EXPIRATION_TIME_SECS = 60;
  public static final String DEFAULT_SYSTEM_NAMESPACE_NAME = "scalardb";
 
  public DatabaseConfig(File propertiesFile) throws IOException {
@@ -180,7 +181,10 @@ public static String getTransactionManager(Properties properties) {
  }
 
  public static long getMetadataCacheExpirationTimeSecs(Properties properties) {
- return getLong(properties, METADATA_CACHE_EXPIRATION_TIME_SECS, -1);
+ return getLong(
+ properties,
+ METADATA_CACHE_EXPIRATION_TIME_SECS,
+ DEFAULT_METADATA_CACHE_EXPIRATION_TIME_SECS);
  }
 
  public static long getActiveTransactionManagementExpirationTimeMillis(Properties properties) {

diff --git a/core/src/test/java/com/scalar/db/config/DatabaseConfigTest.java b/core/src/test/java/com/scalar/db/config/DatabaseConfigTest.java
@@ -35,7 +35,8 @@ public void constructor_PropertiesWithoutPortGiven_ShouldLoadProperly() {
  assertThat(config.getPassword().get()).isEqualTo(ANY_PASSWORD);
  assertThat(config.getStorage()).isEqualTo("cassandra");
  assertThat(config.getTransactionManager()).isEqualTo("consensus-commit");
- assertThat(config.getMetadataCacheExpirationTimeSecs()).isEqualTo(-1);
+ assertThat(config.getMetadataCacheExpirationTimeSecs())
+ .isEqualTo(DatabaseConfig.DEFAULT_METADATA_CACHE_EXPIRATION_TIME_SECS);
  assertThat(config.getActiveTransactionManagementExpirationTimeMillis()).isEqualTo(-1);
  assertThat(config.isCrossPartitionScanEnabled()).isFalse();
  assertThat(config.isCrossPartitionScanFilteringEnabled()).isFalse();
@@ -61,7 +62,8 @@ public void constructor_PropertiesWithoutUsernameGiven_ShouldLoadProperly() {
  assertThat(config.getPassword().get()).isEqualTo(ANY_PASSWORD);
  assertThat(config.getStorage()).isEqualTo("cassandra");
  assertThat(config.getTransactionManager()).isEqualTo("consensus-commit");
- assertThat(config.getMetadataCacheExpirationTimeSecs()).isEqualTo(-1);
+ assertThat(config.getMetadataCacheExpirationTimeSecs())
+ .isEqualTo(DatabaseConfig.DEFAULT_METADATA_CACHE_EXPIRATION_TIME_SECS);
  assertThat(config.getActiveTransactionManagementExpirationTimeMillis()).isEqualTo(-1);
  assertThat(config.getDefaultNamespaceName()).isEmpty();
  assertThat(config.isCrossPartitionScanEnabled()).isFalse();
@@ -88,7 +90,8 @@ public void constructor_PropertiesWithoutPasswordGiven_ShouldLoadProperly() {
  assertThat(config.getPassword().isPresent()).isFalse();
  assertThat(config.getStorage()).isEqualTo("cassandra");
  assertThat(config.getTransactionManager()).isEqualTo("consensus-commit");
- assertThat(config.getMetadataCacheExpirationTimeSecs()).isEqualTo(-1);
+ assertThat(config.getMetadataCacheExpirationTimeSecs())
+ .isEqualTo(DatabaseConfig.DEFAULT_METADATA_CACHE_EXPIRATION_TIME_SECS);
  assertThat(config.getActiveTransactionManagementExpirationTimeMillis()).isEqualTo(-1);
  assertThat(config.getDefaultNamespaceName()).isEmpty();
  assertThat(config.isCrossPartitionScanEnabled()).isFalse();
@@ -117,7 +120,8 @@ public void constructor_PropertiesWithPortGiven_ShouldLoadProperly() {
  assertThat(config.getPassword().get()).isEqualTo(ANY_PASSWORD);
  assertThat(config.getStorage()).isEqualTo("cassandra");
  assertThat(config.getTransactionManager()).isEqualTo("consensus-commit");
- assertThat(config.getMetadataCacheExpirationTimeSecs()).isEqualTo(-1);
+ assertThat(config.getMetadataCacheExpirationTimeSecs())
+ .isEqualTo(DatabaseConfig.DEFAULT_METADATA_CACHE_EXPIRATION_TIME_SECS);
  assertThat(config.getActiveTransactionManagementExpirationTimeMillis()).isEqualTo(-1);
  assertThat(config.getDefaultNamespaceName()).isEmpty();
  assertThat(config.isCrossPartitionScanEnabled()).isFalse();