You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/07/31 08:49:39 UTC
[skywalking] branch master updated: missing time unit in query
(#5210)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 966403c missing time unit in query (#5210)
966403c is described below
commit 966403c0e04a10ade0ffd7e3e3ec976c3ba85557
Author: Daming <zt...@foxmail.com>
AuthorDate: Fri Jul 31 16:49:19 2020 +0800
missing time unit in query (#5210)
---
.../oap/server/storage/plugin/influxdb/InfluxClient.java | 9 ++++++++-
.../server/storage/plugin/influxdb/query/AggregationQuery.java | 4 ++--
.../oap/server/storage/plugin/influxdb/query/AlarmQuery.java | 4 ++--
.../oap/server/storage/plugin/influxdb/query/MetricsQuery.java | 4 ++--
.../oap/server/storage/plugin/influxdb/query/TopologyQuery.java | 8 ++++----
5 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/InfluxClient.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/InfluxClient.java
index d12bd4c..309496a 100644
--- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/InfluxClient.java
+++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/InfluxClient.java
@@ -195,7 +195,14 @@ public class InfluxClient implements Client {
/**
* Convert to InfluxDB {@link TimeInterval}.
*/
- public static TimeInterval timeInterval(long timeBucket) {
+ public static TimeInterval timeIntervalTS(long timestamp) {
+ return ti(timestamp, "ms");
+ }
+
+ /**
+ * Convert to InfluxDB {@link TimeInterval}.
+ */
+ public static TimeInterval timeIntervalTB(long timeBucket) {
return ti(TimeBucket.getTimestamp(timeBucket), "ms");
}
}
diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AggregationQuery.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AggregationQuery.java
index bce8bdc..eba8c84 100644
--- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AggregationQuery.java
+++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AggregationQuery.java
@@ -79,8 +79,8 @@ public class AggregationQuery implements IAggregationQueryDAO {
});
}
final SelectSubQueryImpl<SelectQueryImpl> subQuery = where
- .and(gte(InfluxClient.TIME, duration.getStartTimestamp()))
- .and(lte(InfluxClient.TIME, duration.getEndTimestamp()))
+ .and(gte(InfluxClient.TIME, InfluxClient.timeIntervalTS(duration.getStartTimestamp())))
+ .and(lte(InfluxClient.TIME, InfluxClient.timeIntervalTS(duration.getEndTimestamp())))
.groupBy(InfluxConstants.TagName.ENTITY_ID);
query.setSubQuery(subQuery);
diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java
index c698acc..ca74f0a 100644
--- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java
+++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java
@@ -60,8 +60,8 @@ public class AlarmQuery implements IAlarmQueryDAO {
.from(client.getDatabase(), AlarmRecord.INDEX_NAME)
.where();
if (startTB > 0 && endTB > 0) {
- recallQuery.and(gte(InfluxClient.TIME, InfluxClient.timeInterval(startTB)))
- .and(lte(InfluxClient.TIME, InfluxClient.timeInterval(endTB)));
+ recallQuery.and(gte(InfluxClient.TIME, InfluxClient.timeIntervalTB(startTB)))
+ .and(lte(InfluxClient.TIME, InfluxClient.timeIntervalTB(endTB)));
}
if (!Strings.isNullOrEmpty(keyword)) {
recallQuery.and(contains(AlarmRecord.ALARM_MESSAGE, keyword.replaceAll("/", "\\\\/")));
diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetricsQuery.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetricsQuery.java
index dc8842a..f3eeb61 100644
--- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetricsQuery.java
+++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetricsQuery.java
@@ -82,8 +82,8 @@ public class MetricsQuery implements IMetricsQueryDAO {
}
queryWhereQuery
- .and(gte(InfluxClient.TIME, duration.getStartTimestamp()))
- .and(lte(InfluxClient.TIME, duration.getEndTimestamp()))
+ .and(gte(InfluxClient.TIME, InfluxClient.timeIntervalTS(duration.getStartTimestamp())))
+ .and(lte(InfluxClient.TIME, InfluxClient.timeIntervalTS(duration.getEndTimestamp())))
.groupBy(InfluxConstants.TagName.ENTITY_ID);
List<QueryResult.Series> seriesList = client.queryForSeries(queryWhereQuery);
diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopologyQuery.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopologyQuery.java
index a22ed47..5d8d99a 100644
--- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopologyQuery.java
+++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopologyQuery.java
@@ -194,8 +194,8 @@ public class TopologyQuery implements ITopologyQueryDAO {
.as(ServiceInstanceRelationClientSideMetrics.COMPONENT_ID)
.from(measurement)
.where()
- .and(gte(InfluxClient.TIME, InfluxClient.timeInterval(startTB)))
- .and(lte(InfluxClient.TIME, InfluxClient.timeInterval(endTB)));
+ .and(gte(InfluxClient.TIME, InfluxClient.timeIntervalTB(startTB)))
+ .and(lte(InfluxClient.TIME, InfluxClient.timeIntervalTB(endTB)));
if (!serviceIds.isEmpty()) {
WhereNested whereNested = subQuery.andNested();
@@ -223,8 +223,8 @@ public class TopologyQuery implements ITopologyQueryDAO {
.as(ServiceInstanceRelationClientSideMetrics.COMPONENT_ID)
.from(measurement)
.where()
- .and(gte(InfluxClient.TIME, InfluxClient.timeInterval(startTB)))
- .and(lte(InfluxClient.TIME, InfluxClient.timeInterval(endTB)));
+ .and(gte(InfluxClient.TIME, InfluxClient.timeIntervalTB(startTB)))
+ .and(lte(InfluxClient.TIME, InfluxClient.timeIntervalTB(endTB)));
StringBuilder builder = new StringBuilder("((");
builder.append(sourceCName).append("='").append(sourceServiceId)