fixup! added valkey dependency as a distributed cach

Use Duration, fix database logging, update documentation

Author: hpopuri2

docs/installation.md

@@ -167,8 +167,7 @@ For multi-instance deployments, Trino Gateway supports distributed caching
 using Valkey (or Redis) to share query metadata across gateway instances.
 This improves query routing and enables horizontal scaling.
 
-For single gateway deployments, distributed caching is not needed - the
-local cache is sufficient.
+For single gateway deployment or low workload environment, distributed caching is not needed. The local cache is sufficient.
 
 ```yaml
 valkeyConfiguration:

gateway-ha/src/main/java/io/trino/gateway/ha/cache/ValkeyDistributedCache.java

@@ -35,7 +35,7 @@ public class ValkeyDistributedCache
     public ValkeyDistributedCache(ValkeyConfiguration config)
     {
         this.enabled = config.isEnabled();
-        this.cacheTtlSeconds = config.getCacheTtlSeconds();
+        this.cacheTtlSeconds = (long) config.getCacheTtl().getValue(java.util.concurrent.TimeUnit.SECONDS);
 
         if (enabled) {
             JedisPoolConfig poolConfig = new JedisPoolConfig();
@@ -51,16 +51,20 @@ public ValkeyDistributedCache(ValkeyConfiguration config)
             poolConfig.setBlockWhenExhausted(true);
 
             String password = config.getPassword();
+            int timeoutMs = (int) config.getTimeout().toMillis();
+            int database;
             if (password != null && !password.isEmpty()) {
+                database = config.getDatabase();
                 this.jedisPool = new JedisPool(poolConfig, config.getHost(), config.getPort(),
-                        config.getTimeoutMs(), password, config.getDatabase());
+                        timeoutMs, password, database);
             }
             else {
-                this.jedisPool = new JedisPool(poolConfig, config.getHost(), config.getPort(), config.getTimeoutMs());
+                database = 0; // JedisPool uses DEFAULT_DATABASE (0) when no password is provided
+                this.jedisPool = new JedisPool(poolConfig, config.getHost(), config.getPort(), timeoutMs);
             }
 
             log.info("Valkey distributed cache initialized: %s:%d (database: %d)",
-                    config.getHost(), config.getPort(), config.getDatabase());
+                    config.getHost(), config.getPort(), database);
         }
         else {
             this.jedisPool = null;

gateway-ha/src/main/java/io/trino/gateway/ha/config/ValkeyConfiguration.java

@@ -13,6 +13,10 @@
  */
 package io.trino.gateway.ha.config;
 
+import io.airlift.units.Duration;
+
+import java.util.concurrent.TimeUnit;
+
 public class ValkeyConfiguration
 {
     private boolean enabled;
@@ -23,8 +27,8 @@ public class ValkeyConfiguration
     private int maxTotal = 20;
     private int maxIdle = 10;
     private int minIdle = 5;
-    private int timeoutMs = 2000;
-    private long cacheTtlSeconds = 1800;
+    private Duration timeout = new Duration(2, TimeUnit.SECONDS);
+    private Duration cacheTtl = new Duration(30, TimeUnit.MINUTES);
 
     public boolean isEnabled()
     {
@@ -106,23 +110,23 @@ public void setMinIdle(int minIdle)
         this.minIdle = minIdle;
     }
 
-    public int getTimeoutMs()
+    public Duration getTimeout()
     {
-        return timeoutMs;
+        return timeout;
     }
 
-    public void setTimeoutMs(int timeoutMs)
+    public void setTimeout(Duration timeout)
     {
-        this.timeoutMs = timeoutMs;
+        this.timeout = timeout;
     }
 
-    public long getCacheTtlSeconds()
+    public Duration getCacheTtl()
     {
-        return cacheTtlSeconds;
+        return cacheTtl;
     }
 
-    public void setCacheTtlSeconds(long cacheTtlSeconds)
+    public void setCacheTtl(Duration cacheTtl)
     {
-        this.cacheTtlSeconds = cacheTtlSeconds;
+        this.cacheTtl = cacheTtl;
     }
 }

gateway-ha/src/test/java/io/trino/gateway/ha/config/TestValkeyConfiguration.java

@@ -13,8 +13,11 @@
  */
 package io.trino.gateway.ha.config;
 
+import io.airlift.units.Duration;
 import org.junit.jupiter.api.Test;
 
+import java.util.concurrent.TimeUnit;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 final class TestValkeyConfiguration
@@ -32,8 +35,8 @@ void testDefaultValues()
         assertThat(config.getMaxTotal()).isEqualTo(20);
         assertThat(config.getMaxIdle()).isEqualTo(10);
         assertThat(config.getMinIdle()).isEqualTo(5);
-        assertThat(config.getTimeoutMs()).isEqualTo(2000);
-        assertThat(config.getCacheTtlSeconds()).isEqualTo(1800);
+        assertThat(config.getTimeout()).isEqualTo(new Duration(2, TimeUnit.SECONDS));
+        assertThat(config.getCacheTtl()).isEqualTo(new Duration(30, TimeUnit.MINUTES));
     }
 
     @Test
@@ -49,8 +52,8 @@ void testSettersAndGetters()
         config.setMaxTotal(100);
         config.setMaxIdle(50);
         config.setMinIdle(25);
-        config.setTimeoutMs(5000);
-        config.setCacheTtlSeconds(3600);
+        config.setTimeout(new Duration(5, TimeUnit.SECONDS));
+        config.setCacheTtl(new Duration(1, TimeUnit.HOURS));
 
         assertThat(config.isEnabled()).isTrue();
         assertThat(config.getHost()).isEqualTo("valkey.example.com");
@@ -60,7 +63,7 @@ void testSettersAndGetters()
         assertThat(config.getMaxTotal()).isEqualTo(100);
         assertThat(config.getMaxIdle()).isEqualTo(50);
         assertThat(config.getMinIdle()).isEqualTo(25);
-        assertThat(config.getTimeoutMs()).isEqualTo(5000);
-        assertThat(config.getCacheTtlSeconds()).isEqualTo(3600);
+        assertThat(config.getTimeout()).isEqualTo(new Duration(5, TimeUnit.SECONDS));
+        assertThat(config.getCacheTtl()).isEqualTo(new Duration(1, TimeUnit.HOURS));
     }
 }

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestValkeyDistributedCacheIntegration.java

@@ -13,6 +13,7 @@
  */
 package io.trino.gateway.ha.router;
 
+import io.airlift.units.Duration;
 import io.trino.gateway.ha.cache.QueryCacheManager;
 import io.trino.gateway.ha.cache.ValkeyDistributedCache;
 import io.trino.gateway.ha.config.DataStoreConfiguration;
@@ -30,6 +31,7 @@
 import org.testcontainers.containers.JdbcDatabaseContainer;
 
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 import static io.trino.gateway.ha.TestingJdbcConnectionManager.createTestingJdbcConnectionManager;
 import static io.trino.gateway.ha.util.TestcontainersUtils.createPostgreSqlContainer;
@@ -75,8 +77,8 @@ void setUp()
         valkeyConfig.setMaxTotal(20);
         valkeyConfig.setMaxIdle(10);
         valkeyConfig.setMinIdle(5);
-        valkeyConfig.setTimeoutMs(2000);
-        valkeyConfig.setCacheTtlSeconds(1800);
+        valkeyConfig.setTimeout(new Duration(2, TimeUnit.SECONDS));
+        valkeyConfig.setCacheTtl(new Duration(30, TimeUnit.MINUTES));
 
         distributedCache = new ValkeyDistributedCache(valkeyConfig);
         queryCacheManager = new QueryCacheManager(distributedCache);