Implement Redis Hash functionality (#11)

skodjob · Jul 29, 2024 · d6eec7a · d6eec7a
1 parent e628c81
commit d6eec7a
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 14 deletions.
diff --git a/database-manipulation-tool-schema/pom.xml b/database-manipulation-tool-schema/pom.xml
@@ -50,9 +50,9 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.release>17</maven.compiler.release>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.release>21</maven.compiler.release>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
   </properties>
 
   <dependencies>

diff --git a/database-manipulation-tool/README.md b/database-manipulation-tool/README.md
@@ -96,7 +96,7 @@ You can reset all databases on DMT start with property `onstart.reset.database`.
 <summary><code>POST</code> <code><b>/Main/GenerateBatchLoad?count={count}&maxRows={maxRows}</b></code> <code>(Same as GenerateLoad but uses batch statements for better performance)</code></summary>
 <br />
 <summary>
-    <code>GET</code> 
+    <code>POST</code> 
     <code><b>/Redis/pollMessages?max=5</b></code> 
     <code>
         [
@@ -107,7 +107,7 @@ You can reset all databases on DMT start with property `onstart.reset.database`.
     <code>Reads at most 'max' messages from specified channels</code>
 </summary>
 <summary>
-    <code>GET</code> 
+    <code>POST</code> 
     <code><b>/Redis/sendMessage?channel=channel1</b></code> 
     <code>
         {
@@ -123,6 +123,11 @@ You can reset all databases on DMT start with property `onstart.reset.database`.
     <code><b>/Redis/reset</b></code>
     <code>Flush whole Redis instance</code>
 </summary>
+<summary>
+    <code>GET</code> 
+    <code><b>/Redis/readHash?hashKey=hash1</b></code>
+    <code>Returns all messages stored under 'hashKey'</code>
+</summary>
 
 ## Running the application in dev mode
 

diff --git a/database-manipulation-tool/pom.xml b/database-manipulation-tool/pom.xml
@@ -48,8 +48,8 @@
 
   <properties>
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>

diff --git a/database-manipulation-tool/src/main/docker/Dockerfile.jvm b/database-manipulation-tool/src/main/docker/Dockerfile.jvm
@@ -75,7 +75,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-17:1.14
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.20-3
 
 ENV LANGUAGE='en_US:en'
 

diff --git a/database-manipulation-tool/src/main/docker/Dockerfile.legacy-jar b/database-manipulation-tool/src/main/docker/Dockerfile.legacy-jar
@@ -75,7 +75,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-17:1.14
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.20-3
 
 ENV LANGUAGE='en_US:en'
 

diff --git a/database-manipulation-tool/src/main/java/io/skodjob/dmt/resource/RedisResource.java b/database-manipulation-tool/src/main/java/io/skodjob/dmt/resource/RedisResource.java
@@ -33,6 +33,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.skodjob.dmt.service.RedisService;
@@ -66,12 +67,22 @@ public Response sendMessage(@QueryParam("channel") String channel, Map<String, S
     }
 
     @Path("pollMessages")
-    @GET
+    @POST
     public Response pollMessages(@QueryParam("max") Integer max, List<String> channels) {
         List<Map.Entry<String, List<StreamEntry>>> res = redisService.get(max, channels);
         return Response.ok(res).build();
     }
 
+    @Path("readHash")
+    @GET
+    public Response readHash(@QueryParam("hashKey") String hashKey) {
+        Map<String, String> map = redisService.readHash(hashKey);
+        if (Objects.isNull(map)) {
+            return Response.serverError().build();
+        }
+        return Response.ok(map).build();
+    }
+
     @Path("reset")
     @GET
     public Response resetRedis() {

diff --git a/database-manipulation-tool/src/main/java/io/skodjob/dmt/service/RedisService.java b/database-manipulation-tool/src/main/java/io/skodjob/dmt/service/RedisService.java
@@ -52,6 +52,10 @@ public List<Map.Entry<String, List<StreamEntry>>> get(int amount, List<String> c
         return redisDataSource.pollMessages(amount, channels);
     }
 
+    public Map<String, String> readHash(String hashKey) {
+        return redisDataSource.readHash(hashKey);
+    }
+
     public void resetRedis() {
         redisDataSource.flushRedis();
     }

diff --git a/database-manipulation-tool/src/main/java/io/skodjob/dmt/sinkSources/RedisDataSource.java b/database-manipulation-tool/src/main/java/io/skodjob/dmt/sinkSources/RedisDataSource.java
@@ -78,6 +78,11 @@ public List<Map.Entry<String, List<StreamEntry>>> pollMessages(int maxAmount, Li
         return jedis.xread(XReadParams.xReadParams().count(maxAmount), streams);
     }
 
+    public Map<String, String> readHash(String hashKey) {
+        Jedis jedis = pool.getResource();
+        return jedis.hgetAll(hashKey);
+    }
+
     public void flushRedis() {
         Jedis jedis = pool.getResource();
         jedis.flushAll();

diff --git a/load-generator/pom.xml b/load-generator/pom.xml
@@ -49,7 +49,7 @@
   </licenses>
 
   <properties>
-    <java.version>17</java.version>
+    <java.version>21</java.version>
     <slf4j.version>2.0.3</slf4j.version>
     <jackson.version>2.13.4.2</jackson.version>
     <datafaker.version>1.9.0</datafaker.version>

diff --git a/pom.xml b/pom.xml
@@ -44,9 +44,9 @@
   </developers>
 
   <properties>
-    <maven.compiler.release>17</maven.compiler.release>
-    <compiler-plugin.version>3.11.0</compiler-plugin.version>
-    <maven.compiler.release>17</maven.compiler.release>
+    <maven.compiler.release>21</maven.compiler.release>
+    <compiler-plugin.version>3.13.0</compiler-plugin.version>
+    <maven.compiler.release>21</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>