Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support TS.MADD command #3020

Merged
merged 2 commits into from
Jun 13, 2022
Merged

Support TS.MADD command #3020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e825da
Support TS.MADD command
sazzad16 Jun 13, 2022
da22f76
Pipeline TS.MADD command
sazzad16 Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/redis/clients/jedis/CommandObjects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3441,6 +3441,14 @@ public final CommandObject<Long> tsAdd(String key, long timestamp, double value,
.add(timestamp).add(value).addParams(createParams), BuilderFactory.LONG);
}

public final CommandObject<List<Long>> tsMAdd(Map.Entry<String, TSElement>... entries) {
CommandArguments args = commandArguments(TimeSeriesCommand.MADD);
for (Map.Entry<String, TSElement> entry : entries) {
args.key(entry.getKey()).add(entry.getValue().getTimestamp()).add(entry.getValue().getValue());
}
return new CommandObject<>(args, BuilderFactory.LONG_LIST);
}

public final CommandObject<List<TSElement>> tsRange(String key, long fromTimestamp, long toTimestamp) {
return new CommandObject<>(commandArguments(TimeSeriesCommand.RANGE).key(key)
.add(fromTimestamp).add(toTimestamp), BuilderFactory.TIMESERIES_ELEMENT_LIST);
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3715,6 +3715,11 @@ public Response<Long> tsAdd(String key, long timestamp, double value, TSCreatePa
return appendCommand(commandObjects.tsAdd(key, timestamp, value, createParams));
}

@Override
public Response<List<Long>> tsMAdd(Map.Entry<String, TSElement>... entries) {
return appendCommand(commandObjects.tsMAdd(entries));
}

@Override
public Response<List<TSElement>> tsRange(String key, long fromTimestamp, long toTimestamp) {
return appendCommand(commandObjects.tsRange(key, fromTimestamp, toTimestamp));
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/redis/clients/jedis/Pipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3717,6 +3717,11 @@ public Response<Long> tsAdd(String key, long timestamp, double value, TSCreatePa
return appendCommand(commandObjects.tsAdd(key, timestamp, value, createParams));
}

@Override
public Response<List<Long>> tsMAdd(Map.Entry<String, TSElement>... entries) {
return appendCommand(commandObjects.tsMAdd(entries));
}

@Override
public Response<List<TSElement>> tsRange(String key, long fromTimestamp, long toTimestamp) {
return appendCommand(commandObjects.tsRange(key, fromTimestamp, toTimestamp));
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/redis/clients/jedis/TransactionBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3785,6 +3785,11 @@ public Response<Long> tsAdd(String key, long timestamp, double value, TSCreatePa
return appendCommand(commandObjects.tsAdd(key, timestamp, value, createParams));
}

@Override
public Response<List<Long>> tsMAdd(Map.Entry<String, TSElement>... entries) {
return appendCommand(commandObjects.tsMAdd(entries));
}

@Override
public Response<List<TSElement>> tsRange(String key, long fromTimestamp, long toTimestamp) {
return appendCommand(commandObjects.tsRange(key, fromTimestamp, toTimestamp));
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/redis/clients/jedis/UnifiedJedis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3856,6 +3856,11 @@ public long tsAdd(String key, long timestamp, double value, TSCreateParams creat
return executeCommand(commandObjects.tsAdd(key, timestamp, value, createParams));
}

@Override
public List<Long> tsMAdd(Map.Entry<String, TSElement>... entries) {
return executeCommand(commandObjects.tsMAdd(entries));
}

@Override
public List<TSElement> tsRange(String key, long fromTimestamp, long toTimestamp) {
return executeCommand(commandObjects.tsRange(key, fromTimestamp, toTimestamp));
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/redis/clients/jedis/timeseries/RedisTimeSeriesCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package redis.clients.jedis.timeseries;

import java.util.List;
import java.util.Map;

public interface RedisTimeSeriesCommands {

Expand Down Expand Up @@ -68,6 +69,14 @@ public interface RedisTimeSeriesCommands {
*/
long tsAdd(String key, long timestamp, double value, TSCreateParams createParams);

/**
* {@code TS.MADD key timestamp value [key timestamp value ...]}
*
* @param entries key, timestamp, value
* @return timestamps
*/
List<Long> tsMAdd(Map.Entry<String, TSElement>... entries);

/**
* {@code TS.RANGE key fromTimestamp toTimestamp}
*
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/redis/clients/jedis/timeseries/RedisTimeSeriesPipelineCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package redis.clients.jedis.timeseries;

import java.util.List;
import java.util.Map;
import redis.clients.jedis.Response;

public interface RedisTimeSeriesPipelineCommands {
Expand All @@ -19,6 +20,8 @@ public interface RedisTimeSeriesPipelineCommands {

Response<Long> tsAdd(String key, long timestamp, double value, TSCreateParams createParams);

Response<List<Long>> tsMAdd(Map.Entry<String, TSElement>... entries);

Response<List<TSElement>> tsRange(String key, long fromTimestamp, long toTimestamp);

Response<List<TSElement>> tsRange(String key, TSRangeParams rangeParams);
Expand Down
67 changes: 34 additions & 33 deletions src/test/java/redis/clients/jedis/modules/timeseries/TimeSeriesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
import java.util.*;
import org.junit.BeforeClass;
import org.junit.Test;

import redis.clients.jedis.exceptions.JedisDataException;
import redis.clients.jedis.modules.RedisModuleCommandsTestBase;
import redis.clients.jedis.timeseries.*;
import redis.clients.jedis.util.KeyValue;

public class TimeSeriesTest extends RedisModuleCommandsTestBase {

Expand Down Expand Up @@ -321,39 +323,38 @@ public void testAddStar() throws InterruptedException {
List<TSElement> values = client.tsRange("seriesAdd2", startTime, add3);
assertEquals(3, values.size());
}
//
// @Test
// public void testMadd() {
// Map<String, String> labels = new HashMap<>();
// labels.put("l1", "v1");
// labels.put("l2", "v2");
// assertEquals("OK", client.tsCreate("seriesAdd1", TSCreateParams.createParams().retention(10000L).labels(labels)));
// assertEquals("OK", client.tsCreate("seriesAdd2", TSCreateParams.createParams().retention(10000L).labels(labels)));
//
// long now = System.currentTimeMillis();
// List<Object> result =
// client.tsMadd(
// new Measurement("seriesAdd1", 0L, 1.1), // System time
// new Measurement("seriesAdd2", 2000L, 3.2),
// new Measurement("seriesAdd1", 1500L, 2.67), // Should return an error
// new Measurement("seriesAdd2", 3200L, 54.2),
// new Measurement("seriesAdd2", 4300L, 21.2));
//
// assertTrue(now <= (Long) result.get(0) && now + 5 > (Long) result.get(0));
// assertEquals(2000L, result.get(1));
// assertTrue(result.get(2) instanceof JedisDataException);
// assertEquals(3200L, result.get(3));
// assertEquals(4300L, result.get(4));
//
// List<TSElement> values1 = client.tsRange("seriesAdd1", 0, Long.MAX_VALUE);
// assertEquals(1, values1.size());
// assertEquals(1.1, values1.get(0).getValue(), 0.001);
//
// List<TSElement> values2 = client.tsRange("seriesAdd2", TSRangeParams.rangeParams(0, Long.MAX_VALUE).count(2));
// assertEquals(2, values2.size());
// assertEquals(3.2, values2.get(0).getValue(), 0.001);
// assertEquals(54.2, values2.get(1).getValue(), 0.001);
// }

@Test
public void testMadd() {
Map<String, String> labels = new HashMap<>();
labels.put("l1", "v1");
labels.put("l2", "v2");
assertEquals("OK", client.tsCreate("seriesAdd1", TSCreateParams.createParams().retention(10000L).labels(labels)));
assertEquals("OK", client.tsCreate("seriesAdd2", TSCreateParams.createParams().retention(10000L).labels(labels)));

List<Long> result = client.tsMAdd(
new KeyValue<>("seriesAdd1", new TSElement(1000L, 1.1)),
new KeyValue<>("seriesAdd2", new TSElement(2000L, 3.2)),
new KeyValue<>("seriesAdd1", new TSElement(1500L, 2.67)),
new KeyValue<>("seriesAdd2", new TSElement(3200L, 54.2)),
new KeyValue<>("seriesAdd2", new TSElement(4300L, 21.2)));

assertEquals(1000L, result.get(0).longValue());
assertEquals(2000L, result.get(1).longValue());
assertEquals(1500L, result.get(2).longValue());
assertEquals(3200L, result.get(3).longValue());
assertEquals(4300L, result.get(4).longValue());

List<TSElement> values1 = client.tsRange("seriesAdd1", 0, Long.MAX_VALUE);
assertEquals(2, values1.size());
assertEquals(1.1, values1.get(0).getValue(), 0.001);
assertEquals(2.67, values1.get(1).getValue(), 0.001);

List<TSElement> values2 = client.tsRange("seriesAdd2", TSRangeParams.rangeParams(0, Long.MAX_VALUE).count(2));
assertEquals(2, values2.size());
assertEquals(3.2, values2.get(0).getValue(), 0.001);
assertEquals(54.2, values2.get(1).getValue(), 0.001);
}
//
// @Test
// public void testIncrByDecrBy() throws InterruptedException {
Expand Down