Refactored JRedisTimeSeries out

Implemented custom command for TimeSeries in Lettuce.

Author: NLxAROSA

README.md

@@ -10,15 +10,23 @@ Via RedisCDC these changes will appear in demo application #1.
 
 # Getting Started
 
+## Running locally
+
 1. Checkout the project
 2. `docker run -p 6379:6379 redislabs/redismod:latest`
 3. `./mvnw clean package spring-boot:run`
 4. Navigate to http://localhost:8080 and login with user lars and password larsje
-5. Watch in awe (or horror ;))
 
-WIP
+## Running on Azure Spring Cloud
 
-# Demo
+1. Follow the steps from 'Running locally'
+2. Make sure you are logged into the Azure CLI
+3. Add the Azure Spring Cloud extension to the Azure CLI `az extension add --name spring-cloud` If you already have the extension, make sure it's up to date using `az extension update --name spring-cloud`
+2. Create an Azure Spring Cloud instance using `az spring-cloud create -n acrebank -g rdsLroACRE -l northeurope` (this may take a few minutes)
+3. Create an App in the newly created Azure Spring Cloud instance using `az spring-cloud app create -n acrebankapp -s acrebank -g rdsLroACRE --assign-endpoint true`
+4. Modify the application.properties so it points to your newly created ACRE instance
+5. Rebuild the app using `./mvnw package`
+6. Deploy the app to Azure Spring Cloud using `az spring-cloud app deploy -n acrebankapp -s acrebank -g rdsLroAcre --jar-path target/redisbank-0.0.1-SNAPSHOT.jar`
 
 Demo shows 
 

pom.xml

@@ -51,11 +51,6 @@
 			<artifactId>spring-redisearch</artifactId>
 			<version>3.1.2</version>
 		</dependency>
-		<dependency>
-			<groupId>com.redislabs</groupId>
-			<artifactId>jredistimeseries</artifactId>
-			<version>1.4.0</version>
-		</dependency>
 		<dependency>
 			<groupId>com.github.javafaker</groupId>
 			<artifactId>javafaker</artifactId>

src/main/java/com/redislabs/demos/redisbank/RedisTimeSeriesConfiguration.java

@@ -1,18 +1,17 @@
 package com.redislabs.demos.redisbank;
 
