This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new f987d69996 Rename `isPhysicalTable` to `isMergedTable`. The latter
represents the correct meaning. (#9973)
f987d69996 is described below
commit f987d69996dad368d3a35a31140991853ef81679
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Wed Nov 16 21:50:39 2022 +0800
Rename `isPhysicalTable` to `isMergedTable`. The latter represents the
correct meaning. (#9973)
---
.../plugin/elasticsearch/base/IndexController.java | 2 +-
.../cache/NetworkAddressAliasEsDAO.java | 2 +-
.../elasticsearch/query/AggregationQueryEsDAO.java | 4 ++--
.../elasticsearch/query/AlarmQueryEsDAO.java | 2 +-
.../elasticsearch/query/BrowserLogQueryEsDAO.java | 2 +-
.../query/EBPFProfilingDataEsDAO.java | 2 +-
.../query/EBPFProfilingScheduleEsDAO.java | 2 +-
.../query/EBPFProfilingTaskEsDAO.java | 2 +-
.../elasticsearch/query/ESEventQueryDAO.java | 2 +-
.../plugin/elasticsearch/query/LogQueryEsDAO.java | 2 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 22 +++++++++++-----------
.../elasticsearch/query/MetricsQueryEsDAO.java | 6 +++---
.../elasticsearch/query/ProfileTaskLogEsDAO.java | 2 +-
.../elasticsearch/query/ProfileTaskQueryEsDAO.java | 2 +-
.../query/ProfileThreadSnapshotQueryEsDAO.java | 2 +-
.../elasticsearch/query/RecordsQueryEsDAO.java | 2 +-
.../elasticsearch/query/ServiceLabelEsDAO.java | 2 +-
.../query/SpanAttachedEventEsDAO.java | 2 +-
.../query/TagAutoCompleteQueryDAO.java | 4 ++--
.../elasticsearch/query/TopologyQueryEsDAO.java | 12 ++++++------
.../elasticsearch/query/TraceQueryEsDAO.java | 2 +-
.../query/zipkin/ZipkinQueryEsDAO.java | 6 +++---
22 files changed, 43 insertions(+), 43 deletions(-)
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexController.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexController.java
index 80fdc9f213..437210ef61 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexController.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexController.java
@@ -175,7 +175,7 @@ public enum IndexController {
}
- public static boolean isPhysicalTable(String logicName) {
+ public static boolean isMergedTable(String logicName) {
return !getPhysicalTableName(logicName).equals(logicName);
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressAliasEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressAliasEsDAO.java
index 7794e6b48d..733b25895d 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressAliasEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressAliasEsDAO.java
@@ -57,7 +57,7 @@ public class NetworkAddressAliasEsDAO extends EsDAO
implements INetworkAddressAl
try {
final int batchSize = Math.min(resultWindowMaxSize,
scrollingBatchSize);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(NetworkAddressAlias.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(NetworkAddressAlias.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
NetworkAddressAlias.INDEX_NAME));
}
query.must(Query.range(NetworkAddressAlias.LAST_UPDATE_TIME_BUCKET)
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java
index 77cafcaf6d..9006ff5f6c 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java
@@ -62,7 +62,7 @@ public class AggregationQueryEsDAO extends EsDAO implements
IAggregationQueryDAO
final boolean asc = condition.getOrder().equals(Order.ASC);
if (CollectionUtils.isEmpty(additionalConditions)
- &&
IndexController.LogicIndicesRegister.isPhysicalTable(condition.getName())) {
+ &&
IndexController.LogicIndicesRegister.isMergedTable(condition.getName())) {
final BoolQueryBuilder boolQuery =
Query.bool()
.must(basicQuery)
@@ -74,7 +74,7 @@ public class AggregationQueryEsDAO extends EsDAO implements
IAggregationQueryDAO
} else if (CollectionUtils.isEmpty(additionalConditions)) {
search.query(basicQuery);
} else if (CollectionUtils.isNotEmpty(additionalConditions)
- &&
IndexController.LogicIndicesRegister.isPhysicalTable(condition.getName())) {
+ &&
IndexController.LogicIndicesRegister.isMergedTable(condition.getName())) {
final BoolQueryBuilder boolQuery =
Query.bool()
.must(Query.term(
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AlarmQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AlarmQueryEsDAO.java
index 6a02976088..bd41f769ef 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AlarmQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AlarmQueryEsDAO.java
@@ -60,7 +60,7 @@ public class AlarmQueryEsDAO extends EsDAO implements
IAlarmQueryDAO {
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(AlarmRecord.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(AlarmRecord.INDEX_NAME)) {
+ if
(IndexController.LogicIndicesRegister.isMergedTable(AlarmRecord.INDEX_NAME)) {
query.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
AlarmRecord.INDEX_NAME));
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java
index 1a0b1188a1..07d482d6e2 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java
@@ -57,7 +57,7 @@ public class BrowserLogQueryEsDAO extends EsDAO implements
IBrowserLogQueryDAO {
endSecondTB = duration.getEndTimeBucketInSec();
}
final BoolQueryBuilder boolQueryBuilder = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(BrowserErrorLogRecord.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(BrowserErrorLogRecord.INDEX_NAME))
{
boolQueryBuilder.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
BrowserErrorLogRecord.INDEX_NAME));
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingDataEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingDataEsDAO.java
index e22d323699..76a5947c1c 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingDataEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingDataEsDAO.java
@@ -53,7 +53,7 @@ public class EBPFProfilingDataEsDAO extends EsDAO implements
IEBPFProfilingDataD
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(EBPFProfilingDataRecord.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(EBPFProfilingDataRecord.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(EBPFProfilingDataRecord.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
EBPFProfilingDataRecord.INDEX_NAME));
}
final SearchBuilder search =
Search.builder().query(query).size(scrollingBatchSize);
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingScheduleEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingScheduleEsDAO.java
index 62f9cd69e4..b6ed68b480 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingScheduleEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingScheduleEsDAO.java
@@ -50,7 +50,7 @@ public class EBPFProfilingScheduleEsDAO extends EsDAO
implements IEBPFProfilingS
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(EBPFProfilingScheduleRecord.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(EBPFProfilingScheduleRecord.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(EBPFProfilingScheduleRecord.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
EBPFProfilingScheduleRecord.INDEX_NAME));
}
query.must(Query.term(EBPFProfilingScheduleRecord.TASK_ID, taskId));
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingTaskEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingTaskEsDAO.java
index 82c885edf7..f26fa2b2d6 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingTaskEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/EBPFProfilingTaskEsDAO.java
@@ -62,7 +62,7 @@ public class EBPFProfilingTaskEsDAO extends EsDAO implements
IEBPFProfilingTaskD
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(EBPFProfilingTaskRecord.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(EBPFProfilingTaskRecord.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(EBPFProfilingTaskRecord.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
EBPFProfilingTaskRecord.INDEX_NAME));
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ESEventQueryDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ESEventQueryDAO.java
index 2223c1b8ab..5eaa18275f 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ESEventQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ESEventQueryDAO.java
@@ -78,7 +78,7 @@ public class ESEventQueryDAO extends EsDAO implements
IEventQueryDAO {
private void buildMustQueryListByCondition(final EventQueryCondition
condition,
final BoolQueryBuilder query) {
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(Event.INDEX_NAME)) {
+ if
(IndexController.LogicIndicesRegister.isMergedTable(Event.INDEX_NAME)) {
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
Event.INDEX_NAME));
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
index 7592e09a3b..5032dd3182 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
@@ -79,7 +79,7 @@ public class LogQueryEsDAO extends EsDAO implements
ILogQueryDAO {
endSecondTB = duration.getEndTimeBucketInSec();
}
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(LogRecord.INDEX_NAME)) {
+ if
(IndexController.LogicIndicesRegister.isMergedTable(LogRecord.INDEX_NAME)) {
query.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
LogRecord.INDEX_NAME));
}
if (startSecondTB != 0 && endSecondTB != 0) {
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 010d0c16cb..cbce35e41a 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
@@ -96,7 +96,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
if (StringUtil.isNotEmpty(group)) {
query.must(Query.term(ServiceTraffic.GROUP, group));
}
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ServiceTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ServiceTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ServiceTraffic.INDEX_NAME));
}
final SearchParams params = new
SearchParams().scroll(SCROLL_CONTEXT_RETENTION);
@@ -136,7 +136,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
final BoolQueryBuilder query =
Query.bool()
.must(Query.term(ServiceTraffic.SERVICE_ID, serviceId));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ServiceTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ServiceTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ServiceTraffic.INDEX_NAME));
}
final SearchBuilder search =
Search.builder().query(query).size(layerSize);
@@ -156,7 +156,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
Query.bool()
.must(Query.range(InstanceTraffic.LAST_PING_TIME_BUCKET).gte(minuteTimeBucket))
.must(Query.term(InstanceTraffic.SERVICE_ID, serviceId));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(InstanceTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(InstanceTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
InstanceTraffic.INDEX_NAME));
}
final int batchSize = Math.min(queryMaxSize, scrollingBatchSize);
@@ -183,7 +183,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(InstanceTraffic.INDEX_NAME);
String id = instanceId;
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(InstanceTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(InstanceTraffic.INDEX_NAME))
{
id =
IndexController.INSTANCE.generateDocId(InstanceTraffic.INDEX_NAME, instanceId);
}
final BoolQueryBuilder query =
@@ -212,7 +212,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
query.must(Query.match(matchCName, keyword));
}
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(EndpointTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(EndpointTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
EndpointTraffic.INDEX_NAME));
}
@@ -242,7 +242,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
IndexController.LogicIndicesRegister.getPhysicalTableName(ProcessTraffic.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ProcessTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ProcessTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ProcessTraffic.INDEX_NAME));
}
final SearchBuilder search =
Search.builder().query(query).size(queryMaxSize);
@@ -260,7 +260,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
IndexController.LogicIndicesRegister.getPhysicalTableName(ProcessTraffic.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ProcessTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ProcessTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ProcessTraffic.INDEX_NAME));
}
final SearchBuilder search =
Search.builder().query(query).size(queryMaxSize);
@@ -276,7 +276,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
IndexController.LogicIndicesRegister.getPhysicalTableName(ProcessTraffic.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ProcessTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ProcessTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ProcessTraffic.INDEX_NAME));
}
final SearchBuilder search =
Search.builder().query(query).size(queryMaxSize);
@@ -292,7 +292,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
IndexController.LogicIndicesRegister.getPhysicalTableName(ProcessTraffic.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ProcessTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ProcessTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ProcessTraffic.INDEX_NAME));
}
final SearchBuilder search = Search.builder().query(query).size(0);
@@ -309,7 +309,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
IndexController.LogicIndicesRegister.getPhysicalTableName(ProcessTraffic.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ProcessTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ProcessTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ProcessTraffic.INDEX_NAME));
}
final SearchBuilder search = Search.builder().query(query).size(0);
@@ -351,7 +351,7 @@ public class MetadataQueryEsDAO extends EsDAO implements
IMetadataQueryDAO {
IndexController.LogicIndicesRegister.getPhysicalTableName(ProcessTraffic.INDEX_NAME);
final BoolQueryBuilder query = Query.bool()
.must(Query.term("_id",
processId));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ProcessTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ProcessTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ProcessTraffic.INDEX_NAME));
}
final SearchBuilder search =
Search.builder().query(query).size(queryMaxSize);
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricsQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricsQueryEsDAO.java
index 43b79bed97..9796a149d7 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricsQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricsQueryEsDAO.java
@@ -111,7 +111,7 @@ public class MetricsQueryEsDAO extends EsDAO implements
IMetricsQueryDAO {
final List<String> ids = pointOfTimes.stream().map(pointOfTime -> {
String id = pointOfTime.id(condition.getEntity().buildId());
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(condition.getName())) {
+ if
(IndexController.LogicIndicesRegister.isMergedTable(condition.getName())) {
id =
IndexController.INSTANCE.generateDocId(condition.getName(), id);
}
String indexName = TimeSeriesUtils.queryIndexName(
@@ -262,7 +262,7 @@ public class MetricsQueryEsDAO extends EsDAO implements
IMetricsQueryDAO {
final String entityId = condition.getEntity().buildId();
if (entityId == null &&
-
IndexController.LogicIndicesRegister.isPhysicalTable(condition.getName())) {
+
IndexController.LogicIndicesRegister.isMergedTable(condition.getName())) {
sourceBuilder.query(
Query.bool()
.must(rangeQueryBuilder)
@@ -273,7 +273,7 @@ public class MetricsQueryEsDAO extends EsDAO implements
IMetricsQueryDAO {
);
} else if (entityId == null) {
sourceBuilder.query(rangeQueryBuilder);
- } else if
(IndexController.LogicIndicesRegister.isPhysicalTable(condition.getName())) {
+ } else if
(IndexController.LogicIndicesRegister.isMergedTable(condition.getName())) {
sourceBuilder.query(
Query.bool()
.must(rangeQueryBuilder)
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java
index b9326c2df4..8ab26b58cd 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java
@@ -51,7 +51,7 @@ public class ProfileTaskLogEsDAO extends EsDAO implements
IProfileTaskLogQueryDA
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(
ProfileTaskLogRecord.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ProfileTaskLogRecord.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ProfileTaskLogRecord.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
ProfileTaskLogRecord.INDEX_NAME));
}
final SearchBuilder search =
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java
index 2b3f828197..3b588120af 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java
@@ -53,7 +53,7 @@ public class ProfileTaskQueryEsDAO extends EsDAO implements
IProfileTaskQueryDAO
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(ProfileTaskRecord.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ProfileTaskRecord.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ProfileTaskRecord.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
ProfileTaskRecord.INDEX_NAME));
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java
index 40dc449a2c..97f2ee26c5 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java
@@ -66,7 +66,7 @@ public class ProfileThreadSnapshotQueryEsDAO extends EsDAO
Query.bool()
.must(Query.term(ProfileThreadSnapshotRecord.TASK_ID, taskId))
.must(Query.term(ProfileThreadSnapshotRecord.SEQUENCE, 0));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ProfileThreadSnapshotRecord.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ProfileThreadSnapshotRecord.INDEX_NAME))
{
segmentIdQuery.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
ProfileThreadSnapshotRecord.INDEX_NAME));
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/RecordsQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/RecordsQueryEsDAO.java
index e85a062b07..a79caa10f1 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/RecordsQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/RecordsQueryEsDAO.java
@@ -55,7 +55,7 @@ public class RecordsQueryEsDAO extends EsDAO implements
IRecordsQueryDAO {
.must(Query.range(TopN.TIME_BUCKET)
.gte(duration.getStartTimeBucketInSec())
.lte(duration.getEndTimeBucketInSec()));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(condition.getName())) {
+ if
(IndexController.LogicIndicesRegister.isMergedTable(condition.getName())) {
query.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
condition.getName()));
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ServiceLabelEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ServiceLabelEsDAO.java
index 0cb7ee5827..3f7b8255af 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ServiceLabelEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ServiceLabelEsDAO.java
@@ -46,7 +46,7 @@ public class ServiceLabelEsDAO extends EsDAO implements
IServiceLabelDAO {
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(ServiceLabelRecord.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ServiceLabelRecord.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ServiceLabelRecord.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ServiceLabelRecord.INDEX_NAME));
}
query.must(Query.term(ServiceLabelRecord.SERVICE_ID, serviceId));
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/SpanAttachedEventEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/SpanAttachedEventEsDAO.java
index 4860235757..96eaefb58d 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/SpanAttachedEventEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/SpanAttachedEventEsDAO.java
@@ -55,7 +55,7 @@ public class SpanAttachedEventEsDAO extends EsDAO implements
ISpanAttachedEventQ
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(SpanAttachedEventRecord.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(SpanAttachedEventRecord.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(SpanAttachedEventRecord.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
SpanAttachedEventRecord.INDEX_NAME));
}
final SearchBuilder search =
Search.builder().query(query).size(scrollingBatchSize);
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TagAutoCompleteQueryDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TagAutoCompleteQueryDAO.java
index 366d15958c..dc062d5ccb 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TagAutoCompleteQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TagAutoCompleteQueryDAO.java
@@ -62,7 +62,7 @@ public class TagAutoCompleteQueryDAO extends EsDAO implements
ITagAutoCompleteQu
}
BoolQueryBuilder query = Query.bool();
query.must(Query.term(TagAutocompleteData.TAG_TYPE, tagType.name()));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(TagAutocompleteData.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(TagAutocompleteData.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
TagAutocompleteData.INDEX_NAME));
}
final SearchBuilder search = Search.builder().query(query);
@@ -103,7 +103,7 @@ public class TagAutoCompleteQueryDAO extends EsDAO
implements ITagAutoCompleteQu
}
BoolQueryBuilder query =
Query.bool().must(Query.term(TagAutocompleteData.TAG_KEY, tagKey));
query.must(Query.term(TagAutocompleteData.TAG_TYPE, tagType.name()));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(TagAutocompleteData.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(TagAutocompleteData.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
TagAutocompleteData.INDEX_NAME));
}
final SearchBuilder search = Search.builder().query(query).size(limit);
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
index d69c830206..5527eeb018 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
@@ -87,7 +87,7 @@ public class TopologyQueryEsDAO extends EsDAO implements
ITopologyQueryDAO {
.must(Query.range(ServiceRelationServerSideMetrics.TIME_BUCKET)
.gte(duration.getStartTimeBucket())
.lte(duration.getEndTimeBucket()));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ServiceRelationServerSideMetrics.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ServiceRelationServerSideMetrics.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ServiceRelationServerSideMetrics.INDEX_NAME));
}
sourceBuilder.query(query).size(0);
@@ -103,7 +103,7 @@ public class TopologyQueryEsDAO extends EsDAO implements
ITopologyQueryDAO {
.must(Query.range(ServiceRelationClientSideMetrics.TIME_BUCKET)
.gte(duration.getStartTimeBucket())
.lte(duration.getEndTimeBucket()));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ServiceRelationClientSideMetrics.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ServiceRelationClientSideMetrics.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ServiceRelationClientSideMetrics.INDEX_NAME));
}
sourceBuilder.query(query).size(0);
@@ -173,7 +173,7 @@ public class TopologyQueryEsDAO extends EsDAO implements
ITopologyQueryDAO {
.gte(duration.getStartTimeBucket())
.lte(duration.getEndTimeBucket()))
.must(serviceIdBoolQuery);
- if (IndexController.LogicIndicesRegister.isPhysicalTable(indexName)) {
+ if (IndexController.LogicIndicesRegister.isMergedTable(indexName)) {
boolQuery.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
indexName));
}
search.query(boolQuery);
@@ -199,7 +199,7 @@ public class TopologyQueryEsDAO extends EsDAO implements
ITopologyQueryDAO {
Query.term(
EndpointRelationServerSideMetrics.DEST_ENDPOINT, destEndpointId
));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(EndpointRelationServerSideMetrics.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(EndpointRelationServerSideMetrics.INDEX_NAME))
{
boolQuery.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
EndpointRelationServerSideMetrics.INDEX_NAME));
}
sourceBuilder.query(boolQuery);
@@ -242,7 +242,7 @@ public class TopologyQueryEsDAO extends EsDAO implements
ITopologyQueryDAO {
ProcessRelationServerSideMetrics.INDEX_NAME :
ProcessRelationClientSideMetrics.INDEX_NAME;
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(indexName);
- if (IndexController.LogicIndicesRegister.isPhysicalTable(indexName)) {
+ if (IndexController.LogicIndicesRegister.isMergedTable(indexName)) {
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
indexName));
}
final SearchResponse response = getClient().search(index,
sourceBuilder.build());
@@ -385,7 +385,7 @@ public class TopologyQueryEsDAO extends EsDAO implements
ITopologyQueryDAO {
final BoolQueryBuilder serviceIdBoolQuery = Query.bool();
query.must(serviceIdBoolQuery);
- if (IndexController.LogicIndicesRegister.isPhysicalTable(indexName)) {
+ if (IndexController.LogicIndicesRegister.isMergedTable(indexName)) {
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
indexName));
}
if (serviceIds.size() == 1) {
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java
index 2beb3dde7e..90b683d167 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java
@@ -81,7 +81,7 @@ public class TraceQueryEsDAO extends EsDAO implements
ITraceQueryDAO {
endSecondTB = duration.getEndTimeBucketInSec();
}
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(SegmentRecord.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(SegmentRecord.INDEX_NAME)) {
query.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME,
SegmentRecord.INDEX_NAME));
}
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/zipkin/ZipkinQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/zipkin/ZipkinQueryEsDAO.java
index 41d88cdb7b..74aa1faa15 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/zipkin/ZipkinQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/zipkin/ZipkinQueryEsDAO.java
@@ -67,7 +67,7 @@ public class ZipkinQueryEsDAO extends EsDAO implements
IZipkinQueryDAO {
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(ZipkinServiceTraffic.INDEX_NAME);
final BoolQueryBuilder query = Query.bool();
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ZipkinServiceTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ZipkinServiceTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ZipkinServiceTraffic.INDEX_NAME));
}
final SearchBuilder search =
Search.builder().query(query).size(SCROLLING_BATCH_SIZE);
@@ -102,7 +102,7 @@ public class ZipkinQueryEsDAO extends EsDAO implements
IZipkinQueryDAO {
String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(
ZipkinServiceRelationTraffic.INDEX_NAME);
BoolQueryBuilder query =
Query.bool().must(Query.term(ZipkinServiceRelationTraffic.SERVICE_NAME,
serviceName));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ZipkinServiceRelationTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ZipkinServiceRelationTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ZipkinServiceRelationTraffic.INDEX_NAME));
}
SearchBuilder search =
Search.builder().query(query).size(NAME_QUERY_MAX_SIZE);
@@ -121,7 +121,7 @@ public class ZipkinQueryEsDAO extends EsDAO implements
IZipkinQueryDAO {
public List<String> getSpanNames(final String serviceName) {
String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(ZipkinServiceSpanTraffic.INDEX_NAME);
BoolQueryBuilder query =
Query.bool().must(Query.term(ZipkinServiceSpanTraffic.SERVICE_NAME,
serviceName));
- if
(IndexController.LogicIndicesRegister.isPhysicalTable(ZipkinServiceSpanTraffic.INDEX_NAME))
{
+ if
(IndexController.LogicIndicesRegister.isMergedTable(ZipkinServiceSpanTraffic.INDEX_NAME))
{
query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME,
ZipkinServiceSpanTraffic.INDEX_NAME));
}
SearchBuilder search =
Search.builder().query(query).size(NAME_QUERY_MAX_SIZE);
