From abc15a361be3b702070c6b18ac499688bbd6f6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 28 Sep 2018 15:19:07 +0800 Subject: [PATCH] Make sure can get endpoint list with empty keyword. (#1719) --- .../plugin/elasticsearch/query/MetadataQueryEsDAO.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java index bfe37f3cf..07b6dd5f8 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java @@ -26,6 +26,7 @@ import org.apache.skywalking.oap.server.core.source.DetectPoint; import org.apache.skywalking.oap.server.core.storage.query.IMetadataQueryDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.library.util.BooleanUtils; +import org.apache.skywalking.oap.server.library.util.StringUtils; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.*; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; @@ -143,7 +144,9 @@ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO { boolQueryBuilder.must().add(QueryBuilders.termQuery(EndpointInventory.SERVICE_ID, serviceId)); String matchCName = MatchCNameBuilder.INSTANCE.build(EndpointInventory.NAME); - boolQueryBuilder.must().add(QueryBuilders.matchQuery(matchCName, keyword)); + if (StringUtils.isNotEmpty(keyword)) { + boolQueryBuilder.must().add(QueryBuilders.matchQuery(matchCName, keyword)); + } sourceBuilder.query(boolQueryBuilder); sourceBuilder.size(limit);