-import com.redislabs.redistimeseries.RedisTimeSeries;
-
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.dynamic.RedisCommandFactory;
+
 @Configuration
 public class RedisTimeSeriesConfiguration {
 
     @Bean
-    RedisTimeSeries redisTimeSeries(@Value("${spring.redis.host}") String host, @Value("${spring.redis.port}") int port)  {
-        RedisTimeSeries rts = new RedisTimeSeries(host, port);
-        return rts;
+    RedisCommandFactory redisCommandFactory(RedisClient redis)   {
+        return new RedisCommandFactory(redis.connect());
     }
-
+    
 }

src/main/java/com/redislabs/demos/redisbank/timeseries/TimeSeriesCommands.java

@@ -0,0 +1,19 @@
+package com.redislabs.demos.redisbank.timeseries;
+
+import java.util.Map;
+
+import io.lettuce.core.dynamic.Commands;
+import io.lettuce.core.dynamic.annotation.Command;
+
+public interface TimeSeriesCommands extends Commands {
+
+    @Command("TS.CREATE :key RETENTION :retentionTime ")
+    void create(String key, long retentionTime);
+
+    @Command("TS.ADD :key * :value")
+    void add(String key, double value);
+
+    @Command("TS.RANGE :key :from :to")
+    Map<String, String> range(String key, long from, long to);
+
+}

src/main/java/com/redislabs/demos/redisbank/transactions/Balance.java

@@ -1,20 +1,13 @@
 package com.redislabs.demos.redisbank.transactions;
 
-import com.redislabs.redistimeseries.Value;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
 public class Balance {
 
-    private long x;
-    private double y;
-
-    public Balance(Value v) {
-        this.x = v.getTime();
-        this.y = v.getValue();
-    }
+    private Object x;
+    private Object y;
 
 }

src/main/java/com/redislabs/demos/redisbank/transactions/BankTransactionGenerator.java

@@ -14,11 +14,11 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.redislabs.demos.redisbank.SerializationUtil;
 import com.redislabs.demos.redisbank.Utilities;
+import com.redislabs.demos.redisbank.timeseries.TimeSeriesCommands;
 import com.redislabs.lettusearch.Field;
 import com.redislabs.lettusearch.Field.Text.PhoneticMatcher;
 import com.redislabs.lettusearch.RediSearchCommands;
 import com.redislabs.lettusearch.StatefulRediSearchConnection;
-import com.redislabs.redistimeseries.RedisTimeSeries;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,6 +27,7 @@
 import org.springframework.stereotype.Component;
 
 import io.lettuce.core.RedisCommandExecutionException;
+import io.lettuce.core.dynamic.RedisCommandFactory;
 
 @Component
 public class BankTransactionGenerator {
@@ -47,13 +48,13 @@ public class BankTransactionGenerator {
 
     private final StringRedisTemplate redis;
     private final StatefulRediSearchConnection<String, String> connection;
-    private final RedisTimeSeries rts;
+    private final TimeSeriesCommands tsc;
 
     public BankTransactionGenerator(StringRedisTemplate redis, StatefulRediSearchConnection<String, String> connection,
-            RedisTimeSeries rts) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+            RedisCommandFactory rcf) throws NoSuchAlgorithmException, UnsupportedEncodingException {
         this.redis = redis;
         this.connection = connection;
-        this.rts = rts;
+        this.tsc = rcf.getCommands(TimeSeriesCommands.class);
         transactionSources = SerializationUtil.loadObjectList(TransactionSource.class, "transaction_sources.csv");
         random = SecureRandom.getInstance("SHA1PRNG");
         random.setSeed("lars".getBytes("UTF-8")); // Prime the RNG so it always generates the same pseudorandom set
@@ -86,13 +87,13 @@ private void createSearchIndices() {
                 Field.text("transactionType").matcher(PhoneticMatcher.English).build());
     }
 
-    private void deleteSortedSet()  {
+    private void deleteSortedSet() {
         redis.delete(SORTED_SET_KEY);
     }
 
     private void createTimeSeries() {
         redis.delete(BALANCE_TS);
-        rts.create(BALANCE_TS, 0, null);
+        tsc.create(BALANCE_TS, 0);
     }
 
     private void createInitialStream() {
@@ -143,12 +144,12 @@ private String createTransactionAmount(String accountName) {
         Double amount = random.nextDouble() * bandwidth % 300.0;
         Double roundedAmount = Math.floor(amount * 100) / 100;
 
-        if (random.nextBoolean())   {
+        if (random.nextBoolean()) {
             roundedAmount = roundedAmount * -1.00;
         }
 
         balance = balance + roundedAmount;
-        rts.add(BALANCE_TS, balance);
+        tsc.add(BALANCE_TS, balance);
         redis.opsForZSet().incrementScore(SORTED_SET_KEY, accountName, roundedAmount * -1);
 
         return nf.format(roundedAmount);

src/main/java/com/redislabs/demos/redisbank/transactions/TransactionOverviewController.java

@@ -1,21 +1,24 @@
 package com.redislabs.demos.redisbank.transactions;
 
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import com.redislabs.demos.redisbank.Config;
 import com.redislabs.demos.redisbank.Config.StompConfig;
 import com.redislabs.demos.redisbank.UserSession;
 import com.redislabs.demos.redisbank.UserSessionRepository;
 import com.redislabs.demos.redisbank.Utilities;
+import com.redislabs.demos.redisbank.timeseries.TimeSeriesCommands;
 import com.redislabs.lettusearch.RediSearchCommands;
 import com.redislabs.lettusearch.SearchOptions;
 import com.redislabs.lettusearch.SearchOptions.Highlight;
 import com.redislabs.lettusearch.SearchOptions.Highlight.Tag;
 import com.redislabs.lettusearch.SearchResults;
 import com.redislabs.lettusearch.StatefulRediSearchConnection;
-import com.redislabs.redistimeseries.RedisTimeSeries;
-import com.redislabs.redistimeseries.Value;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -24,11 +27,15 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import io.lettuce.core.dynamic.RedisCommandFactory;
+
 @RestController
 @RequestMapping(path = "/api")
 @CrossOrigin
 public class TransactionOverviewController {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(TransactionOverviewController.class);
+
     private static final String ACCOUNT_INDEX = "transaction_account_idx";
     private static final String SEARCH_INDEX = "transaction_description_idx";
     private static final String BALANCE_TS = "balance_ts";
@@ -37,15 +44,15 @@ public class TransactionOverviewController {
     private final Config config;
     private final UserSessionRepository userSessionRepository;
     private final StatefulRediSearchConnection<String, String> srsc;
-    private final RedisTimeSeries rts;
     private final StringRedisTemplate redis;
+    private final TimeSeriesCommands tsc;
 
     public TransactionOverviewController(Config config, UserSessionRepository userSessionRepository,
-            StatefulRediSearchConnection<String, String> srsc, RedisTimeSeries rts, StringRedisTemplate redis) {
+            StatefulRediSearchConnection<String, String> srsc, RedisCommandFactory rcf, StringRedisTemplate redis) {
         this.config = config;
         this.userSessionRepository = userSessionRepository;
         this.srsc = srsc;
-        this.rts = rts;
+        this.tsc = rcf.getCommands(TimeSeriesCommands.class);
         this.redis = redis;
     }
 
@@ -55,14 +62,18 @@ public StompConfig stompConfig() {
     }
 
     @GetMapping("/balance")
-    public Balance[] listTransactionsByDate() {
-        Value[] tsValues = rts.range(BALANCE_TS, System.currentTimeMillis() - (1000 * 60 * 60 * 24 * 7),
+    public Balance[] balance() {
+        Map<String, String> tsValues = tsc.range(BALANCE_TS, System.currentTimeMillis() - (1000 * 60 * 60 * 24 * 7),
                 System.currentTimeMillis());
 
-        Balance[] balanceTs = new Balance[tsValues.length];
+        Balance[] balanceTs = new Balance[tsValues.size()];
+        int i = 0;
 
-        for (int i = 0; i < tsValues.length; i++) {
-            balanceTs[i] = new Balance(tsValues[i]);
+        for (Entry<String, String> entry : tsValues.entrySet()) {
+            Object keyString = entry.getKey();
+            Object valueString = entry.getValue();
+            balanceTs[i] = new Balance(keyString, valueString);
+            i++;
         }
 
         return balanceTs;

src/main/resources/application.properties

@@ -6,4 +6,8 @@ stomp.destinationPrefix=/topic
 stomp.transactionsTopic=/topic/transactions
 
 spring.redis.host=localhost
-spring.redis.port=6379
+spring.redis.port=6379
+
+#spring.redis.host=lars5.northeurope.redisenterprise.cache.azure.net
+#spring.redis.port=10000
+#spring.redis.password=RzM8a9+p2VHu6ZWVwKWyHbHZBUc1jueNWLg8uQZPe9w=