未验证 提交 6ed40b33 编写于 作者: wu-sheng's avatar wu-sheng 提交者: GitHub

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.
上级 ec175f56
Subproject commit 459f78b95168a4d17acae03e892b17bc78f8f4e5
Subproject commit 3f44392c3b3502b4f3066e7ec89c794bc9ffb54d
......@@ -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);
}
......
......@@ -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);
});
......
......@@ -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);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册