Minor improvement to Redis

* Remove unused argument from RedisJedisManager * Remove unused constructor from RedisQueryRunner * Use closeAfterClass method in tests * Add final in TestingRedisPlugin
trinodb · May 10, 2022 · f16c90a · f16c90a
1 parent 52e7e81
commit f16c90a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 24 deletions.
diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisJedisManager.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisJedisManager.java
@@ -15,7 +15,6 @@
 
 import io.airlift.log.Logger;
 import io.trino.spi.HostAddress;
-import io.trino.spi.NodeManager;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 
@@ -42,9 +41,7 @@ public class RedisJedisManager
     private final JedisPoolConfig jedisPoolConfig;
 
     @Inject
-    RedisJedisManager(
-            RedisConnectorConfig redisConnectorConfig,
-            NodeManager nodeManager)
+    RedisJedisManager(RedisConnectorConfig redisConnectorConfig)
     {
         this.redisConnectorConfig = requireNonNull(redisConnectorConfig, "redisConnectorConfig is null");
         this.jedisPoolConfig = new JedisPoolConfig();

diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/RedisQueryRunner.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/RedisQueryRunner.java
@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.redis;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
@@ -47,12 +46,6 @@ private RedisQueryRunner() {}
     private static final Logger log = Logger.get(RedisQueryRunner.class);
     private static final String TPCH_SCHEMA = "tpch";
 
-    public static DistributedQueryRunner createRedisQueryRunner(RedisServer redisServer, String dataFormat, TpchTable<?>... tables)
-            throws Exception
-    {
-        return createRedisQueryRunner(redisServer, ImmutableMap.of(), dataFormat, ImmutableList.copyOf(tables));
-    }
-
     public static DistributedQueryRunner createRedisQueryRunner(
             RedisServer redisServer,
             Map<String, String> extraProperties,

diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisConnectorTest.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisConnectorTest.java
@@ -26,7 +26,7 @@ public class TestRedisConnectorTest
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        RedisServer redisServer = new RedisServer();
+        RedisServer redisServer = closeAfterClass(new RedisServer());
         return createRedisQueryRunner(redisServer, ImmutableMap.of(), "string", REQUIRED_TPCH_TABLES);
     }
 }
diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisDistributedHash.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisDistributedHash.java
@@ -17,26 +17,17 @@
 import io.trino.plugin.redis.util.RedisServer;
 import io.trino.testing.AbstractTestQueries;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
 
 import static io.trino.plugin.redis.RedisQueryRunner.createRedisQueryRunner;
 
 public class TestRedisDistributedHash
         extends AbstractTestQueries
 {
-    private RedisServer redisServer;
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        redisServer = new RedisServer();
+        RedisServer redisServer = closeAfterClass(new RedisServer());
         return createRedisQueryRunner(redisServer, ImmutableMap.of(), "hash", REQUIRED_TPCH_TABLES);
     }
-
-    @AfterClass(alwaysRun = true)
-    public void destroy()
-    {
-        redisServer.close();
-    }
 }
diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisLatestConnectorTest.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestRedisLatestConnectorTest.java
@@ -27,7 +27,7 @@ public class TestRedisLatestConnectorTest
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        RedisServer redisServer = new RedisServer(LATEST_VERSION);
+        RedisServer redisServer = closeAfterClass(new RedisServer(LATEST_VERSION));
         return createRedisQueryRunner(redisServer, ImmutableMap.of(), "string", REQUIRED_TPCH_TABLES);
     }
 }
diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestingRedisPlugin.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/TestingRedisPlugin.java
@@ -26,7 +26,7 @@
 public class TestingRedisPlugin
         extends RedisPlugin
 {
-    private Map<SchemaTableName, RedisTableDescription> tableDescription;
+    private final Map<SchemaTableName, RedisTableDescription> tableDescription;
 
     public TestingRedisPlugin(Map<SchemaTableName, RedisTableDescription> tableDescription)
     {