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 6529c1d fix TopologyQuery.loadEndpointRelation bug in InfluxDB
storage (#8187)
6529c1d is described below
commit 6529c1d7aec17b524e640bd5cbfd577c40b50a95
Author: 刘威 <[email protected]>
AuthorDate: Fri Nov 26 23:18:16 2021 +0800
fix TopologyQuery.loadEndpointRelation bug in InfluxDB storage (#8187)
---
CHANGES.md | 1 +
.../oap/server/storage/plugin/influxdb/query/TopologyQuery.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 3d0e041..97f52f7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -58,6 +58,7 @@ Release Notes.
* Add `MeterReportService` `collectBatch` method.
* Add OpenSearch 1.2.0 to test and verify it works.
* Upgrade grpc-java to 1.42.1 and protoc to 3.19.1 to allow using native Mac
osx-aarch_64 artifacts.
+* Fix TopologyQuery.loadEndpointRelation bug.
#### UI
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 da76d51..fd855da 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
@@ -169,9 +169,7 @@ public class TopologyQuery implements ITopologyQueryDAO {
);
subQuery2.and(eq(EndpointRelationServerSideMetrics.SOURCE_ENDPOINT,
destEndpointId));
- final List<Call.CallDetail> calls =
buildEndpointCalls(buildQuery(subQuery), DetectPoint.SERVER);
- calls.addAll(buildEndpointCalls(buildQuery(subQuery),
DetectPoint.CLIENT));
- return calls;
+ return buildEndpointCalls(buildQuery(subQuery), DetectPoint.SERVER);
}
private WhereSubQueryImpl<SelectSubQueryImpl<SelectQueryImpl>,
SelectQueryImpl> buildServiceCallsQuery(
