You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2022/10/31 13:55:52 UTC
[skywalking-banyandb-java-client] 01/01: Improve single condition criteria
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch criteria
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-java-client.git
commit 967290497178985d84285b3fc3f811367e256087
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Mon Oct 31 21:55:17 2022 +0800
Improve single condition criteria
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
.../banyandb/v1/client/AbstractQuery.java | 3 ++
.../v1/client/BanyanDBClientMeasureQueryTest.java | 17 ++++--------
.../v1/client/BanyanDBClientStreamQueryTest.java | 32 ++++++++--------------
3 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/apache/skywalking/banyandb/v1/client/AbstractQuery.java b/src/main/java/org/apache/skywalking/banyandb/v1/client/AbstractQuery.java
index 1de4476..99c7675 100644
--- a/src/main/java/org/apache/skywalking/banyandb/v1/client/AbstractQuery.java
+++ b/src/main/java/org/apache/skywalking/banyandb/v1/client/AbstractQuery.java
@@ -124,6 +124,9 @@ public abstract class AbstractQuery<T> {
if (conditions.isEmpty()) {
return Optional.empty();
}
+ if (conditions.size() == 1) {
+ return Optional.of(conditions.get(0).cond().build());
+ }
return Optional.of(conditions.stream()
.reduce(null, (criteria, logicalExpression) -> {
BanyandbModel.LogicalExpression.Builder b = BanyandbModel.LogicalExpression.newBuilder();
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientMeasureQueryTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientMeasureQueryTest.java
index a2e8159..7b04c11 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientMeasureQueryTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientMeasureQueryTest.java
@@ -103,17 +103,12 @@ public class BanyanDBClientMeasureQueryTest extends AbstractBanyanDBClientTest {
Assert.assertEquals(end.toEpochMilli() / 1000, request.getTimeRange().getEnd().getSeconds());
Assert.assertEquals(TimeUnit.MILLISECONDS.toNanos(end.toEpochMilli() % 1000), request.getTimeRange().getEnd().getNanos());
// assert fields, we only have state as a condition which should be state
- Assert.assertEquals("le {\n" +
- " op: LOGICAL_OP_AND\n" +
- " left {\n" +
- " condition {\n" +
- " name: \"entity_id\"\n" +
- " op: BINARY_OP_EQ\n" +
- " value {\n" +
- " str {\n" +
- " value: \"abc\"\n" +
- " }\n" +
- " }\n" +
+ Assert.assertEquals("condition {\n" +
+ " name: \"entity_id\"\n" +
+ " op: BINARY_OP_EQ\n" +
+ " value {\n" +
+ " str {\n" +
+ " value: \"abc\"\n" +
" }\n" +
" }\n" +
"}", request.getCriteria().toString().trim());
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamQueryTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamQueryTest.java
index 04ec60b..cd78db8 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamQueryTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamQueryTest.java
@@ -112,16 +112,11 @@ public class BanyanDBClientStreamQueryTest extends AbstractBanyanDBClientTest {
Assert.assertEquals(end.toEpochMilli() / 1000, request.getTimeRange().getEnd().getSeconds());
Assert.assertEquals(TimeUnit.MILLISECONDS.toNanos(end.toEpochMilli() % 1000), request.getTimeRange().getEnd().getNanos());
// assert criteria
- Assert.assertEquals("le {\n" +
- " op: LOGICAL_OP_AND\n" +
- " left {\n" +
- " condition {\n" +
- " name: \"state\"\n" +
- " op: BINARY_OP_EQ\n" +
- " value {\n" +
- " int {\n" +
- " }\n" +
- " }\n" +
+ Assert.assertEquals("condition {\n" +
+ " name: \"state\"\n" +
+ " op: BINARY_OP_EQ\n" +
+ " value {\n" +
+ " int {\n" +
" }\n" +
" }\n" +
"}", request.getCriteria().toString().trim());
@@ -283,17 +278,12 @@ public class BanyanDBClientStreamQueryTest extends AbstractBanyanDBClientTest {
// assert metadata
Assert.assertEquals("sw", request.getMetadata().getName());
Assert.assertEquals("default", request.getMetadata().getGroup());
- Assert.assertEquals("le {\n" +
- " op: LOGICAL_OP_AND\n" +
- " left {\n" +
- " condition {\n" +
- " name: \"trace_id\"\n" +
- " op: BINARY_OP_EQ\n" +
- " value {\n" +
- " str {\n" +
- " value: \"1111.222.333\"\n" +
- " }\n" +
- " }\n" +
+ Assert.assertEquals("condition {\n" +
+ " name: \"trace_id\"\n" +
+ " op: BINARY_OP_EQ\n" +
+ " value {\n" +
+ " str {\n" +
+ " value: \"1111.222.333\"\n" +
" }\n" +
" }\n" +
"}\n", request.getCriteria().toString());