public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "empty range" exception when querying InfluxDB2 (#14627) 

Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2023-03-18 13:31:41 +01:00 committed by GitHub
parent 979ecb0f98
commit 0f5dfa5088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/influx2/InfluxDB2FilterCriteriaQueryCreatorImpl.java
View File

@ -54,10 +54,12 @@ public class InfluxDB2FilterCriteriaQueryCreatorImpl implements FilterCriteriaQu
if (criteria.getBeginDate() != null) { if (criteria.getBeginDate() != null) {
range.withStart(criteria.getBeginDate().toInstant()); range.withStart(criteria.getBeginDate().toInstant());
} else { } else {
range = flux.range(-100L, ChronoUnit.YEARS); // Flux needs a mandatory start range range.withStart(-100L, ChronoUnit.YEARS); // Flux needs a mandatory start range
} }
if (criteria.getEndDate() != null) { if (criteria.getEndDate() != null) {
range.withStop(criteria.getEndDate().toInstant()); range.withStop(criteria.getEndDate().toInstant());
} else {
range.withStop(100L, ChronoUnit.YEARS);
} }
flux = range; flux = range;

16
bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxFilterCriteriaQueryCreatorImplTest.java
View File

@ -82,7 +82,7 @@ public class InfluxFilterCriteriaQueryCreatorImplTest {
String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY); String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY);
assertThat(queryV2, equalTo(""" assertThat(queryV2, equalTo("""
from(bucket:"origin") from(bucket:"origin")
\t|> range(start:-100y) \t|> range(start:-100y, stop:100y)
\t|> filter(fn: (r) => r["_measurement"] == "sampleItem") \t|> filter(fn: (r) => r["_measurement"] == "sampleItem")
\t|> keep(columns:["_measurement", "_time", "_value"])""")); \t|> keep(columns:["_measurement", "_time", "_value"])"""));
} }
@ -96,7 +96,7 @@ public class InfluxFilterCriteriaQueryCreatorImplTest {
assertThat(queryV1, equalTo("SELECT \"value\"::field,\"item\"::tag FROM \"origin\"./.*/;")); assertThat(queryV1, equalTo("SELECT \"value\"::field,\"item\"::tag FROM \"origin\"./.*/;"));
String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY); String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY);
assertThat(queryV2, equalTo("from(bucket:\"origin\")\n\t" + "|> range(start:-100y)")); assertThat(queryV2, equalTo("from(bucket:\"origin\")\n\t" + "|> range(start:-100y, stop:100y)"));
} }
@Test @Test
@ -136,7 +136,7 @@ public class InfluxFilterCriteriaQueryCreatorImplTest {
String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY); String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY);
assertThat(queryV2, equalTo(""" assertThat(queryV2, equalTo("""
from(bucket:"origin") from(bucket:"origin")
\t|> range(start:-100y) \t|> range(start:-100y, stop:100y)
\t|> filter(fn: (r) => r["_measurement"] == "sampleItem") \t|> filter(fn: (r) => r["_measurement"] == "sampleItem")
\t|> keep(columns:["_measurement", "_time", "_value"]) \t|> keep(columns:["_measurement", "_time", "_value"])
\t|> filter(fn: (r) => (r["_field"] == "value" and r["_value"] <= 90))""")); \t|> filter(fn: (r) => (r["_field"] == "value" and r["_value"] <= 90))"""));
@ -155,7 +155,7 @@ public class InfluxFilterCriteriaQueryCreatorImplTest {
String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY); String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY);
assertThat(queryV2, equalTo(""" assertThat(queryV2, equalTo("""
from(bucket:"origin") from(bucket:"origin")
\t|> range(start:-100y) \t|> range(start:-100y, stop:100y)
\t|> filter(fn: (r) => r["_measurement"] == "sampleItem") \t|> filter(fn: (r) => r["_measurement"] == "sampleItem")
\t|> keep(columns:["_measurement", "_time", "_value"]) \t|> keep(columns:["_measurement", "_time", "_value"])
\t|> limit(n:10, offset:20)""")); \t|> limit(n:10, offset:20)"""));
@ -173,7 +173,7 @@ public class InfluxFilterCriteriaQueryCreatorImplTest {
String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY); String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY);
assertThat(queryV2, equalTo(""" assertThat(queryV2, equalTo("""
from(bucket:"origin") from(bucket:"origin")
\t|> range(start:-100y) \t|> range(start:-100y, stop:100y)
\t|> filter(fn: (r) => r["_measurement"] == "sampleItem") \t|> filter(fn: (r) => r["_measurement"] == "sampleItem")
\t|> keep(columns:["_measurement", "_time", "_value"]) \t|> keep(columns:["_measurement", "_time", "_value"])
\t|> sort(desc:false, columns:["_time"])""")); \t|> sort(desc:false, columns:["_time"])"""));
@ -187,7 +187,7 @@ public class InfluxFilterCriteriaQueryCreatorImplTest {
String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY); String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY);
assertThat(queryV2, equalTo(""" assertThat(queryV2, equalTo("""
from(bucket:"origin") from(bucket:"origin")
\t|> range(start:-100y) \t|> range(start:-100y, stop:100y)
\t|> filter(fn: (r) => r["_measurement"] == "sampleItem") \t|> filter(fn: (r) => r["_measurement"] == "sampleItem")
\t|> keep(columns:["_measurement", "_time", "_value"]) \t|> keep(columns:["_measurement", "_time", "_value"])
\t|> last()""")); \t|> last()"""));
@ -215,7 +215,7 @@ public class InfluxFilterCriteriaQueryCreatorImplTest {
String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY); String queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY);
assertThat(queryV2, equalTo(""" assertThat(queryV2, equalTo("""
from(bucket:"origin") from(bucket:"origin")
\t|> range(start:-100y) \t|> range(start:-100y, stop:100y)
\t|> filter(fn: (r) => r["_measurement"] == "measurementName") \t|> filter(fn: (r) => r["_measurement"] == "measurementName")
\t|> filter(fn: (r) => r["item"] == "sampleItem") \t|> filter(fn: (r) => r["item"] == "sampleItem")
\t|> keep(columns:["_measurement", "_time", "_value", "item"])""")); \t|> keep(columns:["_measurement", "_time", "_value", "item"])"""));
@ -228,7 +228,7 @@ public class InfluxFilterCriteriaQueryCreatorImplTest {
queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY); queryV2 = instanceV2.createQuery(criteria, RETENTION_POLICY);
assertThat(queryV2, equalTo(""" assertThat(queryV2, equalTo("""
from(bucket:"origin") from(bucket:"origin")
\t|> range(start:-100y) \t|> range(start:-100y, stop:100y)
\t|> filter(fn: (r) => r["_measurement"] == "sampleItem") \t|> filter(fn: (r) => r["_measurement"] == "sampleItem")
\t|> keep(columns:["_measurement", "_time", "_value"])""")); \t|> keep(columns:["_measurement", "_time", "_value"])"""));
} }