You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/08/18 07:46:48 UTC
[skywalking] 01/01: Fix distinct in Service/Instance/Endpoint query
is not working.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch fix-distinct
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 8818df8694291d41bd82fd7f2db42f09fb0f35fa
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Aug 18 15:46:34 2021 +0800
Fix distinct in Service/Instance/Endpoint query is not working.
---
CHANGES.md | 1 +
.../org/apache/skywalking/oap/server/core/query/type/Database.java | 5 ++---
.../org/apache/skywalking/oap/server/core/query/type/Endpoint.java | 2 ++
.../org/apache/skywalking/oap/server/core/query/type/Service.java | 2 ++
.../skywalking/oap/server/core/query/type/ServiceInstance.java | 2 ++
5 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index cd56ec7..7e19d94 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -41,6 +41,7 @@ Release Notes.
* Add component id for Python falcon plugin.
* Add `rpcStatusCode` for `rpc.status_code` tag. The `responseCode` field is marked as deprecated and replaced by `httpResponseStatusCode` field.
* Remove the duplicated tags to reduce the storage payload.
+* Fix distinct in Service/Instance/Endpoint query is not working.
#### UI
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Database.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Database.java
index 48a8dac..b54c452 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Database.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Database.java
@@ -18,14 +18,13 @@
package org.apache.skywalking.oap.server.core.query.type;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
-/**
- *
- **/
@Getter
@Setter
+@EqualsAndHashCode
public class Database {
private String id;
private String name;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Endpoint.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Endpoint.java
index a6e4b4c..412bc3e 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Endpoint.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Endpoint.java
@@ -18,11 +18,13 @@
package org.apache.skywalking.oap.server.core.query.type;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
+@EqualsAndHashCode
public class Endpoint {
private String id;
private String name;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java
index b517f4b..acdb2c3 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java
@@ -18,11 +18,13 @@
package org.apache.skywalking.oap.server.core.query.type;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
+@EqualsAndHashCode
public class Service {
private String id;
private String name;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/ServiceInstance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/ServiceInstance.java
index 3caa648..47cefea 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/ServiceInstance.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/ServiceInstance.java
@@ -20,11 +20,13 @@ package org.apache.skywalking.oap.server.core.query.type;
import java.util.ArrayList;
import java.util.List;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.apache.skywalking.oap.server.core.query.enumeration.Language;
@Getter
+@EqualsAndHashCode
public class ServiceInstance {
@Setter
private String id;