From 6ed40b33953f4f0d24edaf909c688c969a2c2708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Tue, 26 May 2020 08:00:03 +0800 Subject: [PATCH] Keep ID as ref ID in the readSampledRecords (#4822) * Keep ID as ref ID in the readSampledRecords, as there is no meaningful logic entity, but based on the graphql, the client could request this. --- .../src/main/resources/query-protocol | 2 +- .../elasticsearch/query/TopNRecordsQueryEsDAO.java | 9 ++++++--- .../storage/plugin/influxdb/query/TopNRecordsQuery.java | 1 + .../plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol index 459f78b951..3f44392c3b 160000 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol @@ -1 +1 @@ -Subproject commit 459f78b95168a4d17acae03e892b17bc78f8f4e5 +Subproject commit 3f44392c3b3502b4f3066e7ec89c794bc9ffb54d diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java index c18dc38318..fa177767eb 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java @@ -21,6 +21,7 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.analysis.IDManager; import org.apache.skywalking.oap.server.core.analysis.topn.TopN; @@ -67,9 +68,11 @@ public class TopNRecordsQueryEsDAO extends EsDAO implements ITopNRecordsQueryDAO for (SearchHit searchHit : response.getHits().getHits()) { SelectedRecord record = new SelectedRecord(); - record.setName((String) searchHit.getSourceAsMap().get(TopN.STATEMENT)); - record.setRefId((String) searchHit.getSourceAsMap().get(TopN.TRACE_ID)); - record.setValue(((Number) searchHit.getSourceAsMap().get(valueColumnName)).toString()); + final Map sourceAsMap = searchHit.getSourceAsMap(); + record.setName((String) sourceAsMap.get(TopN.STATEMENT)); + record.setRefId((String) sourceAsMap.get(TopN.TRACE_ID)); + record.setId(record.getRefId()); + record.setValue(((Number) sourceAsMap.get(valueColumnName)).toString()); results.add(record); } diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java index 9f9e56f0ab..d44f4f796a 100644 --- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java +++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java @@ -89,6 +89,7 @@ public class TopNRecordsQuery implements ITopNRecordsQueryDAO { SelectedRecord record = new SelectedRecord(); record.setValue(String.valueOf(values.get(1))); record.setRefId((String) values.get(3)); + record.setId(record.getRefId()); record.setName((String) values.get(2)); records.add(record); }); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java index 058c544f2b..fe34e0ef37 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java @@ -75,6 +75,7 @@ public class H2TopNRecordsQueryDAO implements ITopNRecordsQueryDAO { SelectedRecord record = new SelectedRecord(); record.setName(resultSet.getString(TopN.STATEMENT)); record.setRefId(resultSet.getString(TopN.TRACE_ID)); + record.setId(record.getRefId()); record.setValue(resultSet.getString(valueColumnName)); results.add(record); } -- GitLab