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 c04b4e0 Fix distinct in Service/Instance/Endpoint query is not
working. (#7482)
c04b4e0 is described below
commit c04b4e0e513562b7ad0365c8f7fd433825ed2f1e
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Wed Aug 18 20:30:15 2021 +0800
Fix distinct in Service/Instance/Endpoint query is not working. (#7482)
---
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 09f1b63..6ef99ae 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -43,6 +43,7 @@ Release Notes.
* Remove the duplicated tags to reduce the storage payload.
* Add a new API to test log analysis language.
* Harden the security of Groovy-based DSL, MAL and LAL.
+* 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;
