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/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 7e149ab Metric query. (#1677)
7e149ab is described below
commit 7e149ab3f65626aea7536dbf01b52c646f0d8a72
Author: 彭勇升 pengys <[email protected]>
AuthorDate: Sat Sep 15 15:53:28 2018 +0800
Metric query. (#1677)
---
.../server/core/analysis/indicator/Indicator.java | 1 +
.../core/analysis/indicator/LongAvgIndicator.java | 11 +-
.../analysis/indicator/ThermodynamicIndicator.java | 15 +-
.../oap/server/core/query/DurationPoint.java} | 30 ++-
.../oap/server/core/query/DurationUtils.java | 227 +++++++++++++++++++++
.../oap/server/core/query/MetricQueryService.java | 83 ++++++++
.../server/core/query/entity}/Thermodynamic.java | 9 +-
.../oap/server/core/query/sql/Function.java | 2 +-
.../sql/{IntKeyValues.java => KeyValues.java} | 4 +-
.../oap/server/core/query/sql/Where.java | 2 +-
.../oap/server/core/storage/annotation/Column.java | 5 +
.../annotation/StorageAnnotationListener.java | 12 +-
.../{Column.java => ValueColumnIds.java} | 33 ++-
.../server/core/storage/query/IMetricQueryDAO.java | 12 +-
.../server/core/storage/query/IUniqueQueryDAO.java | 34 ---
.../server/core/storage/query/OneIdGroupValue.java | 31 ---
.../oap/server/core/storage/query/TwoIdGroup.java | 31 ---
.../server/core/storage/query/TwoIdGroupValue.java | 32 ---
.../client/elasticsearch/ElasticSearchClient.java | 7 +
.../oap/query/graphql/GraphQLQueryProvider.java | 2 +-
.../oap/query/graphql/resolver/MetricQuery.java | 44 +++-
.../oap/query/graphql/resolver/TopologyQuery.java | 3 +-
.../query/graphql/type/BatchMetricConditions.java | 9 +-
.../oap/query/graphql/type/MetricCondition.java | 4 +
.../elasticsearch/query/MetricQueryEsDAO.java | 103 +++++-----
.../elasticsearch/query/UniqueQueryEsDAO.java | 68 ------
26 files changed, 499 insertions(+), 315 deletions(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java
index 2faecea..097a8ad 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java
@@ -30,6 +30,7 @@ import
org.apache.skywalking.oap.server.core.storage.annotation.Column;
public abstract class Indicator extends StreamData implements StorageData {
public static final String TIME_BUCKET = "time_bucket";
+ public static final String ENTITY_ID = "entity_id";
@Getter @Setter @Column(columnName = TIME_BUCKET) private long timeBucket;
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java
index ecb1b66..bb7d789 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java
@@ -18,12 +18,9 @@
package org.apache.skywalking.oap.server.core.analysis.indicator;
-import lombok.Getter;
-import lombok.Setter;
-import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.ConstOne;
-import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance;
-import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator;
-import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.SourceFrom;
+import lombok.*;
+import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*;
+import org.apache.skywalking.oap.server.core.query.sql.Function;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
/**
@@ -38,7 +35,7 @@ public abstract class LongAvgIndicator extends Indicator
implements LongValueHol
@Getter @Setter @Column(columnName = SUMMATION) private long summation;
@Getter @Setter @Column(columnName = COUNT) private int count;
- @Getter @Setter @Column(columnName = VALUE) private long value;
+ @Getter @Setter @Column(columnName = VALUE, isValue = true, function =
Function.Avg) private long value;
@Entrance
public final void combine(@SourceFrom long summation, @ConstOne int count)
{
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicator.java
index 518a16b..acc35d3 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicator.java
@@ -18,16 +18,9 @@
package org.apache.skywalking.oap.server.core.analysis.indicator;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Arg;
-import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance;
-import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator;
-import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.SourceFrom;
+import java.util.*;
+import lombok.*;
+import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
/**
@@ -44,7 +37,7 @@ import
org.apache.skywalking.oap.server.core.storage.annotation.Column;
public abstract class ThermodynamicIndicator extends Indicator {
protected static final String DETAIL_GROUP = "detail_group";
protected static final String STEP = "step";
- protected static final String NUM_OF_STEPS = "num_of_steps";
+ public static final String NUM_OF_STEPS = "num_of_steps";
@Getter @Setter @Column(columnName = STEP) private int step = 0;
@Getter @Setter @Column(columnName = NUM_OF_STEPS) private int numOfSteps
= 0;
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/util/DurationUtils.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationPoint.java
similarity index 59%
rename from
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/util/DurationUtils.java
rename to
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationPoint.java
index ec83b06..e086e56 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/util/DurationUtils.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationPoint.java
@@ -16,19 +16,31 @@
*
*/
-package org.apache.skywalking.oap.query.graphql.util;
-
-import org.apache.skywalking.oap.server.core.Const;
+package org.apache.skywalking.oap.server.core.query;
/**
* @author peng-yongsheng
*/
-public enum DurationUtils {
- INSTANCE;
+public class DurationPoint {
+ private long point;
+ private long secondsBetween;
+ private long minutesBetween;
+
+ public DurationPoint(long point, long secondsBetween, long minutesBetween)
{
+ this.point = point;
+ this.secondsBetween = secondsBetween;
+ this.minutesBetween = minutesBetween;
+ }
+
+ public long getPoint() {
+ return point;
+ }
+
+ public long getSecondsBetween() {
+ return secondsBetween;
+ }
- public long exchangeToTimeBucket(String dateStr) {
- dateStr = dateStr.replaceAll("-", Const.EMPTY_STRING);
- dateStr = dateStr.replaceAll(" ", Const.EMPTY_STRING);
- return Long.valueOf(dateStr);
+ public long getMinutesBetween() {
+ return minutesBetween;
}
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java
new file mode 100644
index 0000000..b79d82d
--- /dev/null
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java
@@ -0,0 +1,227 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.oap.server.core.query;
+
+import java.text.*;
+import java.util.*;
+import org.apache.skywalking.oap.server.core.*;
+import org.apache.skywalking.oap.server.core.query.entity.Step;
+import org.joda.time.*;
+
+/**
+ * @author peng-yongsheng
+ */
+public enum DurationUtils {
+ INSTANCE;
+
+ public long exchangeToTimeBucket(String dateStr) {
+ dateStr = dateStr.replaceAll("-", Const.EMPTY_STRING);
+ dateStr = dateStr.replaceAll(" ", Const.EMPTY_STRING);
+ return Long.valueOf(dateStr);
+ }
+
+ public long startTimeDurationToSecondTimeBucket(Step step, String dateStr)
{
+ long secondTimeBucket = 0;
+ switch (step) {
+ case MONTH:
+ secondTimeBucket = exchangeToTimeBucket(dateStr) * 100 * 100 *
100 * 100;
+ break;
+ case DAY:
+ secondTimeBucket = exchangeToTimeBucket(dateStr) * 100 * 100 *
100;
+ break;
+ case HOUR:
+ secondTimeBucket = exchangeToTimeBucket(dateStr) * 100 * 100;
+ break;
+ case MINUTE:
+ secondTimeBucket = exchangeToTimeBucket(dateStr) * 100;
+ break;
+ case SECOND:
+ secondTimeBucket = exchangeToTimeBucket(dateStr);
+ break;
+ }
+ return secondTimeBucket;
+ }
+
+ public long endTimeDurationToSecondTimeBucket(Step step, String dateStr) {
+ long secondTimeBucket = 0;
+ switch (step) {
+ case MONTH:
+ secondTimeBucket = (((exchangeToTimeBucket(dateStr) * 100 +
99) * 100 + 99) * 100 + 99) * 100 + 99;
+ break;
+ case DAY:
+ secondTimeBucket = ((exchangeToTimeBucket(dateStr) * 100 + 99)
* 100 + 99) * 100 + 99;
+ break;
+ case HOUR:
+ secondTimeBucket = (exchangeToTimeBucket(dateStr) * 100 + 99)
* 100 + 99;
+ break;
+ case MINUTE:
+ secondTimeBucket = exchangeToTimeBucket(dateStr) * 100 + 99;
+ break;
+ case SECOND:
+ secondTimeBucket = exchangeToTimeBucket(dateStr);
+ break;
+ }
+ return secondTimeBucket;
+ }
+
+ public int minutesBetween(Step step, long startTimeBucket, long
endTimeBucket) throws ParseException {
+ Date startDate = formatDate(step, startTimeBucket);
+ Date endDate = formatDate(step, endTimeBucket);
+
+ return Minutes.minutesBetween(new DateTime(startDate), new
DateTime(endDate)).getMinutes();
+ }
+
+ public int minutesBetween(Step step, DateTime dateTime) {
+ switch (step) {
+ case MONTH:
+ return dateTime.dayOfMonth().getMaximumValue() * 24 * 60;
+ case DAY:
+ return 24 * 60;
+ case HOUR:
+ return 60;
+ case MINUTE:
+ return 1;
+ case SECOND:
+ return 1;
+ default:
+ return 1;
+ }
+ }
+
+ public int secondsBetween(Step step, long startTimeBucket, long
endTimeBucket) throws ParseException {
+ Date startDate = formatDate(step, startTimeBucket);
+ Date endDate = formatDate(step, endTimeBucket);
+
+ return Seconds.secondsBetween(new DateTime(startDate), new
DateTime(endDate)).getSeconds();
+ }
+
+ public int secondsBetween(Step step, DateTime dateTime) {
+ switch (step) {
+ case MONTH:
+ return dateTime.dayOfMonth().getMaximumValue() * 24 * 60 * 60;
+ case DAY:
+ return 24 * 60 * 60;
+ case HOUR:
+ return 60 * 60;
+ case MINUTE:
+ return 60;
+ case SECOND:
+ return 1;
+ default:
+ return 1;
+ }
+ }
+
+ private Date formatDate(Step step, long timeBucket) throws ParseException {
+ Date date = null;
+ switch (step) {
+ case MONTH:
+ date = new
SimpleDateFormat("yyyyMM").parse(String.valueOf(timeBucket));
+ break;
+ case DAY:
+ date = new
SimpleDateFormat("yyyyMMdd").parse(String.valueOf(timeBucket));
+ break;
+ case HOUR:
+ date = new
SimpleDateFormat("yyyyMMddHH").parse(String.valueOf(timeBucket));
+ break;
+ case MINUTE:
+ date = new
SimpleDateFormat("yyyyMMddHHmm").parse(String.valueOf(timeBucket));
+ break;
+ case SECOND:
+ date = new
SimpleDateFormat("yyyyMMddHHmmss").parse(String.valueOf(timeBucket));
+ break;
+ }
+ return date;
+ }
+
+ public DateTime parseToDateTime(Step step, long time) throws
ParseException {
+ DateTime dateTime = null;
+
+ switch (step) {
+ case MONTH:
+ Date date = new
SimpleDateFormat("yyyyMM").parse(String.valueOf(time));
+ dateTime = new DateTime(date);
+ break;
+ case DAY:
+ date = new
SimpleDateFormat("yyyyMMdd").parse(String.valueOf(time));
+ dateTime = new DateTime(date);
+ break;
+ case HOUR:
+ date = new
SimpleDateFormat("yyyyMMddHH").parse(String.valueOf(time));
+ dateTime = new DateTime(date);
+ break;
+ case MINUTE:
+ date = new
SimpleDateFormat("yyyyMMddHHmm").parse(String.valueOf(time));
+ dateTime = new DateTime(date);
+ break;
+ case SECOND:
+ date = new
SimpleDateFormat("yyyyMMddHHmmss").parse(String.valueOf(time));
+ dateTime = new DateTime(date);
+ break;
+ }
+
+ return dateTime;
+ }
+
+ public List<DurationPoint> getDurationPoints(Step step, long
startTimeBucket,
+ long endTimeBucket) throws ParseException {
+ DateTime dateTime = parseToDateTime(step, startTimeBucket);
+
+ List<DurationPoint> durations = new LinkedList<>();
+ durations.add(new DurationPoint(startTimeBucket, secondsBetween(step,
dateTime), minutesBetween(step, dateTime)));
+
+ int i = 0;
+ do {
+ switch (step) {
+ case MONTH:
+ dateTime = dateTime.plusMonths(1);
+ String timeBucket = new
SimpleDateFormat("yyyyMM").format(dateTime.toDate());
+ durations.add(new DurationPoint(Long.valueOf(timeBucket),
secondsBetween(step, dateTime), minutesBetween(step, dateTime)));
+ break;
+ case DAY:
+ dateTime = dateTime.plusDays(1);
+ timeBucket = new
SimpleDateFormat("yyyyMMdd").format(dateTime.toDate());
+ durations.add(new DurationPoint(Long.valueOf(timeBucket),
secondsBetween(step, dateTime), minutesBetween(step, dateTime)));
+ break;
+ case HOUR:
+ dateTime = dateTime.plusHours(1);
+ timeBucket = new
SimpleDateFormat("yyyyMMddHH").format(dateTime.toDate());
+ durations.add(new DurationPoint(Long.valueOf(timeBucket),
secondsBetween(step, dateTime), minutesBetween(step, dateTime)));
+ break;
+ case MINUTE:
+ dateTime = dateTime.plusMinutes(1);
+ timeBucket = new
SimpleDateFormat("yyyyMMddHHmm").format(dateTime.toDate());
+ durations.add(new DurationPoint(Long.valueOf(timeBucket),
secondsBetween(step, dateTime), minutesBetween(step, dateTime)));
+ break;
+ case SECOND:
+ dateTime = dateTime.plusSeconds(1);
+ timeBucket = new
SimpleDateFormat("yyyyMMddHHmmss").format(dateTime.toDate());
+ durations.add(new DurationPoint(Long.valueOf(timeBucket),
secondsBetween(step, dateTime), minutesBetween(step, dateTime)));
+ break;
+ }
+ i++;
+ if (i > 500) {
+ throw new UnexpectedException("Duration data error, step: " +
step.name() + ", start: " + startTimeBucket + ", end: " + endTimeBucket);
+ }
+ }
+ while (endTimeBucket != durations.get(durations.size() -
1).getPoint());
+
+ return durations;
+ }
+}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java
new file mode 100644
index 0000000..4c8a841
--- /dev/null
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.oap.server.core.query;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.*;
+import org.apache.skywalking.oap.server.core.Const;
+import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
+import org.apache.skywalking.oap.server.core.query.entity.*;
+import org.apache.skywalking.oap.server.core.query.sql.*;
+import org.apache.skywalking.oap.server.core.storage.StorageModule;
+import org.apache.skywalking.oap.server.core.storage.annotation.ValueColumnIds;
+import org.apache.skywalking.oap.server.core.storage.query.IMetricQueryDAO;
+import org.apache.skywalking.oap.server.library.module.*;
+import org.slf4j.*;
+
+/**
+ * @author peng-yongsheng
+ */
+public class MetricQueryService implements Service {
+
+ private static final Logger logger =
LoggerFactory.getLogger(MetricQueryService.class);
+
+ private final ModuleManager moduleManager;
+ private IMetricQueryDAO metricQueryDAO;
+
+ public MetricQueryService(ModuleManager moduleManager) {
+ this.moduleManager = moduleManager;
+ }
+
+ private IMetricQueryDAO getMetricQueryDAO() {
+ if (metricQueryDAO == null) {
+ metricQueryDAO =
moduleManager.find(StorageModule.NAME).getService(IMetricQueryDAO.class);
+ }
+ return metricQueryDAO;
+ }
+
+ public IntValues getValues(final String indName, final List<String> ids,
final Step step, final long startTB,
+ final long endTB) throws IOException {
+ Where where = new Where();
+ KeyValues intKeyValues = new KeyValues();
+ intKeyValues.setKey(Indicator.ENTITY_ID);
+ where.getKeyValues().add(intKeyValues);
+ ids.forEach(intKeyValues.getValues()::add);
+
+ return getMetricQueryDAO().getValues(indName, step, startTB, endTB,
where, ValueColumnIds.INSTANCE.getValueCName(indName),
ValueColumnIds.INSTANCE.getValueFunction(indName));
+ }
+
+ public IntValues getLinearIntValues(final String indName, final String id,
final Step step, final long startTB,
+ final long endTB) throws IOException, ParseException {
+ List<DurationPoint> durationPoints =
DurationUtils.INSTANCE.getDurationPoints(step, startTB, endTB);
+ List<String> ids = new ArrayList<>();
+ durationPoints.forEach(durationPoint ->
ids.add(durationPoint.getPoint() + Const.ID_SPLIT + id));
+
+ return getMetricQueryDAO().getLinearIntValues(indName, step, ids,
ValueColumnIds.INSTANCE.getValueCName(indName));
+ }
+
+ public Thermodynamic getThermodynamic(final String indName, final String
id, final Step step, final long startTB,
+ final long endTB) throws IOException, ParseException {
+ List<DurationPoint> durationPoints =
DurationUtils.INSTANCE.getDurationPoints(step, startTB, endTB);
+ List<String> ids = new ArrayList<>();
+ durationPoints.forEach(durationPoint ->
ids.add(durationPoint.getPoint() + Const.ID_SPLIT + id));
+
+ return getMetricQueryDAO().getThermodynamic(indName, step, ids,
ValueColumnIds.INSTANCE.getValueCName(indName));
+ }
+}
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Thermodynamic.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Thermodynamic.java
similarity index 83%
rename from
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Thermodynamic.java
rename to
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Thermodynamic.java
index 9c0f773..5cd65d3 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Thermodynamic.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Thermodynamic.java
@@ -16,11 +16,14 @@
*
*/
-package org.apache.skywalking.oap.query.graphql.type;
+package org.apache.skywalking.oap.server.core.query.entity;
-import java.util.List;
+import java.util.*;
+import lombok.*;
+@Getter
+@Setter
public class Thermodynamic {
- private List<List<Long>> nodes;
+ private List<List<Long>> nodes = new ArrayList<>();
private int axisYStep;
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java
index bce985e..eb59451 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java
@@ -22,5 +22,5 @@ package org.apache.skywalking.oap.server.core.query.sql;
* @author peng-yongsheng
*/
public enum Function {
- Avg, Sum
+ None, Avg, Sum
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/IntKeyValues.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/KeyValues.java
similarity index 91%
rename from
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/IntKeyValues.java
rename to
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/KeyValues.java
index c0a2745..6cb5d76 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/IntKeyValues.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/KeyValues.java
@@ -24,7 +24,7 @@ import lombok.*;
/**
* @author peng-yongsheng
*/
-public class IntKeyValues {
+public class KeyValues {
@Getter @Setter private String key;
- @Getter private List<Integer> values = new LinkedList<>();
+ @Getter private List<String> values = new LinkedList<>();
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Where.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Where.java
index 62672a5..ad7cf65 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Where.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Where.java
@@ -26,5 +26,5 @@ import lombok.Getter;
*/
@Getter
public class Where {
- private List<IntKeyValues> keyValues = new LinkedList<>();
+ private List<KeyValues> keyValues = new LinkedList<>();
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java
index adbf45e..1a9ee73 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java
@@ -19,6 +19,7 @@
package org.apache.skywalking.oap.server.core.storage.annotation;
import java.lang.annotation.*;
+import org.apache.skywalking.oap.server.core.query.sql.Function;
/**
* @author peng-yongsheng
@@ -28,6 +29,10 @@ import java.lang.annotation.*;
public @interface Column {
String columnName();
+ boolean isValue() default false;
+
+ Function function() default Function.None;
+
boolean matchQuery() default false;
boolean termQuery() default true;
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageAnnotationListener.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageAnnotationListener.java
index fe134aa..e003995 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageAnnotationListener.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageAnnotationListener.java
@@ -46,14 +46,15 @@ public class StorageAnnotationListener implements
AnnotationListener, IModelGett
@Override public void notify(Class aClass) {
logger.info("The owner class of storage annotation, class name: {}",
aClass.getName());
+ String modelName = StorageEntityAnnotationUtils.getModelName(aClass);
+
List<ModelColumn> modelColumns = new LinkedList<>();
- retrieval(aClass, modelColumns);
+ retrieval(aClass, modelName, modelColumns);
- String modelName = StorageEntityAnnotationUtils.getModelName(aClass);
models.add(new Model(modelName, modelColumns));
}
- private void retrieval(Class clazz, List<ModelColumn> modelColumns) {
+ private void retrieval(Class clazz, String modelName, List<ModelColumn>
modelColumns) {
Field[] fields = clazz.getDeclaredFields();
for (Field field : fields) {
@@ -63,11 +64,14 @@ public class StorageAnnotationListener implements
AnnotationListener, IModelGett
if (logger.isDebugEnabled()) {
logger.debug("The field named {} with the {} type",
column.columnName(), field.getType());
}
+ if (column.isValue()) {
+ ValueColumnIds.INSTANCE.putIfAbsent(modelName,
column.columnName(), column.function());
+ }
}
}
if (Objects.nonNull(clazz.getSuperclass())) {
- retrieval(clazz.getSuperclass(), modelColumns);
+ retrieval(clazz.getSuperclass(), modelName, modelColumns);
}
}
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnIds.java
similarity index 51%
copy from
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java
copy to
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnIds.java
index adbf45e..b25622c 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnIds.java
@@ -18,17 +18,36 @@
package org.apache.skywalking.oap.server.core.storage.annotation;
-import java.lang.annotation.*;
+import java.util.*;
+import org.apache.skywalking.oap.server.core.query.sql.Function;
/**
* @author peng-yongsheng
*/
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Column {
- String columnName();
+public enum ValueColumnIds {
+ INSTANCE;
- boolean matchQuery() default false;
+ private Map<String, ValueColumn> mapping = new HashMap<>();
- boolean termQuery() default true;
+ public void putIfAbsent(String indName, String valueCName, Function
function) {
+ mapping.putIfAbsent(indName, new ValueColumn(valueCName, function));
+ }
+
+ public String getValueCName(String indName) {
+ return mapping.get(indName).valueCName;
+ }
+
+ public Function getValueFunction(String indName) {
+ return mapping.get(indName).function;
+ }
+
+ class ValueColumn {
+ private final String valueCName;
+ private final Function function;
+
+ private ValueColumn(String valueCName, Function function) {
+ this.valueCName = valueCName;
+ this.function = function;
+ }
+ }
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricQueryDAO.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricQueryDAO.java
index 7165069..1ea0ca1 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricQueryDAO.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricQueryDAO.java
@@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.storage.query;
import java.io.IOException;
import java.util.List;
-import org.apache.skywalking.oap.server.core.query.entity.Step;
+import org.apache.skywalking.oap.server.core.query.entity.*;
import org.apache.skywalking.oap.server.core.query.sql.*;
import org.apache.skywalking.oap.server.core.storage.DAO;
@@ -29,10 +29,10 @@ import org.apache.skywalking.oap.server.core.storage.DAO;
*/
public interface IMetricQueryDAO extends DAO {
- List<OneIdGroupValue> aggregation(String indName, Step step, long startTB,
- long endTB, Where where, String idCName, String valueCName, Function
function) throws IOException;
+ IntValues getValues(String indName, Step step, long startTB,
+ long endTB, Where where, String valueCName, Function function) throws
IOException;
- List<TwoIdGroupValue> aggregation(String indName, Step step, long startTB,
- long endTB, Where where, String idCName1, String idCName2, String
valueCName,
- Function function) throws IOException;
+ IntValues getLinearIntValues(String indName, Step step, List<String> ids,
String valueCName) throws IOException;
+
+ Thermodynamic getThermodynamic(String indName, Step step, List<String>
ids, String valueCName) throws IOException;
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IUniqueQueryDAO.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IUniqueQueryDAO.java
deleted file mode 100644
index 8ba1fc1..0000000
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IUniqueQueryDAO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.oap.server.core.storage.query;
-
-import java.io.IOException;
-import java.util.List;
-import org.apache.skywalking.oap.server.core.query.entity.Step;
-import org.apache.skywalking.oap.server.core.query.sql.Where;
-import org.apache.skywalking.oap.server.core.storage.DAO;
-
-/**
- * @author peng-yongsheng
- */
-public interface IUniqueQueryDAO extends DAO {
-
- List<TwoIdGroup> aggregation(String indName, Step step, long startTB,
- long endTB, Where where, String idCName1, String idCName2) throws
IOException;
-}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/OneIdGroupValue.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/OneIdGroupValue.java
deleted file mode 100644
index bc1370a..0000000
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/OneIdGroupValue.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.oap.server.core.storage.query;
-
-import lombok.*;
-
-/**
- * @author peng-yongsheng
- */
-@Getter
-@Setter
-public class OneIdGroupValue {
- private int id;
- private Number value;
-}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/TwoIdGroup.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/TwoIdGroup.java
deleted file mode 100644
index 1638092..0000000
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/TwoIdGroup.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.oap.server.core.storage.query;
-
-import lombok.*;
-
-/**
- * @author peng-yongsheng
- */
-@Getter
-@Setter
-public class TwoIdGroup {
- private int id1;
- private int id2;
-}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/TwoIdGroupValue.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/TwoIdGroupValue.java
deleted file mode 100644
index add34d6..0000000
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/TwoIdGroupValue.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.oap.server.core.storage.query;
-
-import lombok.*;
-
-/**
- * @author peng-yongsheng
- */
-@Getter
-@Setter
-public class TwoIdGroupValue {
- private int id1;
- private int id2;
- private Number value;
-}
diff --git
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
index 5df57f6..7dd9adf 100644
---
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
+++
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
@@ -128,6 +128,13 @@ public class ElasticSearchClient implements Client {
return client.get(request);
}
+ public MultiGetResponse multiGet(String indexName, List<String> ids)
throws IOException {
+ final String newIndexName = formatIndexName(indexName);
+ MultiGetRequest request = new MultiGetRequest();
+ ids.forEach(id -> request.add(newIndexName, TYPE, id));
+ return client.multiGet(request);
+ }
+
public void forceInsert(String indexName, String id, XContentBuilder
source) throws IOException {
IndexRequest request = prepareInsert(indexName, id, source);
request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java
index 4525fe4..b2e4bfc 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java
@@ -57,7 +57,7 @@ public class GraphQLQueryProvider extends ModuleProvider {
.file("query-protocol/metadata.graphqls")
.resolvers(new MetadataQuery())
.file("query-protocol/metric.graphqls")
- .resolvers(new MetricQuery())
+ .resolvers(new MetricQuery(getManager()))
.file("query-protocol/topology.graphqls")
.resolvers(new TopologyQuery(getManager()))
.file("query-protocol/trace.graphqls")
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java
index 7744463..618ca0d 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java
@@ -19,20 +19,50 @@
package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver;
+import java.io.IOException;
+import java.text.ParseException;
import org.apache.skywalking.oap.query.graphql.type.*;
-import org.apache.skywalking.oap.server.core.query.entity.IntValues;
+import org.apache.skywalking.oap.server.core.CoreModule;
+import org.apache.skywalking.oap.server.core.query.*;
+import org.apache.skywalking.oap.server.core.query.entity.*;
+import org.apache.skywalking.oap.server.library.module.ModuleManager;
public class MetricQuery implements GraphQLQueryResolver {
- public IntValues getValues(final BatchMetricConditions metric, final
Duration duration) {
- return new IntValues();
+ private final ModuleManager moduleManager;
+ private MetricQueryService metricQueryService;
+
+ public MetricQuery(ModuleManager moduleManager) {
+ this.moduleManager = moduleManager;
+ }
+
+ private MetricQueryService getMetricQueryService() {
+ if (metricQueryService == null) {
+ this.metricQueryService =
moduleManager.find(CoreModule.NAME).getService(MetricQueryService.class);
+ }
+ return metricQueryService;
+ }
+
+ public IntValues getValues(final BatchMetricConditions metric, final
Duration duration) throws IOException {
+ long startTimeBucket =
DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart());
+ long endTimeBucket =
DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd());
+
+ return getMetricQueryService().getValues(metric.getName(),
metric.getIds(), duration.getStep(), startTimeBucket, endTimeBucket);
}
- public IntValues getLinearIntValues(final MetricCondition metric, final
Duration duration) {
- return new IntValues();
+ public IntValues getLinearIntValues(final MetricCondition metric,
+ final Duration duration) throws IOException, ParseException {
+ long startTimeBucket =
DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart());
+ long endTimeBucket =
DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd());
+
+ return getMetricQueryService().getLinearIntValues(metric.getName(),
metric.getId(), duration.getStep(), startTimeBucket, endTimeBucket);
}
- public Thermodynamic getThermodynamic(final MetricCondition metric, final
Duration duration) {
- return new Thermodynamic();
+ public Thermodynamic getThermodynamic(final MetricCondition metric,
+ final Duration duration) throws IOException, ParseException {
+ long startTimeBucket =
DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart());
+ long endTimeBucket =
DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd());
+
+ return getMetricQueryService().getThermodynamic(metric.getName(),
metric.getId(), duration.getStep(), startTimeBucket, endTimeBucket);
}
}
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java
index 185e858..454d9b7 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java
@@ -21,9 +21,8 @@ package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver;
import java.io.IOException;
import org.apache.skywalking.oap.query.graphql.type.Duration;
-import org.apache.skywalking.oap.query.graphql.util.DurationUtils;
import org.apache.skywalking.oap.server.core.CoreModule;
-import org.apache.skywalking.oap.server.core.query.TopologyQueryService;
+import org.apache.skywalking.oap.server.core.query.*;
import org.apache.skywalking.oap.server.core.query.entity.Topology;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java
index b028f75..420ef7f 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java
@@ -17,11 +17,14 @@
*/
package org.apache.skywalking.oap.query.graphql.type;
-import java.util.List;
+import java.util.*;
+import lombok.Getter;
/**
- * @author liu-xinyuan
+ * @author liu-xinyuan
**/
+@Getter
public class BatchMetricConditions {
- private List<MetricCondition> metricConditions;
+ private String name;
+ private List<String> ids = new ArrayList<>();
}
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/MetricCondition.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/MetricCondition.java
index 5650a81..6692962 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/MetricCondition.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/MetricCondition.java
@@ -18,6 +18,10 @@
package org.apache.skywalking.oap.query.graphql.type;
+import lombok.*;
+
+@Getter
+@Setter
public class MetricCondition {
private String id;
private String name;
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
index bb90cbf..60eda38 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
@@ -20,12 +20,14 @@ package
org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query;
import java.io.IOException;
import java.util.*;
-import org.apache.skywalking.oap.server.core.query.entity.Step;
+import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
+import org.apache.skywalking.oap.server.core.query.entity.*;
import org.apache.skywalking.oap.server.core.query.sql.*;
import
org.apache.skywalking.oap.server.core.storage.TimePyramidTableNameBuilder;
-import org.apache.skywalking.oap.server.core.storage.query.*;
+import org.apache.skywalking.oap.server.core.storage.query.IMetricQueryDAO;
import
org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
import
org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO;
+import org.elasticsearch.action.get.*;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.search.aggregations.AggregationBuilders;
import org.elasticsearch.search.aggregations.bucket.terms.*;
@@ -40,73 +42,32 @@ public class MetricQueryEsDAO extends EsDAO implements
IMetricQueryDAO {
super(client);
}
- public List<OneIdGroupValue> aggregation(String indName, Step step, long
startTB,
- long endTB, Where where, String idCName, String valueCName, Function
function) throws IOException {
+ public IntValues getValues(String indName, Step step, long startTB, long
endTB, Where where, String valueCName,
+ Function function) throws IOException {
String indexName = TimePyramidTableNameBuilder.build(step, indName);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
queryBuild(sourceBuilder, where, startTB, endTB);
- TermsAggregationBuilder aggIdCName1 =
AggregationBuilders.terms(idCName).field(idCName).size(1000);
- functionAggregation(function, aggIdCName1, valueCName);
+ TermsAggregationBuilder entityIdAggregation =
AggregationBuilders.terms(Indicator.ENTITY_ID).field(Indicator.ENTITY_ID).size(1000);
+ functionAggregation(function, entityIdAggregation, valueCName);
- sourceBuilder.aggregation(aggIdCName1);
+ sourceBuilder.aggregation(entityIdAggregation);
SearchResponse response = getClient().search(indexName, sourceBuilder);
- List<OneIdGroupValue> values = new ArrayList<>();
- Terms idTerms = response.getAggregations().get(idCName);
+ IntValues intValues = new IntValues();
+ Terms idTerms = response.getAggregations().get(Indicator.ENTITY_ID);
for (Terms.Bucket idBucket : idTerms.getBuckets()) {
Terms valueTerms = idBucket.getAggregations().get(valueCName);
for (Terms.Bucket valueBucket : valueTerms.getBuckets()) {
- OneIdGroupValue value = new OneIdGroupValue();
- value.setId(idBucket.getKeyAsNumber().intValue());
- value.setValue(valueBucket.getKeyAsNumber());
- values.add(value);
+ KVInt value = new KVInt();
+ value.setId(idBucket.getKeyAsString());
+ value.setValue(valueBucket.getKeyAsNumber().intValue());
+ intValues.getValues().add(value);
}
}
- return values;
- }
-
- public List<TwoIdGroupValue> aggregation(String indName, Step step, long
startTB,
- long endTB, Where where, String idCName1, String idCName2, String
valueCName,
- Function function) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, indName);
-
- SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
- queryBuild(sourceBuilder, where, startTB, endTB);
-
- sourceBuilder.aggregation(
- AggregationBuilders.terms(idCName1).field(idCName1).size(1000)
-
.subAggregation(AggregationBuilders.terms(idCName2).field(idCName2).size(1000)
-
.subAggregation(AggregationBuilders.avg(valueCName).field(valueCName)))
- );
-
- TermsAggregationBuilder aggIdCName1 =
AggregationBuilders.terms(idCName1).field(idCName1).size(1000);
- TermsAggregationBuilder aggIdCName2 =
AggregationBuilders.terms(idCName2).field(idCName2).size(1000);
- aggIdCName1.subAggregation(aggIdCName2);
- functionAggregation(function, aggIdCName2, valueCName);
-
- sourceBuilder.aggregation(aggIdCName1);
-
- SearchResponse response = getClient().search(indexName, sourceBuilder);
-
- List<TwoIdGroupValue> values = new ArrayList<>();
- Terms id1Terms = response.getAggregations().get(idCName1);
- for (Terms.Bucket id1Bucket : id1Terms.getBuckets()) {
- Terms id2Terms = id1Bucket.getAggregations().get(idCName2);
- for (Terms.Bucket id2Bucket : id2Terms.getBuckets()) {
- Terms valueTerms = id1Bucket.getAggregations().get(valueCName);
- for (Terms.Bucket valueBucket : valueTerms.getBuckets()) {
- TwoIdGroupValue value = new TwoIdGroupValue();
- value.setId1(id1Bucket.getKeyAsNumber().intValue());
- value.setId1(id2Bucket.getKeyAsNumber().intValue());
- value.setValue(valueBucket.getKeyAsNumber());
- values.add(value);
- }
- }
- }
- return values;
+ return intValues;
}
private void functionAggregation(Function function,
TermsAggregationBuilder parentAggBuilder, String valueCName) {
@@ -119,4 +80,36 @@ public class MetricQueryEsDAO extends EsDAO implements
IMetricQueryDAO {
break;
}
}
+
+ @Override public IntValues getLinearIntValues(String indName, Step step,
List<String> ids,
+ String valueCName) throws IOException {
+ String indexName = TimePyramidTableNameBuilder.build(step, indName);
+
+ MultiGetResponse response = getClient().multiGet(indexName, ids);
+
+ IntValues intValues = new IntValues();
+ for (MultiGetItemResponse itemResponse : response.getResponses()) {
+ int value =
((Number)itemResponse.getResponse().getSource().getOrDefault(valueCName,
0)).intValue();
+
+ KVInt kvInt = new KVInt();
+ kvInt.setId(itemResponse.getId());
+ kvInt.setValue(value);
+ intValues.getValues().add(kvInt);
+ }
+ return intValues;
+ }
+
+ @Override public Thermodynamic getThermodynamic(String indName, Step step,
List<String> ids,
+ String valueCName) throws IOException {
+ String indexName = TimePyramidTableNameBuilder.build(step, indName);
+
+ MultiGetResponse response = getClient().multiGet(indexName, ids);
+
+ Thermodynamic thermodynamic = new Thermodynamic();
+ for (MultiGetItemResponse itemResponse : response.getResponses()) {
+ List<Long> axisYValues = new ArrayList<>();
+ thermodynamic.getNodes().add(axisYValues);
+ }
+ return thermodynamic;
+ }
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/UniqueQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/UniqueQueryEsDAO.java
deleted file mode 100644
index ef3b4ff..0000000
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/UniqueQueryEsDAO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query;
-
-import java.io.IOException;
-import java.util.*;
-import org.apache.skywalking.oap.server.core.query.entity.Step;
-import org.apache.skywalking.oap.server.core.query.sql.Where;
-import
org.apache.skywalking.oap.server.core.storage.TimePyramidTableNameBuilder;
-import org.apache.skywalking.oap.server.core.storage.query.*;
-import
org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
-import
org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.builder.SearchSourceBuilder;
-
-/**
- * @author peng-yongsheng
- */
-public class UniqueQueryEsDAO extends EsDAO implements IUniqueQueryDAO {
-
- public UniqueQueryEsDAO(ElasticSearchClient client) {
- super(client);
- }
-
- @Override public List<TwoIdGroup> aggregation(String indName, Step step,
long startTB, long endTB, Where where,
- String idCName1, String idCName2) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, indName);
-
- SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
- queryBuild(sourceBuilder, where, startTB, endTB);
-
-
sourceBuilder.aggregation(AggregationBuilders.terms(idCName1).field(idCName1).size(1000)
-
.subAggregation(AggregationBuilders.terms(idCName2).field(idCName2).size(1000)));
-
- SearchResponse response = getClient().search(indexName, sourceBuilder);
-
- List<TwoIdGroup> values = new ArrayList<>();
- Terms id1Terms = response.getAggregations().get(idCName1);
- for (Terms.Bucket id1Bucket : id1Terms.getBuckets()) {
- Terms id2Terms = id1Bucket.getAggregations().get(idCName2);
- for (Terms.Bucket id2Bucket : id2Terms.getBuckets()) {
- TwoIdGroup value = new TwoIdGroup();
- value.setId1(id1Bucket.getKeyAsNumber().intValue());
- value.setId2(id2Bucket.getKeyAsNumber().intValue());
- values.add(value);
- }
- }
- return values;
- }
-}
