Fix limit doesn't work for findEndpoint API in ES storage

apache · Nov 2, 2023 · 8a235c2 · 8a235c2
1 parent 92af797
commit 8a235c2
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/...g/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java b/...g/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
@@ -31,7 +31,6 @@
 import org.apache.skywalking.library.elasticsearch.response.search.SearchHit;
 import org.apache.skywalking.library.elasticsearch.response.search.SearchResponse;
 import org.apache.skywalking.oap.server.core.analysis.IDManager;
-import org.apache.skywalking.oap.server.core.analysis.Layer;
 import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
 import org.apache.skywalking.oap.server.core.analysis.manual.endpoint.EndpointTraffic;
 import org.apache.skywalking.oap.server.core.analysis.manual.instance.InstanceTraffic;
@@ -71,7 +70,6 @@ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO {
     private final int scrollingBatchSize;
     private String endpointTrafficNameAlias;
     private boolean aliasNameInit = false;
-    private final int layerSize;
 
     protected final Function<SearchHit, Service> searchHitServiceFunction = hit -> {
         final var sourceAsMap = hit.getSource();
@@ -121,7 +119,6 @@ public MetadataQueryEsDAO(
         super(client);
         this.queryMaxSize = config.getMetadataQueryMaxSize();
         this.scrollingBatchSize = config.getScrollingBatchSize();
-        this.layerSize = Layer.values().length;
     }
 
     @Override
@@ -231,14 +228,14 @@ public List<Endpoint> findEndpoint(String keyword, String serviceId, int limit)
             query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME, EndpointTraffic.INDEX_NAME));
         }
 
-        final var search = Search.builder().query(query).size(limit);
+        final var search = Search.builder().query(query);
 
         final var scroller = ElasticSearchScroller
             .<Endpoint>builder()
             .client(getClient())
             .search(search.build())
             .index(index)
-            .queryMaxSize(queryMaxSize)
+            .queryMaxSize(Math.min(limit, queryMaxSize))
             .resultConverter(searchHit -> {
                 final var sourceAsMap = searchHit.getSource();
 
@@ -404,14 +401,6 @@ public Process getProcess(String processId) {
         return null;
     }
 
-    private List<Service> buildServices(SearchResponse response) {
-        List<Service> services = new ArrayList<>();
-        for (SearchHit hit : response.getHits()) {
-            services.add(searchHitServiceFunction.apply(hit));
-        }
-        return services;
-    }
-
     private List<ServiceInstance> buildInstances(SearchResponse response) {
         List<ServiceInstance> serviceInstances = new ArrayList<>();
         for (SearchHit searchHit : response.getHits()) {