This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch h2-storage in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from a3a6f1d Fix some CIs add a062fda Fixed the bug from topology. (#1736) add 1a49f70 Get the value column name from value column annotation manager. (#1737) add 8e459ec Merge commit '1a49f7053c966aecd2271a40017e13f2ed54c6b9' into h2-storage No new revisions were added by this update. Summary of changes: .../server/core/cache/EndpointInventoryCache.java | 18 +++++++--- .../core/cache/ServiceInstanceInventoryCache.java | 12 +++++++ .../server/core/cache/ServiceInventoryCache.java | 15 +++++++++ .../server/core/query/AggregationQueryService.java | 21 ++++++------ .../oap/server/core/query/TopologyBuilder.java | 9 +++++ .../server/core/query/TopologyQueryService.java | 2 +- .../register/worker/RegisterDistinctWorker.java | 2 +- .../register/worker/RegisterPersistentWorker.java | 2 +- .../core/storage/query/IAggregationQueryDAO.java | 12 ++++--- .../server/receiver/trace/mock/ConsumerMock.java | 20 +++++------ .../server/receiver/trace/mock/ProviderMock.java | 20 +++++------ .../server/receiver/trace/mock/RegisterMock.java | 5 ++- .../server-starter/src/main/resources/log4j2.xml | 2 +- .../plugin/elasticsearch/base/RegisterEsDAO.java | 2 +- .../elasticsearch/query/AggregationQueryEsDAO.java | 39 +++++++++++----------- .../elasticsearch/query/TopologyQueryEsDAO.java | 18 +++++----- .../elasticsearch/query/TraceQueryEsDAO.java | 2 +- 17 files changed, 125 insertions(+), 76 deletions(-)