BanyanDB: fix log query missing order by condition, and fix missing service id condition when query by instance id or endpoint id. (#13508)

Author: wankai123

docs/en/changes/changes.md

@@ -99,6 +99,7 @@
 * Open `health-checker` module by default due to latest UI changes. Change the default check period to 30s.
 * Refactor Kubernetes coordinator to be more accurate about node readiness.
 * Bump up netty to 4.2.5.Final.
+* BanyanDB: fix log query missing order by condition, and fix missing service id condition when query by instance id or endpoint id.
 
 #### UI
 

oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBLogQueryDAO.java

@@ -19,6 +19,7 @@
 package org.apache.skywalking.oap.server.storage.plugin.banyandb.stream;
 
 import com.google.common.collect.ImmutableSet;
+import org.apache.skywalking.banyandb.v1.client.AbstractQuery;
 import org.apache.skywalking.banyandb.v1.client.RowEntity;
 import org.apache.skywalking.banyandb.v1.client.StreamQuery;
 import org.apache.skywalking.banyandb.v1.client.StreamQueryResponse;
@@ -76,9 +77,19 @@ public void apply(StreamQuery query) {
                 }
 
                 if (StringUtil.isNotEmpty(serviceInstanceId)) {
+                    if (StringUtil.isEmpty(serviceId)) {
+                        IDManager.ServiceInstanceID.InstanceIDDefinition instanceIDDefinition = IDManager.ServiceInstanceID.analysisId(
+                            serviceInstanceId);
+                        query.and(eq(AbstractLogRecord.SERVICE_ID, instanceIDDefinition.getServiceId()));
+                    }
                     query.and(eq(AbstractLogRecord.SERVICE_INSTANCE_ID, serviceInstanceId));
                 }
                 if (StringUtil.isNotEmpty(endpointId)) {
+                    if (StringUtil.isEmpty(serviceId)) {
+                        IDManager.EndpointID.EndpointIDDefinition endpointIDDefinition = IDManager.EndpointID.analysisId(
+                            endpointId);
+                        query.and(eq(AbstractLogRecord.SERVICE_ID, endpointIDDefinition.getServiceId()));
+                    }
                     query.and(eq(AbstractLogRecord.ENDPOINT_ID, endpointId));
                 }
                 if (Objects.nonNull(relatedTrace)) {
@@ -100,6 +111,13 @@ public void apply(StreamQuery query) {
                     }
                     query.and(having(LogRecord.TAGS, tagsConditions));
                 }
+                if (queryOrder == Order.ASC) {
+                    query.setOrderBy(
+                        new AbstractQuery.OrderBy(AbstractQuery.Sort.ASC));
+                } else {
+                    query.setOrderBy(
+                        new AbstractQuery.OrderBy(AbstractQuery.Sort.DESC));
+                }
             }
         };
 

oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/trace/BanyanDBTraceQueryDAO.java

@@ -162,10 +162,20 @@ public void apply(TraceQuery query) {
                     }
 
                     if (StringUtil.isNotEmpty(condition.getServiceInstanceId())) {
+                        if (StringUtil.isEmpty(condition.getServiceId())) {
+                            IDManager.ServiceInstanceID.InstanceIDDefinition instanceIDDefinition = IDManager.ServiceInstanceID.analysisId(
+                                condition.getServiceInstanceId());
+                            query.and(eq(SegmentRecord.SERVICE_ID, instanceIDDefinition.getServiceId()));
+                        }
                         query.and(eq(SegmentRecord.SERVICE_INSTANCE_ID, condition.getServiceInstanceId()));
                     }
 
                     if (StringUtil.isNotEmpty(condition.getEndpointId())) {
+                        if (StringUtil.isEmpty(condition.getServiceId())) {
+                            IDManager.EndpointID.EndpointIDDefinition endpointIDDefinition = IDManager.EndpointID.analysisId(
+                                condition.getEndpointId());
+                            query.and(eq(SegmentRecord.SERVICE_ID, endpointIDDefinition.getServiceId()));
+                        }
                         query.and(eq(SegmentRecord.ENDPOINT_ID, condition.getEndpointId()));
                     }