kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
吴晟 Wu Sheng 2020-05-26 08:00:03 +08:00 committed by GitHub
parent ec175f5655
commit 6ed40b3395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol

@ -1 +1 @@
Subproject commit 459f78b95168a4d17acae03e892b17bc78f8f4e5
Subproject commit 3f44392c3b3502b4f3066e7ec89c794bc9ffb54d

9
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java
View File

@ -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<String, Object> 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);
}

1
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java
View File

@ -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);
});

1
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java
View File

@ -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);
}