Skip to content

Commit

Permalink
fix due to master
Browse files Browse the repository at this point in the history
  • Loading branch information
@sazzad16
sazzad16 committed Aug 3, 2021
1 parent ad543ab commit a35f0a8
Showing 1 changed file with 22 additions and 20 deletions.
42 changes: 22 additions & 20 deletions src/test/java/com/redislabs/redistimeseries/RedisTimeSeriesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,41 +432,43 @@ public void rangeFilterBy() {
}

// RANGE
Value[] values = client.range("filterBy", 0, 5000, RangeParams.rangeParams());
Value[] values = client.range("filterBy", 0L, 5000L, RangeParams.rangeParams());
Assert.assertArrayEquals(rawValues, values);

values = client.range("filterBy", 0, 5000, RangeParams.rangeParams().filterByTS(1000L, 2000L));
values =
client.range("filterBy", 0L, 5000L, RangeParams.rangeParams().filterByTS(1000L, 2000L));
Assert.assertArrayEquals(new Value[] {rawValues[0], rawValues[1]}, values);

values = client.range("filterBy", 0, 5000, RangeParams.rangeParams().filterByValues(1.0, 1.2));
values =
client.range("filterBy", 0L, 5000L, RangeParams.rangeParams().filterByValues(1.0, 1.2));
Assert.assertArrayEquals(new Value[] {rawValues[0], rawValues[2]}, values);

values =
client.range(
"filterBy",
0,
5000,
0L,
5000L,
RangeParams.rangeParams().filterByTS(1000L, 2000L).filterByValues(1.0, 1.2));
Assert.assertArrayEquals(new Value[] {rawValues[0]}, values);

// REVRANGE
values = client.revrange("filterBy", 0, 5000, RangeParams.rangeParams());
values = client.revrange("filterBy", 0L, 5000L, RangeParams.rangeParams());
Assert.assertArrayEquals(
new Value[] {rawValues[3], rawValues[2], rawValues[1], rawValues[0]}, values);

values =
client.revrange("filterBy", 0, 5000, RangeParams.rangeParams().filterByTS(1000L, 2000L));
client.revrange("filterBy", 0L, 5000L, RangeParams.rangeParams().filterByTS(1000L, 2000L));
Assert.assertArrayEquals(new Value[] {rawValues[1], rawValues[0]}, values);

values =
client.revrange("filterBy", 0, 5000, RangeParams.rangeParams().filterByValues(1.0, 1.2));
client.revrange("filterBy", 0L, 5000L, RangeParams.rangeParams().filterByValues(1.0, 1.2));
Assert.assertArrayEquals(new Value[] {rawValues[2], rawValues[0]}, values);

values =
client.revrange(
"filterBy",
0,
5000,
0L,
5000L,
RangeParams.rangeParams().filterByTS(1000L, 2000L).filterByValues(1.0, 1.2));
Assert.assertArrayEquals(new Value[] {rawValues[0]}, values);
}
Expand All @@ -493,63 +495,63 @@ public void mrangeFilterBy() {
client.add("ts1", rawValues[3].getTime(), rawValues[3].getValue());

// MRANGE
Range[] range = client.mrange(0, 5000, MultiRangeParams.multiRangeParams(), filter);
Range[] range = client.mrange(0L, 5000L, MultiRangeParams.multiRangeParams(), filter);
assertEquals("ts1", range[0].getKey());
assertArrayEquals(new Value[] {rawValues[0], rawValues[3]}, range[0].getValues());
assertEquals("ts2", range[1].getKey());
assertArrayEquals(new Value[] {rawValues[1], rawValues[2]}, range[1].getValues());

range =
client.mrange(
0, 5000, MultiRangeParams.multiRangeParams().filterByTS(1000L, 2000L), filter);
0L, 5000L, MultiRangeParams.multiRangeParams().filterByTS(1000L, 2000L), filter);
assertEquals("ts1", range[0].getKey());
assertArrayEquals(new Value[] {rawValues[0]}, range[0].getValues());
assertEquals("ts2", range[1].getKey());
assertArrayEquals(new Value[] {rawValues[1]}, range[1].getValues());

range =
client.mrange(
0, 5000, MultiRangeParams.multiRangeParams().filterByValues(1.0, 1.2), filter);
0L, 5000L, MultiRangeParams.multiRangeParams().filterByValues(1.0, 1.2), filter);
assertEquals("ts1", range[0].getKey());
assertArrayEquals(new Value[] {rawValues[0]}, range[0].getValues());
assertEquals("ts2", range[1].getKey());
assertArrayEquals(new Value[] {rawValues[2]}, range[1].getValues());

range =
client.mrange(
0,
5000,
0L,
5000L,
MultiRangeParams.multiRangeParams().filterByTS(1000L, 2000L).filterByValues(1.0, 1.2),
filter);
assertArrayEquals(new Value[] {rawValues[0]}, range[0].getValues());

// MREVRANGE
range = client.mrevrange(0, 5000, MultiRangeParams.multiRangeParams(), filter);
range = client.mrevrange(0L, 5000L, MultiRangeParams.multiRangeParams(), filter);
assertEquals("ts1", range[0].getKey());
assertArrayEquals(new Value[] {rawValues[3], rawValues[0]}, range[0].getValues());
assertEquals("ts2", range[1].getKey());
assertArrayEquals(new Value[] {rawValues[2], rawValues[1]}, range[1].getValues());

range =
client.mrevrange(
0, 5000, MultiRangeParams.multiRangeParams().filterByTS(1000L, 2000L), filter);
0L, 5000L, MultiRangeParams.multiRangeParams().filterByTS(1000L, 2000L), filter);
assertEquals("ts1", range[0].getKey());
assertArrayEquals(new Value[] {rawValues[0]}, range[0].getValues());
assertEquals("ts2", range[1].getKey());
assertArrayEquals(new Value[] {rawValues[1]}, range[1].getValues());

range =
client.mrevrange(
0, 5000, MultiRangeParams.multiRangeParams().filterByValues(1.0, 1.2), filter);
0L, 5000L, MultiRangeParams.multiRangeParams().filterByValues(1.0, 1.2), filter);
assertEquals("ts1", range[0].getKey());
assertArrayEquals(new Value[] {rawValues[0]}, range[0].getValues());
assertEquals("ts2", range[1].getKey());
assertArrayEquals(new Value[] {rawValues[2]}, range[1].getValues());

range =
client.mrevrange(
0,
5000,
0L,
5000L,
MultiRangeParams.multiRangeParams().filterByTS(1000L, 2000L).filterByValues(1.0, 1.2),
filter);
assertArrayEquals(new Value[] {rawValues[0]}, range[0].getValues());
Expand Down

0 comments on commit a35f0a8

Please sign in to comment.