You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yo...@apache.org on 2023/07/31 12:57:38 UTC
[iotdb] branch compute-resource-balance-1.2 created (now 5dac5193163)
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a change to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 5dac5193163 Fix the bug when delete view meets statement error
This branch includes the following new commits:
new 4ea3c003d9f Fix incorrect use of Operator.next() in IdentitySinkOperatorTest
new 8eabce2042c [IOTDB-5134] Fix auth antlr (#10538)
new 5037231a1d7 [IOTDB-5134] Fix Auth Module Contain (#10545)
new 6c043eafd87 [IOTDB-6061] Fix the instability failure caused by initServer in IoTConsensus UT not binding to the corresponding port (#10540)
new c9de5ca4c15 [IOTDB-5134] add MAINTAIN privilege (#10549)
new 8c93538c406 [IOTDB-6066] Add ConfigNode timeslot metric (#10546)
new 0b76520ae1a Use customer timeout in schema fetcher
new 696390dcca5 [IOTDB-6068] Pipe: Failed to load tsfile when the first page is empty in a chunk (#10556)
new 0d129bd9214 [IOTDB-6019] Fix concurrent update of last query
new 076aed3caac [IOTDB-6064] Pipe: Fix deadlock in rolling back procedures concurrently (#10537)
new 7873366803b Update sonar key in sonar-coveralls.yml (#10567)
new 5dac5193163 Fix the bug when delete view meets statement error
The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 04/12: [IOTDB-6061] Fix the instability failure caused by initServer in IoTConsensus UT not binding to the corresponding port (#10540)
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6c043eafd872f9bc1242b5957c338ce0d988bd0b
Author: Xiangpeng Hu <65...@users.noreply.github.com>
AuthorDate: Thu Jul 13 20:37:53 2023 +0800
[IOTDB-6061] Fix the instability failure caused by initServer in IoTConsensus UT not binding to the corresponding port (#10540)
---
.../apache/iotdb/consensus/iot/ReplicateTest.java | 68 +++++++++++-----------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/ReplicateTest.java b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/ReplicateTest.java
index 916f91f3ac5..ba1cdae71af 100644
--- a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/ReplicateTest.java
+++ b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/ReplicateTest.java
@@ -66,16 +66,16 @@ public class ReplicateTest {
private int basePort = 9000;
private final List<Peer> peers =
- Arrays.asList(
- new Peer(gid, 1, new TEndPoint("127.0.0.1", basePort - 2)),
- new Peer(gid, 2, new TEndPoint("127.0.0.1", basePort - 1)),
- new Peer(gid, 3, new TEndPoint("127.0.0.1", basePort)));
+ Arrays.asList(
+ new Peer(gid, 1, new TEndPoint("127.0.0.1", basePort - 2)),
+ new Peer(gid, 2, new TEndPoint("127.0.0.1", basePort - 1)),
+ new Peer(gid, 3, new TEndPoint("127.0.0.1", basePort)));
private final List<File> peersStorage =
- Arrays.asList(
- new File("target" + java.io.File.separator + "1"),
- new File("target" + java.io.File.separator + "2"),
- new File("target" + java.io.File.separator + "3"));
+ Arrays.asList(
+ new File("target" + java.io.File.separator + "1"),
+ new File("target" + java.io.File.separator + "2"),
+ new File("target" + java.io.File.separator + "3"));
private final ConsensusGroup group = new ConsensusGroup(gid, peers);
private final List<IoTConsensus> servers = new ArrayList<>();
@@ -100,16 +100,16 @@ public class ReplicateTest {
public void changeConfiguration(int i) {
try (PublicBAOS publicBAOS = new PublicBAOS();
- DataOutputStream outputStream = new DataOutputStream(publicBAOS)) {
+ DataOutputStream outputStream = new DataOutputStream(publicBAOS)) {
outputStream.writeInt(this.peers.size());
for (Peer peer : this.peers) {
peer.serialize(outputStream);
}
File storageDir = new File(IoTConsensus.buildPeerDir(peersStorage.get(i), gid));
Path tmpConfigurationPath =
- Paths.get(new File(storageDir, CONFIGURATION_TMP_FILE_NAME).getAbsolutePath());
+ Paths.get(new File(storageDir, CONFIGURATION_TMP_FILE_NAME).getAbsolutePath());
Path configurationPath =
- Paths.get(new File(storageDir, CONFIGURATION_FILE_NAME).getAbsolutePath());
+ Paths.get(new File(storageDir, CONFIGURATION_FILE_NAME).getAbsolutePath());
Files.write(tmpConfigurationPath, publicBAOS.getBuf());
if (Files.exists(configurationPath)) {
Files.delete(configurationPath);
@@ -128,22 +128,22 @@ public class ReplicateTest {
int finalI = i;
changeConfiguration(i);
servers.add(
- (IoTConsensus)
- ConsensusFactory.getConsensusImpl(
- ConsensusFactory.IOT_CONSENSUS,
- ConsensusConfig.newBuilder()
- .setThisNodeId(peers.get(i).getNodeId())
- .setThisNode(peers.get(i).getEndpoint())
- .setStorageDir(peersStorage.get(i).getAbsolutePath())
- .setConsensusGroupType(TConsensusGroupType.DataRegion)
- .build(),
- groupId -> stateMachines.get(finalI))
- .orElseThrow(
- () ->
- new IllegalArgumentException(
- String.format(
- ConsensusFactory.CONSTRUCT_FAILED_MSG,
- ConsensusFactory.IOT_CONSENSUS))));
+ (IoTConsensus)
+ ConsensusFactory.getConsensusImpl(
+ ConsensusFactory.IOT_CONSENSUS,
+ ConsensusConfig.newBuilder()
+ .setThisNodeId(peers.get(i).getNodeId())
+ .setThisNode(peers.get(i).getEndpoint())
+ .setStorageDir(peersStorage.get(i).getAbsolutePath())
+ .setConsensusGroupType(TConsensusGroupType.DataRegion)
+ .build(),
+ groupId -> stateMachines.get(finalI))
+ .orElseThrow(
+ () ->
+ new IllegalArgumentException(
+ String.format(
+ ConsensusFactory.CONSTRUCT_FAILED_MSG,
+ ConsensusFactory.IOT_CONSENSUS))));
servers.get(i).start();
}
}
@@ -188,11 +188,11 @@ public class ReplicateTest {
}
Assert.assertEquals(
- CHECK_POINT_GAP, servers.get(0).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
+ CHECK_POINT_GAP, servers.get(0).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
Assert.assertEquals(
- CHECK_POINT_GAP, servers.get(1).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
+ CHECK_POINT_GAP, servers.get(1).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
Assert.assertEquals(
- CHECK_POINT_GAP, servers.get(2).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
+ CHECK_POINT_GAP, servers.get(2).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
Assert.assertEquals(CHECK_POINT_GAP * 3, stateMachines.get(0).getRequestSet().size());
Assert.assertEquals(CHECK_POINT_GAP * 3, stateMachines.get(1).getRequestSet().size());
Assert.assertEquals(CHECK_POINT_GAP * 3, stateMachines.get(2).getRequestSet().size());
@@ -222,11 +222,11 @@ public class ReplicateTest {
}
Assert.assertEquals(
- CHECK_POINT_GAP, servers.get(0).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
+ CHECK_POINT_GAP, servers.get(0).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
Assert.assertEquals(
- CHECK_POINT_GAP, servers.get(1).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
+ CHECK_POINT_GAP, servers.get(1).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
Assert.assertEquals(
- CHECK_POINT_GAP, servers.get(2).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
+ CHECK_POINT_GAP, servers.get(2).getImpl(gid).getCurrentSafelyDeletedSearchIndex());
}
/**
@@ -307,4 +307,4 @@ public class ReplicateTest {
}
Assert.fail(String.format("can not find port for node %d after 300s", i + 1));
}
-}
+}
\ No newline at end of file
[iotdb] 09/12: [IOTDB-6019] Fix concurrent update of last query
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0d129bd9214aaabfd124a0d4a7d23521b105b584
Author: Weihao Li <60...@users.noreply.github.com>
AuthorDate: Sun Jul 16 18:34:34 2023 +0800
[IOTDB-6019] Fix concurrent update of last query
---
.../fragment/FragmentInstanceContext.java | 92 +-
.../cache/schema/lastcache/LastCacheContainer.java | 6 +-
.../plan/planner/OperatorTreeGenerator.java | 1910 ++++++++++----------
.../SimpleFragmentParallelPlanner.java | 140 +-
4 files changed, 1074 insertions(+), 1074 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
index 9da3e51c1b0..85dad6f9d7b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
@@ -83,37 +83,37 @@ public class FragmentInstanceContext extends QueryContext {
private DataNodeQueryContext dataNodeQueryContext;
public static FragmentInstanceContext createFragmentInstanceContext(
- FragmentInstanceId id, FragmentInstanceStateMachine stateMachine, SessionInfo sessionInfo) {
+ FragmentInstanceId id, FragmentInstanceStateMachine stateMachine, SessionInfo sessionInfo) {
FragmentInstanceContext instanceContext =
- new FragmentInstanceContext(id, stateMachine, sessionInfo);
+ new FragmentInstanceContext(id, stateMachine, sessionInfo);
instanceContext.initialize();
instanceContext.start();
return instanceContext;
}
public static FragmentInstanceContext createFragmentInstanceContext(
- FragmentInstanceId id,
- FragmentInstanceStateMachine stateMachine,
- SessionInfo sessionInfo,
- IDataRegionForQuery dataRegion,
- Filter timeFilter) {
+ FragmentInstanceId id,
+ FragmentInstanceStateMachine stateMachine,
+ SessionInfo sessionInfo,
+ IDataRegionForQuery dataRegion,
+ Filter timeFilter) {
FragmentInstanceContext instanceContext =
- new FragmentInstanceContext(id, stateMachine, sessionInfo, dataRegion, timeFilter);
+ new FragmentInstanceContext(id, stateMachine, sessionInfo, dataRegion, timeFilter);
instanceContext.initialize();
instanceContext.start();
return instanceContext;
}
public static FragmentInstanceContext createFragmentInstanceContext(
- FragmentInstanceId id,
- FragmentInstanceStateMachine stateMachine,
- SessionInfo sessionInfo,
- IDataRegionForQuery dataRegion,
- Filter timeFilter,
- Map<QueryId, DataNodeQueryContext> dataNodeQueryContextMap) {
+ FragmentInstanceId id,
+ FragmentInstanceStateMachine stateMachine,
+ SessionInfo sessionInfo,
+ IDataRegionForQuery dataRegion,
+ Filter timeFilter,
+ Map<QueryId, DataNodeQueryContext> dataNodeQueryContextMap) {
FragmentInstanceContext instanceContext =
- new FragmentInstanceContext(
- id, stateMachine, sessionInfo, dataRegion, timeFilter, dataNodeQueryContextMap);
+ new FragmentInstanceContext(
+ id, stateMachine, sessionInfo, dataRegion, timeFilter, dataNodeQueryContextMap);
instanceContext.initialize();
instanceContext.start();
return instanceContext;
@@ -125,22 +125,22 @@ public class FragmentInstanceContext extends QueryContext {
@TestOnly
public static FragmentInstanceContext createFragmentInstanceContext(
- FragmentInstanceId id, FragmentInstanceStateMachine stateMachine) {
+ FragmentInstanceId id, FragmentInstanceStateMachine stateMachine) {
FragmentInstanceContext instanceContext =
- new FragmentInstanceContext(
- id, stateMachine, new SessionInfo(1, "test", ZoneId.systemDefault().getId()));
+ new FragmentInstanceContext(
+ id, stateMachine, new SessionInfo(1, "test", ZoneId.systemDefault().getId()));
instanceContext.initialize();
instanceContext.start();
return instanceContext;
}
private FragmentInstanceContext(
- FragmentInstanceId id,
- FragmentInstanceStateMachine stateMachine,
- SessionInfo sessionInfo,
- IDataRegionForQuery dataRegion,
- Filter timeFilter,
- Map<QueryId, DataNodeQueryContext> dataNodeQueryContextMap) {
+ FragmentInstanceId id,
+ FragmentInstanceStateMachine stateMachine,
+ SessionInfo sessionInfo,
+ IDataRegionForQuery dataRegion,
+ Filter timeFilter,
+ Map<QueryId, DataNodeQueryContext> dataNodeQueryContextMap) {
this.id = id;
this.stateMachine = stateMachine;
this.executionEndTime.set(END_TIME_INITIAL_VALUE);
@@ -152,7 +152,7 @@ public class FragmentInstanceContext extends QueryContext {
}
private FragmentInstanceContext(
- FragmentInstanceId id, FragmentInstanceStateMachine stateMachine, SessionInfo sessionInfo) {
+ FragmentInstanceId id, FragmentInstanceStateMachine stateMachine, SessionInfo sessionInfo) {
this.id = id;
this.stateMachine = stateMachine;
this.executionEndTime.set(END_TIME_INITIAL_VALUE);
@@ -162,11 +162,11 @@ public class FragmentInstanceContext extends QueryContext {
}
private FragmentInstanceContext(
- FragmentInstanceId id,
- FragmentInstanceStateMachine stateMachine,
- SessionInfo sessionInfo,
- IDataRegionForQuery dataRegion,
- Filter timeFilter) {
+ FragmentInstanceId id,
+ FragmentInstanceStateMachine stateMachine,
+ SessionInfo sessionInfo,
+ IDataRegionForQuery dataRegion,
+ Filter timeFilter) {
this.id = id;
this.stateMachine = stateMachine;
this.executionEndTime.set(END_TIME_INITIAL_VALUE);
@@ -235,16 +235,16 @@ public class FragmentInstanceContext extends QueryContext {
/** return Message string of all failures */
public String getFailedCause() {
return stateMachine.getFailureCauses().stream()
- .findFirst()
- .map(Throwable::getMessage)
- .orElse("");
+ .findFirst()
+ .map(Throwable::getMessage)
+ .orElse("");
}
/** return List of specific throwable and stack trace */
public List<FragmentInstanceFailureInfo> getFailureInfoList() {
return stateMachine.getFailureCauses().stream()
- .map(FragmentInstanceFailureInfo::toFragmentInstanceFailureInfo)
- .collect(Collectors.toList());
+ .map(FragmentInstanceFailureInfo::toFragmentInstanceFailureInfo)
+ .collect(Collectors.toList());
}
public void finished() {
@@ -282,7 +282,7 @@ public class FragmentInstanceContext extends QueryContext {
public FragmentInstanceInfo getInstanceInfo() {
return new FragmentInstanceInfo(
- stateMachine.getState(), getEndTime(), getFailedCause(), getFailureInfoList());
+ stateMachine.getState(), getEndTime(), getFailedCause(), getFailureInfoList());
}
public FragmentInstanceStateMachine getStateMachine() {
@@ -323,13 +323,13 @@ public class FragmentInstanceContext extends QueryContext {
}
this.sharedQueryDataSource =
- dataRegion.query(
- pathList,
- // when all the selected series are under the same device, the QueryDataSource will be
- // filtered according to timeIndex
- selectedDeviceIdSet.size() == 1 ? selectedDeviceIdSet.iterator().next() : null,
- this,
- timeFilter != null ? timeFilter.copy() : null);
+ dataRegion.query(
+ pathList,
+ // when all the selected series are under the same device, the QueryDataSource will be
+ // filtered according to timeIndex
+ selectedDeviceIdSet.size() == 1 ? selectedDeviceIdSet.iterator().next() : null,
+ this,
+ timeFilter != null ? timeFilter.copy() : null);
// used files should be added before mergeLock is unlocked, or they may be deleted by
// running merge
@@ -410,7 +410,7 @@ public class FragmentInstanceContext extends QueryContext {
break;
} catch (InterruptedException e) {
LOGGER.warn(
- "Interrupted when await on allDriversClosed, FragmentInstance Id is {}", this.getId());
+ "Interrupted when await on allDriversClosed, FragmentInstance Id is {}", this.getId());
}
}
releaseResource();
@@ -462,4 +462,4 @@ public class FragmentInstanceContext extends QueryContext {
public boolean mayHaveTmpFile() {
return mayHaveTmpFile;
}
-}
+}
\ No newline at end of file
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/lastcache/LastCacheContainer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/lastcache/LastCacheContainer.java
index 0f9d34cc06b..ca58ef45ed8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/lastcache/LastCacheContainer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/lastcache/LastCacheContainer.java
@@ -41,7 +41,7 @@ public class LastCacheContainer implements ILastCacheContainer {
@Override
public synchronized int updateCachedLast(
- TimeValuePair timeValuePair, boolean highPriorityUpdate, Long latestFlushedTime) {
+ TimeValuePair timeValuePair, boolean highPriorityUpdate, Long latestFlushedTime) {
if (highPriorityUpdate) { // for write, we won't cache null value
if (timeValuePair == null || timeValuePair.getValue() == null) {
return 0;
@@ -61,7 +61,7 @@ public class LastCacheContainer implements ILastCacheContainer {
return lastCacheValue.estimateSize();
}
} else if (timeValuePair.getTimestamp() > lastCacheValue.getTimestamp()
- || (timeValuePair.getTimestamp() == lastCacheValue.getTimestamp() && highPriorityUpdate)) {
+ || (timeValuePair.getTimestamp() == lastCacheValue.getTimestamp() && highPriorityUpdate)) {
TsPrimitiveType oldValue = lastCacheValue.getValue();
lastCacheValue.setTimestamp(timeValuePair.getTimestamp());
lastCacheValue.setValue(timeValuePair.getValue());
@@ -92,4 +92,4 @@ public class LastCacheContainer implements ILastCacheContainer {
public int estimateSize() {
return 16 + (lastCacheValue == null ? 0 : lastCacheValue.estimateSize());
}
-}
+}
\ No newline at end of file
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
index 4dfec56a44e..12f41a51556 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
@@ -249,10 +249,10 @@ import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.Series
public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionPlanContext> {
private static final MPPDataExchangeManager MPP_DATA_EXCHANGE_MANAGER =
- MPPDataExchangeService.getInstance().getMPPDataExchangeManager();
+ MPPDataExchangeService.getInstance().getMPPDataExchangeManager();
private static final DataNodeSchemaCache DATA_NODE_SCHEMA_CACHE =
- DataNodeSchemaCache.getInstance();
+ DataNodeSchemaCache.getInstance();
private static final TimeComparator ASC_TIME_COMPARATOR = new AscTimeComparator();
@@ -288,24 +288,24 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
PartialPath seriesPath = node.getSeriesPath();
seriesScanOptionsBuilder.withAllSensors(
- context.getAllSensors(seriesPath.getDevice(), seriesPath.getMeasurement()));
+ context.getAllSensors(seriesPath.getDevice(), seriesPath.getMeasurement()));
seriesScanOptionsBuilder.withLimit(node.getLimit());
seriesScanOptionsBuilder.withOffset(node.getOffset());
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SeriesScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SeriesScanOperator.class.getSimpleName());
SeriesScanOperator seriesScanOperator =
- new SeriesScanOperator(
- operatorContext,
- node.getPlanNodeId(),
- seriesPath,
- node.getScanOrder(),
- seriesScanOptionsBuilder.build());
+ new SeriesScanOperator(
+ operatorContext,
+ node.getPlanNodeId(),
+ seriesPath,
+ node.getScanOrder(),
+ seriesScanOptionsBuilder.build());
((DataDriverContext) context.getDriverContext()).addSourceOperator(seriesScanOperator);
((DataDriverContext) context.getDriverContext()).addPath(seriesPath);
@@ -316,7 +316,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitAlignedSeriesScan(
- AlignedSeriesScanNode node, LocalExecutionPlanContext context) {
+ AlignedSeriesScanNode node, LocalExecutionPlanContext context) {
SeriesScanOptions.Builder seriesScanOptionsBuilder = new SeriesScanOptions.Builder();
Filter timeFilter = node.getTimeFilter();
Filter valueFilter = node.getValueFilter();
@@ -332,60 +332,60 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
seriesScanOptionsBuilder.withAllSensors(new HashSet<>(seriesPath.getMeasurementList()));
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- AlignedSeriesScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ AlignedSeriesScanOperator.class.getSimpleName());
AlignedSeriesScanOperator seriesScanOperator =
- new AlignedSeriesScanOperator(
- operatorContext,
- node.getPlanNodeId(),
- seriesPath,
- node.getScanOrder(),
- seriesScanOptionsBuilder.build());
+ new AlignedSeriesScanOperator(
+ operatorContext,
+ node.getPlanNodeId(),
+ seriesPath,
+ node.getScanOrder(),
+ seriesScanOptionsBuilder.build());
((DataDriverContext) context.getDriverContext()).addSourceOperator(seriesScanOperator);
((DataDriverContext) context.getDriverContext()).addPath(seriesPath);
context.getDriverContext().setInputDriver(true);
context
- .getTimeSliceAllocator()
- .recordExecutionWeight(operatorContext, seriesPath.getColumnNum());
+ .getTimeSliceAllocator()
+ .recordExecutionWeight(operatorContext, seriesPath.getColumnNum());
return seriesScanOperator;
}
@Override
public Operator visitSeriesAggregationScan(
- SeriesAggregationScanNode node, LocalExecutionPlanContext context) {
+ SeriesAggregationScanNode node, LocalExecutionPlanContext context) {
PartialPath seriesPath = node.getSeriesPath();
boolean ascending = node.getScanOrder() == Ordering.ASC;
List<AggregationDescriptor> aggregationDescriptors = node.getAggregationDescriptorList();
List<Aggregator> aggregators = new ArrayList<>();
aggregationDescriptors.forEach(
- o ->
- aggregators.add(
- new Aggregator(
- AccumulatorFactory.createAccumulator(
- o.getAggregationType(),
- node.getSeriesPath().getSeriesType(),
- o.getInputExpressions(),
- o.getInputAttributes(),
- ascending),
- o.getStep())));
+ o ->
+ aggregators.add(
+ new Aggregator(
+ AccumulatorFactory.createAccumulator(
+ o.getAggregationType(),
+ node.getSeriesPath().getSeriesType(),
+ o.getInputExpressions(),
+ o.getInputAttributes(),
+ ascending),
+ o.getStep())));
GroupByTimeParameter groupByTimeParameter = node.getGroupByTimeParameter();
ITimeRangeIterator timeRangeIterator =
- initTimeRangeIterator(groupByTimeParameter, ascending, true);
+ initTimeRangeIterator(groupByTimeParameter, ascending, true);
long maxReturnSize =
- AggregationUtil.calculateMaxAggregationResultSize(
- node.getAggregationDescriptorList(), timeRangeIterator, context.getTypeProvider());
+ AggregationUtil.calculateMaxAggregationResultSize(
+ node.getAggregationDescriptorList(), timeRangeIterator, context.getTypeProvider());
Filter timeFilter = node.getTimeFilter();
Filter valueFilter = node.getValueFilter();
SeriesScanOptions.Builder scanOptionsBuilder = new SeriesScanOptions.Builder();
scanOptionsBuilder.withAllSensors(
- context.getAllSensors(seriesPath.getDevice(), seriesPath.getMeasurement()));
+ context.getAllSensors(seriesPath.getDevice(), seriesPath.getMeasurement()));
if (timeFilter != null) {
scanOptionsBuilder.withGlobalTimeFilter(timeFilter.copy());
}
@@ -394,23 +394,23 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SeriesAggregationScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SeriesAggregationScanOperator.class.getSimpleName());
SeriesAggregationScanOperator aggregateScanOperator =
- new SeriesAggregationScanOperator(
- node.getPlanNodeId(),
- seriesPath,
- node.getScanOrder(),
- scanOptionsBuilder.build(),
- operatorContext,
- aggregators,
- timeRangeIterator,
- node.getGroupByTimeParameter(),
- maxReturnSize);
+ new SeriesAggregationScanOperator(
+ node.getPlanNodeId(),
+ seriesPath,
+ node.getScanOrder(),
+ scanOptionsBuilder.build(),
+ operatorContext,
+ aggregators,
+ timeRangeIterator,
+ node.getGroupByTimeParameter(),
+ maxReturnSize);
((DataDriverContext) context.getDriverContext()).addSourceOperator(aggregateScanOperator);
((DataDriverContext) context.getDriverContext()).addPath(seriesPath);
@@ -421,42 +421,42 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitAlignedSeriesAggregationScan(
- AlignedSeriesAggregationScanNode node, LocalExecutionPlanContext context) {
+ AlignedSeriesAggregationScanNode node, LocalExecutionPlanContext context) {
AlignedPath seriesPath = node.getAlignedPath();
boolean ascending = node.getScanOrder() == Ordering.ASC;
List<Aggregator> aggregators = new ArrayList<>();
for (AggregationDescriptor descriptor : node.getAggregationDescriptorList()) {
checkArgument(
- descriptor.getInputExpressions().size() == 1,
- "descriptor's input expression size is not 1");
+ descriptor.getInputExpressions().size() == 1,
+ "descriptor's input expression size is not 1");
checkArgument(
- descriptor.getInputExpressions().get(0) instanceof TimeSeriesOperand,
- "descriptor's input expression is not TimeSeriesOperand");
+ descriptor.getInputExpressions().get(0) instanceof TimeSeriesOperand,
+ "descriptor's input expression is not TimeSeriesOperand");
String inputSeries =
- ((TimeSeriesOperand) (descriptor.getInputExpressions().get(0)))
- .getPath()
- .getMeasurement();
+ ((TimeSeriesOperand) (descriptor.getInputExpressions().get(0)))
+ .getPath()
+ .getMeasurement();
int seriesIndex = seriesPath.getMeasurementList().indexOf(inputSeries);
TSDataType seriesDataType =
- seriesPath.getMeasurementSchema().getSubMeasurementsTSDataTypeList().get(seriesIndex);
+ seriesPath.getMeasurementSchema().getSubMeasurementsTSDataTypeList().get(seriesIndex);
aggregators.add(
- new Aggregator(
- AccumulatorFactory.createAccumulator(
- descriptor.getAggregationType(),
- seriesDataType,
- descriptor.getInputExpressions(),
- descriptor.getInputAttributes(),
- ascending),
- descriptor.getStep(),
- Collections.singletonList(new InputLocation[] {new InputLocation(0, seriesIndex)})));
+ new Aggregator(
+ AccumulatorFactory.createAccumulator(
+ descriptor.getAggregationType(),
+ seriesDataType,
+ descriptor.getInputExpressions(),
+ descriptor.getInputAttributes(),
+ ascending),
+ descriptor.getStep(),
+ Collections.singletonList(new InputLocation[] {new InputLocation(0, seriesIndex)})));
}
GroupByTimeParameter groupByTimeParameter = node.getGroupByTimeParameter();
ITimeRangeIterator timeRangeIterator =
- initTimeRangeIterator(groupByTimeParameter, ascending, true);
+ initTimeRangeIterator(groupByTimeParameter, ascending, true);
long maxReturnSize =
- AggregationUtil.calculateMaxAggregationResultSize(
- node.getAggregationDescriptorList(), timeRangeIterator, context.getTypeProvider());
+ AggregationUtil.calculateMaxAggregationResultSize(
+ node.getAggregationDescriptorList(), timeRangeIterator, context.getTypeProvider());
Filter timeFilter = node.getTimeFilter();
Filter valueFilter = node.getValueFilter();
@@ -470,26 +470,26 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- AlignedSeriesAggregationScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ AlignedSeriesAggregationScanOperator.class.getSimpleName());
AlignedSeriesAggregationScanOperator seriesAggregationScanOperator =
- new AlignedSeriesAggregationScanOperator(
- node.getPlanNodeId(),
- seriesPath,
- node.getScanOrder(),
- scanOptionsBuilder.build(),
- operatorContext,
- aggregators,
- timeRangeIterator,
- groupByTimeParameter,
- maxReturnSize);
+ new AlignedSeriesAggregationScanOperator(
+ node.getPlanNodeId(),
+ seriesPath,
+ node.getScanOrder(),
+ scanOptionsBuilder.build(),
+ operatorContext,
+ aggregators,
+ timeRangeIterator,
+ groupByTimeParameter,
+ maxReturnSize);
((DataDriverContext) context.getDriverContext())
- .addSourceOperator(seriesAggregationScanOperator);
+ .addSourceOperator(seriesAggregationScanOperator);
((DataDriverContext) context.getDriverContext()).addPath(seriesPath);
context.getDriverContext().setInputDriver(true);
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, aggregators.size());
@@ -498,17 +498,17 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitSchemaQueryOrderByHeat(
- SchemaQueryOrderByHeatNode node, LocalExecutionPlanContext context) {
+ SchemaQueryOrderByHeatNode node, LocalExecutionPlanContext context) {
List<Operator> children =
- node.getChildren().stream().map(n -> n.accept(this, context)).collect(Collectors.toList());
+ node.getChildren().stream().map(n -> n.accept(this, context)).collect(Collectors.toList());
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaQueryOrderByHeatOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaQueryOrderByHeatOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaQueryOrderByHeatOperator(operatorContext, children);
@@ -516,7 +516,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitSchemaQueryScan(
- SchemaQueryScanNode node, LocalExecutionPlanContext context) {
+ SchemaQueryScanNode node, LocalExecutionPlanContext context) {
if (node instanceof TimeSeriesSchemaScanNode) {
return visitTimeSeriesSchemaScan((TimeSeriesSchemaScanNode) node, context);
} else if (node instanceof DevicesSchemaScanNode) {
@@ -539,61 +539,61 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitTimeSeriesSchemaScan(
- TimeSeriesSchemaScanNode node, LocalExecutionPlanContext context) {
+ TimeSeriesSchemaScanNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaQueryScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaQueryScanOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaQueryScanOperator<>(
- node.getPlanNodeId(),
- operatorContext,
- SchemaSourceFactory.getTimeSeriesSchemaScanSource(
- node.getPath(),
- node.isPrefixPath(),
- node.getLimit(),
- node.getOffset(),
- node.getSchemaFilter(),
- node.getTemplateMap()));
+ node.getPlanNodeId(),
+ operatorContext,
+ SchemaSourceFactory.getTimeSeriesSchemaScanSource(
+ node.getPath(),
+ node.isPrefixPath(),
+ node.getLimit(),
+ node.getOffset(),
+ node.getSchemaFilter(),
+ node.getTemplateMap()));
}
@Override
public Operator visitDevicesSchemaScan(
- DevicesSchemaScanNode node, LocalExecutionPlanContext context) {
+ DevicesSchemaScanNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaQueryScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaQueryScanOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaQueryScanOperator<>(
- node.getPlanNodeId(),
- operatorContext,
- SchemaSourceFactory.getDeviceSchemaSource(
- node.getPath(),
- node.isPrefixPath(),
- node.getLimit(),
- node.getOffset(),
- node.isHasSgCol(),
- node.getSchemaFilter()));
+ node.getPlanNodeId(),
+ operatorContext,
+ SchemaSourceFactory.getDeviceSchemaSource(
+ node.getPath(),
+ node.isPrefixPath(),
+ node.getLimit(),
+ node.getOffset(),
+ node.isHasSgCol(),
+ node.getSchemaFilter()));
}
@Override
public Operator visitSchemaQueryMerge(
- SchemaQueryMergeNode node, LocalExecutionPlanContext context) {
+ SchemaQueryMergeNode node, LocalExecutionPlanContext context) {
List<Operator> children = dealWithConsumeChildrenOneByOneNode(node, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaQueryMergeOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaQueryMergeOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaQueryMergeOperator(operatorContext, children);
}
@@ -602,12 +602,12 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
public Operator visitCountMerge(CountSchemaMergeNode node, LocalExecutionPlanContext context) {
List<Operator> children = dealWithConsumeChildrenOneByOneNode(node, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- CountMergeOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ CountMergeOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
if (node.getChildren().get(0) instanceof LevelTimeSeriesCountNode) {
return new CountGroupByLevelMergeOperator(operatorContext, children);
@@ -619,99 +619,99 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitDevicesCount(DevicesCountNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaCountOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaCountOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaCountOperator<>(
- node.getPlanNodeId(),
- operatorContext,
- SchemaSourceFactory.getDeviceSchemaSource(node.getPath(), node.isPrefixPath()));
+ node.getPlanNodeId(),
+ operatorContext,
+ SchemaSourceFactory.getDeviceSchemaSource(node.getPath(), node.isPrefixPath()));
}
@Override
public Operator visitTimeSeriesCount(
- TimeSeriesCountNode node, LocalExecutionPlanContext context) {
+ TimeSeriesCountNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaCountOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaCountOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaCountOperator<>(
- node.getPlanNodeId(),
- operatorContext,
- SchemaSourceFactory.getTimeSeriesSchemaCountSource(
- node.getPath(), node.isPrefixPath(), node.getSchemaFilter(), node.getTemplateMap()));
+ node.getPlanNodeId(),
+ operatorContext,
+ SchemaSourceFactory.getTimeSeriesSchemaCountSource(
+ node.getPath(), node.isPrefixPath(), node.getSchemaFilter(), node.getTemplateMap()));
}
@Override
public Operator visitLevelTimeSeriesCount(
- LevelTimeSeriesCountNode node, LocalExecutionPlanContext context) {
+ LevelTimeSeriesCountNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- CountGroupByLevelScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ CountGroupByLevelScanOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new CountGroupByLevelScanOperator<>(
- node.getPlanNodeId(),
- operatorContext,
- node.getLevel(),
- SchemaSourceFactory.getTimeSeriesSchemaCountSource(
- node.getPath(), node.isPrefixPath(), node.getSchemaFilter(), node.getTemplateMap()));
+ node.getPlanNodeId(),
+ operatorContext,
+ node.getLevel(),
+ SchemaSourceFactory.getTimeSeriesSchemaCountSource(
+ node.getPath(), node.isPrefixPath(), node.getSchemaFilter(), node.getTemplateMap()));
}
@Override
public Operator visitNodePathsSchemaScan(
- NodePathsSchemaScanNode node, LocalExecutionPlanContext context) {
+ NodePathsSchemaScanNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaQueryScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaQueryScanOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaQueryScanOperator<>(
- node.getPlanNodeId(),
- operatorContext,
- SchemaSourceFactory.getNodeSchemaSource(node.getPrefixPath(), node.getLevel()));
+ node.getPlanNodeId(),
+ operatorContext,
+ SchemaSourceFactory.getNodeSchemaSource(node.getPrefixPath(), node.getLevel()));
}
@Override
public Operator visitNodeManagementMemoryMerge(
- NodeManagementMemoryMergeNode node, LocalExecutionPlanContext context) {
+ NodeManagementMemoryMergeNode node, LocalExecutionPlanContext context) {
Operator child = node.getChild().accept(this, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- NodeManageMemoryMergeOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ NodeManageMemoryMergeOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new NodeManageMemoryMergeOperator(operatorContext, node.getData(), child);
}
@Override
public Operator visitNodePathConvert(
- NodePathsConvertNode node, LocalExecutionPlanContext context) {
+ NodePathsConvertNode node, LocalExecutionPlanContext context) {
Operator child = node.getChild().accept(this, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- NodePathsConvertOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ NodePathsConvertOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new NodePathsConvertOperator(operatorContext, child);
}
@@ -720,70 +720,70 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
public Operator visitNodePathsCount(NodePathsCountNode node, LocalExecutionPlanContext context) {
Operator child = node.getChild().accept(this, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- NodePathsCountOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ NodePathsCountOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new NodePathsCountOperator(operatorContext, child);
}
@Override
public Operator visitSingleDeviceView(
- SingleDeviceViewNode node, LocalExecutionPlanContext context) {
+ SingleDeviceViewNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SingleDeviceViewOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SingleDeviceViewOperator.class.getSimpleName());
Operator child = node.getChild().accept(this, context);
List<Integer> deviceColumnIndex = node.getDeviceToMeasurementIndexes();
List<TSDataType> outputColumnTypes =
- node.isCacheOutputColumnNames()
- ? getOutputColumnTypes(node, context.getTypeProvider())
- : context.getCachedDataTypes();
+ node.isCacheOutputColumnNames()
+ ? getOutputColumnTypes(node, context.getTypeProvider())
+ : context.getCachedDataTypes();
if (outputColumnTypes == null || outputColumnTypes.isEmpty()) {
throw new IllegalStateException("OutputColumTypes should not be null/empty");
}
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SingleDeviceViewOperator(
- operatorContext, node.getDevice(), child, deviceColumnIndex, outputColumnTypes);
+ operatorContext, node.getDevice(), child, deviceColumnIndex, outputColumnTypes);
}
@Override
public Operator visitDeviceView(DeviceViewNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- DeviceViewOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ DeviceViewOperator.class.getSimpleName());
List<Operator> children = dealWithConsumeChildrenOneByOneNode(node, context);
List<List<Integer>> deviceColumnIndex =
- node.getDevices().stream()
- .map(deviceName -> node.getDeviceToMeasurementIndexesMap().get(deviceName))
- .collect(Collectors.toList());
+ node.getDevices().stream()
+ .map(deviceName -> node.getDeviceToMeasurementIndexesMap().get(deviceName))
+ .collect(Collectors.toList());
List<TSDataType> outputColumnTypes = getOutputColumnTypes(node, context.getTypeProvider());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new DeviceViewOperator(
- operatorContext, node.getDevices(), children, deviceColumnIndex, outputColumnTypes);
+ operatorContext, node.getDevices(), children, deviceColumnIndex, outputColumnTypes);
}
@Override
public Operator visitMergeSort(MergeSortNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- MergeSortOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ MergeSortOperator.class.getSimpleName());
List<TSDataType> dataTypes = getOutputColumnTypes(node, context.getTypeProvider());
context.setCachedDataTypes(dataTypes);
List<Operator> children = dealWithConsumeAllChildrenPipelineBreaker(node, context);
@@ -793,44 +793,44 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
List<Integer> sortItemIndexList = new ArrayList<>(sortItemList.size());
List<TSDataType> sortItemDataTypeList = new ArrayList<>(sortItemList.size());
genSortInformation(
- node.getOutputColumnNames(),
- dataTypes,
- sortItemList,
- sortItemIndexList,
- sortItemDataTypeList);
+ node.getOutputColumnNames(),
+ dataTypes,
+ sortItemList,
+ sortItemIndexList,
+ sortItemDataTypeList);
return new MergeSortOperator(
- operatorContext,
- children,
- dataTypes,
- MergeSortComparator.getComparator(sortItemList, sortItemIndexList, sortItemDataTypeList));
+ operatorContext,
+ children,
+ dataTypes,
+ MergeSortComparator.getComparator(sortItemList, sortItemIndexList, sortItemDataTypeList));
}
private void genSortInformation(
- List<String> outputColumnNames,
- List<TSDataType> dataTypes,
- List<SortItem> sortItemList,
- List<Integer> sortItemIndexList,
- List<TSDataType> sortItemDataTypeList) {
+ List<String> outputColumnNames,
+ List<TSDataType> dataTypes,
+ List<SortItem> sortItemList,
+ List<Integer> sortItemIndexList,
+ List<TSDataType> sortItemDataTypeList) {
sortItemList.forEach(
- sortItem -> {
- if (sortItem.getSortKey().equals(OrderByKey.TIME)) {
- sortItemIndexList.add(-1);
- sortItemDataTypeList.add(TSDataType.INT64);
- } else {
- for (int i = 0; i < outputColumnNames.size(); i++) {
- if (sortItem.getSortKey().equalsIgnoreCase(outputColumnNames.get(i))) {
- sortItemIndexList.add(i);
- sortItemDataTypeList.add(dataTypes.get(i));
- break;
- }
- // there is no related column in outputColumnNames
- if (i == outputColumnNames.size() - 1) {
- sortItemIndexList.add(-2);
- sortItemDataTypeList.add(null);
- }
+ sortItem -> {
+ if (sortItem.getSortKey().equals(OrderByKey.TIME)) {
+ sortItemIndexList.add(-1);
+ sortItemDataTypeList.add(TSDataType.INT64);
+ } else {
+ for (int i = 0; i < outputColumnNames.size(); i++) {
+ if (sortItem.getSortKey().equalsIgnoreCase(outputColumnNames.get(i))) {
+ sortItemIndexList.add(i);
+ sortItemDataTypeList.add(dataTypes.get(i));
+ break;
+ }
+ // there is no related column in outputColumnNames
+ if (i == outputColumnNames.size() - 1) {
+ sortItemIndexList.add(-2);
+ sortItemDataTypeList.add(null);
}
}
- });
+ }
+ });
}
@Override
@@ -840,40 +840,40 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
private ProcessOperator getFillOperator(
- FillNode node, LocalExecutionPlanContext context, Operator child) {
+ FillNode node, LocalExecutionPlanContext context, Operator child) {
FillDescriptor descriptor = node.getFillDescriptor();
List<TSDataType> inputDataTypes =
- getOutputColumnTypes(node.getChild(), context.getTypeProvider());
+ getOutputColumnTypes(node.getChild(), context.getTypeProvider());
int inputColumns = inputDataTypes.size();
FillPolicy fillPolicy = descriptor.getFillPolicy();
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- FillOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ FillOperator.class.getSimpleName());
switch (fillPolicy) {
case VALUE:
Literal literal = descriptor.getFillValue();
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new FillOperator(
- operatorContext, getConstantFill(inputColumns, inputDataTypes, literal), child);
+ operatorContext, getConstantFill(inputColumns, inputDataTypes, literal), child);
case PREVIOUS:
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new FillOperator(
- operatorContext, getPreviousFill(inputColumns, inputDataTypes), child);
+ operatorContext, getPreviousFill(inputColumns, inputDataTypes), child);
case LINEAR:
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new LinearFillOperator(
- operatorContext, getLinearFill(inputColumns, inputDataTypes), child);
+ operatorContext, getLinearFill(inputColumns, inputDataTypes), child);
default:
throw new IllegalArgumentException("Unknown fill policy: " + fillPolicy);
}
}
private IFill[] getConstantFill(
- int inputColumns, List<TSDataType> inputDataTypes, Literal literal) {
+ int inputColumns, List<TSDataType> inputDataTypes, Literal literal) {
IFill[] constantFill = new IFill[inputColumns];
for (int i = 0; i < inputColumns; i++) {
if (!literal.isDataTypeConsistency(inputDataTypes.get(i))) {
@@ -965,12 +965,12 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitTransform(TransformNode node, LocalExecutionPlanContext context) {
final OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- TransformOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ TransformOperator.class.getSimpleName());
final Operator inputOperator = generateOnlyChildOperator(node, context);
final List<TSDataType> inputDataTypes = getInputColumnTypes(node, context.getTypeProvider());
final Map<String, List<InputLocation>> inputLocations = makeLayout(node);
@@ -1005,46 +1005,46 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
ColumnTransformerVisitor visitor = new ColumnTransformerVisitor();
ColumnTransformerVisitor.ColumnTransformerVisitorContext projectColumnTransformerContext =
- new ColumnTransformerVisitor.ColumnTransformerVisitorContext(
- projectContext,
- expressionTypes,
- projectLeafColumnTransformerList,
- inputLocations,
- projectExpressionColumnTransformerMap,
- ImmutableMap.of(),
- ImmutableList.of(),
- inputDataTypes,
- inputLocations.size());
+ new ColumnTransformerVisitor.ColumnTransformerVisitorContext(
+ projectContext,
+ expressionTypes,
+ projectLeafColumnTransformerList,
+ inputLocations,
+ projectExpressionColumnTransformerMap,
+ ImmutableMap.of(),
+ ImmutableList.of(),
+ inputDataTypes,
+ inputLocations.size());
for (Expression expression : projectExpressions) {
projectOutputTransformerList.add(
- visitor.process(expression, projectColumnTransformerContext));
+ visitor.process(expression, projectColumnTransformerContext));
}
return new FilterAndProjectOperator(
- operatorContext,
- inputOperator,
- inputDataTypes,
- ImmutableList.of(),
- null,
- ImmutableList.of(),
- projectLeafColumnTransformerList,
- projectOutputTransformerList,
- false,
- false);
+ operatorContext,
+ inputOperator,
+ inputDataTypes,
+ ImmutableList.of(),
+ null,
+ ImmutableList.of(),
+ projectLeafColumnTransformerList,
+ projectOutputTransformerList,
+ false,
+ false);
}
try {
return new TransformOperator(
- operatorContext,
- inputOperator,
- inputDataTypes,
- inputLocations,
- node.getOutputExpressions(),
- node.isKeepNull(),
- node.getZoneId(),
- expressionTypes,
- node.getScanOrder() == Ordering.ASC);
+ operatorContext,
+ inputOperator,
+ inputDataTypes,
+ inputLocations,
+ node.getOutputExpressions(),
+ node.isKeepNull(),
+ node.getZoneId(),
+ expressionTypes,
+ node.getScanOrder() == Ordering.ASC);
} catch (QueryProcessException e) {
throw new RuntimeException(e);
}
@@ -1067,12 +1067,12 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
final List<TSDataType> inputDataTypes = getInputColumnTypes(node, context.getTypeProvider());
final List<TSDataType> filterOutputDataTypes = new ArrayList<>(inputDataTypes);
final OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- FilterAndProjectOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ FilterAndProjectOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
for (Expression projectExpression : projectExpressions) {
@@ -1106,19 +1106,19 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
ColumnTransformerVisitor visitor = new ColumnTransformerVisitor();
ColumnTransformerVisitor.ColumnTransformerVisitorContext filterColumnTransformerContext =
- new ColumnTransformerVisitor.ColumnTransformerVisitorContext(
- filterContext,
- expressionTypes,
- filterLeafColumnTransformerList,
- inputLocations,
- filterExpressionColumnTransformerMap,
- ImmutableMap.of(),
- ImmutableList.of(),
- ImmutableList.of(),
- 0);
+ new ColumnTransformerVisitor.ColumnTransformerVisitorContext(
+ filterContext,
+ expressionTypes,
+ filterLeafColumnTransformerList,
+ inputLocations,
+ filterExpressionColumnTransformerMap,
+ ImmutableMap.of(),
+ ImmutableList.of(),
+ ImmutableList.of(),
+ 0);
ColumnTransformer filterOutputTransformer =
- visitor.process(filterExpression, filterColumnTransformerContext);
+ visitor.process(filterExpression, filterColumnTransformerContext);
List<ColumnTransformer> projectOutputTransformerList = new ArrayList<>();
@@ -1131,35 +1131,35 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
projectContext.constructUdfExecutors(projectExpressions);
ColumnTransformerVisitor.ColumnTransformerVisitorContext projectColumnTransformerContext =
- new ColumnTransformerVisitor.ColumnTransformerVisitorContext(
- projectContext,
- expressionTypes,
- projectLeafColumnTransformerList,
- inputLocations,
- projectExpressionColumnTransformerMap,
- filterExpressionColumnTransformerMap,
- commonTransformerList,
- filterOutputDataTypes,
- inputLocations.size());
+ new ColumnTransformerVisitor.ColumnTransformerVisitorContext(
+ projectContext,
+ expressionTypes,
+ projectLeafColumnTransformerList,
+ inputLocations,
+ projectExpressionColumnTransformerMap,
+ filterExpressionColumnTransformerMap,
+ commonTransformerList,
+ filterOutputDataTypes,
+ inputLocations.size());
for (Expression expression : projectExpressions) {
projectOutputTransformerList.add(
- visitor.process(expression, projectColumnTransformerContext));
+ visitor.process(expression, projectColumnTransformerContext));
}
}
Operator filter =
- new FilterAndProjectOperator(
- operatorContext,
- inputOperator,
- filterOutputDataTypes,
- filterLeafColumnTransformerList,
- filterOutputTransformer,
- commonTransformerList,
- projectLeafColumnTransformerList,
- projectOutputTransformerList,
- hasNonMappableUdf,
- true);
+ new FilterAndProjectOperator(
+ operatorContext,
+ inputOperator,
+ filterOutputDataTypes,
+ filterLeafColumnTransformerList,
+ filterOutputTransformer,
+ commonTransformerList,
+ projectLeafColumnTransformerList,
+ projectOutputTransformerList,
+ hasNonMappableUdf,
+ true);
// Project expressions don't contain Non-Mappable UDF, TransformOperator is not needed
if (!hasNonMappableUdf) {
@@ -1169,23 +1169,23 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
// has Non-Mappable UDF, we wrap a TransformOperator for further calculation
try {
final OperatorContext transformContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- TransformOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ TransformOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(transformContext, 1);
return new TransformOperator(
- transformContext,
- filter,
- inputDataTypes,
- inputLocations,
- projectExpressions,
- node.isKeepNull(),
- node.getZoneId(),
- expressionTypes,
- node.getScanOrder() == Ordering.ASC);
+ transformContext,
+ filter,
+ inputDataTypes,
+ inputLocations,
+ projectExpressions,
+ node.isKeepNull(),
+ node.getZoneId(),
+ expressionTypes,
+ node.getScanOrder() == Ordering.ASC);
} catch (QueryProcessException e) {
throw new RuntimeException(e);
}
@@ -1194,58 +1194,58 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitGroupByLevel(GroupByLevelNode node, LocalExecutionPlanContext context) {
checkArgument(
- !node.getGroupByLevelDescriptors().isEmpty(),
- "GroupByLevel descriptorList cannot be empty");
+ !node.getGroupByLevelDescriptors().isEmpty(),
+ "GroupByLevel descriptorList cannot be empty");
List<Operator> children = dealWithConsumeAllChildrenPipelineBreaker(node, context);
boolean ascending = node.getScanOrder() == Ordering.ASC;
List<Aggregator> aggregators = new ArrayList<>();
Map<String, List<InputLocation>> layout = makeLayout(node);
List<CrossSeriesAggregationDescriptor> aggregationDescriptors =
- node.getGroupByLevelDescriptors();
+ node.getGroupByLevelDescriptors();
for (CrossSeriesAggregationDescriptor descriptor : aggregationDescriptors) {
List<InputLocation[]> inputLocationList = calcInputLocationList(descriptor, layout);
TSDataType seriesDataType =
- context
- .getTypeProvider()
- // get the type of first inputExpression
- .getType(descriptor.getInputExpressions().get(0).getExpressionString());
+ context
+ .getTypeProvider()
+ // get the type of first inputExpression
+ .getType(descriptor.getInputExpressions().get(0).getExpressionString());
aggregators.add(
- new Aggregator(
- AccumulatorFactory.createAccumulator(
- descriptor.getAggregationType(),
- seriesDataType,
- descriptor.getInputExpressions(),
- descriptor.getInputAttributes(),
- ascending),
- descriptor.getStep(),
- inputLocationList));
+ new Aggregator(
+ AccumulatorFactory.createAccumulator(
+ descriptor.getAggregationType(),
+ seriesDataType,
+ descriptor.getInputExpressions(),
+ descriptor.getInputAttributes(),
+ ascending),
+ descriptor.getStep(),
+ inputLocationList));
}
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- AggregationOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ AggregationOperator.class.getSimpleName());
GroupByTimeParameter groupByTimeParameter = node.getGroupByTimeParameter();
ITimeRangeIterator timeRangeIterator =
- initTimeRangeIterator(groupByTimeParameter, ascending, false);
+ initTimeRangeIterator(groupByTimeParameter, ascending, false);
long maxReturnSize =
- calculateMaxAggregationResultSize(
- aggregationDescriptors, timeRangeIterator, context.getTypeProvider());
+ calculateMaxAggregationResultSize(
+ aggregationDescriptors, timeRangeIterator, context.getTypeProvider());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, aggregators.size());
return new AggregationOperator(
- operatorContext, aggregators, timeRangeIterator, children, maxReturnSize);
+ operatorContext, aggregators, timeRangeIterator, children, maxReturnSize);
}
@Override
public Operator visitGroupByTag(GroupByTagNode node, LocalExecutionPlanContext context) {
checkArgument(!node.getTagKeys().isEmpty(), "GroupByTag tag keys cannot be empty");
checkArgument(
- node.getTagValuesToAggregationDescriptors().size() >= 1,
- "GroupByTag aggregation descriptors cannot be empty");
+ node.getTagValuesToAggregationDescriptors().size() >= 1,
+ "GroupByTag aggregation descriptors cannot be empty");
List<Operator> children = dealWithConsumeAllChildrenPipelineBreaker(node, context);
@@ -1255,7 +1255,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
List<List<Aggregator>> groupedAggregators = new ArrayList<>();
int aggregatorCount = 0;
for (Map.Entry<List<String>, List<CrossSeriesAggregationDescriptor>> entry :
- node.getTagValuesToAggregationDescriptors().entrySet()) {
+ node.getTagValuesToAggregationDescriptors().entrySet()) {
groups.add(entry.getKey());
List<Aggregator> aggregators = new ArrayList<>();
for (CrossSeriesAggregationDescriptor aggregationDescriptor : entry.getValue()) {
@@ -1265,61 +1265,61 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
List<InputLocation[]> inputLocations = calcInputLocationList(aggregationDescriptor, layout);
TSDataType seriesDataType =
- context
- .getTypeProvider()
- .getType(aggregationDescriptor.getInputExpressions().get(0).getExpressionString());
+ context
+ .getTypeProvider()
+ .getType(aggregationDescriptor.getInputExpressions().get(0).getExpressionString());
aggregators.add(
- new Aggregator(
- AccumulatorFactory.createAccumulator(
- aggregationDescriptor.getAggregationType(),
- seriesDataType,
- aggregationDescriptor.getInputExpressions(),
- aggregationDescriptor.getInputAttributes(),
- ascending),
- aggregationDescriptor.getStep(),
- inputLocations));
+ new Aggregator(
+ AccumulatorFactory.createAccumulator(
+ aggregationDescriptor.getAggregationType(),
+ seriesDataType,
+ aggregationDescriptor.getInputExpressions(),
+ aggregationDescriptor.getInputAttributes(),
+ ascending),
+ aggregationDescriptor.getStep(),
+ inputLocations));
}
groupedAggregators.add(aggregators);
aggregatorCount += aggregators.size();
}
GroupByTimeParameter groupByTimeParameter = node.getGroupByTimeParameter();
ITimeRangeIterator timeRangeIterator =
- initTimeRangeIterator(groupByTimeParameter, ascending, false);
+ initTimeRangeIterator(groupByTimeParameter, ascending, false);
List<AggregationDescriptor> aggregationDescriptors =
- node.getTagValuesToAggregationDescriptors().values().stream()
- .flatMap(Collection::stream)
- .filter(Objects::nonNull)
- .collect(Collectors.toList());
+ node.getTagValuesToAggregationDescriptors().values().stream()
+ .flatMap(Collection::stream)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- TagAggregationOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ TagAggregationOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, aggregatorCount);
long maxReturnSize =
- calculateMaxAggregationResultSize(
- aggregationDescriptors, timeRangeIterator, context.getTypeProvider());
+ calculateMaxAggregationResultSize(
+ aggregationDescriptors, timeRangeIterator, context.getTypeProvider());
return new TagAggregationOperator(
- operatorContext, groups, groupedAggregators, children, maxReturnSize);
+ operatorContext, groups, groupedAggregators, children, maxReturnSize);
}
@Override
public Operator visitSlidingWindowAggregation(
- SlidingWindowAggregationNode node, LocalExecutionPlanContext context) {
+ SlidingWindowAggregationNode node, LocalExecutionPlanContext context) {
checkArgument(
- !node.getAggregationDescriptorList().isEmpty(),
- "Aggregation descriptorList cannot be empty");
+ !node.getAggregationDescriptorList().isEmpty(),
+ "Aggregation descriptorList cannot be empty");
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SlidingWindowAggregationOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SlidingWindowAggregationOperator.class.getSimpleName());
Operator child = node.getChild().accept(this, context);
boolean ascending = node.getScanOrder() == Ordering.ASC;
List<Aggregator> aggregators = new ArrayList<>();
@@ -1328,47 +1328,47 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
for (AggregationDescriptor descriptor : aggregationDescriptors) {
List<InputLocation[]> inputLocationList = calcInputLocationList(descriptor, layout);
aggregators.add(
- SlidingWindowAggregatorFactory.createSlidingWindowAggregator(
- descriptor.getAggregationType(),
- context
- .getTypeProvider()
- // get the type of first inputExpression
- .getType(descriptor.getInputExpressions().get(0).getExpressionString()),
- descriptor.getInputExpressions(),
- descriptor.getInputAttributes(),
- ascending,
- inputLocationList,
- descriptor.getStep()));
+ SlidingWindowAggregatorFactory.createSlidingWindowAggregator(
+ descriptor.getAggregationType(),
+ context
+ .getTypeProvider()
+ // get the type of first inputExpression
+ .getType(descriptor.getInputExpressions().get(0).getExpressionString()),
+ descriptor.getInputExpressions(),
+ descriptor.getInputAttributes(),
+ ascending,
+ inputLocationList,
+ descriptor.getStep()));
}
GroupByTimeParameter groupByTimeParameter = node.getGroupByTimeParameter();
ITimeRangeIterator timeRangeIterator =
- initTimeRangeIterator(groupByTimeParameter, ascending, false);
+ initTimeRangeIterator(groupByTimeParameter, ascending, false);
long maxReturnSize =
- calculateMaxAggregationResultSize(
- aggregationDescriptors, timeRangeIterator, context.getTypeProvider());
+ calculateMaxAggregationResultSize(
+ aggregationDescriptors, timeRangeIterator, context.getTypeProvider());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, aggregators.size());
return new SlidingWindowAggregationOperator(
- operatorContext,
- aggregators,
- timeRangeIterator,
- child,
- ascending,
- groupByTimeParameter,
- maxReturnSize);
+ operatorContext,
+ aggregators,
+ timeRangeIterator,
+ child,
+ ascending,
+ groupByTimeParameter,
+ maxReturnSize);
}
@Override
public Operator visitLimit(LimitNode node, LocalExecutionPlanContext context) {
Operator child = node.getChild().accept(this, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- LimitOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ LimitOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new LimitOperator(operatorContext, node.getLimit(), child);
@@ -1378,12 +1378,12 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
public Operator visitOffset(OffsetNode node, LocalExecutionPlanContext context) {
Operator child = node.getChild().accept(this, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- OffsetOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ OffsetOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new OffsetOperator(operatorContext, node.getOffset(), child);
@@ -1392,8 +1392,8 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitAggregation(AggregationNode node, LocalExecutionPlanContext context) {
checkArgument(
- !node.getAggregationDescriptorList().isEmpty(),
- "Aggregation descriptorList cannot be empty");
+ !node.getAggregationDescriptorList().isEmpty(),
+ "Aggregation descriptorList cannot be empty");
List<Operator> children = dealWithConsumeAllChildrenPipelineBreaker(node, context);
boolean ascending = node.getScanOrder() == Ordering.ASC;
List<Aggregator> aggregators = new ArrayList<>();
@@ -1402,18 +1402,18 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
for (AggregationDescriptor descriptor : node.getAggregationDescriptorList()) {
List<InputLocation[]> inputLocationList = calcInputLocationList(descriptor, layout);
aggregators.add(
- new Aggregator(
- AccumulatorFactory.createAccumulator(
- descriptor.getAggregationType(),
- context
- .getTypeProvider()
- // get the type of first inputExpression
- .getType(descriptor.getInputExpressions().get(0).getExpressionString()),
- descriptor.getInputExpressions(),
- descriptor.getInputAttributes(),
- ascending),
- descriptor.getStep(),
- inputLocationList));
+ new Aggregator(
+ AccumulatorFactory.createAccumulator(
+ descriptor.getAggregationType(),
+ context
+ .getTypeProvider()
+ // get the type of first inputExpression
+ .getType(descriptor.getInputExpressions().get(0).getExpressionString()),
+ descriptor.getInputExpressions(),
+ descriptor.getInputAttributes(),
+ ascending),
+ descriptor.getStep(),
+ inputLocationList));
}
boolean inputRaw = node.getAggregationDescriptorList().get(0).getStep().isInputRaw();
GroupByTimeParameter groupByTimeParameter = node.getGroupByTimeParameter();
@@ -1422,19 +1422,19 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
if (inputRaw) {
checkArgument(children.size() == 1, "rawDataAggregateOperator can only accept one input");
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- RawDataAggregationOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ RawDataAggregationOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, aggregators.size());
ITimeRangeIterator timeRangeIterator =
- initTimeRangeIterator(groupByTimeParameter, ascending, true);
+ initTimeRangeIterator(groupByTimeParameter, ascending, true);
long maxReturnSize =
- calculateMaxAggregationResultSize(
- aggregationDescriptors, timeRangeIterator, context.getTypeProvider());
+ calculateMaxAggregationResultSize(
+ aggregationDescriptors, timeRangeIterator, context.getTypeProvider());
// groupByParameter and groupByTimeParameter
if (groupByParameter != null) {
@@ -1450,12 +1450,12 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
String controlColumn = groupByVariationExpression.getExpressionString();
TSDataType controlColumnType = context.getTypeProvider().getType(controlColumn);
windowParameter =
- new VariationWindowParameter(
- controlColumnType,
- layout.get(controlColumn).get(0).getValueColumnIndex(),
- node.isOutputEndTime(),
- ((GroupByVariationParameter) groupByParameter).isIgnoringNull(),
- ((GroupByVariationParameter) groupByParameter).getDelta());
+ new VariationWindowParameter(
+ controlColumnType,
+ layout.get(controlColumn).get(0).getValueColumnIndex(),
+ node.isOutputEndTime(),
+ ((GroupByVariationParameter) groupByParameter).isIgnoringNull(),
+ ((GroupByVariationParameter) groupByParameter).getDelta());
break;
case CONDITION_WINDOW:
Expression groupByConditionExpression = node.getGroupByExpression();
@@ -1463,20 +1463,20 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
throw new IllegalArgumentException("groupByConditionExpression can't be null");
}
windowParameter =
- new ConditionWindowParameter(
- node.isOutputEndTime(),
- ((GroupByConditionParameter) groupByParameter).isIgnoringNull(),
- layout
- .get(groupByConditionExpression.getExpressionString())
- .get(0)
- .getValueColumnIndex(),
- ((GroupByConditionParameter) groupByParameter).getKeepExpression());
+ new ConditionWindowParameter(
+ node.isOutputEndTime(),
+ ((GroupByConditionParameter) groupByParameter).isIgnoringNull(),
+ layout
+ .get(groupByConditionExpression.getExpressionString())
+ .get(0)
+ .getValueColumnIndex(),
+ ((GroupByConditionParameter) groupByParameter).getKeepExpression());
break;
case SESSION_WINDOW:
windowParameter =
- new SessionWindowParameter(
- ((GroupBySessionParameter) groupByParameter).getTimeInterval(),
- node.isOutputEndTime());
+ new SessionWindowParameter(
+ ((GroupBySessionParameter) groupByParameter).getTimeInterval(),
+ node.isOutputEndTime());
break;
case COUNT_WINDOW:
Expression groupByCountExpression = node.getGroupByExpression();
@@ -1484,30 +1484,19 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
throw new IllegalArgumentException("groupByCountExpression can't be null");
}
windowParameter =
- new CountWindowParameter(
- ((GroupByCountParameter) groupByParameter).getCountNumber(),
- layout
- .get(groupByCountExpression.getExpressionString())
- .get(0)
- .getValueColumnIndex(),
- node.isOutputEndTime(),
- ((GroupByCountParameter) groupByParameter).isIgnoreNull());
+ new CountWindowParameter(
+ ((GroupByCountParameter) groupByParameter).getCountNumber(),
+ layout
+ .get(groupByCountExpression.getExpressionString())
+ .get(0)
+ .getValueColumnIndex(),
+ node.isOutputEndTime(),
+ ((GroupByCountParameter) groupByParameter).isIgnoreNull());
break;
default:
throw new IllegalArgumentException("Unsupported window type");
}
return new RawDataAggregationOperator(
- operatorContext,
- aggregators,
- timeRangeIterator,
- children.get(0),
- ascending,
- maxReturnSize,
- windowParameter);
- }
-
- WindowParameter windowParameter = new TimeWindowParameter(node.isOutputEndTime());
- return new RawDataAggregationOperator(
operatorContext,
aggregators,
timeRangeIterator,
@@ -1515,29 +1504,40 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
ascending,
maxReturnSize,
windowParameter);
+ }
+
+ WindowParameter windowParameter = new TimeWindowParameter(node.isOutputEndTime());
+ return new RawDataAggregationOperator(
+ operatorContext,
+ aggregators,
+ timeRangeIterator,
+ children.get(0),
+ ascending,
+ maxReturnSize,
+ windowParameter);
} else {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- AggregationOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ AggregationOperator.class.getSimpleName());
ITimeRangeIterator timeRangeIterator =
- initTimeRangeIterator(groupByTimeParameter, ascending, true);
+ initTimeRangeIterator(groupByTimeParameter, ascending, true);
long maxReturnSize =
- calculateMaxAggregationResultSize(
- aggregationDescriptors, timeRangeIterator, context.getTypeProvider());
+ calculateMaxAggregationResultSize(
+ aggregationDescriptors, timeRangeIterator, context.getTypeProvider());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, aggregators.size());
return new AggregationOperator(
- operatorContext, aggregators, timeRangeIterator, children, maxReturnSize);
+ operatorContext, aggregators, timeRangeIterator, children, maxReturnSize);
}
}
private List<InputLocation[]> calcInputLocationList(
- AggregationDescriptor descriptor, Map<String, List<InputLocation>> layout) {
+ AggregationDescriptor descriptor, Map<String, List<InputLocation>> layout) {
List<List<String>> inputColumnNames = descriptor.getInputColumnNamesList();
List<InputLocation[]> inputLocationList = new ArrayList<>();
@@ -1550,9 +1550,9 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
inputLocationList.add(new InputLocation[] {inputLocationParts.get(0).get(i)});
} else {
inputLocationList.add(
- new InputLocation[] {
- inputLocationParts.get(0).get(i), inputLocationParts.get(1).get(i)
- });
+ new InputLocation[] {
+ inputLocationParts.get(0).get(i), inputLocationParts.get(1).get(i)
+ });
}
}
}
@@ -1562,12 +1562,12 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitSort(SortNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SortOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SortOperator.class.getSimpleName());
List<TSDataType> dataTypes = getOutputColumnTypes(node, context.getTypeProvider());
@@ -1577,19 +1577,19 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
List<Integer> sortItemIndexList = new ArrayList<>(sortItemList.size());
List<TSDataType> sortItemDataTypeList = new ArrayList<>(sortItemList.size());
genSortInformation(
- node.getOutputColumnNames(),
- dataTypes,
- sortItemList,
- sortItemIndexList,
- sortItemDataTypeList);
+ node.getOutputColumnNames(),
+ dataTypes,
+ sortItemList,
+ sortItemIndexList,
+ sortItemDataTypeList);
String filePrefix =
- IoTDBDescriptor.getInstance().getConfig().getSortTmpDir()
- + File.separator
- + operatorContext.getDriverContext().getFragmentInstanceContext().getId().getFullId()
- + File.separator
- + operatorContext.getDriverContext().getPipelineId()
- + File.separator;
+ IoTDBDescriptor.getInstance().getConfig().getSortTmpDir()
+ + File.separator
+ + operatorContext.getDriverContext().getFragmentInstanceContext().getId().getFullId()
+ + File.separator
+ + operatorContext.getDriverContext().getPipelineId()
+ + File.separator;
context.getDriverContext().setHaveTmpFile(true);
context.getDriverContext().getFragmentInstanceContext().setMayHaveTmpFile(true);
@@ -1597,46 +1597,46 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
Operator child = node.getChild().accept(this, context);
return new SortOperator(
- operatorContext,
- child,
- dataTypes,
- filePrefix,
- MergeSortComparator.getComparator(sortItemList, sortItemIndexList, sortItemDataTypeList));
+ operatorContext,
+ child,
+ dataTypes,
+ filePrefix,
+ MergeSortComparator.getComparator(sortItemList, sortItemIndexList, sortItemDataTypeList));
}
@Override
public Operator visitInto(IntoNode node, LocalExecutionPlanContext context) {
Operator child = node.getChild().accept(this, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- IntoOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ IntoOperator.class.getSimpleName());
IntoPathDescriptor intoPathDescriptor = node.getIntoPathDescriptor();
Map<String, InputLocation> sourceColumnToInputLocationMap =
- constructSourceColumnToInputLocationMap(node);
+ constructSourceColumnToInputLocationMap(node);
Map<PartialPath, Map<String, InputLocation>> targetPathToSourceInputLocationMap =
- new HashMap<>();
+ new HashMap<>();
processTargetPathToSourceMap(
- intoPathDescriptor.getTargetPathToSourceMap(),
- targetPathToSourceInputLocationMap,
- sourceColumnToInputLocationMap);
+ intoPathDescriptor.getTargetPathToSourceMap(),
+ targetPathToSourceInputLocationMap,
+ sourceColumnToInputLocationMap);
Map<PartialPath, Map<String, TSDataType>> targetPathToDataTypeMap =
- intoPathDescriptor.getTargetPathToDataTypeMap();
+ intoPathDescriptor.getTargetPathToDataTypeMap();
long statementSizePerLine = calculateStatementSizePerLine(targetPathToDataTypeMap);
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
List<Pair<String, PartialPath>> sourceTargetPathPairList =
- intoPathDescriptor.getSourceTargetPathPairList();
+ intoPathDescriptor.getSourceTargetPathPairList();
List<String> sourceColumnToViewList = intoPathDescriptor.getSourceColumnToViewList();
List<Pair<String, PartialPath>> sourceTargetPathPairWithViewList =
- new ArrayList<>(sourceTargetPathPairList);
+ new ArrayList<>(sourceTargetPathPairList);
for (int i = 0; i < sourceColumnToViewList.size(); i++) {
String viewPath = sourceColumnToViewList.get(i);
if (StringUtils.isNotEmpty(viewPath)) {
@@ -1645,68 +1645,68 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
return new IntoOperator(
- operatorContext,
- child,
- getInputColumnTypes(node, context.getTypeProvider()),
- targetPathToSourceInputLocationMap,
- targetPathToDataTypeMap,
- intoPathDescriptor.getTargetDeviceToAlignedMap(),
- sourceTargetPathPairWithViewList,
- sourceColumnToInputLocationMap,
- FragmentInstanceManager.getInstance().getIntoOperationExecutor(),
- statementSizePerLine);
+ operatorContext,
+ child,
+ getInputColumnTypes(node, context.getTypeProvider()),
+ targetPathToSourceInputLocationMap,
+ targetPathToDataTypeMap,
+ intoPathDescriptor.getTargetDeviceToAlignedMap(),
+ sourceTargetPathPairWithViewList,
+ sourceColumnToInputLocationMap,
+ FragmentInstanceManager.getInstance().getIntoOperationExecutor(),
+ statementSizePerLine);
}
@Override
public Operator visitDeviceViewInto(DeviceViewIntoNode node, LocalExecutionPlanContext context) {
Operator child = node.getChild().accept(this, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- DeviceViewIntoOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ DeviceViewIntoOperator.class.getSimpleName());
DeviceViewIntoPathDescriptor deviceViewIntoPathDescriptor =
- node.getDeviceViewIntoPathDescriptor();
+ node.getDeviceViewIntoPathDescriptor();
Map<String, InputLocation> sourceColumnToInputLocationMap =
- constructSourceColumnToInputLocationMap(node);
+ constructSourceColumnToInputLocationMap(node);
Map<String, Map<PartialPath, Map<String, InputLocation>>>
- deviceToTargetPathSourceInputLocationMap = new HashMap<>();
+ deviceToTargetPathSourceInputLocationMap = new HashMap<>();
Map<String, Map<PartialPath, Map<String, TSDataType>>> deviceToTargetPathDataTypeMap =
- deviceViewIntoPathDescriptor.getSourceDeviceToTargetPathDataTypeMap();
+ deviceViewIntoPathDescriptor.getSourceDeviceToTargetPathDataTypeMap();
Map<String, Map<PartialPath, Map<String, String>>> sourceDeviceToTargetPathMap =
- deviceViewIntoPathDescriptor.getSourceDeviceToTargetPathMap();
+ deviceViewIntoPathDescriptor.getSourceDeviceToTargetPathMap();
long statementSizePerLine = 0L;
for (Map.Entry<String, Map<PartialPath, Map<String, String>>> deviceEntry :
- sourceDeviceToTargetPathMap.entrySet()) {
+ sourceDeviceToTargetPathMap.entrySet()) {
String sourceDevice = deviceEntry.getKey();
Map<PartialPath, Map<String, InputLocation>> targetPathToSourceInputLocationMap =
- new HashMap<>();
+ new HashMap<>();
processTargetPathToSourceMap(
- deviceEntry.getValue(),
- targetPathToSourceInputLocationMap,
- sourceColumnToInputLocationMap);
+ deviceEntry.getValue(),
+ targetPathToSourceInputLocationMap,
+ sourceColumnToInputLocationMap);
deviceToTargetPathSourceInputLocationMap.put(
- sourceDevice, targetPathToSourceInputLocationMap);
+ sourceDevice, targetPathToSourceInputLocationMap);
statementSizePerLine +=
- calculateStatementSizePerLine(deviceToTargetPathDataTypeMap.get(sourceDevice));
+ calculateStatementSizePerLine(deviceToTargetPathDataTypeMap.get(sourceDevice));
}
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new DeviceViewIntoOperator(
- operatorContext,
- child,
- getInputColumnTypes(node, context.getTypeProvider()),
- deviceToTargetPathSourceInputLocationMap,
- deviceToTargetPathDataTypeMap,
- deviceViewIntoPathDescriptor.getTargetDeviceToAlignedMap(),
- deviceViewIntoPathDescriptor.getDeviceToSourceTargetPathPairListMap(),
- sourceColumnToInputLocationMap,
- FragmentInstanceManager.getInstance().getIntoOperationExecutor(),
- statementSizePerLine);
+ operatorContext,
+ child,
+ getInputColumnTypes(node, context.getTypeProvider()),
+ deviceToTargetPathSourceInputLocationMap,
+ deviceToTargetPathDataTypeMap,
+ deviceViewIntoPathDescriptor.getTargetDeviceToAlignedMap(),
+ deviceViewIntoPathDescriptor.getDeviceToSourceTargetPathPairListMap(),
+ sourceColumnToInputLocationMap,
+ FragmentInstanceManager.getInstance().getIntoOperationExecutor(),
+ statementSizePerLine);
}
private Map<String, InputLocation> constructSourceColumnToInputLocationMap(PlanNode node) {
@@ -1719,9 +1719,9 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
private void processTargetPathToSourceMap(
- Map<PartialPath, Map<String, String>> targetPathToSourceMap,
- Map<PartialPath, Map<String, InputLocation>> targetPathToSourceInputLocationMap,
- Map<String, InputLocation> sourceColumnToInputLocationMap) {
+ Map<PartialPath, Map<String, String>> targetPathToSourceMap,
+ Map<PartialPath, Map<String, InputLocation>> targetPathToSourceInputLocationMap,
+ Map<String, InputLocation> sourceColumnToInputLocationMap) {
for (Map.Entry<PartialPath, Map<String, String>> entry : targetPathToSourceMap.entrySet()) {
PartialPath targetDevice = entry.getKey();
Map<String, InputLocation> measurementToInputLocationMap = new HashMap<>();
@@ -1729,19 +1729,19 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
String targetMeasurement = measurementEntry.getKey();
String sourceColumn = measurementEntry.getValue();
measurementToInputLocationMap.put(
- targetMeasurement, sourceColumnToInputLocationMap.get(sourceColumn));
+ targetMeasurement, sourceColumnToInputLocationMap.get(sourceColumn));
}
targetPathToSourceInputLocationMap.put(targetDevice, measurementToInputLocationMap);
}
}
private long calculateStatementSizePerLine(
- Map<PartialPath, Map<String, TSDataType>> targetPathToDataTypeMap) {
+ Map<PartialPath, Map<String, TSDataType>> targetPathToDataTypeMap) {
long maxStatementSize = Long.BYTES;
List<TSDataType> dataTypes =
- targetPathToDataTypeMap.values().stream()
- .flatMap(stringTSDataTypeMap -> stringTSDataTypeMap.values().stream())
- .collect(Collectors.toList());
+ targetPathToDataTypeMap.values().stream()
+ .flatMap(stringTSDataTypeMap -> stringTSDataTypeMap.values().stream())
+ .collect(Collectors.toList());
for (TSDataType dataType : dataTypes) {
maxStatementSize += getValueSizePerLine(dataType);
}
@@ -1772,39 +1772,39 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
public Operator visitTimeJoin(TimeJoinNode node, LocalExecutionPlanContext context) {
List<Operator> children = dealWithConsumeAllChildrenPipelineBreaker(node, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- RowBasedTimeJoinOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ RowBasedTimeJoinOperator.class.getSimpleName());
TimeComparator timeComparator =
- node.getMergeOrder() == Ordering.ASC ? ASC_TIME_COMPARATOR : DESC_TIME_COMPARATOR;
+ node.getMergeOrder() == Ordering.ASC ? ASC_TIME_COMPARATOR : DESC_TIME_COMPARATOR;
List<OutputColumn> outputColumns = generateOutputColumnsFromChildren(node);
List<ColumnMerger> mergers = createColumnMergers(outputColumns, timeComparator);
List<TSDataType> outputColumnTypes = getOutputColumnTypes(node, context.getTypeProvider());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new RowBasedTimeJoinOperator(
- operatorContext,
- children,
- node.getMergeOrder(),
- outputColumnTypes,
- mergers,
- timeComparator);
+ operatorContext,
+ children,
+ node.getMergeOrder(),
+ outputColumnTypes,
+ mergers,
+ timeComparator);
}
@Override
public Operator visitHorizontallyConcat(
- HorizontallyConcatNode node, LocalExecutionPlanContext context) {
+ HorizontallyConcatNode node, LocalExecutionPlanContext context) {
List<Operator> children = dealWithConsumeAllChildrenPipelineBreaker(node, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- HorizontallyConcatOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ HorizontallyConcatOperator.class.getSimpleName());
List<TSDataType> outputColumnTypes = getOutputColumnTypes(node, context.getTypeProvider());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
@@ -1814,28 +1814,28 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitShowQueries(ShowQueriesNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- ShowQueriesOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ ShowQueriesOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new ShowQueriesOperator(
- operatorContext, node.getPlanNodeId(), Coordinator.getInstance());
+ operatorContext, node.getPlanNodeId(), Coordinator.getInstance());
}
private List<OutputColumn> generateOutputColumnsFromChildren(MultiChildProcessNode node) {
// TODO we should also sort the InputLocation for each column if they are not overlapped
return makeLayout(node).values().stream()
- .map(inputLocations -> new OutputColumn(inputLocations, inputLocations.size() > 1))
- .collect(Collectors.toList());
+ .map(inputLocations -> new OutputColumn(inputLocations, inputLocations.size() > 1))
+ .collect(Collectors.toList());
}
private List<ColumnMerger> createColumnMergers(
- List<OutputColumn> outputColumns, TimeComparator timeComparator) {
+ List<OutputColumn> outputColumns, TimeComparator timeComparator) {
List<ColumnMerger> mergers = new ArrayList<>(outputColumns.size());
for (OutputColumn outputColumn : outputColumns) {
ColumnMerger merger;
@@ -1848,7 +1848,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
} else {
// has more than one input columns and time of these input columns is not overlapped
merger =
- new NonOverlappedMultiColumnMerger(outputColumn.getSourceLocations(), timeComparator);
+ new NonOverlappedMultiColumnMerger(outputColumn.getSourceLocations(), timeComparator);
}
mergers.add(merger);
}
@@ -1858,12 +1858,12 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitExchange(ExchangeNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- ExchangeOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ ExchangeOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 0);
FragmentInstanceId localInstanceId = context.getInstanceContext().getId();
@@ -1872,27 +1872,27 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
TEndPoint upstreamEndPoint = node.getUpstreamEndpoint();
boolean isSameNode = isSameNode(upstreamEndPoint);
ISourceHandle sourceHandle =
- isSameNode
- ? MPP_DATA_EXCHANGE_MANAGER.createLocalSourceHandleForFragment(
- localInstanceId.toThrift(),
- node.getPlanNodeId().getId(),
- node.getUpstreamPlanNodeId().getId(),
- remoteInstanceId.toThrift(),
- node.getIndexOfUpstreamSinkHandle(),
- context.getInstanceContext()::failed)
- : MPP_DATA_EXCHANGE_MANAGER.createSourceHandle(
- localInstanceId.toThrift(),
- node.getPlanNodeId().getId(),
- node.getIndexOfUpstreamSinkHandle(),
- upstreamEndPoint,
- remoteInstanceId.toThrift(),
- context.getInstanceContext()::failed);
+ isSameNode
+ ? MPP_DATA_EXCHANGE_MANAGER.createLocalSourceHandleForFragment(
+ localInstanceId.toThrift(),
+ node.getPlanNodeId().getId(),
+ node.getUpstreamPlanNodeId().getId(),
+ remoteInstanceId.toThrift(),
+ node.getIndexOfUpstreamSinkHandle(),
+ context.getInstanceContext()::failed)
+ : MPP_DATA_EXCHANGE_MANAGER.createSourceHandle(
+ localInstanceId.toThrift(),
+ node.getPlanNodeId().getId(),
+ node.getIndexOfUpstreamSinkHandle(),
+ upstreamEndPoint,
+ remoteInstanceId.toThrift(),
+ context.getInstanceContext()::failed);
if (!isSameNode) {
context.addExchangeSumNum(1);
}
sourceHandle.setMaxBytesCanReserve(context.getMaxBytesOneHandleCanReserve());
ExchangeOperator exchangeOperator =
- new ExchangeOperator(operatorContext, sourceHandle, node.getUpstreamPlanNodeId());
+ new ExchangeOperator(operatorContext, sourceHandle, node.getUpstreamPlanNodeId());
context.addExchangeOperator(exchangeOperator);
return exchangeOperator;
}
@@ -1901,26 +1901,26 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
public Operator visitIdentitySink(IdentitySinkNode node, LocalExecutionPlanContext context) {
context.addExchangeSumNum(1);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- IdentitySinkOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ IdentitySinkOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
checkArgument(
- MPP_DATA_EXCHANGE_MANAGER != null, "MPP_DATA_EXCHANGE_MANAGER should not be null");
+ MPP_DATA_EXCHANGE_MANAGER != null, "MPP_DATA_EXCHANGE_MANAGER should not be null");
FragmentInstanceId localInstanceId = context.getInstanceContext().getId();
DownStreamChannelIndex downStreamChannelIndex = new DownStreamChannelIndex(0);
ISinkHandle sinkHandle =
- MPP_DATA_EXCHANGE_MANAGER.createShuffleSinkHandle(
- node.getDownStreamChannelLocationList(),
- downStreamChannelIndex,
- ShuffleSinkHandle.ShuffleStrategyEnum.PLAIN,
- localInstanceId.toThrift(),
- node.getPlanNodeId().getId(),
- context.getInstanceContext());
+ MPP_DATA_EXCHANGE_MANAGER.createShuffleSinkHandle(
+ node.getDownStreamChannelLocationList(),
+ downStreamChannelIndex,
+ ShuffleSinkHandle.ShuffleStrategyEnum.PLAIN,
+ localInstanceId.toThrift(),
+ node.getPlanNodeId().getId(),
+ context.getInstanceContext());
sinkHandle.setMaxBytesCanReserve(context.getMaxBytesOneHandleCanReserve());
context.getDriverContext().setSink(sinkHandle);
@@ -1932,12 +1932,12 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
public Operator visitShuffleSink(ShuffleSinkNode node, LocalExecutionPlanContext context) {
context.addExchangeSumNum(1);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- ShuffleHelperOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ ShuffleHelperOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
// TODO implement pipeline division for shuffle sink
@@ -1945,17 +1945,17 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
List<Operator> children = dealWithConsumeAllChildrenPipelineBreaker(node, context);
checkArgument(
- MPP_DATA_EXCHANGE_MANAGER != null, "MPP_DATA_EXCHANGE_MANAGER should not be null");
+ MPP_DATA_EXCHANGE_MANAGER != null, "MPP_DATA_EXCHANGE_MANAGER should not be null");
FragmentInstanceId localInstanceId = context.getInstanceContext().getId();
DownStreamChannelIndex downStreamChannelIndex = new DownStreamChannelIndex(0);
ISinkHandle sinkHandle =
- MPP_DATA_EXCHANGE_MANAGER.createShuffleSinkHandle(
- node.getDownStreamChannelLocationList(),
- downStreamChannelIndex,
- ShuffleSinkHandle.ShuffleStrategyEnum.SIMPLE_ROUND_ROBIN,
- localInstanceId.toThrift(),
- node.getPlanNodeId().getId(),
- context.getInstanceContext());
+ MPP_DATA_EXCHANGE_MANAGER.createShuffleSinkHandle(
+ node.getDownStreamChannelLocationList(),
+ downStreamChannelIndex,
+ ShuffleSinkHandle.ShuffleStrategyEnum.SIMPLE_ROUND_ROBIN,
+ localInstanceId.toThrift(),
+ node.getPlanNodeId().getId(),
+ context.getInstanceContext());
sinkHandle.setMaxBytesCanReserve(context.getMaxBytesOneHandleCanReserve());
context.getDriverContext().setSink(sinkHandle);
@@ -1964,37 +1964,37 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitSchemaFetchMerge(
- SchemaFetchMergeNode node, LocalExecutionPlanContext context) {
+ SchemaFetchMergeNode node, LocalExecutionPlanContext context) {
List<Operator> children = dealWithConsumeChildrenOneByOneNode(node, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaFetchMergeOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaFetchMergeOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaFetchMergeOperator(operatorContext, children, node.getStorageGroupList());
}
@Override
public Operator visitSchemaFetchScan(
- SchemaFetchScanNode node, LocalExecutionPlanContext context) {
+ SchemaFetchScanNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaFetchScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaFetchScanOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaFetchScanOperator(
- node.getPlanNodeId(),
- operatorContext,
- node.getPatternTree(),
- node.getTemplateMap(),
- ((SchemaDriverContext) (context.getDriverContext())).getSchemaRegion(),
- node.isWithTags());
+ node.getPlanNodeId(),
+ operatorContext,
+ node.getPatternTree(),
+ node.getTemplateMap(),
+ ((SchemaDriverContext) (context.getDriverContext())).getSchemaRegion(),
+ node.isWithTags());
}
@Override
@@ -2018,12 +2018,12 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
} else if (timeValuePair.getValue() == null) { // there is no data for this time series
return null;
} else if (!LastQueryUtil.satisfyFilter(
- updateFilterUsingTTL(context.getLastQueryTimeFilter(), context.getDataRegionTTL()),
- timeValuePair)) { // cached last value is not satisfied
+ updateFilterUsingTTL(context.getLastQueryTimeFilter(), context.getDataRegionTTL()),
+ timeValuePair)) { // cached last value is not satisfied
boolean isFilterGtOrGe =
- (context.getLastQueryTimeFilter() instanceof Gt
- || context.getLastQueryTimeFilter() instanceof GtEq);
+ (context.getLastQueryTimeFilter() instanceof Gt
+ || context.getLastQueryTimeFilter() instanceof GtEq);
// time filter is not > or >=, we still need to read from disk
if (!isFilterGtOrGe) {
return createUpdateLastCacheOperator(node, context, node.getSeriesPath());
@@ -2037,97 +2037,97 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
private UpdateLastCacheOperator createUpdateLastCacheOperator(
- LastQueryScanNode node, LocalExecutionPlanContext context, MeasurementPath fullPath) {
+ LastQueryScanNode node, LocalExecutionPlanContext context, MeasurementPath fullPath) {
SeriesAggregationScanOperator lastQueryScan = createLastQueryScanOperator(node, context);
if (node.getOutputViewPath() == null) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- UpdateLastCacheOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ UpdateLastCacheOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new UpdateLastCacheOperator(
- operatorContext,
- lastQueryScan,
- fullPath,
- node.getSeriesPath().getSeriesType(),
- DATA_NODE_SCHEMA_CACHE,
- context.isNeedUpdateLastCache(),
- context.isNeedUpdateNullEntry());
+ operatorContext,
+ lastQueryScan,
+ fullPath,
+ node.getSeriesPath().getSeriesType(),
+ DATA_NODE_SCHEMA_CACHE,
+ context.isNeedUpdateLastCache(),
+ context.isNeedUpdateNullEntry());
} else {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- UpdateViewPathLastCacheOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ UpdateViewPathLastCacheOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new UpdateViewPathLastCacheOperator(
- operatorContext,
- lastQueryScan,
- fullPath,
- node.getSeriesPath().getSeriesType(),
- DATA_NODE_SCHEMA_CACHE,
- context.isNeedUpdateLastCache(),
- context.isNeedUpdateNullEntry(),
- node.getOutputViewPath());
+ operatorContext,
+ lastQueryScan,
+ fullPath,
+ node.getSeriesPath().getSeriesType(),
+ DATA_NODE_SCHEMA_CACHE,
+ context.isNeedUpdateLastCache(),
+ context.isNeedUpdateNullEntry(),
+ node.getOutputViewPath());
}
}
private AlignedUpdateLastCacheOperator createAlignedUpdateLastCacheOperator(
- AlignedLastQueryScanNode node, AlignedPath unCachedPath, LocalExecutionPlanContext context) {
+ AlignedLastQueryScanNode node, AlignedPath unCachedPath, LocalExecutionPlanContext context) {
AlignedSeriesAggregationScanOperator lastQueryScan =
- createLastQueryScanOperator(node, unCachedPath, context);
+ createLastQueryScanOperator(node, unCachedPath, context);
if (node.getOutputViewPath() == null) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- AlignedUpdateLastCacheOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ AlignedUpdateLastCacheOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new AlignedUpdateLastCacheOperator(
- operatorContext,
- lastQueryScan,
- unCachedPath,
- DATA_NODE_SCHEMA_CACHE,
- context.isNeedUpdateLastCache(),
- context.isNeedUpdateNullEntry());
+ operatorContext,
+ lastQueryScan,
+ unCachedPath,
+ DATA_NODE_SCHEMA_CACHE,
+ context.isNeedUpdateLastCache(),
+ context.isNeedUpdateNullEntry());
} else {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- AlignedUpdateViewPathLastCacheOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ AlignedUpdateViewPathLastCacheOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new AlignedUpdateViewPathLastCacheOperator(
- operatorContext,
- lastQueryScan,
- unCachedPath,
- DATA_NODE_SCHEMA_CACHE,
- context.isNeedUpdateLastCache(),
- context.isNeedUpdateNullEntry(),
- node.getOutputViewPath());
+ operatorContext,
+ lastQueryScan,
+ unCachedPath,
+ DATA_NODE_SCHEMA_CACHE,
+ context.isNeedUpdateLastCache(),
+ context.isNeedUpdateNullEntry(),
+ node.getOutputViewPath());
}
}
private SeriesAggregationScanOperator createLastQueryScanOperator(
- LastQueryScanNode node, LocalExecutionPlanContext context) {
+ LastQueryScanNode node, LocalExecutionPlanContext context) {
MeasurementPath seriesPath = node.getSeriesPath();
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SeriesAggregationScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SeriesAggregationScanOperator.class.getSimpleName());
// last_time, last_value
List<Aggregator> aggregators = LastQueryUtil.createAggregators(seriesPath.getSeriesType());
@@ -2136,34 +2136,34 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
SeriesScanOptions.Builder scanOptionsBuilder = new SeriesScanOptions.Builder();
scanOptionsBuilder.withAllSensors(
- context.getAllSensors(seriesPath.getDevice(), seriesPath.getMeasurement()));
+ context.getAllSensors(seriesPath.getDevice(), seriesPath.getMeasurement()));
scanOptionsBuilder.withGlobalTimeFilter(context.getLastQueryTimeFilter());
SeriesAggregationScanOperator seriesAggregationScanOperator =
- new SeriesAggregationScanOperator(
- node.getPlanNodeId(),
- seriesPath,
- Ordering.DESC,
- scanOptionsBuilder.build(),
- operatorContext,
- aggregators,
- timeRangeIterator,
- null,
- maxReturnSize);
+ new SeriesAggregationScanOperator(
+ node.getPlanNodeId(),
+ seriesPath,
+ Ordering.DESC,
+ scanOptionsBuilder.build(),
+ operatorContext,
+ aggregators,
+ timeRangeIterator,
+ null,
+ maxReturnSize);
((DataDriverContext) context.getDriverContext())
- .addSourceOperator(seriesAggregationScanOperator);
+ .addSourceOperator(seriesAggregationScanOperator);
((DataDriverContext) context.getDriverContext()).addPath(seriesPath);
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, aggregators.size());
return seriesAggregationScanOperator;
}
private AlignedSeriesAggregationScanOperator createLastQueryScanOperator(
- AlignedLastQueryScanNode node, AlignedPath unCachedPath, LocalExecutionPlanContext context) {
+ AlignedLastQueryScanNode node, AlignedPath unCachedPath, LocalExecutionPlanContext context) {
// last_time, last_value
List<Aggregator> aggregators = new ArrayList<>();
for (int i = 0; i < unCachedPath.getMeasurementList().size(); i++) {
aggregators.addAll(
- LastQueryUtil.createAggregators(unCachedPath.getSchemaList().get(i).getType(), i));
+ LastQueryUtil.createAggregators(unCachedPath.getSchemaList().get(i).getType(), i));
}
ITimeRangeIterator timeRangeIterator = initTimeRangeIterator(null, false, false);
long maxReturnSize = calculateMaxAggregationResultSizeForLastQuery(aggregators);
@@ -2176,25 +2176,25 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- AlignedSeriesAggregationScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ AlignedSeriesAggregationScanOperator.class.getSimpleName());
AlignedSeriesAggregationScanOperator seriesAggregationScanOperator =
- new AlignedSeriesAggregationScanOperator(
- node.getPlanNodeId(),
- unCachedPath,
- Ordering.DESC,
- scanOptionsBuilder.build(),
- operatorContext,
- aggregators,
- timeRangeIterator,
- null,
- maxReturnSize);
+ new AlignedSeriesAggregationScanOperator(
+ node.getPlanNodeId(),
+ unCachedPath,
+ Ordering.DESC,
+ scanOptionsBuilder.build(),
+ operatorContext,
+ aggregators,
+ timeRangeIterator,
+ null,
+ maxReturnSize);
((DataDriverContext) context.getDriverContext())
- .addSourceOperator(seriesAggregationScanOperator);
+ .addSourceOperator(seriesAggregationScanOperator);
((DataDriverContext) context.getDriverContext()).addPath(unCachedPath);
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, aggregators.size());
return seriesAggregationScanOperator;
@@ -2202,7 +2202,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitAlignedLastQueryScan(
- AlignedLastQueryScanNode node, LocalExecutionPlanContext context) {
+ AlignedLastQueryScanNode node, LocalExecutionPlanContext context) {
AlignedPath alignedPath = node.getSeriesPath();
PartialPath devicePath = alignedPath.getDevicePath();
// get series under aligned entity that has not been cached
@@ -2217,7 +2217,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
timeValuePair = DATA_NODE_SCHEMA_CACHE.getLastCache(measurementPath);
if (timeValuePair == null) {
context.dataNodeQueryContext.addUnCachePath(
- measurementPath, new AtomicInteger(node.getDataNodeSeriesScanNum().get()));
+ measurementPath, new AtomicInteger(node.getDataNodeSeriesScanNum().get()));
}
}
} finally {
@@ -2229,12 +2229,12 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
} else if (timeValuePair.getValue() == null) {
// there is no data for this time series, just ignore
} else if (!LastQueryUtil.satisfyFilter(
- updateFilterUsingTTL(context.getLastQueryTimeFilter(), context.getDataRegionTTL()),
- timeValuePair)) { // cached last value is not satisfied
+ updateFilterUsingTTL(context.getLastQueryTimeFilter(), context.getDataRegionTTL()),
+ timeValuePair)) { // cached last value is not satisfied
boolean isFilterGtOrGe =
- (context.getLastQueryTimeFilter() instanceof Gt
- || context.getLastQueryTimeFilter() instanceof GtEq);
+ (context.getLastQueryTimeFilter() instanceof Gt
+ || context.getLastQueryTimeFilter() instanceof GtEq);
// time filter is not > or >=, we still need to read from disk
if (!isFilterGtOrGe) {
unCachedMeasurementIndexes.add(i);
@@ -2266,14 +2266,14 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
context.setNeedUpdateNullEntry(LastQueryUtil.needUpdateNullEntry(node.getTimeFilter()));
List<AbstractUpdateLastCacheOperator> operatorList =
- node.getChildren().stream()
- .map(child -> child.accept(this, context))
- .filter(Objects::nonNull)
- .map(o -> (AbstractUpdateLastCacheOperator) o)
- .collect(Collectors.toList());
+ node.getChildren().stream()
+ .map(child -> child.accept(this, context))
+ .filter(Objects::nonNull)
+ .map(o -> (AbstractUpdateLastCacheOperator) o)
+ .collect(Collectors.toList());
List<Pair<TimeValuePair, Binary>> cachedLastValueAndPathList =
- context.getCachedLastValueAndPathList();
+ context.getCachedLastValueAndPathList();
int initSize = cachedLastValueAndPathList != null ? cachedLastValueAndPathList.size() : 0;
// no need to order by timeseries at first
@@ -2282,27 +2282,27 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
for (int i = 0; i < initSize; i++) {
TimeValuePair timeValuePair = cachedLastValueAndPathList.get(i).left;
LastQueryUtil.appendLastValue(
- builder,
- timeValuePair.getTimestamp(),
- cachedLastValueAndPathList.get(i).right,
- timeValuePair.getValue().getStringValue(),
- timeValuePair.getValue().getDataType().name());
+ builder,
+ timeValuePair.getTimestamp(),
+ cachedLastValueAndPathList.get(i).right,
+ timeValuePair.getValue().getStringValue(),
+ timeValuePair.getValue().getDataType().name());
}
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- LastQueryOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ LastQueryOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new LastQueryOperator(operatorContext, operatorList, builder);
} else {
// order by timeseries
Comparator<Binary> comparator =
- node.getTimeseriesOrdering() == Ordering.ASC
- ? ASC_BINARY_COMPARATOR
- : DESC_BINARY_COMPARATOR;
+ node.getTimeseriesOrdering() == Ordering.ASC
+ ? ASC_BINARY_COMPARATOR
+ : DESC_BINARY_COMPARATOR;
// sort values from last cache
if (initSize > 0) {
cachedLastValueAndPathList.sort(Comparator.comparing(Pair::getRight, comparator));
@@ -2312,20 +2312,20 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
for (int i = 0; i < initSize; i++) {
TimeValuePair timeValuePair = cachedLastValueAndPathList.get(i).left;
LastQueryUtil.appendLastValue(
- builder,
- timeValuePair.getTimestamp(),
- cachedLastValueAndPathList.get(i).right,
- timeValuePair.getValue().getStringValue(),
- timeValuePair.getValue().getDataType().name());
+ builder,
+ timeValuePair.getTimestamp(),
+ cachedLastValueAndPathList.get(i).right,
+ timeValuePair.getValue().getStringValue(),
+ timeValuePair.getValue().getDataType().name());
}
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- LastQuerySortOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ LastQuerySortOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new LastQuerySortOperator(operatorContext, builder.build(), operatorList, comparator);
}
@@ -2334,22 +2334,22 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitLastQueryMerge(LastQueryMergeNode node, LocalExecutionPlanContext context) {
List<Operator> children =
- node.getChildren().stream()
- .map(child -> child.accept(this, context))
- .collect(Collectors.toList());
+ node.getChildren().stream()
+ .map(child -> child.accept(this, context))
+ .collect(Collectors.toList());
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- LastQueryMergeOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ LastQueryMergeOperator.class.getSimpleName());
Ordering timeseriesOrdering = node.getTimeseriesOrdering();
Comparator<Binary> comparator =
- (timeseriesOrdering == null || timeseriesOrdering == Ordering.ASC)
- ? ASC_BINARY_COMPARATOR
- : DESC_BINARY_COMPARATOR;
+ (timeseriesOrdering == null || timeseriesOrdering == Ordering.ASC)
+ ? ASC_BINARY_COMPARATOR
+ : DESC_BINARY_COMPARATOR;
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new LastQueryMergeOperator(operatorContext, children, comparator);
@@ -2357,15 +2357,15 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
@Override
public Operator visitLastQueryCollect(
- LastQueryCollectNode node, LocalExecutionPlanContext context) {
+ LastQueryCollectNode node, LocalExecutionPlanContext context) {
List<Operator> children = dealWithConsumeChildrenOneByOneNode(node, context);
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- LastQueryCollectOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ LastQueryCollectOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new LastQueryCollectOperator(operatorContext, children);
@@ -2378,8 +2378,8 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
int valueColumnIndex = 0;
for (String columnName : childNode.getOutputColumnNames()) {
outputMappings
- .computeIfAbsent(columnName, key -> new ArrayList<>())
- .add(new InputLocation(tsBlockIndex, valueColumnIndex));
+ .computeIfAbsent(columnName, key -> new ArrayList<>())
+ .add(new InputLocation(tsBlockIndex, valueColumnIndex));
valueColumnIndex++;
}
tsBlockIndex++;
@@ -2389,63 +2389,63 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
private List<TSDataType> getInputColumnTypes(PlanNode node, TypeProvider typeProvider) {
return node.getChildren().stream()
- .map(PlanNode::getOutputColumnNames)
- .flatMap(List::stream)
- .map(typeProvider::getType)
- .collect(Collectors.toList());
+ .map(PlanNode::getOutputColumnNames)
+ .flatMap(List::stream)
+ .map(typeProvider::getType)
+ .collect(Collectors.toList());
}
private List<TSDataType> getOutputColumnTypes(PlanNode node, TypeProvider typeProvider) {
return node.getOutputColumnNames().stream()
- .map(typeProvider::getType)
- .collect(Collectors.toList());
+ .map(typeProvider::getType)
+ .collect(Collectors.toList());
}
private Operator generateOnlyChildOperator(PlanNode node, LocalExecutionPlanContext context) {
List<Operator> children =
- node.getChildren().stream()
- .map(child -> child.accept(this, context))
- .collect(Collectors.toList());
+ node.getChildren().stream()
+ .map(child -> child.accept(this, context))
+ .collect(Collectors.toList());
Validate.isTrue(children.size() == 1);
return children.get(0);
}
public Operator visitPathsUsingTemplateScan(
- PathsUsingTemplateScanNode node, LocalExecutionPlanContext context) {
+ PathsUsingTemplateScanNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaQueryScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaQueryScanOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaQueryScanOperator<>(
- node.getPlanNodeId(),
- operatorContext,
- SchemaSourceFactory.getPathsUsingTemplateSource(
- node.getPathPatternList(), node.getTemplateId()));
+ node.getPlanNodeId(),
+ operatorContext,
+ SchemaSourceFactory.getPathsUsingTemplateSource(
+ node.getPathPatternList(), node.getTemplateId()));
}
public Operator visitLogicalViewSchemaScan(
- LogicalViewSchemaScanNode node, LocalExecutionPlanContext context) {
+ LogicalViewSchemaScanNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- node.getPlanNodeId(),
- SchemaQueryScanOperator.class.getSimpleName());
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaQueryScanOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
return new SchemaQueryScanOperator<>(
- node.getPlanNodeId(),
- operatorContext,
- SchemaSourceFactory.getLogicalViewSchemaSource(
- node.getPath(), node.getLimit(), node.getOffset(), node.getSchemaFilter()));
+ node.getPlanNodeId(),
+ operatorContext,
+ SchemaSourceFactory.getLogicalViewSchemaSource(
+ node.getPath(), node.getLimit(), node.getOffset(), node.getSchemaFilter()));
}
public List<Operator> dealWithConsumeAllChildrenPipelineBreaker(
- PlanNode node, LocalExecutionPlanContext context) {
+ PlanNode node, LocalExecutionPlanContext context) {
// children after pipelining
List<Operator> parentPipelineChildren = new ArrayList<>();
int finalExchangeNum = context.getExchangeSumNum();
@@ -2496,7 +2496,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
Operator sourceOperator = createNewPipelineForChildNode(context, subContext, childNode);
parentPipelineChildren.add(sourceOperator);
dopForChild =
- Math.max(1, dopForChild - (subContext.getPipelineNumber() - 1 - originPipeNum));
+ Math.max(1, dopForChild - (subContext.getPipelineNumber() - 1 - originPipeNum));
finalExchangeNum += subContext.getExchangeSumNum() - context.getExchangeSumNum() + 1;
}
}
@@ -2504,8 +2504,8 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
// If dop <= localChildrenSize, we have to divide every childNumInEachPipeline localChildren
// to different pipeline
int[] childNumInEachPipeline =
- getChildNumInEachPipeline(
- node.getChildren(), localChildrenSize, context.getDegreeOfParallelism());
+ getChildNumInEachPipeline(
+ node.getChildren(), localChildrenSize, context.getDegreeOfParallelism());
int childGroupNum = Math.min(context.getDegreeOfParallelism(), localChildrenSize);
int startIndex;
int endIndex = firstChildIndex;
@@ -2535,7 +2535,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
Operator sourceOperator =
- createNewPipelineForChildNode(context, subContext, partialParentNode);
+ createNewPipelineForChildNode(context, subContext, partialParentNode);
parentPipelineChildren.add(sourceOperator);
afterwardsNodes.add(partialParentNode);
finalExchangeNum += subContext.getExchangeSumNum() - context.getExchangeSumNum() + 1;
@@ -2557,7 +2557,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
* <p>This method can only be invoked when dop <= localChildrenSize.
*/
public int[] getChildNumInEachPipeline(
- List<PlanNode> allChildren, int localChildrenSize, int dop) {
+ List<PlanNode> allChildren, int localChildrenSize, int dop) {
int maxPipelineNum = Math.min(localChildrenSize, dop);
int[] childNumInEachPipeline = new int[maxPipelineNum];
int avgChildNum = Math.max(1, localChildrenSize / dop);
@@ -2588,26 +2588,26 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
private Operator createNewPipelineForChildNode(
- LocalExecutionPlanContext context, LocalExecutionPlanContext subContext, PlanNode childNode) {
+ LocalExecutionPlanContext context, LocalExecutionPlanContext subContext, PlanNode childNode) {
Operator childOperation = childNode.accept(this, subContext);
ISinkChannel localSinkChannel =
- MPP_DATA_EXCHANGE_MANAGER.createLocalSinkChannelForPipeline(
- // Attention, there is no parent node, use first child node instead
- subContext.getDriverContext(), childNode.getPlanNodeId().getId());
+ MPP_DATA_EXCHANGE_MANAGER.createLocalSinkChannelForPipeline(
+ // Attention, there is no parent node, use first child node instead
+ subContext.getDriverContext(), childNode.getPlanNodeId().getId());
subContext.setISink(localSinkChannel);
subContext.addPipelineDriverFactory(childOperation, subContext.getDriverContext(), 0);
ExchangeOperator sourceOperator =
- new ExchangeOperator(
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(), null, ExchangeOperator.class.getSimpleName()),
- MPP_DATA_EXCHANGE_MANAGER.createLocalSourceHandleForPipeline(
- ((LocalSinkChannel) localSinkChannel).getSharedTsBlockQueue(),
- context.getDriverContext()),
- childNode.getPlanNodeId(),
- childOperation.calculateMaxReturnSize());
+ new ExchangeOperator(
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(), null, ExchangeOperator.class.getSimpleName()),
+ MPP_DATA_EXCHANGE_MANAGER.createLocalSourceHandleForPipeline(
+ ((LocalSinkChannel) localSinkChannel).getSharedTsBlockQueue(),
+ context.getDriverContext()),
+ childNode.getPlanNodeId(),
+ childOperation.calculateMaxReturnSize());
context.getTimeSliceAllocator().recordExecutionWeight(sourceOperator.getOperatorContext(), 1);
context.addExchangeOperator(sourceOperator);
@@ -2615,7 +2615,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
public List<Operator> dealWithConsumeChildrenOneByOneNode(
- PlanNode node, LocalExecutionPlanContext context) {
+ PlanNode node, LocalExecutionPlanContext context) {
List<Operator> parentPipelineChildren = new ArrayList<>();
int originExchangeNum = context.getExchangeSumNum();
int finalExchangeNum = context.getExchangeSumNum();
@@ -2650,16 +2650,16 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
int originPipeNum = context.getPipelineNumber();
Operator childOperation = childNode.accept(this, subContext);
ISinkChannel localSinkChannel =
- MPP_DATA_EXCHANGE_MANAGER.createLocalSinkChannelForPipeline(
- // Attention, there is no parent node, use first child node instead
- context.getDriverContext(), childNode.getPlanNodeId().getId());
+ MPP_DATA_EXCHANGE_MANAGER.createLocalSinkChannelForPipeline(
+ // Attention, there is no parent node, use first child node instead
+ context.getDriverContext(), childNode.getPlanNodeId().getId());
subContext.setISink(localSinkChannel);
subContext.addPipelineDriverFactory(childOperation, subContext.getDriverContext(), 0);
// OneByOneChild may be divided into more than dop pipelines, but the number of running
// actually is dop
int curChildPipelineNum =
- Math.min(dopForChild, subContext.getPipelineNumber() - originPipeNum);
+ Math.min(dopForChild, subContext.getPipelineNumber() - originPipeNum);
childPipelineNums.add(curChildPipelineNum);
sumOfChildPipelines += curChildPipelineNum;
// If sumOfChildPipelines > dopForChild, we have to wait until some pipelines finish
@@ -2681,33 +2681,33 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
ExchangeOperator sourceOperator =
- new ExchangeOperator(
- context
- .getDriverContext()
- .addOperatorContext(
- context.getNextOperatorId(),
- null,
- ExchangeOperator.class.getSimpleName()),
- MPP_DATA_EXCHANGE_MANAGER.createLocalSourceHandleForPipeline(
- ((LocalSinkChannel) localSinkChannel).getSharedTsBlockQueue(),
- context.getDriverContext()),
- childNode.getPlanNodeId(),
- childOperation.calculateMaxReturnSize());
+ new ExchangeOperator(
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ null,
+ ExchangeOperator.class.getSimpleName()),
+ MPP_DATA_EXCHANGE_MANAGER.createLocalSourceHandleForPipeline(
+ ((LocalSinkChannel) localSinkChannel).getSharedTsBlockQueue(),
+ context.getDriverContext()),
+ childNode.getPlanNodeId(),
+ childOperation.calculateMaxReturnSize());
context.getCurrentPipelineDriverFactory().setDownstreamOperator(sourceOperator);
context
- .getTimeSliceAllocator()
- .recordExecutionWeight(sourceOperator.getOperatorContext(), 1);
+ .getTimeSliceAllocator()
+ .recordExecutionWeight(sourceOperator.getOperatorContext(), 1);
parentPipelineChildren.add(sourceOperator);
context.addExchangeOperator(sourceOperator);
int childExchangeNum = subContext.getExchangeSumNum() - context.getExchangeSumNum() + 1;
sumOfChildExchangeNums += childExchangeNum;
childExchangeNums.add(childExchangeNum);
finalExchangeNum =
- Math.max(finalExchangeNum, context.getExchangeSumNum() + sumOfChildExchangeNums);
+ Math.max(finalExchangeNum, context.getExchangeSumNum() + sumOfChildExchangeNums);
}
}
}
context.setExchangeSumNum(finalExchangeNum);
return parentPipelineChildren;
}
-}
+}
\ No newline at end of file
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java
index 2bf79e2a113..7b438563d1c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java
@@ -74,7 +74,7 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
private final Map<TDataNodeLocation, List<FragmentInstance>> dataNodeFIMap;
public SimpleFragmentParallelPlanner(
- SubPlan subPlan, Analysis analysis, MPPQueryContext context) {
+ SubPlan subPlan, Analysis analysis, MPPQueryContext context) {
this.subPlan = subPlan;
this.analysis = analysis;
this.queryContext = context;
@@ -98,24 +98,24 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
produceFragmentInstance(fragment);
}
fragmentInstanceList.forEach(
- fragmentInstance ->
- fragmentInstance.setDataNodeFINum(
- dataNodeFIMap.get(fragmentInstance.getHostDataNode()).size()));
+ fragmentInstance ->
+ fragmentInstance.setDataNodeFINum(
+ dataNodeFIMap.get(fragmentInstance.getHostDataNode()).size()));
// compute dataNodeSeriesScanNum in LastQueryScanNode
if (analysis.getStatement() instanceof QueryStatement
- && ((QueryStatement) analysis.getStatement()).isLastQuery()) {
+ && ((QueryStatement) analysis.getStatement()).isLastQuery()) {
final Map<Path, AtomicInteger> pathSumMap = new HashMap<>();
dataNodeFIMap
- .values()
- .forEach(
- fragmentInstances -> {
- fragmentInstances.forEach(
- fragmentInstance ->
- updateScanNum(
- fragmentInstance.getFragment().getPlanNodeTree(), pathSumMap));
- pathSumMap.clear();
- });
+ .values()
+ .forEach(
+ fragmentInstances -> {
+ fragmentInstances.forEach(
+ fragmentInstance ->
+ updateScanNum(
+ fragmentInstance.getFragment().getPlanNodeTree(), pathSumMap));
+ pathSumMap.clear();
+ });
}
}
@@ -123,12 +123,12 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
if (planNode instanceof LastSeriesSourceNode) {
LastSeriesSourceNode lastSeriesSourceNode = (LastSeriesSourceNode) planNode;
pathSumMap.merge(
- lastSeriesSourceNode.getSeriesPath(),
- lastSeriesSourceNode.getDataNodeSeriesScanNum(),
- (k, v) -> {
- v.incrementAndGet();
- return v;
- });
+ lastSeriesSourceNode.getSeriesPath(),
+ lastSeriesSourceNode.getDataNodeSeriesScanNum(),
+ (k, v) -> {
+ v.incrementAndGet();
+ return v;
+ });
}
planNode.getChildren().forEach(node -> updateScanNum(node, pathSumMap));
}
@@ -136,14 +136,14 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
private void produceFragmentInstance(PlanFragment fragment) {
Filter timeFilter = analysis.getGlobalTimeFilter();
FragmentInstance fragmentInstance =
- new FragmentInstance(
- fragment,
- fragment.getId().genFragmentInstanceId(),
- timeFilter,
- queryContext.getQueryType(),
- queryContext.getTimeOut(),
- queryContext.getSession(),
- fragment.isRoot());
+ new FragmentInstance(
+ fragment,
+ fragment.getId().genFragmentInstanceId(),
+ timeFilter,
+ queryContext.getQueryType(),
+ queryContext.getTimeOut(),
+ queryContext.getSession(),
+ fragment.isRoot());
// Get the target region for origin PlanFragment, then its instance will be distributed one
// of them.
@@ -162,10 +162,10 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
// no data region && no dataNodeLocation, we need to execute this FI on local
// now only the case AggregationQuery has schemaengine but no data region will enter here
fragmentInstance.setExecutorAndHost(
- new QueryExecutor(
- new TDataNodeLocation()
- .setInternalEndPoint(DataNodeEndPoints.LOCAL_HOST_INTERNAL_ENDPOINT)
- .setMPPDataExchangeEndPoint(DataNodeEndPoints.LOCAL_HOST_DATA_BLOCK_ENDPOINT)));
+ new QueryExecutor(
+ new TDataNodeLocation()
+ .setInternalEndPoint(DataNodeEndPoints.LOCAL_HOST_INTERNAL_ENDPOINT)
+ .setMPPDataExchangeEndPoint(DataNodeEndPoints.LOCAL_HOST_DATA_BLOCK_ENDPOINT)));
}
} else {
fragmentInstance.setExecutorAndHost(new StorageExecutor(regionReplicaSet));
@@ -173,17 +173,17 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
}
dataNodeFIMap.compute(
- fragmentInstance.getHostDataNode(),
- (k, v) -> {
- if (v == null) {
- v = new ArrayList<>();
- }
- v.add(fragmentInstance);
- return v;
- });
+ fragmentInstance.getHostDataNode(),
+ (k, v) -> {
+ if (v == null) {
+ v = new ArrayList<>();
+ }
+ v.add(fragmentInstance);
+ return v;
+ });
if (analysis.getStatement() instanceof QueryStatement
- || analysis.getStatement() instanceof ShowQueriesStatement) {
+ || analysis.getStatement() instanceof ShowQueriesStatement) {
fragmentInstance.getFragment().generateTypeProvider(queryContext.getTypeProvider());
}
instanceMap.putIfAbsent(fragment.getId(), fragmentInstance);
@@ -192,13 +192,13 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
private TDataNodeLocation selectTargetDataNode(TRegionReplicaSet regionReplicaSet) {
if (regionReplicaSet == null
- || regionReplicaSet.getDataNodeLocations() == null
- || regionReplicaSet.getDataNodeLocations().isEmpty()) {
+ || regionReplicaSet.getDataNodeLocations() == null
+ || regionReplicaSet.getDataNodeLocations().isEmpty()) {
throw new IllegalArgumentException(
- String.format("regionReplicaSet is invalid: %s", regionReplicaSet));
+ String.format("regionReplicaSet is invalid: %s", regionReplicaSet));
}
String readConsistencyLevel =
- IoTDBDescriptor.getInstance().getConfig().getReadConsistencyLevel();
+ IoTDBDescriptor.getInstance().getConfig().getReadConsistencyLevel();
// TODO: (Chen Rongzhao) need to make the values of ReadConsistencyLevel as static variable or
// enums
boolean selectRandomDataNode = "weak".equals(readConsistencyLevel);
@@ -206,12 +206,12 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
// When planning fragment onto specific DataNode, the DataNode whose endPoint is in
// black list won't be considered because it may have connection issue now.
List<TDataNodeLocation> availableDataNodes =
- filterAvailableTDataNode(regionReplicaSet.getDataNodeLocations());
+ filterAvailableTDataNode(regionReplicaSet.getDataNodeLocations());
if (availableDataNodes.isEmpty()) {
String errorMsg =
- String.format(
- "all replicas for region[%s] are not available in these DataNodes[%s]",
- regionReplicaSet.getRegionId(), regionReplicaSet.getDataNodeLocations());
+ String.format(
+ "all replicas for region[%s] are not available in these DataNodes[%s]",
+ regionReplicaSet.getRegionId(), regionReplicaSet.getDataNodeLocations());
throw new IllegalArgumentException(errorMsg);
}
if (regionReplicaSet.getDataNodeLocationsSize() != availableDataNodes.size()) {
@@ -227,7 +227,7 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
}
private List<TDataNodeLocation> filterAvailableTDataNode(
- List<TDataNodeLocation> originalDataNodeList) {
+ List<TDataNodeLocation> originalDataNodeList) {
List<TDataNodeLocation> result = new LinkedList<>();
for (TDataNodeLocation dataNodeLocation : originalDataNodeList) {
if (isAvailableDataNode(dataNodeLocation)) {
@@ -252,26 +252,26 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
if (rootNode instanceof MultiChildrenSinkNode) {
MultiChildrenSinkNode sinkNode = (MultiChildrenSinkNode) rootNode;
sinkNode
- .getDownStreamChannelLocationList()
- .forEach(
- downStreamChannelLocation -> {
- // Set target Endpoint for FragmentSinkNode
- PlanNodeId downStreamNodeId =
- new PlanNodeId(downStreamChannelLocation.getRemotePlanNodeId());
- FragmentInstance downStreamInstance = findDownStreamInstance(downStreamNodeId);
- downStreamChannelLocation.setRemoteEndpoint(
- downStreamInstance.getHostDataNode().getMPPDataExchangeEndPoint());
- downStreamChannelLocation.setRemoteFragmentInstanceId(
- downStreamInstance.getId().toThrift());
+ .getDownStreamChannelLocationList()
+ .forEach(
+ downStreamChannelLocation -> {
+ // Set target Endpoint for FragmentSinkNode
+ PlanNodeId downStreamNodeId =
+ new PlanNodeId(downStreamChannelLocation.getRemotePlanNodeId());
+ FragmentInstance downStreamInstance = findDownStreamInstance(downStreamNodeId);
+ downStreamChannelLocation.setRemoteEndpoint(
+ downStreamInstance.getHostDataNode().getMPPDataExchangeEndPoint());
+ downStreamChannelLocation.setRemoteFragmentInstanceId(
+ downStreamInstance.getId().toThrift());
- // Set upstream info for corresponding ExchangeNode in downstream FragmentInstance
- PlanNode downStreamExchangeNode = planNodeMap.get(downStreamNodeId).right;
- ((ExchangeNode) downStreamExchangeNode)
- .setUpstream(
- instance.getHostDataNode().getMPPDataExchangeEndPoint(),
- instance.getId(),
- sinkNode.getPlanNodeId());
- });
+ // Set upstream info for corresponding ExchangeNode in downstream FragmentInstance
+ PlanNode downStreamExchangeNode = planNodeMap.get(downStreamNodeId).right;
+ ((ExchangeNode) downStreamExchangeNode)
+ .setUpstream(
+ instance.getHostDataNode().getMPPDataExchangeEndPoint(),
+ instance.getId(),
+ sinkNode.getPlanNodeId());
+ });
}
}
}
@@ -286,4 +286,4 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
recordPlanNodeRelation(child, planFragmentId);
}
}
-}
+}
\ No newline at end of file
[iotdb] 11/12: Update sonar key in sonar-coveralls.yml (#10567)
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7873366803b6e4dda7ae8f6e3d086ca0e08a685d
Author: Haonan <hh...@outlook.com>
AuthorDate: Mon Jul 17 15:49:47 2023 +0800
Update sonar key in sonar-coveralls.yml (#10567)
https://issues.apache.org/jira/browse/INFRA-24794
---
.github/workflows/sonar-coveralls.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/sonar-coveralls.yml b/.github/workflows/sonar-coveralls.yml
index 22a56157900..23ec394a897 100644
--- a/.github/workflows/sonar-coveralls.yml
+++ b/.github/workflows/sonar-coveralls.yml
@@ -74,7 +74,7 @@ jobs:
run: |
mvn -B verify sonar:sonar \
-Dsonar.organization=apache \
- -Dsonar.projectKey=apache_incubator-iotdb \
+ -Dsonar.projectKey=apache_iotdb \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.login=${{ secrets.SONARCLOUD_TOKEN }} \
-DskipTests -pl '!distribution,!integration-test' -am
[iotdb] 06/12: [IOTDB-6066] Add ConfigNode timeslot metric (#10546)
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8c93538c406a3f129cf7594dfb9244a091867d64
Author: Xiangpeng Hu <65...@users.noreply.github.com>
AuthorDate: Fri Jul 14 10:42:29 2023 +0800
[IOTDB-6066] Add ConfigNode timeslot metric (#10546)
* add timeseries_slot metric
* compute directly
* fix compute
[iotdb] 08/12: [IOTDB-6068] Pipe: Failed to load tsfile when the first page is empty in a chunk (#10556)
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 696390dcca57c7eb7a9da04b75880da8f015416b
Author: Itami Sho <42...@users.noreply.github.com>
AuthorDate: Sat Jul 15 20:46:07 2023 +0800
[IOTDB-6068] Pipe: Failed to load tsfile when the first page is empty in a chunk (#10556)
In previous pr: Githhub#10487, We only considered the case where the empty page is at the end of an aligned chunk, and it's not well thought out. Empty page is skipped, causing problems with rewriting tsfile on datanode.
In this pr, we consider all the position of empty pages in an aligned chunk, and handle the empty page through write an empty page into the chunk.
[iotdb] 02/12: [IOTDB-5134] Fix auth antlr (#10538)
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8eabce2042c765fdb69684ce57c9b30b4f08aa5a
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Thu Jul 13 14:57:56 2023 +0800
[IOTDB-5134] Fix auth antlr (#10538)
* Fix auth anltr
* Fix antlr
---
.../src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 5 +++++
.../antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 ----
.../src/test/java/org/apache/iotdb/commons/path/PartialPathTest.java | 5 +++++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4 b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
index 896165c40b1..5a0d9b6f259 100644
--- a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
+++ b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
@@ -71,6 +71,8 @@ keyWords
| CQS
| CREATE
| DATA
+ | DATA_REPLICATION_FACTOR
+ | DATA_REGION_GROUP_NUM
| DATABASE
| DATABASES
| DATANODEID
@@ -185,6 +187,8 @@ keyWords
| ROUND
| RUNNING
| SCHEMA
+ | SCHEMA_REPLICATION_FACTOR
+ | SCHEMA_REGION_GROUP_NUM
| SELECT
| SERIESSLOTID
| SESSION
@@ -210,6 +214,7 @@ keyWords
| TEMPLATES
| THEN
| THROTTLE
+ | TIME_PARTITION_INTERVAL
| TIMEOUT
| TIMESERIES
| TIMEPARTITION
diff --git a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
index 0d66cbc8033..d1cac40b30d 100644
--- a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
+++ b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
@@ -967,10 +967,6 @@ MANAGE_DATABASE
: M A N A G E '_' D A T A B A S E
;
-SET_STORAGE_GROUP
- : S E T '_' S T O R A G E '_' G R O U P
- ;
-
SCHEMA_REPLICATION_FACTOR
: S C H E M A '_' R E P L I C A T I O N '_' F A C T O R
;
diff --git a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/path/PartialPathTest.java b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/path/PartialPathTest.java
index 8874c34fd4e..232c4b87550 100644
--- a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/path/PartialPathTest.java
+++ b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/path/PartialPathTest.java
@@ -128,6 +128,11 @@ public class PartialPathTest {
Assert.assertEquals("root.sg.abc", t.getFullPath());
nodes = new String[] {"root", "sg", "abc"};
checkNodes(nodes, t.getNodes());
+
+ PartialPath u = new PartialPath("root.sg.set_storage_group");
+ Assert.assertEquals("root.sg.set_storage_group", u.getFullPath());
+ nodes = new String[] {"root", "sg", "set_storage_group"};
+ checkNodes(nodes, u.getNodes());
}
@Test
[iotdb] 10/12: [IOTDB-6064] Pipe: Fix deadlock in rolling back procedures concurrently (#10537)
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 076aed3caac45187dbc8a1231d0e4b565680387a
Author: 马子坤 <55...@users.noreply.github.com>
AuthorDate: Mon Jul 17 11:54:51 2023 +0800
[IOTDB-6064] Pipe: Fix deadlock in rolling back procedures concurrently (#10537)
---
.../manager/pipe/task/PipeTaskCoordinator.java | 28 +++---
.../impl/pipe/AbstractOperatePipeProcedureV2.java | 106 ++++++++++-----------
2 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeTaskCoordinator.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeTaskCoordinator.java
index 886a728916b..e79509c0a9c 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeTaskCoordinator.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeTaskCoordinator.java
@@ -116,7 +116,7 @@ public class PipeTaskCoordinator {
final TSStatus status = configManager.getProcedureManager().stopPipe(pipeName);
if (status == RpcUtils.SUCCESS_STATUS && isStoppedByRuntimeException) {
LOGGER.info(
- "Pipe {} has stopped successfully manually, stop its auto restart process.", pipeName);
+ "Pipe {} has stopped successfully manually, stop its auto restart process.", pipeName);
pipeTaskInfo.setIsStoppedByRuntimeExceptionToFalse(pipeName);
configManager.getProcedureManager().pipeHandleMetaChange(true, true);
}
@@ -131,20 +131,20 @@ public class PipeTaskCoordinator {
LOGGER.warn("Failed to drop pipe {}. Result status: {}.", pipeName, status);
}
return isPipeExistedBeforeDrop
- ? status
- : RpcUtils.getStatus(
- TSStatusCode.PIPE_NOT_EXIST_ERROR,
- String.format(
- "Failed to drop pipe %s. Failures: %s does not exist.", pipeName, pipeName));
+ ? status
+ : RpcUtils.getStatus(
+ TSStatusCode.PIPE_NOT_EXIST_ERROR,
+ String.format(
+ "Failed to drop pipe %s. Failures: %s does not exist.", pipeName, pipeName));
}
public TShowPipeResp showPipes(TShowPipeReq req) {
lock();
try {
return ((PipeTableResp)
- configManager.getConsensusManager().read(new ShowPipePlanV2()).getDataset())
- .filter(req.whereClause, req.pipeName)
- .convertToTShowPipeResp();
+ configManager.getConsensusManager().read(new ShowPipePlanV2()).getDataset())
+ .filter(req.whereClause, req.pipeName)
+ .convertToTShowPipeResp();
} finally {
unlock();
}
@@ -154,13 +154,13 @@ public class PipeTaskCoordinator {
lock();
try {
return ((PipeTableResp)
- configManager.getConsensusManager().read(new ShowPipePlanV2()).getDataset())
- .convertToTGetAllPipeInfoResp();
+ configManager.getConsensusManager().read(new ShowPipePlanV2()).getDataset())
+ .convertToTGetAllPipeInfoResp();
} catch (IOException e) {
LOGGER.warn("Failed to get all pipe info.", e);
return new TGetAllPipeInfoResp(
- new TSStatus(TSStatusCode.PIPE_ERROR.getStatusCode()).setMessage(e.getMessage()),
- Collections.emptyList());
+ new TSStatus(TSStatusCode.PIPE_ERROR.getStatusCode()).setMessage(e.getMessage()),
+ Collections.emptyList());
} finally {
unlock();
}
@@ -174,4 +174,4 @@ public class PipeTaskCoordinator {
unlock();
}
}
-}
+}
\ No newline at end of file
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java
index c0ef6d4bfc4..fe7a7a55b61 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java
@@ -55,10 +55,10 @@ import java.util.concurrent.atomic.AtomicReference;
* executed in sequence and node procedures can be locked when a pipe task procedure is running.
*/
public abstract class AbstractOperatePipeProcedureV2
- extends AbstractNodeProcedure<OperatePipeTaskState> {
+ extends AbstractNodeProcedure<OperatePipeTaskState> {
private static final Logger LOGGER =
- LoggerFactory.getLogger(AbstractOperatePipeProcedureV2.class);
+ LoggerFactory.getLogger(AbstractOperatePipeProcedureV2.class);
private static final int RETRY_THRESHOLD = 1;
@@ -75,11 +75,11 @@ public abstract class AbstractOperatePipeProcedureV2
try {
if (configNodeProcedureEnv.getNodeLock().tryLock(this)) {
pipeTaskInfo =
- configNodeProcedureEnv
- .getConfigManager()
- .getPipeManager()
- .getPipeTaskCoordinator()
- .lock();
+ configNodeProcedureEnv
+ .getConfigManager()
+ .getPipeManager()
+ .getPipeTaskCoordinator()
+ .lock();
LOGGER.info("ProcedureId {} acquire lock.", getProcId());
return ProcedureLockState.LOCK_ACQUIRED;
}
@@ -98,15 +98,15 @@ public abstract class AbstractOperatePipeProcedureV2
LOGGER.info("ProcedureId {} release lock.", getProcId());
if (pipeTaskInfo != null) {
configNodeProcedureEnv
- .getConfigManager()
- .getPipeManager()
- .getPipeTaskCoordinator()
- .unlock();
+ .getConfigManager()
+ .getPipeManager()
+ .getPipeTaskCoordinator()
+ .unlock();
}
if (configNodeProcedureEnv.getNodeLock().releaseLock(this)) {
configNodeProcedureEnv
- .getNodeLock()
- .wakeWaitingProcedures(configNodeProcedureEnv.getScheduler());
+ .getNodeLock()
+ .wakeWaitingProcedures(configNodeProcedureEnv.getScheduler());
}
} finally {
configNodeProcedureEnv.getSchedulerLock().unlock();
@@ -131,7 +131,7 @@ public abstract class AbstractOperatePipeProcedureV2
* @throws PipeException if configNode consensus write failed
*/
protected abstract void executeFromWriteConfigNodeConsensus(ConfigNodeProcedureEnv env)
- throws PipeException;
+ throws PipeException;
/**
* Execute at state {@link OperatePipeTaskState#OPERATE_ON_DATA_NODES}.
@@ -140,11 +140,11 @@ public abstract class AbstractOperatePipeProcedureV2
* @throws IOException Exception when Serializing to byte buffer
*/
protected abstract void executeFromOperateOnDataNodes(ConfigNodeProcedureEnv env)
- throws PipeException, IOException;
+ throws PipeException, IOException;
@Override
protected Flow executeFromState(ConfigNodeProcedureEnv env, OperatePipeTaskState state)
- throws ProcedureSuspendedException, ProcedureYieldException, InterruptedException {
+ throws ProcedureSuspendedException, ProcedureYieldException, InterruptedException {
try {
switch (state) {
case VALIDATE_TASK:
@@ -164,30 +164,30 @@ public abstract class AbstractOperatePipeProcedureV2
return Flow.NO_MORE_STATE;
default:
throw new UnsupportedOperationException(
- String.format("Unknown state during executing operatePipeProcedure, %s", state));
+ String.format("Unknown state during executing operatePipeProcedure, %s", state));
}
} catch (Exception e) {
// Retry before rollback
if (getCycles() < RETRY_THRESHOLD) {
LOGGER.warn(
- "Encountered error when trying to {} at state [{}], retry [{}/{}]",
- getOperation(),
- state,
- getCycles() + 1,
- RETRY_THRESHOLD,
- e);
+ "Encountered error when trying to {} at state [{}], retry [{}/{}]",
+ getOperation(),
+ state,
+ getCycles() + 1,
+ RETRY_THRESHOLD,
+ e);
// Wait 3s for next retry
TimeUnit.MILLISECONDS.sleep(3000L);
} else {
LOGGER.warn(
- "All {} retries failed when trying to {} at state [{}], will rollback...",
- RETRY_THRESHOLD,
- getOperation(),
- state,
- e);
+ "All {} retries failed when trying to {} at state [{}], will rollback...",
+ RETRY_THRESHOLD,
+ getOperation(),
+ state,
+ e);
setFailure(
- new ProcedureException(
- String.format("Fail to %s because %s", getOperation().name(), e.getMessage())));
+ new ProcedureException(
+ String.format("Fail to %s because %s", getOperation().name(), e.getMessage())));
}
}
return Flow.HAS_MORE_STATE;
@@ -200,7 +200,7 @@ public abstract class AbstractOperatePipeProcedureV2
@Override
protected void rollbackState(ConfigNodeProcedureEnv env, OperatePipeTaskState state)
- throws IOException, InterruptedException, ProcedureException {
+ throws IOException, InterruptedException, ProcedureException {
switch (state) {
case VALIDATE_TASK:
rollbackFromValidateTask(env);
@@ -237,7 +237,7 @@ public abstract class AbstractOperatePipeProcedureV2
protected abstract void rollbackFromWriteConfigNodeConsensus(ConfigNodeProcedureEnv env);
protected abstract void rollbackFromOperateOnDataNodes(ConfigNodeProcedureEnv env)
- throws IOException;
+ throws IOException;
@Override
protected OperatePipeTaskState getState(int stateId) {
@@ -263,7 +263,7 @@ public abstract class AbstractOperatePipeProcedureV2
* @throws IOException Exception when Serializing to byte buffer
*/
protected Map<Integer, TPushPipeMetaResp> pushPipeMetaToDataNodes(ConfigNodeProcedureEnv env)
- throws IOException {
+ throws IOException {
final List<ByteBuffer> pipeMetaBinaryList = new ArrayList<>();
for (PipeMeta pipeMeta : pipeTaskInfo.get().getPipeMetaList()) {
pipeMetaBinaryList.add(pipeMeta.serialize());
@@ -280,7 +280,7 @@ public abstract class AbstractOperatePipeProcedureV2
* @return Error messages for the given pipe after pushing pipe meta
*/
protected String parsePushPipeMetaExceptionForPipe(
- String pipeName, Map<Integer, TPushPipeMetaResp> respMap) {
+ String pipeName, Map<Integer, TPushPipeMetaResp> respMap) {
final StringBuilder exceptionMessageBuilder = new StringBuilder();
for (Map.Entry<Integer, TPushPipeMetaResp> respEntry : respMap.entrySet()) {
@@ -290,30 +290,30 @@ public abstract class AbstractOperatePipeProcedureV2
if (resp.getStatus().getCode() == TSStatusCode.PIPE_PUSH_META_ERROR.getStatusCode()) {
if (!resp.isSetExceptionMessages()) {
exceptionMessageBuilder.append(
- String.format(
- "DataNodeId: %s, Message: Internal error while processing pushPipeMeta on dataNodes.",
- dataNodeId));
+ String.format(
+ "DataNodeId: %s, Message: Internal error while processing pushPipeMeta on dataNodes.",
+ dataNodeId));
continue;
}
AtomicBoolean hasException = new AtomicBoolean(false);
resp.getExceptionMessages()
- .forEach(
- message -> {
- // Ignore the timeStamp for simplicity
- if (pipeName == null) {
- hasException.set(true);
- exceptionMessageBuilder.append(
- String.format(
- "PipeName: %s, Message: %s",
- message.getPipeName(), message.getMessage()));
- } else if (pipeName.equals(message.getPipeName())) {
- hasException.set(true);
- exceptionMessageBuilder.append(
- String.format("Message: %s", message.getMessage()));
- }
- });
+ .forEach(
+ message -> {
+ // Ignore the timeStamp for simplicity
+ if (pipeName == null) {
+ hasException.set(true);
+ exceptionMessageBuilder.append(
+ String.format(
+ "PipeName: %s, Message: %s",
+ message.getPipeName(), message.getMessage()));
+ } else if (pipeName.equals(message.getPipeName())) {
+ hasException.set(true);
+ exceptionMessageBuilder.append(
+ String.format("Message: %s", message.getMessage()));
+ }
+ });
if (hasException.get()) {
// Only print dataNodeId if the given pipe meets exception on that node
@@ -345,4 +345,4 @@ public abstract class AbstractOperatePipeProcedureV2
super.deserialize(byteBuffer);
isRollbackFromOperateOnDataNodesSuccessful = ReadWriteIOUtils.readBool(byteBuffer);
}
-}
+}
\ No newline at end of file
[iotdb] 01/12: Fix incorrect use of Operator.next() in IdentitySinkOperatorTest
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4ea3c003d9fcfb4f55d5f34247d3905da9263c51
Author: Liao Lanyu <14...@qq.com>
AuthorDate: Thu Jul 13 13:59:35 2023 +0800
Fix incorrect use of Operator.next() in IdentitySinkOperatorTest
---
.../operator/sink/IdentitySinkOperatorTest.java | 70 ++++++++++++++++------
1 file changed, 51 insertions(+), 19 deletions(-)
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
index 7cadc6a41b0..4c554ea4f89 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
@@ -32,7 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle;
import org.apache.iotdb.db.queryengine.execution.exchange.sink.ShuffleSinkHandle;
import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext;
import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine;
-import org.apache.iotdb.db.queryengine.execution.operator.Operator;
import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions;
@@ -69,7 +68,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class IdentitySinkOperatorTest {
- private static final String TIME_JOIN_OPERATOR_TEST_SG = "root.identitySinkTest";
+ private static final String IDENTITY_SINK_TEST = "root.identitySinkTest";
private final List<String> deviceIds = new ArrayList<>();
private final List<MeasurementSchema> measurementSchemas = new ArrayList<>();
@@ -79,7 +78,7 @@ public class IdentitySinkOperatorTest {
@Before
public void setUp() throws MetadataException, IOException, WriteProcessException {
SeriesReaderTestUtil.setUp(
- measurementSchemas, deviceIds, seqResources, unSeqResources, TIME_JOIN_OPERATOR_TEST_SG);
+ measurementSchemas, deviceIds, seqResources, unSeqResources, IDENTITY_SINK_TEST);
}
@After
@@ -93,7 +92,7 @@ public class IdentitySinkOperatorTest {
IoTDBThreadPoolFactory.newFixedThreadPool(1, "test-instance-notification");
try {
MeasurementPath measurementPath1 =
- new MeasurementPath(TIME_JOIN_OPERATOR_TEST_SG + ".device0.sensor0", TSDataType.INT32);
+ new MeasurementPath(IDENTITY_SINK_TEST + ".device0.sensor0", TSDataType.INT32);
Set<String> allSensors = new HashSet<>();
allSensors.add("sensor0");
allSensors.add("sensor1");
@@ -111,6 +110,10 @@ public class IdentitySinkOperatorTest {
driverContext.addOperatorContext(2, planNodeId2, SeriesScanOperator.class.getSimpleName());
driverContext.addOperatorContext(
3, new PlanNodeId("3"), IdentitySinkOperator.class.getSimpleName());
+ PlanNodeId planNodeId4 = new PlanNodeId("4");
+ driverContext.addOperatorContext(4, planNodeId4, SeriesScanOperator.class.getSimpleName());
+ PlanNodeId planNodeId5 = new PlanNodeId("5");
+ driverContext.addOperatorContext(5, planNodeId5, SeriesScanOperator.class.getSimpleName());
SeriesScanOptions.Builder scanOptionsBuilder = new SeriesScanOptions.Builder();
scanOptionsBuilder.withAllSensors(allSensors);
@@ -124,10 +127,10 @@ public class IdentitySinkOperatorTest {
seriesScanOperator1.initQueryDataSource(new QueryDataSource(seqResources, unSeqResources));
seriesScanOperator1
.getOperatorContext()
- .setMaxRunTime(new Duration(500, TimeUnit.MILLISECONDS));
+ .setMaxRunTime(new Duration(1000, TimeUnit.MILLISECONDS));
MeasurementPath measurementPath2 =
- new MeasurementPath(TIME_JOIN_OPERATOR_TEST_SG + ".device0.sensor1", TSDataType.INT32);
+ new MeasurementPath(IDENTITY_SINK_TEST + ".device0.sensor1", TSDataType.INT32);
SeriesScanOperator seriesScanOperator2 =
new SeriesScanOperator(
driverContext.getOperatorContexts().get(1),
@@ -138,26 +141,35 @@ public class IdentitySinkOperatorTest {
seriesScanOperator2.initQueryDataSource(new QueryDataSource(seqResources, unSeqResources));
seriesScanOperator2
.getOperatorContext()
- .setMaxRunTime(new Duration(500, TimeUnit.MILLISECONDS));
+ .setMaxRunTime(new Duration(1000, TimeUnit.MILLISECONDS));
MeasurementPath measurementPath3 =
- new MeasurementPath(TIME_JOIN_OPERATOR_TEST_SG + ".device0.sensor0", TSDataType.INT32);
+ new MeasurementPath(IDENTITY_SINK_TEST + ".device0.sensor0", TSDataType.INT32);
SeriesScanOperator seriesScanOperator3 =
new SeriesScanOperator(
- driverContext.getOperatorContexts().get(1),
- planNodeId2,
+ driverContext.getOperatorContexts().get(3),
+ planNodeId4,
measurementPath3,
Ordering.ASC,
scanOptionsBuilder.build());
seriesScanOperator3.initQueryDataSource(new QueryDataSource(seqResources, unSeqResources));
seriesScanOperator3
.getOperatorContext()
- .setMaxRunTime(new Duration(500, TimeUnit.MILLISECONDS));
+ .setMaxRunTime(new Duration(1000, TimeUnit.MILLISECONDS));
- TsBlock identityTsBlock = null;
- while (seriesScanOperator3.hasNext()) {
- identityTsBlock = seriesScanOperator3.next();
- }
+ MeasurementPath measurementPath4 =
+ new MeasurementPath(IDENTITY_SINK_TEST + ".device0.sensor1", TSDataType.INT32);
+ SeriesScanOperator seriesScanOperator4 =
+ new SeriesScanOperator(
+ driverContext.getOperatorContexts().get(4),
+ planNodeId5,
+ measurementPath4,
+ Ordering.ASC,
+ scanOptionsBuilder.build());
+ seriesScanOperator4.initQueryDataSource(new QueryDataSource(seqResources, unSeqResources));
+ seriesScanOperator4
+ .getOperatorContext()
+ .setMaxRunTime(new Duration(1000, TimeUnit.MILLISECONDS));
ISinkHandle sinkHandle = Mockito.mock(ShuffleSinkHandle.class);
Mockito.when(sinkHandle.isChannelClosed(0)).thenReturn(false);
@@ -168,6 +180,9 @@ public class IdentitySinkOperatorTest {
Arrays.asList(seriesScanOperator1, seriesScanOperator2),
new DownStreamChannelIndex(0),
sinkHandle);
+ identitySinkOperator
+ .getOperatorContext()
+ .setMaxRunTime(new Duration(1200, TimeUnit.MILLISECONDS));
Assert.assertEquals(
seriesScanOperator3.calculateMaxPeekMemory(),
@@ -176,7 +191,27 @@ public class IdentitySinkOperatorTest {
seriesScanOperator3.calculateMaxReturnSize(),
identitySinkOperator.calculateMaxReturnSize());
- while (identitySinkOperator.isBlocked().isDone() && identitySinkOperator.hasNext()) {
+ while (seriesScanOperator3.hasNext()
+ && identitySinkOperator.isBlocked().isDone()
+ && identitySinkOperator.hasNext()) {
+ TsBlock identityTsBlock = seriesScanOperator3.next();
+ TsBlock tsBlock = identitySinkOperator.next();
+ if (tsBlock == null) {
+ continue;
+ }
+ assertEquals(1, tsBlock.getValueColumnCount());
+ assertTrue(tsBlock.getColumn(0) instanceof IntColumn);
+ assertNotNull(identityTsBlock);
+ assertEquals(identityTsBlock.getPositionCount(), tsBlock.getPositionCount());
+ for (int i = 0; i < identityTsBlock.getPositionCount(); i++) {
+ assertEquals(identityTsBlock.getColumn(0).getInt(i), tsBlock.getColumn(0).getInt(i));
+ }
+ }
+
+ while (seriesScanOperator4.hasNext()
+ && identitySinkOperator.isBlocked().isDone()
+ && identitySinkOperator.hasNext()) {
+ TsBlock identityTsBlock = seriesScanOperator4.next();
TsBlock tsBlock = identitySinkOperator.next();
if (tsBlock == null) {
continue;
@@ -189,9 +224,6 @@ public class IdentitySinkOperatorTest {
assertEquals(identityTsBlock.getColumn(0).getInt(i), tsBlock.getColumn(0).getInt(i));
}
}
- List<Operator> children = identitySinkOperator.getChildren();
- Assert.assertNull(children.get(0));
- Assert.assertNull(children.get(1));
} catch (IllegalPathException e) {
e.printStackTrace();
[iotdb] 07/12: Use customer timeout in schema fetcher
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0b76520ae1a04d22a3b51516031c8d4c5987b402
Author: Chen YZ <43...@users.noreply.github.com>
AuthorDate: Fri Jul 14 13:43:59 2023 +0800
Use customer timeout in schema fetcher
---
.../queryengine/plan/analyze/AnalyzeVisitor.java | 1470 ++++++++++----------
1 file changed, 735 insertions(+), 735 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
index 448f5b08ff0..94614bddc8f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
@@ -207,19 +207,19 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
private static final Expression deviceExpression =
- TimeSeriesOperand.constructColumnHeaderExpression(DEVICE, TSDataType.TEXT);
+ TimeSeriesOperand.constructColumnHeaderExpression(DEVICE, TSDataType.TEXT);
private static final Expression endTimeExpression =
- TimeSeriesOperand.constructColumnHeaderExpression(ENDTIME, TSDataType.INT64);
+ TimeSeriesOperand.constructColumnHeaderExpression(ENDTIME, TSDataType.INT64);
private final List<String> lastQueryColumnNames =
- new ArrayList<>(Arrays.asList("TIME", "TIMESERIES", "VALUE", "DATATYPE"));
+ new ArrayList<>(Arrays.asList("TIME", "TIMESERIES", "VALUE", "DATATYPE"));
private final IPartitionFetcher partitionFetcher;
private final ISchemaFetcher schemaFetcher;
private static final PerformanceOverviewMetrics PERFORMANCE_OVERVIEW_METRICS =
- PerformanceOverviewMetrics.getInstance();
+ PerformanceOverviewMetrics.getInstance();
public AnalyzeVisitor(IPartitionFetcher partitionFetcher, ISchemaFetcher schemaFetcher) {
this.partitionFetcher = partitionFetcher;
@@ -229,7 +229,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitNode(StatementNode node, MPPQueryContext context) {
throw new UnsupportedOperationException(
- "Unsupported statement type: " + node.getClass().getName());
+ "Unsupported statement type: " + node.getClass().getName());
}
@Override
@@ -284,7 +284,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
analyzeInto(analysis, queryStatement, deviceSet, outputExpressions);
} else {
Map<Integer, List<Pair<Expression, String>>> outputExpressionMap =
- analyzeSelect(analysis, queryStatement, schemaTree);
+ analyzeSelect(analysis, queryStatement, schemaTree);
outputExpressions = new ArrayList<>();
outputExpressionMap.values().forEach(outputExpressions::addAll);
@@ -331,13 +331,13 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
} catch (StatementAnalyzeException e) {
throw new StatementAnalyzeException(
- "Meet error when analyzing the query statement: " + e.getMessage());
+ "Meet error when analyzing the query statement: " + e.getMessage());
}
return analysis;
}
private ISchemaTree analyzeSchema(
- QueryStatement queryStatement, Analysis analysis, MPPQueryContext context) {
+ QueryStatement queryStatement, Analysis analysis, MPPQueryContext context) {
// concat path and construct path pattern tree
PathPatternTree patternTree = new PathPatternTree(queryStatement.useWildcard());
queryStatement = (QueryStatement) new ConcatPathRewriter().rewrite(queryStatement, patternTree);
@@ -359,7 +359,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
} finally {
logger.debug("[EndFetchSchema]");
QueryPlanCostMetricSet.getInstance()
- .recordPlanCost(SCHEMA_FETCHER, System.nanoTime() - startTime);
+ .recordPlanCost(SCHEMA_FETCHER, System.nanoTime() - startTime);
}
analysis.setSchemaTree(schemaTree);
return schemaTree;
@@ -368,7 +368,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
private Analysis finishQuery(QueryStatement queryStatement, Analysis analysis) {
if (queryStatement.isSelectInto()) {
analysis.setRespDatasetHeader(
- DatasetHeaderFactory.getSelectIntoHeader(queryStatement.isAlignByDevice()));
+ DatasetHeaderFactory.getSelectIntoHeader(queryStatement.isAlignByDevice()));
}
if (queryStatement.isLastQuery()) {
analysis.setRespDatasetHeader(DatasetHeaderFactory.getLastQueryHeader());
@@ -385,7 +385,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Expression predicate = whereCondition.getPredicate();
Pair<Filter, Boolean> resultPair =
- ExpressionAnalyzer.extractGlobalTimeFilter(predicate, true, true);
+ ExpressionAnalyzer.extractGlobalTimeFilter(predicate, true, true);
globalTimeFilter = resultPair.left;
if (globalTimeFilter != null) {
globalTimeFilter = PredicateRemoveNotRewriter.rewrite(globalTimeFilter);
@@ -396,8 +396,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
// set where condition to null if predicate is true or time filter.
if (!hasValueFilter
- || (predicate.getExpressionType().equals(ExpressionType.CONSTANT)
- && Boolean.parseBoolean(predicate.getExpressionString()))) {
+ || (predicate.getExpressionType().equals(ExpressionType.CONSTANT)
+ && Boolean.parseBoolean(predicate.getExpressionString()))) {
queryStatement.setWhereCondition(null);
} else {
whereCondition.setPredicate(predicate);
@@ -417,7 +417,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private Analysis analyzeLastQuery(
- QueryStatement queryStatement, Analysis analysis, ISchemaTree schemaTree) {
+ QueryStatement queryStatement, Analysis analysis, ISchemaTree schemaTree) {
if (analysis.hasValueFilter()) {
throw new SemanticException("Only time filters are supported in LAST query");
}
@@ -438,17 +438,17 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void analyzeLastSource(
- Analysis analysis, List<Expression> selectExpressions, ISchemaTree schemaTree) {
+ Analysis analysis, List<Expression> selectExpressions, ISchemaTree schemaTree) {
Set<Expression> sourceExpressions;
sourceExpressions = new LinkedHashSet<>();
for (Expression selectExpression : selectExpressions) {
for (Expression sourceExpression :
- ExpressionAnalyzer.bindSchemaForExpression(selectExpression, schemaTree)) {
+ ExpressionAnalyzer.bindSchemaForExpression(selectExpression, schemaTree)) {
if (!(sourceExpression instanceof TimeSeriesOperand)) {
throw new SemanticException(
- "Views with functions and expressions cannot be used in LAST query");
+ "Views with functions and expressions cannot be used in LAST query");
}
sourceExpressions.add(sourceExpression);
}
@@ -466,12 +466,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
boolean useLogicalView = false;
try {
Pair<List<MeasurementPath>, Integer> tempPair =
- originSchemaTree.searchMeasurementPaths(new PartialPath("root.**"));
+ originSchemaTree.searchMeasurementPaths(new PartialPath("root.**"));
for (MeasurementPath measurementPath : tempPair.left) {
if (measurementPath.getMeasurementSchema().isLogicalView()) {
useLogicalView = true;
LogicalViewSchema logicalViewSchema =
- (LogicalViewSchema) measurementPath.getMeasurementSchema();
+ (LogicalViewSchema) measurementPath.getMeasurementSchema();
ViewExpression viewExpression = logicalViewSchema.getExpression();
List<PartialPath> pathsNeedToReFetch = getSourcePaths(viewExpression);
for (PartialPath path : pathsNeedToReFetch) {
@@ -485,8 +485,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
analysis.setUseLogicalView(useLogicalView);
if (useLogicalView
- && analysis.getStatement() instanceof QueryStatement
- && (((QueryStatement) analysis.getStatement()).isGroupByTag())) {
+ && analysis.getStatement() instanceof QueryStatement
+ && (((QueryStatement) analysis.getStatement()).isGroupByTag())) {
throw new SemanticException("Views cannot be used in GROUP BY TAGS query yet.");
}
@@ -500,15 +500,15 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private Map<Integer, List<Pair<Expression, String>>> analyzeSelect(
- Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
+ Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
Map<Integer, List<Pair<Expression, String>>> outputExpressionMap = new HashMap<>();
boolean isGroupByLevel = queryStatement.isGroupByLevel();
ColumnPaginationController paginationController =
- new ColumnPaginationController(
- queryStatement.getSeriesLimit(),
- queryStatement.getSeriesOffset(),
- queryStatement.isLastQuery() || isGroupByLevel);
+ new ColumnPaginationController(
+ queryStatement.getSeriesLimit(),
+ queryStatement.getSeriesOffset(),
+ queryStatement.isLastQuery() || isGroupByLevel);
Set<String> aliasSet = new HashSet<>();
@@ -518,7 +518,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
List<Pair<Expression, String>> outputExpressions = new ArrayList<>();
List<Expression> resultExpressions =
- ExpressionAnalyzer.bindSchemaForExpression(resultColumn.getExpression(), schemaTree);
+ ExpressionAnalyzer.bindSchemaForExpression(resultColumn.getExpression(), schemaTree);
for (Expression expression : resultExpressions) {
if (paginationController.hasCurOffset()) {
paginationController.consumeOffset();
@@ -527,8 +527,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
analyzeExpressionType(analysis, expression);
outputExpressions.add(new Pair<>(expression, resultColumn.getAlias()));
queryStatement
- .getGroupByLevelComponent()
- .updateIsCountStar(resultColumn.getExpression());
+ .getGroupByLevelComponent()
+ .updateIsCountStar(resultColumn.getExpression());
} else {
Expression normalizedExpression = ExpressionAnalyzer.normalizeExpression(expression);
analyzeExpressionType(analysis, normalizedExpression);
@@ -536,9 +536,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
checkAliasUniqueness(resultColumn.getAlias(), aliasSet);
outputExpressions.add(
- new Pair<>(
- normalizedExpression,
- analyzeAlias(resultColumn.getAlias(), expression, normalizedExpression)));
+ new Pair<>(
+ normalizedExpression,
+ analyzeAlias(resultColumn.getAlias(), expression, normalizedExpression)));
}
paginationController.consumeLimit();
} else {
@@ -558,24 +558,24 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
for (PartialPath devicePattern : devicePatternList) {
// get all matched devices
deviceSet.addAll(
- schemaTree.getMatchedDevices(devicePattern).stream()
- .map(DeviceSchemaInfo::getDevicePath)
- .collect(Collectors.toList()));
+ schemaTree.getMatchedDevices(devicePattern).stream()
+ .map(DeviceSchemaInfo::getDevicePath)
+ .collect(Collectors.toList()));
}
return deviceSet;
}
private List<Pair<Expression, String>> analyzeSelect(
- Analysis analysis,
- QueryStatement queryStatement,
- ISchemaTree schemaTree,
- Set<PartialPath> deviceSet) {
+ Analysis analysis,
+ QueryStatement queryStatement,
+ ISchemaTree schemaTree,
+ Set<PartialPath> deviceSet) {
List<Pair<Expression, String>> outputExpressions = new ArrayList<>();
Map<String, Set<Expression>> deviceToSelectExpressions = new HashMap<>();
ColumnPaginationController paginationController =
- new ColumnPaginationController(
- queryStatement.getSeriesLimit(), queryStatement.getSeriesOffset(), false);
+ new ColumnPaginationController(
+ queryStatement.getSeriesLimit(), queryStatement.getSeriesOffset(), false);
Set<PartialPath> noMeasurementDevices = new HashSet<>(deviceSet);
for (ResultColumn resultColumn : queryStatement.getSelectComponent().getResultColumns()) {
@@ -584,53 +584,53 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
// select expression after removing wildcard
// use LinkedHashMap for order-preserving
Map<Expression, Map<String, Expression>> measurementToDeviceSelectExpressions =
- new LinkedHashMap<>();
+ new LinkedHashMap<>();
for (PartialPath device : deviceSet) {
List<Expression> selectExpressionsOfOneDevice =
- ExpressionAnalyzer.concatDeviceAndBindSchemaForExpression(
- selectExpression, device, schemaTree);
+ ExpressionAnalyzer.concatDeviceAndBindSchemaForExpression(
+ selectExpression, device, schemaTree);
if (selectExpressionsOfOneDevice.isEmpty()) {
continue;
}
noMeasurementDevices.remove(device);
updateMeasurementToDeviceSelectExpressions(
- analysis, measurementToDeviceSelectExpressions, device, selectExpressionsOfOneDevice);
+ analysis, measurementToDeviceSelectExpressions, device, selectExpressionsOfOneDevice);
}
checkAliasUniqueness(resultColumn.getAlias(), measurementToDeviceSelectExpressions);
for (Map.Entry<Expression, Map<String, Expression>> measurementDeviceSelectExpressionsEntry :
- measurementToDeviceSelectExpressions.entrySet()) {
+ measurementToDeviceSelectExpressions.entrySet()) {
Expression measurementExpression = measurementDeviceSelectExpressionsEntry.getKey();
Map<String, Expression> deviceToSelectExpressionsOfOneMeasurement =
- measurementDeviceSelectExpressionsEntry.getValue();
+ measurementDeviceSelectExpressionsEntry.getValue();
if (paginationController.hasCurOffset()) {
paginationController.consumeOffset();
} else if (paginationController.hasCurLimit()) {
deviceToSelectExpressionsOfOneMeasurement
- .values()
- .forEach(expression -> analyzeExpressionType(analysis, expression));
+ .values()
+ .forEach(expression -> analyzeExpressionType(analysis, expression));
// check whether the datatype of paths which has the same measurement name are
// consistent; if not, throw a SemanticException
checkDataTypeConsistencyInAlignByDevice(
- analysis, new ArrayList<>(deviceToSelectExpressionsOfOneMeasurement.values()));
+ analysis, new ArrayList<>(deviceToSelectExpressionsOfOneMeasurement.values()));
// add outputExpressions
Expression normalizedMeasurementExpression =
- ExpressionAnalyzer.toLowerCaseExpression(measurementExpression);
+ ExpressionAnalyzer.toLowerCaseExpression(measurementExpression);
analyzeExpressionType(analysis, normalizedMeasurementExpression);
outputExpressions.add(
- new Pair<>(
- normalizedMeasurementExpression,
- analyzeAlias(
- resultColumn.getAlias(),
- measurementExpression,
- normalizedMeasurementExpression)));
+ new Pair<>(
+ normalizedMeasurementExpression,
+ analyzeAlias(
+ resultColumn.getAlias(),
+ measurementExpression,
+ normalizedMeasurementExpression)));
// add deviceToSelectExpressions
updateDeviceToSelectExpressions(
- analysis, deviceToSelectExpressions, deviceToSelectExpressionsOfOneMeasurement);
+ analysis, deviceToSelectExpressions, deviceToSelectExpressionsOfOneMeasurement);
paginationController.consumeLimit();
} else {
@@ -646,7 +646,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
// the where expression map also need remove this device
if (analysis.getDeviceToWhereExpression() != null) {
noMeasurementDevices.forEach(
- devicePath -> analysis.getDeviceToWhereExpression().remove(devicePath.getFullPath()));
+ devicePath -> analysis.getDeviceToWhereExpression().remove(devicePath.getFullPath()));
}
analysis.setDeviceToSelectExpressions(deviceToSelectExpressions);
@@ -658,47 +658,47 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
selectExpressions.add(endTimeExpression);
}
selectExpressions.addAll(
- outputExpressions.stream()
- .map(Pair::getLeft)
- .collect(Collectors.toCollection(LinkedHashSet::new)));
+ outputExpressions.stream()
+ .map(Pair::getLeft)
+ .collect(Collectors.toCollection(LinkedHashSet::new)));
analysis.setSelectExpressions(selectExpressions);
return outputExpressions;
}
private void updateMeasurementToDeviceSelectExpressions(
- Analysis analysis,
- Map<Expression, Map<String, Expression>> measurementToDeviceSelectExpressions,
- PartialPath device,
- List<Expression> selectExpressionsOfOneDevice) {
+ Analysis analysis,
+ Map<Expression, Map<String, Expression>> measurementToDeviceSelectExpressions,
+ PartialPath device,
+ List<Expression> selectExpressionsOfOneDevice) {
for (Expression expression : selectExpressionsOfOneDevice) {
Expression measurementExpression =
- ExpressionAnalyzer.getMeasurementExpression(expression, analysis);
+ ExpressionAnalyzer.getMeasurementExpression(expression, analysis);
measurementToDeviceSelectExpressions
- .computeIfAbsent(measurementExpression, key -> new LinkedHashMap<>())
- .put(device.getFullPath(), ExpressionAnalyzer.toLowerCaseExpression(expression));
+ .computeIfAbsent(measurementExpression, key -> new LinkedHashMap<>())
+ .put(device.getFullPath(), ExpressionAnalyzer.toLowerCaseExpression(expression));
}
}
private void updateDeviceToSelectExpressions(
- Analysis analysis,
- Map<String, Set<Expression>> deviceToSelectExpressions,
- Map<String, Expression> deviceToSelectExpressionsOfOneMeasurement) {
+ Analysis analysis,
+ Map<String, Set<Expression>> deviceToSelectExpressions,
+ Map<String, Expression> deviceToSelectExpressionsOfOneMeasurement) {
for (Map.Entry<String, Expression> deviceNameSelectExpressionEntry :
- deviceToSelectExpressionsOfOneMeasurement.entrySet()) {
+ deviceToSelectExpressionsOfOneMeasurement.entrySet()) {
String deviceName = deviceNameSelectExpressionEntry.getKey();
Expression expression = deviceNameSelectExpressionEntry.getValue();
Expression normalizedExpression = ExpressionAnalyzer.toLowerCaseExpression(expression);
analyzeExpressionType(analysis, normalizedExpression);
deviceToSelectExpressions
- .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
- .add(normalizedExpression);
+ .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
+ .add(normalizedExpression);
}
}
private String analyzeAlias(
- String resultColumnAlias, Expression rawExpression, Expression normalizedExpression) {
+ String resultColumnAlias, Expression rawExpression, Expression normalizedExpression) {
if (resultColumnAlias != null) {
// use alias as output symbol
return resultColumnAlias;
@@ -711,67 +711,67 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void analyzeHaving(
- Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
+ Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
if (!queryStatement.hasHaving()) {
return;
}
// get removeWildcard Expressions in Having
List<Expression> conJunctions =
- ExpressionAnalyzer.bindSchemaForPredicate(
- queryStatement.getHavingCondition().getPredicate(),
- queryStatement.getFromComponent().getPrefixPaths(),
- schemaTree,
- true);
+ ExpressionAnalyzer.bindSchemaForPredicate(
+ queryStatement.getHavingCondition().getPredicate(),
+ queryStatement.getFromComponent().getPrefixPaths(),
+ schemaTree,
+ true);
Expression havingExpression =
- ExpressionUtils.constructQueryFilter(
- conJunctions.stream().distinct().collect(Collectors.toList()));
+ ExpressionUtils.constructQueryFilter(
+ conJunctions.stream().distinct().collect(Collectors.toList()));
havingExpression = ExpressionAnalyzer.normalizeExpression(havingExpression);
TSDataType outputType = analyzeExpressionType(analysis, havingExpression);
if (outputType != TSDataType.BOOLEAN) {
throw new SemanticException(
- String.format(
- "The output type of the expression in HAVING clause should be BOOLEAN, actual data type: %s.",
- outputType));
+ String.format(
+ "The output type of the expression in HAVING clause should be BOOLEAN, actual data type: %s.",
+ outputType));
}
analysis.setHavingExpression(havingExpression);
}
private void analyzeHaving(
- Analysis analysis,
- QueryStatement queryStatement,
- ISchemaTree schemaTree,
- Set<PartialPath> deviceSet) {
+ Analysis analysis,
+ QueryStatement queryStatement,
+ ISchemaTree schemaTree,
+ Set<PartialPath> deviceSet) {
if (!queryStatement.hasHaving()) {
return;
}
// two maps to be updated
Map<String, Set<Expression>> deviceToAggregationExpressions =
- analysis.getDeviceToAggregationExpressions();
+ analysis.getDeviceToAggregationExpressions();
Map<String, Set<Expression>> deviceToOutputExpressions =
- analysis.getDeviceToOutputExpressions();
+ analysis.getDeviceToOutputExpressions();
Expression havingExpression = queryStatement.getHavingCondition().getPredicate();
Set<Expression> conJunctions = new HashSet<>();
for (PartialPath device : deviceSet) {
List<Expression> expressionsInHaving =
- ExpressionAnalyzer.concatDeviceAndBindSchemaForExpression(
- havingExpression, device, schemaTree);
+ ExpressionAnalyzer.concatDeviceAndBindSchemaForExpression(
+ havingExpression, device, schemaTree);
conJunctions.addAll(
- expressionsInHaving.stream()
- .map(expression -> ExpressionAnalyzer.getMeasurementExpression(expression, analysis))
- .collect(Collectors.toList()));
+ expressionsInHaving.stream()
+ .map(expression -> ExpressionAnalyzer.getMeasurementExpression(expression, analysis))
+ .collect(Collectors.toList()));
for (Expression expression : expressionsInHaving) {
Set<Expression> aggregationExpressions = new LinkedHashSet<>();
Set<Expression> normalizedAggregationExpressions = new LinkedHashSet<>();
for (Expression aggregationExpression :
- ExpressionAnalyzer.searchAggregationExpressions(expression)) {
+ ExpressionAnalyzer.searchAggregationExpressions(expression)) {
Expression normalizedAggregationExpression =
- ExpressionAnalyzer.normalizeExpression(aggregationExpression);
+ ExpressionAnalyzer.normalizeExpression(aggregationExpression);
analyzeExpressionType(analysis, aggregationExpression);
analyzeExpressionType(analysis, normalizedAggregationExpression);
@@ -780,11 +780,11 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
normalizedAggregationExpressions.add(normalizedAggregationExpression);
}
deviceToOutputExpressions
- .computeIfAbsent(device.getFullPath(), key -> new LinkedHashSet<>())
- .addAll(aggregationExpressions);
+ .computeIfAbsent(device.getFullPath(), key -> new LinkedHashSet<>())
+ .addAll(aggregationExpressions);
deviceToAggregationExpressions
- .computeIfAbsent(device.getFullPath(), key -> new LinkedHashSet<>())
- .addAll(normalizedAggregationExpressions);
+ .computeIfAbsent(device.getFullPath(), key -> new LinkedHashSet<>())
+ .addAll(normalizedAggregationExpressions);
}
}
@@ -792,25 +792,25 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
TSDataType outputType = analyzeExpressionType(analysis, havingExpression);
if (outputType != TSDataType.BOOLEAN) {
throw new SemanticException(
- String.format(
- "The output type of the expression in HAVING clause should be BOOLEAN, actual data type: %s.",
- outputType));
+ String.format(
+ "The output type of the expression in HAVING clause should be BOOLEAN, actual data type: %s.",
+ outputType));
}
analysis.setDeviceToAggregationExpressions(deviceToAggregationExpressions);
analysis.setHavingExpression(havingExpression);
}
private void analyzeGroupByLevel(
- Analysis analysis,
- QueryStatement queryStatement,
- Map<Integer, List<Pair<Expression, String>>> outputExpressionMap,
- List<Pair<Expression, String>> outputExpressions) {
+ Analysis analysis,
+ QueryStatement queryStatement,
+ Map<Integer, List<Pair<Expression, String>>> outputExpressionMap,
+ List<Pair<Expression, String>> outputExpressions) {
if (!queryStatement.isGroupByLevel()) {
return;
}
GroupByLevelController groupByLevelController =
- new GroupByLevelController(queryStatement.getGroupByLevelComponent().getLevels());
+ new GroupByLevelController(queryStatement.getGroupByLevelComponent().getLevels());
List<Expression> groupedSelectExpressions = new LinkedList<>();
@@ -820,8 +820,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Pair<Expression, String> expressionAliasPair = outputExpressionList.get(i);
boolean isCountStar = queryStatement.getGroupByLevelComponent().isCountStar(i);
Expression groupedExpression =
- groupByLevelController.control(
- isCountStar, expressionAliasPair.left, expressionAliasPair.right);
+ groupByLevelController.control(
+ isCountStar, expressionAliasPair.left, expressionAliasPair.right);
groupedSelectExpressionSet.add(groupedExpression);
}
groupedSelectExpressions.addAll(groupedSelectExpressionSet);
@@ -834,35 +834,35 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
analyzeExpressionType(analysis, havingExpression);
analysis.setHavingExpression(havingExpression);
updateGroupByLevelExpressions(
- analysis,
- havingExpression,
- groupByLevelExpressions,
- groupByLevelController.getGroupedExpressionToRawExpressionsMap());
+ analysis,
+ havingExpression,
+ groupByLevelExpressions,
+ groupByLevelController.getGroupedExpressionToRawExpressionsMap());
}
outputExpressions.clear();
ColumnPaginationController paginationController =
- new ColumnPaginationController(
- queryStatement.getSeriesLimit(), queryStatement.getSeriesOffset(), false);
+ new ColumnPaginationController(
+ queryStatement.getSeriesLimit(), queryStatement.getSeriesOffset(), false);
for (Expression groupedExpression : groupedSelectExpressions) {
if (paginationController.hasCurOffset()) {
paginationController.consumeOffset();
} else if (paginationController.hasCurLimit()) {
Expression normalizedGroupedExpression =
- ExpressionAnalyzer.normalizeExpression(groupedExpression);
+ ExpressionAnalyzer.normalizeExpression(groupedExpression);
analyzeExpressionType(analysis, normalizedGroupedExpression);
outputExpressions.add(
- new Pair<>(
- normalizedGroupedExpression,
- analyzeAlias(
- groupByLevelController.getAlias(groupedExpression.getExpressionString()),
- groupedExpression,
- normalizedGroupedExpression)));
+ new Pair<>(
+ normalizedGroupedExpression,
+ analyzeAlias(
+ groupByLevelController.getAlias(groupedExpression.getExpressionString()),
+ groupedExpression,
+ normalizedGroupedExpression)));
updateGroupByLevelExpressions(
- analysis,
- groupedExpression,
- groupByLevelExpressions,
- groupByLevelController.getGroupedExpressionToRawExpressionsMap());
+ analysis,
+ groupedExpression,
+ groupByLevelExpressions,
+ groupByLevelController.getGroupedExpressionToRawExpressionsMap());
paginationController.consumeLimit();
} else {
break;
@@ -874,9 +874,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void checkDataTypeConsistencyInGroupByLevel(
- Analysis analysis, Map<Expression, Set<Expression>> groupByLevelExpressions) {
+ Analysis analysis, Map<Expression, Set<Expression>> groupByLevelExpressions) {
for (Map.Entry<Expression, Set<Expression>> groupedExpressionRawExpressionsEntry :
- groupByLevelExpressions.entrySet()) {
+ groupByLevelExpressions.entrySet()) {
Expression groupedAggregationExpression = groupedExpressionRawExpressionsEntry.getKey();
Set<Expression> rawAggregationExpressions = groupedExpressionRawExpressionsEntry.getValue();
@@ -884,35 +884,35 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
for (Expression rawAggregationExpression : rawAggregationExpressions) {
if (analysis.getType(rawAggregationExpression) != checkedDataType) {
throw new SemanticException(
- String.format(
- "GROUP BY LEVEL: the data types of the same output column[%s] should be the same.",
- groupedAggregationExpression));
+ String.format(
+ "GROUP BY LEVEL: the data types of the same output column[%s] should be the same.",
+ groupedAggregationExpression));
}
}
}
}
private void updateGroupByLevelExpressions(
- Analysis analysis,
- Expression expression,
- Map<Expression, Set<Expression>> groupByLevelExpressions,
- Map<Expression, Set<Expression>> groupedExpressionToRawExpressionsMap) {
+ Analysis analysis,
+ Expression expression,
+ Map<Expression, Set<Expression>> groupByLevelExpressions,
+ Map<Expression, Set<Expression>> groupedExpressionToRawExpressionsMap) {
for (Expression groupedAggregationExpression :
- ExpressionAnalyzer.searchAggregationExpressions(expression)) {
+ ExpressionAnalyzer.searchAggregationExpressions(expression)) {
Set<Expression> groupedExpressionSet =
- groupedExpressionToRawExpressionsMap.get(groupedAggregationExpression).stream()
- .map(ExpressionAnalyzer::normalizeExpression)
- .collect(Collectors.toSet());
+ groupedExpressionToRawExpressionsMap.get(groupedAggregationExpression).stream()
+ .map(ExpressionAnalyzer::normalizeExpression)
+ .collect(Collectors.toSet());
Expression groupedAggregationExpressionWithoutAlias =
- ExpressionAnalyzer.normalizeExpression(groupedAggregationExpression);
+ ExpressionAnalyzer.normalizeExpression(groupedAggregationExpression);
analyzeExpressionType(analysis, groupedAggregationExpressionWithoutAlias);
groupedExpressionSet.forEach(
- groupedExpression -> analyzeExpressionType(analysis, groupedExpression));
+ groupedExpression -> analyzeExpressionType(analysis, groupedExpression));
groupByLevelExpressions
- .computeIfAbsent(groupedAggregationExpressionWithoutAlias, key -> new HashSet<>())
- .addAll(groupedExpressionSet);
+ .computeIfAbsent(groupedAggregationExpressionWithoutAlias, key -> new HashSet<>())
+ .addAll(groupedExpressionSet);
}
}
@@ -922,9 +922,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
* <p>TODO: support slimit/soffset/value filter
*/
private void analyzeGroupByTag(
- Analysis analysis,
- QueryStatement queryStatement,
- List<Pair<Expression, String>> outputExpressions) {
+ Analysis analysis,
+ QueryStatement queryStatement,
+ List<Pair<Expression, String>> outputExpressions) {
if (!queryStatement.isGroupByTag()) {
return;
}
@@ -934,37 +934,37 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
List<String> tagKeys = queryStatement.getGroupByTagComponent().getTagKeys();
Map<List<String>, LinkedHashMap<Expression, List<Expression>>>
- tagValuesToGroupedTimeseriesOperands = new HashMap<>();
+ tagValuesToGroupedTimeseriesOperands = new HashMap<>();
LinkedHashMap<Expression, Set<Expression>> outputExpressionToRawExpressionsMap =
- new LinkedHashMap<>();
+ new LinkedHashMap<>();
for (Pair<Expression, String> outputExpressionAndAlias : outputExpressions) {
FunctionExpression rawExpression = (FunctionExpression) outputExpressionAndAlias.getLeft();
FunctionExpression measurementExpression =
- (FunctionExpression) ExpressionAnalyzer.getMeasurementExpression(rawExpression, analysis);
+ (FunctionExpression) ExpressionAnalyzer.getMeasurementExpression(rawExpression, analysis);
outputExpressionToRawExpressionsMap
- .computeIfAbsent(measurementExpression, v -> new HashSet<>())
- .add(rawExpression);
+ .computeIfAbsent(measurementExpression, v -> new HashSet<>())
+ .add(rawExpression);
Map<String, String> tagMap =
- ((MeasurementPath)
- ((TimeSeriesOperand) measurementExpression.getExpressions().get(0)).getPath())
- .getTagMap();
+ ((MeasurementPath)
+ ((TimeSeriesOperand) measurementExpression.getExpressions().get(0)).getPath())
+ .getTagMap();
List<String> tagValues = new ArrayList<>();
for (String tagKey : tagKeys) {
tagValues.add(tagMap.get(tagKey));
}
tagValuesToGroupedTimeseriesOperands
- .computeIfAbsent(tagValues, key -> new LinkedHashMap<>())
- .computeIfAbsent(measurementExpression, key -> new ArrayList<>())
- .add(rawExpression.getExpressions().get(0));
+ .computeIfAbsent(tagValues, key -> new LinkedHashMap<>())
+ .computeIfAbsent(measurementExpression, key -> new ArrayList<>())
+ .add(rawExpression.getExpressions().get(0));
}
// update outputExpressions
outputExpressions.clear();
for (String tagKey : tagKeys) {
Expression tagKeyExpression =
- TimeSeriesOperand.constructColumnHeaderExpression(tagKey, TSDataType.TEXT);
+ TimeSeriesOperand.constructColumnHeaderExpression(tagKey, TSDataType.TEXT);
analyzeExpressionType(analysis, tagKeyExpression);
outputExpressions.add(new Pair<>(tagKeyExpression, null));
}
@@ -984,23 +984,23 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
updateDeviceToAggregationAndOutputExpressions(
- analysis, analysis.getDeviceToSelectExpressions());
+ analysis, analysis.getDeviceToSelectExpressions());
if (queryStatement.hasOrderByExpression()) {
updateDeviceToAggregationAndOutputExpressions(
- analysis, analysis.getDeviceToOrderByExpressions());
+ analysis, analysis.getDeviceToOrderByExpressions());
}
}
private void updateDeviceToAggregationAndOutputExpressions(
- Analysis analysis, Map<String, Set<Expression>> deviceToExpressions) {
+ Analysis analysis, Map<String, Set<Expression>> deviceToExpressions) {
// two maps to be updated
Map<String, Set<Expression>> deviceToAggregationExpressions =
- analysis.getDeviceToAggregationExpressions();
+ analysis.getDeviceToAggregationExpressions();
Map<String, Set<Expression>> deviceToOutputExpressions =
- analysis.getDeviceToOutputExpressions();
+ analysis.getDeviceToOutputExpressions();
for (Map.Entry<String, Set<Expression>> deviceExpressionsEntry :
- deviceToExpressions.entrySet()) {
+ deviceToExpressions.entrySet()) {
String deviceName = deviceExpressionsEntry.getKey();
Set<Expression> expressionSet = deviceExpressionsEntry.getValue();
@@ -1008,9 +1008,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Set<Expression> normalizedAggregationExpressions = new LinkedHashSet<>();
for (Expression expression : expressionSet) {
for (Expression aggregationExpression :
- ExpressionAnalyzer.searchAggregationExpressions(expression)) {
+ ExpressionAnalyzer.searchAggregationExpressions(expression)) {
Expression normalizedAggregationExpression =
- ExpressionAnalyzer.normalizeExpression(aggregationExpression);
+ ExpressionAnalyzer.normalizeExpression(aggregationExpression);
analyzeExpressionType(analysis, normalizedAggregationExpression);
aggregationExpressions.add(aggregationExpression);
@@ -1018,11 +1018,11 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
}
deviceToOutputExpressions
- .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
- .addAll(aggregationExpressions);
+ .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
+ .addAll(aggregationExpressions);
deviceToAggregationExpressions
- .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
- .addAll(normalizedAggregationExpressions);
+ .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
+ .addAll(normalizedAggregationExpressions);
}
}
@@ -1033,9 +1033,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (queryStatement.isGroupByLevel() || queryStatement.isGroupByTag()) {
Set<Expression> aggregationExpressions =
- analysis.getCrossGroupByExpressions().values().stream()
- .flatMap(Set::stream)
- .collect(Collectors.toSet());
+ analysis.getCrossGroupByExpressions().values().stream()
+ .flatMap(Set::stream)
+ .collect(Collectors.toSet());
analysis.setAggregationExpressions(aggregationExpressions);
} else {
Set<Expression> aggregationExpressions = new HashSet<>();
@@ -1044,12 +1044,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
if (queryStatement.hasHaving()) {
aggregationExpressions.addAll(
- ExpressionAnalyzer.searchAggregationExpressions(analysis.getHavingExpression()));
+ ExpressionAnalyzer.searchAggregationExpressions(analysis.getHavingExpression()));
}
if (queryStatement.hasOrderByExpression()) {
for (Expression expression : analysis.getOrderByExpressions()) {
aggregationExpressions.addAll(
- ExpressionAnalyzer.searchAggregationExpressions(expression));
+ ExpressionAnalyzer.searchAggregationExpressions(expression));
}
}
analysis.setAggregationExpressions(aggregationExpressions);
@@ -1061,9 +1061,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Map<String, Set<Expression>> deviceToSourceTransformExpressions = new HashMap<>();
Map<String, Set<Expression>> deviceToAggregationExpressions =
- analysis.getDeviceToAggregationExpressions();
+ analysis.getDeviceToAggregationExpressions();
for (Map.Entry<String, Set<Expression>> deviceAggregationExpressionsEntry :
- deviceToAggregationExpressions.entrySet()) {
+ deviceToAggregationExpressions.entrySet()) {
String deviceName = deviceAggregationExpressionsEntry.getKey();
Set<Expression> aggregationExpressions = deviceAggregationExpressionsEntry.getValue();
@@ -1083,24 +1083,24 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
analysis.setDeviceToSourceTransformExpressions(deviceToSourceTransformExpressions);
} else {
updateDeviceToSourceTransformAndOutputExpressions(
- analysis, analysis.getDeviceToSelectExpressions());
+ analysis, analysis.getDeviceToSelectExpressions());
if (queryStatement.hasOrderByExpression()) {
updateDeviceToSourceTransformAndOutputExpressions(
- analysis, analysis.getDeviceToOrderByExpressions());
+ analysis, analysis.getDeviceToOrderByExpressions());
}
}
}
private void updateDeviceToSourceTransformAndOutputExpressions(
- Analysis analysis, Map<String, Set<Expression>> deviceToExpressions) {
+ Analysis analysis, Map<String, Set<Expression>> deviceToExpressions) {
// two maps to be updated
Map<String, Set<Expression>> deviceToSourceTransformExpressions =
- analysis.getDeviceToSourceTransformExpressions();
+ analysis.getDeviceToSourceTransformExpressions();
Map<String, Set<Expression>> deviceToOutputExpressions =
- analysis.getDeviceToOutputExpressions();
+ analysis.getDeviceToOutputExpressions();
for (Map.Entry<String, Set<Expression>> deviceExpressionsEntry :
- deviceToExpressions.entrySet()) {
+ deviceToExpressions.entrySet()) {
String deviceName = deviceExpressionsEntry.getKey();
Set<Expression> expressions = deviceExpressionsEntry.getValue();
@@ -1112,11 +1112,11 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
normalizedExpressions.add(normalizedExpression);
}
deviceToOutputExpressions
- .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
- .addAll(expressions);
+ .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
+ .addAll(expressions);
deviceToSourceTransformExpressions
- .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
- .addAll(normalizedExpressions);
+ .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
+ .addAll(normalizedExpressions);
}
}
@@ -1142,9 +1142,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
private void analyzeDeviceToSource(Analysis analysis, QueryStatement queryStatement) {
Map<String, Set<Expression>> deviceToSourceExpressions = new HashMap<>();
Map<String, Set<Expression>> deviceToSourceTransformExpressions =
- analysis.getDeviceToSourceTransformExpressions();
+ analysis.getDeviceToSourceTransformExpressions();
for (Map.Entry<String, Set<Expression>> deviceSourceTransformExpressionsEntry :
- deviceToSourceTransformExpressions.entrySet()) {
+ deviceToSourceTransformExpressions.entrySet()) {
String deviceName = deviceSourceTransformExpressionsEntry.getKey();
Set<Expression> sourceTransformExpressions = deviceSourceTransformExpressionsEntry.getValue();
@@ -1157,18 +1157,18 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (queryStatement.hasWhere()) {
Map<String, Expression> deviceToWhereExpression = analysis.getDeviceToWhereExpression();
for (Map.Entry<String, Expression> deviceWhereExpressionEntry :
- deviceToWhereExpression.entrySet()) {
+ deviceToWhereExpression.entrySet()) {
String deviceName = deviceWhereExpressionEntry.getKey();
Expression whereExpression = deviceWhereExpressionEntry.getValue();
deviceToSourceExpressions
- .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
- .addAll(ExpressionAnalyzer.searchSourceExpressions(whereExpression));
+ .computeIfAbsent(deviceName, key -> new LinkedHashSet<>())
+ .addAll(ExpressionAnalyzer.searchSourceExpressions(whereExpression));
}
}
Map<String, List<String>> outputDeviceToQueriedDevicesMap = new LinkedHashMap<>();
for (Map.Entry<String, Set<Expression>> deviceSourceExpressionsEntry :
- deviceToSourceExpressions.entrySet()) {
+ deviceToSourceExpressions.entrySet()) {
Set<Expression> sourceExpressionsUnderDevice = deviceSourceExpressionsEntry.getValue();
Set<String> queriedDevices = new HashSet<>();
for (Expression expression : sourceExpressionsUnderDevice) {
@@ -1176,10 +1176,10 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
if (queriedDevices.size() > 1) {
throw new SemanticException(
- "Cross-device queries are not supported in ALIGN BY DEVICE queries.");
+ "Cross-device queries are not supported in ALIGN BY DEVICE queries.");
}
outputDeviceToQueriedDevicesMap.put(
- deviceSourceExpressionsEntry.getKey(), new ArrayList<>(queriedDevices));
+ deviceSourceExpressionsEntry.getKey(), new ArrayList<>(queriedDevices));
}
analysis.setDeviceToSourceExpressions(deviceToSourceExpressions);
@@ -1193,19 +1193,19 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
if (queryStatement.hasWhere()) {
sourceExpressions.addAll(
- ExpressionAnalyzer.searchSourceExpressions(analysis.getWhereExpression()));
+ ExpressionAnalyzer.searchSourceExpressions(analysis.getWhereExpression()));
}
analysis.setSourceExpressions(sourceExpressions);
}
private static final String WHERE_WRONG_TYPE_ERROR_MSG =
- "The output type of the expression in WHERE clause should be BOOLEAN, actual data type: %s.";
+ "The output type of the expression in WHERE clause should be BOOLEAN, actual data type: %s.";
private void analyzeDeviceToWhere(
- Analysis analysis,
- QueryStatement queryStatement,
- ISchemaTree schemaTree,
- Set<PartialPath> deviceSet) {
+ Analysis analysis,
+ QueryStatement queryStatement,
+ ISchemaTree schemaTree,
+ Set<PartialPath> deviceSet) {
if (!queryStatement.hasWhere()) {
return;
}
@@ -1217,13 +1217,13 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Expression whereExpression;
try {
whereExpression =
- ExpressionAnalyzer.normalizeExpression(
- analyzeWhereSplitByDevice(queryStatement, devicePath, schemaTree));
+ ExpressionAnalyzer.normalizeExpression(
+ analyzeWhereSplitByDevice(queryStatement, devicePath, schemaTree));
} catch (MeasurementNotExistException e) {
logger.warn(
- "Meets MeasurementNotExistException in analyzeDeviceToWhere when executing align by device, "
- + "error msg: {}",
- e.getMessage());
+ "Meets MeasurementNotExistException in analyzeDeviceToWhere when executing align by device, "
+ + "error msg: {}",
+ e.getMessage());
deviceIterator.remove();
continue;
}
@@ -1239,19 +1239,19 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void analyzeWhere(
- Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
+ Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
if (!queryStatement.hasWhere()) {
return;
}
List<Expression> conJunctions =
- ExpressionAnalyzer.bindSchemaForPredicate(
- queryStatement.getWhereCondition().getPredicate(),
- queryStatement.getFromComponent().getPrefixPaths(),
- schemaTree,
- true);
+ ExpressionAnalyzer.bindSchemaForPredicate(
+ queryStatement.getWhereCondition().getPredicate(),
+ queryStatement.getFromComponent().getPrefixPaths(),
+ schemaTree,
+ true);
Expression whereExpression =
- ExpressionUtils.constructQueryFilter(
- conJunctions.stream().distinct().collect(Collectors.toList()));
+ ExpressionUtils.constructQueryFilter(
+ conJunctions.stream().distinct().collect(Collectors.toList()));
whereExpression = ExpressionAnalyzer.normalizeExpression(whereExpression);
TSDataType outputType = analyzeExpressionType(analysis, whereExpression);
if (outputType != TSDataType.BOOLEAN) {
@@ -1261,12 +1261,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private Expression analyzeWhereSplitByDevice(
- QueryStatement queryStatement, PartialPath devicePath, ISchemaTree schemaTree) {
+ QueryStatement queryStatement, PartialPath devicePath, ISchemaTree schemaTree) {
List<Expression> conJunctions =
- ExpressionAnalyzer.concatDeviceAndBindSchemaForPredicate(
- queryStatement.getWhereCondition().getPredicate(), devicePath, schemaTree, true);
+ ExpressionAnalyzer.concatDeviceAndBindSchemaForPredicate(
+ queryStatement.getWhereCondition().getPredicate(), devicePath, schemaTree, true);
return ExpressionUtils.constructQueryFilter(
- conJunctions.stream().distinct().collect(Collectors.toList()));
+ conJunctions.stream().distinct().collect(Collectors.toList()));
}
private void analyzeDeviceViewOutput(Analysis analysis, QueryStatement queryStatement) {
@@ -1279,16 +1279,16 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
for (Expression selectExpression : selectExpressions) {
deviceViewOutputExpressions.addAll(
- ExpressionAnalyzer.searchAggregationExpressions(selectExpression));
+ ExpressionAnalyzer.searchAggregationExpressions(selectExpression));
}
if (queryStatement.hasHaving()) {
deviceViewOutputExpressions.addAll(
- ExpressionAnalyzer.searchAggregationExpressions(analysis.getHavingExpression()));
+ ExpressionAnalyzer.searchAggregationExpressions(analysis.getHavingExpression()));
}
if (queryStatement.hasOrderByExpression()) {
for (Expression orderByExpression : analysis.getOrderByExpressions()) {
deviceViewOutputExpressions.addAll(
- ExpressionAnalyzer.searchAggregationExpressions(orderByExpression));
+ ExpressionAnalyzer.searchAggregationExpressions(orderByExpression));
}
}
} else {
@@ -1299,17 +1299,17 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
analysis.setDeviceViewOutputExpressions(deviceViewOutputExpressions);
analysis.setDeviceViewSpecialProcess(
- analyzeDeviceViewSpecialProcess(deviceViewOutputExpressions, queryStatement, analysis));
+ analyzeDeviceViewSpecialProcess(deviceViewOutputExpressions, queryStatement, analysis));
}
private boolean analyzeDeviceViewSpecialProcess(
- Set<Expression> deviceViewOutputExpressions,
- QueryStatement queryStatement,
- Analysis analysis) {
+ Set<Expression> deviceViewOutputExpressions,
+ QueryStatement queryStatement,
+ Analysis analysis) {
if (queryStatement.isAggregationQuery()
- || queryStatement.hasWhere()
- && ExpressionAnalyzer.isDeviceViewNeedSpecialProcess(
- queryStatement.getWhereCondition().getPredicate(), analysis)) {
+ || queryStatement.hasWhere()
+ && ExpressionAnalyzer.isDeviceViewNeedSpecialProcess(
+ queryStatement.getWhereCondition().getPredicate(), analysis)) {
return true;
}
for (Expression expression : deviceViewOutputExpressions) {
@@ -1322,15 +1322,15 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
private void analyzeDeviceViewInput(Analysis analysis, QueryStatement queryStatement) {
List<String> deviceViewOutputColumns =
- analysis.getDeviceViewOutputExpressions().stream()
- .map(Expression::getOutputSymbol)
- .collect(Collectors.toList());
+ analysis.getDeviceViewOutputExpressions().stream()
+ .map(Expression::getOutputSymbol)
+ .collect(Collectors.toList());
Map<String, Set<String>> deviceToOutputColumnsMap = new LinkedHashMap<>();
Map<String, Set<Expression>> deviceToOutputExpressions =
- analysis.getDeviceToOutputExpressions();
+ analysis.getDeviceToOutputExpressions();
for (Map.Entry<String, Set<Expression>> deviceOutputExpressionEntry :
- deviceToOutputExpressions.entrySet()) {
+ deviceToOutputExpressions.entrySet()) {
Set<Expression> outputExpressionsUnderDevice = deviceOutputExpressionEntry.getValue();
checkDeviceViewInputUniqueness(outputExpressionsUnderDevice);
@@ -1340,14 +1340,14 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
for (Expression expression : outputExpressionsUnderDevice) {
outputColumns.add(
- ExpressionAnalyzer.getMeasurementExpression(expression, analysis).getOutputSymbol());
+ ExpressionAnalyzer.getMeasurementExpression(expression, analysis).getOutputSymbol());
}
deviceToOutputColumnsMap.put(deviceOutputExpressionEntry.getKey(), outputColumns);
}
Map<String, List<Integer>> deviceViewInputIndexesMap = new HashMap<>();
for (Map.Entry<String, Set<String>> deviceOutputColumnsEntry :
- deviceToOutputColumnsMap.entrySet()) {
+ deviceToOutputColumnsMap.entrySet()) {
String deviceName = deviceOutputColumnsEntry.getKey();
List<String> outputsUnderDevice = new ArrayList<>(deviceOutputColumnsEntry.getValue());
@@ -1355,7 +1355,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
for (String output : outputsUnderDevice) {
int index = deviceViewOutputColumns.indexOf(output);
checkState(
- index >= 1, "output column '%s' is not stored in %s", output, deviceViewOutputColumns);
+ index >= 1, "output column '%s' is not stored in %s", output, deviceViewOutputColumns);
indexes.add(index);
}
deviceViewInputIndexesMap.put(deviceName, indexes);
@@ -1365,23 +1365,23 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
private void checkDeviceViewInputUniqueness(Set<Expression> outputExpressionsUnderDevice) {
Set<Expression> normalizedOutputExpressionsUnderDevice =
- outputExpressionsUnderDevice.stream()
- .map(ExpressionAnalyzer::normalizeExpression)
- .collect(Collectors.toSet());
+ outputExpressionsUnderDevice.stream()
+ .map(ExpressionAnalyzer::normalizeExpression)
+ .collect(Collectors.toSet());
if (normalizedOutputExpressionsUnderDevice.size() < outputExpressionsUnderDevice.size()) {
throw new SemanticException(
- "Views or measurement aliases representing the same data source "
- + "cannot be queried concurrently in ALIGN BY DEVICE queries.");
+ "Views or measurement aliases representing the same data source "
+ + "cannot be queried concurrently in ALIGN BY DEVICE queries.");
}
}
private void analyzeOutput(
- Analysis analysis,
- QueryStatement queryStatement,
- List<Pair<Expression, String>> outputExpressions) {
+ Analysis analysis,
+ QueryStatement queryStatement,
+ List<Pair<Expression, String>> outputExpressions) {
if (queryStatement.isSelectInto()) {
analysis.setRespDatasetHeader(
- DatasetHeaderFactory.getSelectIntoHeader(queryStatement.isAlignByDevice()));
+ DatasetHeaderFactory.getSelectIntoHeader(queryStatement.isAlignByDevice()));
return;
}
@@ -1395,10 +1395,10 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
for (Pair<Expression, String> expressionAliasPair : outputExpressions) {
columnHeaders.add(
- new ColumnHeader(
- expressionAliasPair.left.getExpressionString(),
- analysis.getType(expressionAliasPair.left),
- expressionAliasPair.right));
+ new ColumnHeader(
+ expressionAliasPair.left.getExpressionString(),
+ analysis.getType(expressionAliasPair.left),
+ expressionAliasPair.right));
}
analysis.setRespDatasetHeader(new DatasetHeader(columnHeaders, isIgnoreTimestamp));
}
@@ -1409,44 +1409,44 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (queryStatement.onlyOrderByTimeseries()) {
analysis.setTimeseriesOrderingForLastQuery(
- queryStatement.getOrderByComponent().getTimeseriesOrder());
+ queryStatement.getOrderByComponent().getTimeseriesOrder());
}
for (SortItem sortItem : queryStatement.getSortItemList()) {
String sortKey = sortItem.getSortKey();
if (!lastQueryColumnNames.contains(sortKey.toUpperCase())) {
throw new SemanticException(
- String.format(
- "%s in order by clause doesn't exist in the result of last query.", sortKey));
+ String.format(
+ "%s in order by clause doesn't exist in the result of last query.", sortKey));
}
}
}
private void analyzeOrderBy(
- Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
+ Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
if (!queryStatement.hasOrderByExpression()) return;
Set<Expression> orderByExpressions = new LinkedHashSet<>();
for (Expression expressionForItem : queryStatement.getExpressionSortItemList()) {
// Expression in a sortItem only indicates one column
List<Expression> expressions =
- ExpressionAnalyzer.bindSchemaForExpression(expressionForItem, schemaTree);
+ ExpressionAnalyzer.bindSchemaForExpression(expressionForItem, schemaTree);
if (expressions.isEmpty()) {
throw new SemanticException(
- String.format(
- "%s in order by clause doesn't exist.", expressionForItem.getExpressionString()));
+ String.format(
+ "%s in order by clause doesn't exist.", expressionForItem.getExpressionString()));
}
if (expressions.size() > 1) {
throw new SemanticException(
- String.format(
- "%s in order by clause shouldn't refer to more than one timeseries.",
- expressionForItem.getExpressionString()));
+ String.format(
+ "%s in order by clause shouldn't refer to more than one timeseries.",
+ expressionForItem.getExpressionString()));
}
expressionForItem = ExpressionAnalyzer.normalizeExpression(expressions.get(0));
TSDataType dataType = analyzeExpressionType(analysis, expressionForItem);
if (!dataType.isComparable()) {
throw new SemanticException(
- String.format("The data type of %s is not comparable", dataType));
+ String.format("The data type of %s is not comparable", dataType));
}
orderByExpressions.add(expressionForItem);
}
@@ -1459,10 +1459,10 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void analyzeDeviceToGroupBy(
- Analysis analysis,
- QueryStatement queryStatement,
- ISchemaTree schemaTree,
- Set<PartialPath> deviceSet) {
+ Analysis analysis,
+ QueryStatement queryStatement,
+ ISchemaTree schemaTree,
+ Set<PartialPath> deviceSet) {
if (queryStatement.getGroupByComponent() == null) {
return;
}
@@ -1474,22 +1474,22 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Expression expression = groupByComponent.getControlColumnExpression();
for (PartialPath device : deviceSet) {
List<Expression> groupByExpressionsOfOneDevice =
- ExpressionAnalyzer.concatDeviceAndBindSchemaForExpression(
- expression, device, schemaTree);
+ ExpressionAnalyzer.concatDeviceAndBindSchemaForExpression(
+ expression, device, schemaTree);
if (groupByExpressionsOfOneDevice.isEmpty()) {
throw new SemanticException(
- String.format("%s in group by clause doesn't exist.", expression));
+ String.format("%s in group by clause doesn't exist.", expression));
}
if (groupByExpressionsOfOneDevice.size() > 1) {
throw new SemanticException(
- String.format(
- "%s in group by clause shouldn't refer to more than one timeseries.",
- expression));
+ String.format(
+ "%s in group by clause shouldn't refer to more than one timeseries.",
+ expression));
}
deviceToGroupByExpression.put(
- device.getFullPath(),
- ExpressionAnalyzer.normalizeExpression(groupByExpressionsOfOneDevice.get(0)));
+ device.getFullPath(),
+ ExpressionAnalyzer.normalizeExpression(groupByExpressionsOfOneDevice.get(0)));
}
}
@@ -1505,24 +1505,24 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
break;
case CONDITION_WINDOW:
Expression keepExpression =
- ((GroupByConditionComponent) groupByComponent).getKeepExpression();
+ ((GroupByConditionComponent) groupByComponent).getKeepExpression();
for (Expression expression : deviceToGroupByExpression.values()) {
checkGroupByConditionExpressionType(analysis, expression, keepExpression);
}
groupByParameter =
- new GroupByConditionParameter(groupByComponent.isIgnoringNull(), keepExpression);
+ new GroupByConditionParameter(groupByComponent.isIgnoringNull(), keepExpression);
analysis.setDeviceToGroupByExpression(deviceToGroupByExpression);
break;
case SESSION_WINDOW:
groupByParameter =
- new GroupBySessionParameter(
- ((GroupBySessionComponent) groupByComponent).getTimeInterval());
+ new GroupBySessionParameter(
+ ((GroupBySessionComponent) groupByComponent).getTimeInterval());
break;
case COUNT_WINDOW:
groupByParameter =
- new GroupByCountParameter(
- ((GroupByCountComponent) groupByComponent).getCountNumber(),
- groupByComponent.isIgnoringNull());
+ new GroupByCountParameter(
+ ((GroupByCountComponent) groupByComponent).getCountNumber(),
+ groupByComponent.isIgnoringNull());
analysis.setDeviceToGroupByExpression(deviceToGroupByExpression);
break;
default:
@@ -1532,10 +1532,10 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void analyzeDeviceToOrderBy(
- Analysis analysis,
- QueryStatement queryStatement,
- ISchemaTree schemaTree,
- Set<PartialPath> deviceSet) {
+ Analysis analysis,
+ QueryStatement queryStatement,
+ ISchemaTree schemaTree,
+ Set<PartialPath> deviceSet) {
if (!queryStatement.hasOrderByExpression()) {
return;
}
@@ -1548,35 +1548,35 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Set<Expression> orderByExpressionsForOneDevice = new LinkedHashSet<>();
for (Expression expressionForItem : queryStatement.getExpressionSortItemList()) {
List<Expression> expressions =
- ExpressionAnalyzer.concatDeviceAndBindSchemaForExpression(
- expressionForItem, device, schemaTree);
+ ExpressionAnalyzer.concatDeviceAndBindSchemaForExpression(
+ expressionForItem, device, schemaTree);
if (expressions.isEmpty()) {
throw new SemanticException(
- String.format(
- "%s in order by clause doesn't exist.", expressionForItem.getExpressionString()));
+ String.format(
+ "%s in order by clause doesn't exist.", expressionForItem.getExpressionString()));
}
if (expressions.size() > 1) {
throw new SemanticException(
- String.format(
- "%s in order by clause shouldn't refer to more than one timeseries.",
- expressionForItem.getExpressionString()));
+ String.format(
+ "%s in order by clause shouldn't refer to more than one timeseries.",
+ expressionForItem.getExpressionString()));
}
expressionForItem = expressions.get(0);
TSDataType dataType = analyzeExpressionType(analysis, expressionForItem);
if (!dataType.isComparable()) {
throw new SemanticException(
- String.format("The data type of %s is not comparable", dataType));
+ String.format("The data type of %s is not comparable", dataType));
}
Expression deviceViewExpression =
- ExpressionAnalyzer.getMeasurementExpression(expressionForItem, analysis);
+ ExpressionAnalyzer.getMeasurementExpression(expressionForItem, analysis);
analyzeExpressionType(analysis, deviceViewExpression);
deviceViewOrderByExpression.add(deviceViewExpression);
orderByExpressionsForOneDevice.add(expressionForItem);
}
deviceToSortItems.put(
- device.getFullPath(), queryStatement.getUpdatedSortItems(orderByExpressionsForOneDevice));
+ device.getFullPath(), queryStatement.getUpdatedSortItems(orderByExpressionsForOneDevice));
deviceToOrderByExpressions.put(device.getFullPath(), orderByExpressionsForOneDevice);
}
@@ -1587,7 +1587,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void analyzeGroupBy(
- Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
+ Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
if (queryStatement.getGroupByComponent() == null) {
return;
@@ -1600,21 +1600,21 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
groupByExpression = groupByComponent.getControlColumnExpression();
// Expression in group by variation clause only indicates one column
List<Expression> expressions =
- ExpressionAnalyzer.bindSchemaForExpression(groupByExpression, schemaTree);
+ ExpressionAnalyzer.bindSchemaForExpression(groupByExpression, schemaTree);
if (expressions.isEmpty()) {
throw new SemanticException(
- String.format(
- "%s in group by clause doesn't exist.", groupByExpression.getExpressionString()));
+ String.format(
+ "%s in group by clause doesn't exist.", groupByExpression.getExpressionString()));
}
if (expressions.size() > 1) {
throw new SemanticException(
- String.format(
- "%s in group by clause shouldn't refer to more than one timeseries.",
- groupByExpression.getExpressionString()));
+ String.format(
+ "%s in group by clause shouldn't refer to more than one timeseries.",
+ groupByExpression.getExpressionString()));
}
// Aggregation expression shouldn't exist in group by clause.
List<Expression> aggregationExpression =
- ExpressionAnalyzer.searchAggregationExpressions(expressions.get(0));
+ ExpressionAnalyzer.searchAggregationExpressions(expressions.get(0));
if (aggregationExpression != null && !aggregationExpression.isEmpty()) {
throw new SemanticException("Aggregation expression shouldn't exist in group by clause");
}
@@ -1625,15 +1625,15 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
double delta = ((GroupByVariationComponent) groupByComponent).getDelta();
checkGroupByVariationExpressionType(analysis, groupByExpression, delta);
GroupByParameter groupByParameter =
- new GroupByVariationParameter(groupByComponent.isIgnoringNull(), delta);
+ new GroupByVariationParameter(groupByComponent.isIgnoringNull(), delta);
analysis.setGroupByExpression(groupByExpression);
analysis.setGroupByParameter(groupByParameter);
} else if (windowType == WindowType.CONDITION_WINDOW) {
Expression keepExpression =
- ((GroupByConditionComponent) groupByComponent).getKeepExpression();
+ ((GroupByConditionComponent) groupByComponent).getKeepExpression();
checkGroupByConditionExpressionType(analysis, groupByExpression, keepExpression);
GroupByParameter groupByParameter =
- new GroupByConditionParameter(groupByComponent.isIgnoringNull(), keepExpression);
+ new GroupByConditionParameter(groupByComponent.isIgnoringNull(), keepExpression);
analysis.setGroupByExpression(groupByExpression);
analysis.setGroupByParameter(groupByParameter);
} else if (windowType == WindowType.SESSION_WINDOW) {
@@ -1642,9 +1642,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
analysis.setGroupByParameter(groupByParameter);
} else if (windowType == WindowType.COUNT_WINDOW) {
GroupByParameter groupByParameter =
- new GroupByCountParameter(
- ((GroupByCountComponent) groupByComponent).getCountNumber(),
- groupByComponent.isIgnoringNull());
+ new GroupByCountParameter(
+ ((GroupByCountComponent) groupByComponent).getCountNumber(),
+ groupByComponent.isIgnoringNull());
analyzeExpressionType(analysis, groupByExpression);
analysis.setGroupByExpression(groupByExpression);
analysis.setGroupByParameter(groupByParameter);
@@ -1654,7 +1654,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void checkGroupByVariationExpressionType(
- Analysis analysis, Expression groupByExpression, double delta) {
+ Analysis analysis, Expression groupByExpression, double delta) {
TSDataType type = analyzeExpressionType(analysis, groupByExpression);
if (delta != 0 && !type.isNumeric()) {
throw new SemanticException("Only support numeric type when delta != 0");
@@ -1662,7 +1662,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void checkGroupByConditionExpressionType(
- Analysis analysis, Expression groupByExpression, Expression keepExpression) {
+ Analysis analysis, Expression groupByExpression, Expression keepExpression) {
TSDataType type = analyzeExpressionType(analysis, groupByExpression);
if (type != TSDataType.BOOLEAN) {
throw new SemanticException("Only support boolean type in predict of group by series");
@@ -1673,20 +1673,20 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Expression leftExpression = ((CompareBinaryExpression) keepExpression).getLeftExpression();
Expression rightExpression = ((CompareBinaryExpression) keepExpression).getRightExpression();
if (!(leftExpression instanceof TimeSeriesOperand
- && leftExpression.getExpressionString().equalsIgnoreCase("keep")
- && rightExpression instanceof ConstantOperand)) {
+ && leftExpression.getExpressionString().equalsIgnoreCase("keep")
+ && rightExpression instanceof ConstantOperand)) {
throw new SemanticException(
- String.format(
- "Please check the keep condition ([%s]),it need to be a constant or a compare expression constructed by 'keep' and a long number.",
- keepExpression.getExpressionString()));
+ String.format(
+ "Please check the keep condition ([%s]),it need to be a constant or a compare expression constructed by 'keep' and a long number.",
+ keepExpression.getExpressionString()));
}
return;
}
if (!(keepExpression instanceof ConstantOperand)) {
throw new SemanticException(
- String.format(
- "Please check the keep condition ([%s]),it need to be a constant or a compare expression constructed by 'keep' and a long number.",
- keepExpression.getExpressionString()));
+ String.format(
+ "Please check the keep condition ([%s]),it need to be a constant or a compare expression constructed by 'keep' and a long number.",
+ keepExpression.getExpressionString()));
}
}
@@ -1697,13 +1697,13 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
GroupByTimeComponent groupByTimeComponent = queryStatement.getGroupByTimeComponent();
if ((groupByTimeComponent.isIntervalByMonth() || groupByTimeComponent.isSlidingStepByMonth())
- && queryStatement.getResultTimeOrder() == Ordering.DESC) {
+ && queryStatement.getResultTimeOrder() == Ordering.DESC) {
throw new SemanticException("Group by month doesn't support order by time desc now.");
}
if (!queryStatement.isCqQueryBody()
- && (groupByTimeComponent.getStartTime() == 0 && groupByTimeComponent.getEndTime() == 0)) {
+ && (groupByTimeComponent.getStartTime() == 0 && groupByTimeComponent.getEndTime() == 0)) {
throw new SemanticException(
- "The query time range should be specified in the GROUP BY TIME clause.");
+ "The query time range should be specified in the GROUP BY TIME clause.");
}
analysis.setGroupByTimeParameter(new GroupByTimeParameter(groupByTimeComponent));
}
@@ -1715,47 +1715,47 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
FillComponent fillComponent = queryStatement.getFillComponent();
analysis.setFillDescriptor(
- new FillDescriptor(fillComponent.getFillPolicy(), fillComponent.getFillValue()));
+ new FillDescriptor(fillComponent.getFillPolicy(), fillComponent.getFillValue()));
}
private void analyzeDataPartition(
- Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
+ Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
Set<String> deviceSet = new HashSet<>();
if (queryStatement.isAlignByDevice()) {
deviceSet =
- analysis.getOutputDeviceToQueriedDevicesMap().values().stream()
- .flatMap(List::stream)
- .collect(Collectors.toSet());
+ analysis.getOutputDeviceToQueriedDevicesMap().values().stream()
+ .flatMap(List::stream)
+ .collect(Collectors.toSet());
} else {
for (Expression expression : analysis.getSourceExpressions()) {
deviceSet.add(ExpressionAnalyzer.getDeviceNameInSourceExpression(expression));
}
}
DataPartition dataPartition =
- fetchDataPartitionByDevices(deviceSet, schemaTree, analysis.getGlobalTimeFilter());
+ fetchDataPartitionByDevices(deviceSet, schemaTree, analysis.getGlobalTimeFilter());
analysis.setDataPartitionInfo(dataPartition);
}
private DataPartition fetchDataPartitionByDevices(
- Set<String> deviceSet, ISchemaTree schemaTree, Filter globalTimeFilter) {
+ Set<String> deviceSet, ISchemaTree schemaTree, Filter globalTimeFilter) {
long startTime = System.nanoTime();
try {
Pair<List<TTimePartitionSlot>, Pair<Boolean, Boolean>> res =
- getTimePartitionSlotList(globalTimeFilter);
+ getTimePartitionSlotList(globalTimeFilter);
// there is no satisfied time range
if (res.left.isEmpty() && Boolean.FALSE.equals(res.right.left)) {
return new DataPartition(
- Collections.emptyMap(),
- CONFIG.getSeriesPartitionExecutorClass(),
- CONFIG.getSeriesPartitionSlotNum());
+ Collections.emptyMap(),
+ CONFIG.getSeriesPartitionExecutorClass(),
+ CONFIG.getSeriesPartitionSlotNum());
}
Map<String, List<DataPartitionQueryParam>> sgNameToQueryParamsMap = new HashMap<>();
for (String devicePath : deviceSet) {
DataPartitionQueryParam queryParam =
- new DataPartitionQueryParam(devicePath, res.left, res.right.left, res.right.right);
+ new DataPartitionQueryParam(devicePath, res.left, res.right.left, res.right.right);
sgNameToQueryParamsMap
- .computeIfAbsent(schemaTree.getBelongedDatabase(devicePath), key -> new ArrayList<>())
- .add(queryParam);
+ .computeIfAbsent(schemaTree.getBelongedDatabase(devicePath), key -> new ArrayList<>())
+ .add(queryParam);
}
if (res.right.left || res.right.right) {
@@ -1765,7 +1765,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
} finally {
QueryPlanCostMetricSet.getInstance()
- .recordPlanCost(PARTITION_FETCHER, System.nanoTime() - startTime);
+ .recordPlanCost(PARTITION_FETCHER, System.nanoTime() - startTime);
}
}
@@ -1777,7 +1777,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
*/
@SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning
public static Pair<List<TTimePartitionSlot>, Pair<Boolean, Boolean>> getTimePartitionSlotList(
- Filter timeFilter) {
+ Filter timeFilter) {
if (timeFilter == null) {
// (-oo, +oo)
return new Pair<>(Collections.emptyList(), new Pair<>(true, true));
@@ -1787,8 +1787,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
// no satisfied time range
return new Pair<>(Collections.emptyList(), new Pair<>(false, false));
} else if (timeRangeList.size() == 1
- && (timeRangeList.get(0).getMin() == Long.MIN_VALUE
- && timeRangeList.get(timeRangeList.size() - 1).getMax() == Long.MAX_VALUE)) {
+ && (timeRangeList.get(0).getMin() == Long.MIN_VALUE
+ && timeRangeList.get(timeRangeList.size() - 1).getMax() == Long.MAX_VALUE)) {
// (-oo, +oo)
return new Pair<>(Collections.emptyList(), new Pair<>(true, true));
}
@@ -1804,14 +1804,14 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (timeRangeList.get(0).getMin() == Long.MIN_VALUE) {
needLeftAll = true;
startTime =
- (timeRangeList.get(0).getMax() / TimePartitionUtils.timePartitionInterval)
- * TimePartitionUtils.timePartitionInterval; // included
+ (timeRangeList.get(0).getMax() / TimePartitionUtils.timePartitionInterval)
+ * TimePartitionUtils.timePartitionInterval; // included
endTime = startTime + TimePartitionUtils.timePartitionInterval; // excluded
timePartitionSlot = TimePartitionUtils.getTimePartition(timeRangeList.get(0).getMax());
} else {
startTime =
- (timeRangeList.get(0).getMin() / TimePartitionUtils.timePartitionInterval)
- * TimePartitionUtils.timePartitionInterval; // included
+ (timeRangeList.get(0).getMin() / TimePartitionUtils.timePartitionInterval)
+ * TimePartitionUtils.timePartitionInterval; // included
endTime = startTime + TimePartitionUtils.timePartitionInterval; // excluded
timePartitionSlot = TimePartitionUtils.getTimePartition(timeRangeList.get(0).getMin());
needLeftAll = false;
@@ -1832,8 +1832,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
result.add(timePartitionSlot);
// next init
endTime =
- (curLeft / TimePartitionUtils.timePartitionInterval + 1)
- * TimePartitionUtils.timePartitionInterval;
+ (curLeft / TimePartitionUtils.timePartitionInterval + 1)
+ * TimePartitionUtils.timePartitionInterval;
timePartitionSlot = TimePartitionUtils.getTimePartition(curLeft);
} else if (curRight >= endTime) {
result.add(timePartitionSlot);
@@ -1848,7 +1848,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (needRightAll) {
TTimePartitionSlot lastTimePartitionSlot =
- TimePartitionUtils.getTimePartition(timeRangeList.get(timeRangeList.size() - 1).getMin());
+ TimePartitionUtils.getTimePartition(timeRangeList.get(timeRangeList.size() - 1).getMin());
if (lastTimePartitionSlot.startTime != timePartitionSlot.startTime) {
result.add(lastTimePartitionSlot);
}
@@ -1857,10 +1857,10 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void analyzeInto(
- Analysis analysis,
- QueryStatement queryStatement,
- Set<PartialPath> deviceSet,
- List<Pair<Expression, String>> outputExpressions) {
+ Analysis analysis,
+ QueryStatement queryStatement,
+ Set<PartialPath> deviceSet,
+ List<Pair<Expression, String>> outputExpressions) {
if (!queryStatement.isSelectInto()) {
return;
}
@@ -1868,9 +1868,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
List<PartialPath> sourceDevices = new ArrayList<>(deviceSet);
List<Expression> sourceColumns =
- outputExpressions.stream()
- .map(Pair::getLeft)
- .collect(Collectors.toCollection(ArrayList::new));
+ outputExpressions.stream()
+ .map(Pair::getLeft)
+ .collect(Collectors.toCollection(ArrayList::new));
IntoComponent intoComponent = queryStatement.getIntoComponent();
intoComponent.validate(sourceDevices, sourceColumns);
@@ -1878,7 +1878,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
DeviceViewIntoPathDescriptor deviceViewIntoPathDescriptor = new DeviceViewIntoPathDescriptor();
PathPatternTree targetPathTree = new PathPatternTree();
IntoComponent.IntoDeviceMeasurementIterator intoDeviceMeasurementIterator =
- intoComponent.getIntoDeviceMeasurementIterator();
+ intoComponent.getIntoDeviceMeasurementIterator();
for (PartialPath sourceDevice : sourceDevices) {
PartialPath deviceTemplate = intoDeviceMeasurementIterator.getDeviceTemplate();
boolean isAlignedDevice = intoDeviceMeasurementIterator.isAlignedDevice();
@@ -1890,17 +1890,17 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
String targetMeasurement;
if (sourceColumn instanceof TimeSeriesOperand) {
targetMeasurement =
- constructTargetMeasurement(
- sourceDevice.concatNode(sourceColumn.getExpressionString()), measurementTemplate);
+ constructTargetMeasurement(
+ sourceDevice.concatNode(sourceColumn.getExpressionString()), measurementTemplate);
} else {
targetMeasurement = measurementTemplate;
}
deviceViewIntoPathDescriptor.specifyTargetDeviceMeasurement(
- sourceDevice, targetDevice, sourceColumn.getExpressionString(), targetMeasurement);
+ sourceDevice, targetDevice, sourceColumn.getExpressionString(), targetMeasurement);
targetPathTree.appendFullPath(targetDevice, targetMeasurement);
deviceViewIntoPathDescriptor.recordSourceColumnDataType(
- sourceColumn.getExpressionString(), analysis.getType(sourceColumn));
+ sourceColumn.getExpressionString(), analysis.getType(sourceColumn));
intoDeviceMeasurementIterator.nextMeasurement();
}
@@ -1913,25 +1913,25 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
long startTime = System.nanoTime();
ISchemaTree targetSchemaTree = schemaFetcher.fetchSchema(targetPathTree, null);
QueryPlanCostMetricSet.getInstance()
- .recordPlanCost(SCHEMA_FETCHER, System.nanoTime() - startTime);
+ .recordPlanCost(SCHEMA_FETCHER, System.nanoTime() - startTime);
deviceViewIntoPathDescriptor.bindType(targetSchemaTree);
analysis.setDeviceViewIntoPathDescriptor(deviceViewIntoPathDescriptor);
}
private void analyzeInto(
- Analysis analysis,
- QueryStatement queryStatement,
- List<Pair<Expression, String>> outputExpressions) {
+ Analysis analysis,
+ QueryStatement queryStatement,
+ List<Pair<Expression, String>> outputExpressions) {
if (!queryStatement.isSelectInto()) {
return;
}
queryStatement.setOrderByComponent(null);
List<Expression> sourceColumns =
- outputExpressions.stream()
- .map(Pair::getLeft)
- .collect(Collectors.toCollection(ArrayList::new));
+ outputExpressions.stream()
+ .map(Pair::getLeft)
+ .collect(Collectors.toCollection(ArrayList::new));
IntoComponent intoComponent = queryStatement.getIntoComponent();
intoComponent.validate(sourceColumns);
@@ -1955,8 +1955,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
sourcePath = new PartialPath(viewPath);
} catch (IllegalPathException e) {
throw new SemanticException(
- String.format(
- "View path %s of source column %s is illegal path", viewPath, sourceColumn));
+ String.format(
+ "View path %s of source column %s is illegal path", viewPath, sourceColumn));
}
} else {
sourcePath = ((TimeSeriesOperand) sourceExpression).getPath();
@@ -1967,11 +1967,11 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
intoPathDescriptor.specifyTargetPath(sourceColumn, viewPath, targetPath);
intoPathDescriptor.specifyDeviceAlignment(
- targetPath.getDevicePath().toString(), isAlignedDevice);
+ targetPath.getDevicePath().toString(), isAlignedDevice);
targetPathTree.appendFullPath(targetPath);
intoPathDescriptor.recordSourceColumnDataType(
- sourceColumn, analysis.getType(sourceExpression));
+ sourceColumn, analysis.getType(sourceExpression));
intoPathIterator.next();
}
@@ -1982,7 +1982,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
ISchemaTree targetSchemaTree = schemaFetcher.fetchSchema(targetPathTree, null);
updateSchemaTreeByViews(analysis, targetSchemaTree);
QueryPlanCostMetricSet.getInstance()
- .recordPlanCost(SCHEMA_FETCHER, System.nanoTime() - startTime);
+ .recordPlanCost(SCHEMA_FETCHER, System.nanoTime() - startTime);
intoPathDescriptor.bindType(targetSchemaTree);
analysis.setIntoPathDescriptor(intoPathDescriptor);
@@ -1995,12 +1995,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
* false while root.sg1.d1.s0 is INT32 and root.sg1.d2.s0 is FLOAT.
*/
private void checkDataTypeConsistencyInAlignByDevice(
- Analysis analysis, List<Expression> expressions) {
+ Analysis analysis, List<Expression> expressions) {
TSDataType checkedDataType = analysis.getType(expressions.get(0));
for (Expression expression : expressions) {
if (analysis.getType(expression) != checkedDataType) {
throw new SemanticException(
- "ALIGN BY DEVICE: the data types of the same measurement column should be the same across devices.");
+ "ALIGN BY DEVICE: the data types of the same measurement column should be the same across devices.");
}
}
}
@@ -2009,17 +2009,17 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (alias != null) {
if (aliasSet.contains(alias)) {
throw new SemanticException(
- String.format("alias '%s' can only be matched with one time series", alias));
+ String.format("alias '%s' can only be matched with one time series", alias));
}
aliasSet.add(alias);
}
}
private void checkAliasUniqueness(
- String alias, Map<Expression, Map<String, Expression>> measurementToDeviceSelectExpressions) {
+ String alias, Map<Expression, Map<String, Expression>> measurementToDeviceSelectExpressions) {
if (alias != null && measurementToDeviceSelectExpressions.keySet().size() > 1) {
throw new SemanticException(
- String.format("alias '%s' can only be matched with one time series", alias));
+ String.format("alias '%s' can only be matched with one time series", alias));
}
}
@@ -2047,7 +2047,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
// construct insert rows statement
// construct insert statement
InsertRowsOfOneDeviceStatement insertRowsOfOneDeviceStatement =
- new InsertRowsOfOneDeviceStatement();
+ new InsertRowsOfOneDeviceStatement();
List<InsertRowStatement> insertRowStatementList = new ArrayList<>();
for (int i = 0; i < timeArray.length; i++) {
InsertRowStatement statement = new InsertRowStatement();
@@ -2072,21 +2072,21 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitCreateTimeseries(
- CreateTimeSeriesStatement createTimeSeriesStatement, MPPQueryContext context) {
+ CreateTimeSeriesStatement createTimeSeriesStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
if (createTimeSeriesStatement.getPath().getNodeLength() < 3) {
throw new SemanticException(
- new IllegalPathException(createTimeSeriesStatement.getPath().getFullPath()));
+ new IllegalPathException(createTimeSeriesStatement.getPath().getFullPath()));
}
analyzeSchemaProps(createTimeSeriesStatement.getProps());
if (createTimeSeriesStatement.getTags() != null
- && !createTimeSeriesStatement.getTags().isEmpty()
- && createTimeSeriesStatement.getAttributes() != null
- && !createTimeSeriesStatement.getAttributes().isEmpty()) {
+ && !createTimeSeriesStatement.getTags().isEmpty()
+ && createTimeSeriesStatement.getAttributes() != null
+ && !createTimeSeriesStatement.getAttributes().isEmpty()) {
for (String tagKey : createTimeSeriesStatement.getTags().keySet()) {
if (createTimeSeriesStatement.getAttributes().containsKey(tagKey)) {
throw new SemanticException(
- String.format("Tag and attribute shouldn't have the same property key [%s]", tagKey));
+ String.format("Tag and attribute shouldn't have the same property key [%s]", tagKey));
}
}
}
@@ -2095,7 +2095,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
analysis.setStatement(createTimeSeriesStatement);
checkIsTemplateCompatible(
- createTimeSeriesStatement.getPath(), createTimeSeriesStatement.getAlias());
+ createTimeSeriesStatement.getPath(), createTimeSeriesStatement.getAlias());
PathPatternTree patternTree = new PathPatternTree();
patternTree.appendFullPath(createTimeSeriesStatement.getPath());
@@ -2106,27 +2106,27 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
private void checkIsTemplateCompatible(PartialPath timeseriesPath, String alias) {
Pair<Template, PartialPath> templateInfo =
- schemaFetcher.checkTemplateSetAndPreSetInfo(timeseriesPath, alias);
+ schemaFetcher.checkTemplateSetAndPreSetInfo(timeseriesPath, alias);
if (templateInfo != null) {
throw new SemanticException(
- new TemplateIncompatibleException(
- timeseriesPath.getFullPath(), templateInfo.left.getName(), templateInfo.right));
+ new TemplateIncompatibleException(
+ timeseriesPath.getFullPath(), templateInfo.left.getName(), templateInfo.right));
}
}
private void checkIsTemplateCompatible(
- PartialPath devicePath, List<String> measurements, List<String> aliasList) {
+ PartialPath devicePath, List<String> measurements, List<String> aliasList) {
for (int i = 0; i < measurements.size(); i++) {
Pair<Template, PartialPath> templateInfo =
- schemaFetcher.checkTemplateSetAndPreSetInfo(
- devicePath.concatNode(measurements.get(i)),
- aliasList == null ? null : aliasList.get(i));
+ schemaFetcher.checkTemplateSetAndPreSetInfo(
+ devicePath.concatNode(measurements.get(i)),
+ aliasList == null ? null : aliasList.get(i));
if (templateInfo != null) {
throw new SemanticException(
- new TemplateIncompatibleException(
- devicePath.getFullPath() + measurements,
- templateInfo.left.getName(),
- templateInfo.right));
+ new TemplateIncompatibleException(
+ devicePath.getFullPath() + measurements,
+ templateInfo.left.getName(),
+ templateInfo.right));
}
}
}
@@ -2143,8 +2143,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
String lowerCaseKey = caseChangeEntry.getKey();
if (!ALLOWED_SCHEMA_PROPS.contains(lowerCaseKey)) {
throw new SemanticException(
- new MetadataException(
- String.format("%s is not a legal prop.", caseChangeEntry.getValue())));
+ new MetadataException(
+ String.format("%s is not a legal prop.", caseChangeEntry.getValue())));
}
props.put(lowerCaseKey, props.remove(caseChangeEntry.getValue()));
}
@@ -2164,26 +2164,26 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitCreateAlignedTimeseries(
- CreateAlignedTimeSeriesStatement createAlignedTimeSeriesStatement, MPPQueryContext context) {
+ CreateAlignedTimeSeriesStatement createAlignedTimeSeriesStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
if (createAlignedTimeSeriesStatement.getDevicePath().getNodeLength() < 2) {
throw new SemanticException(
- new IllegalPathException(createAlignedTimeSeriesStatement.getDevicePath().getFullPath()));
+ new IllegalPathException(createAlignedTimeSeriesStatement.getDevicePath().getFullPath()));
}
List<String> measurements = createAlignedTimeSeriesStatement.getMeasurements();
Set<String> measurementsSet = new HashSet<>(measurements);
if (measurementsSet.size() < measurements.size()) {
throw new SemanticException(
- "Measurement under an aligned device is not allowed to have the same measurement name");
+ "Measurement under an aligned device is not allowed to have the same measurement name");
}
Analysis analysis = new Analysis();
analysis.setStatement(createAlignedTimeSeriesStatement);
checkIsTemplateCompatible(
- createAlignedTimeSeriesStatement.getDevicePath(),
- createAlignedTimeSeriesStatement.getMeasurements(),
- createAlignedTimeSeriesStatement.getAliasList());
+ createAlignedTimeSeriesStatement.getDevicePath(),
+ createAlignedTimeSeriesStatement.getMeasurements(),
+ createAlignedTimeSeriesStatement.getAliasList());
PathPatternTree pathPatternTree = new PathPatternTree();
for (String measurement : createAlignedTimeSeriesStatement.getMeasurements()) {
@@ -2198,8 +2198,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitInternalCreateTimeseries(
- InternalCreateTimeSeriesStatement internalCreateTimeSeriesStatement,
- MPPQueryContext context) {
+ InternalCreateTimeSeriesStatement internalCreateTimeSeriesStatement,
+ MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
@@ -2208,7 +2208,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
PathPatternTree pathPatternTree = new PathPatternTree();
for (String measurement : internalCreateTimeSeriesStatement.getMeasurements()) {
pathPatternTree.appendFullPath(
- internalCreateTimeSeriesStatement.getDevicePath(), measurement);
+ internalCreateTimeSeriesStatement.getDevicePath(), measurement);
}
SchemaPartition schemaPartitionInfo;
@@ -2219,8 +2219,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitInternalCreateMultiTimeSeries(
- InternalCreateMultiTimeSeriesStatement internalCreateMultiTimeSeriesStatement,
- MPPQueryContext context) {
+ InternalCreateMultiTimeSeriesStatement internalCreateMultiTimeSeriesStatement,
+ MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
@@ -2239,7 +2239,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitCreateMultiTimeseries(
- CreateMultiTimeSeriesStatement createMultiTimeSeriesStatement, MPPQueryContext context) {
+ CreateMultiTimeSeriesStatement createMultiTimeSeriesStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
analysis.setStatement(createMultiTimeSeriesStatement);
@@ -2250,7 +2250,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
List<String> aliasList = createMultiTimeSeriesStatement.getAliasList();
for (int i = 0; i < timeseriesPathList.size(); i++) {
checkIsTemplateCompatible(
- timeseriesPathList.get(i), aliasList == null ? null : aliasList.get(i));
+ timeseriesPathList.get(i), aliasList == null ? null : aliasList.get(i));
}
PathPatternTree patternTree = new PathPatternTree();
@@ -2264,22 +2264,22 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitAlterTimeseries(
- AlterTimeSeriesStatement alterTimeSeriesStatement, MPPQueryContext context) {
+ AlterTimeSeriesStatement alterTimeSeriesStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
analysis.setStatement(alterTimeSeriesStatement);
Pair<Template, PartialPath> templateInfo =
- schemaFetcher.checkTemplateSetAndPreSetInfo(
- alterTimeSeriesStatement.getPath(), alterTimeSeriesStatement.getAlias());
+ schemaFetcher.checkTemplateSetAndPreSetInfo(
+ alterTimeSeriesStatement.getPath(), alterTimeSeriesStatement.getAlias());
if (templateInfo != null) {
throw new RuntimeException(
- new TemplateIncompatibleException(
- String.format(
- "Cannot alter template timeseries [%s] since schema template [%s] already set on path [%s].",
- alterTimeSeriesStatement.getPath().getFullPath(),
- templateInfo.left.getName(),
- templateInfo.right)));
+ new TemplateIncompatibleException(
+ String.format(
+ "Cannot alter template timeseries [%s] since schema template [%s] already set on path [%s].",
+ alterTimeSeriesStatement.getPath().getFullPath(),
+ templateInfo.left.getName(),
+ templateInfo.right)));
}
PathPatternTree patternTree = new PathPatternTree();
@@ -2292,7 +2292,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitInsertTablet(
- InsertTabletStatement insertTabletStatement, MPPQueryContext context) {
+ InsertTabletStatement insertTabletStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
validateSchema(analysis, insertTabletStatement, context);
@@ -2306,9 +2306,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
InsertTabletStatement realInsertTabletStatement = (InsertTabletStatement) realStatement;
DataPartitionQueryParam dataPartitionQueryParam = new DataPartitionQueryParam();
dataPartitionQueryParam.setDevicePath(
- realInsertTabletStatement.getDevicePath().getFullPath());
+ realInsertTabletStatement.getDevicePath().getFullPath());
dataPartitionQueryParam.setTimePartitionSlotList(
- realInsertTabletStatement.getTimePartitionSlots());
+ realInsertTabletStatement.getTimePartitionSlots());
return getAnalysisForWriting(analysis, Collections.singletonList(dataPartitionQueryParam));
} else {
@@ -2332,7 +2332,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
DataPartitionQueryParam dataPartitionQueryParam = new DataPartitionQueryParam();
dataPartitionQueryParam.setDevicePath(realInsertRowStatement.getDevicePath().getFullPath());
dataPartitionQueryParam.setTimePartitionSlotList(
- Collections.singletonList(realInsertRowStatement.getTimePartitionSlot()));
+ Collections.singletonList(realInsertRowStatement.getTimePartitionSlot()));
return getAnalysisForWriting(analysis, Collections.singletonList(dataPartitionQueryParam));
} else {
@@ -2341,12 +2341,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private Analysis computeAnalysisForInsertRows(
- Analysis analysis, InsertRowsStatement insertRowsStatement) {
+ Analysis analysis, InsertRowsStatement insertRowsStatement) {
Map<String, Set<TTimePartitionSlot>> dataPartitionQueryParamMap = new HashMap<>();
for (InsertRowStatement insertRowStatement : insertRowsStatement.getInsertRowStatementList()) {
Set<TTimePartitionSlot> timePartitionSlotSet =
- dataPartitionQueryParamMap.computeIfAbsent(
- insertRowStatement.getDevicePath().getFullPath(), k -> new HashSet<>());
+ dataPartitionQueryParamMap.computeIfAbsent(
+ insertRowStatement.getDevicePath().getFullPath(), k -> new HashSet<>());
timePartitionSlotSet.add(insertRowStatement.getTimePartitionSlot());
}
@@ -2363,12 +2363,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitInsertRows(
- InsertRowsStatement insertRowsStatement, MPPQueryContext context) {
+ InsertRowsStatement insertRowsStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
validateSchema(analysis, insertRowsStatement, context);
InsertRowsStatement realInsertRowsStatement =
- (InsertRowsStatement) removeLogicalView(analysis, insertRowsStatement);
+ (InsertRowsStatement) removeLogicalView(analysis, insertRowsStatement);
if (analysis.isFinishQueryAfterAnalyze()) {
return analysis;
}
@@ -2378,13 +2378,13 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private Analysis computeAnalysisForMultiTablets(
- Analysis analysis, InsertMultiTabletsStatement insertMultiTabletsStatement) {
+ Analysis analysis, InsertMultiTabletsStatement insertMultiTabletsStatement) {
Map<String, Set<TTimePartitionSlot>> dataPartitionQueryParamMap = new HashMap<>();
for (InsertTabletStatement insertTabletStatement :
- insertMultiTabletsStatement.getInsertTabletStatementList()) {
+ insertMultiTabletsStatement.getInsertTabletStatementList()) {
Set<TTimePartitionSlot> timePartitionSlotSet =
- dataPartitionQueryParamMap.computeIfAbsent(
- insertTabletStatement.getDevicePath().getFullPath(), k -> new HashSet<>());
+ dataPartitionQueryParamMap.computeIfAbsent(
+ insertTabletStatement.getDevicePath().getFullPath(), k -> new HashSet<>());
timePartitionSlotSet.addAll(insertTabletStatement.getTimePartitionSlots());
}
@@ -2401,12 +2401,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitInsertMultiTablets(
- InsertMultiTabletsStatement insertMultiTabletsStatement, MPPQueryContext context) {
+ InsertMultiTabletsStatement insertMultiTabletsStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
validateSchema(analysis, insertMultiTabletsStatement, context);
InsertMultiTabletsStatement realStatement =
- (InsertMultiTabletsStatement) removeLogicalView(analysis, insertMultiTabletsStatement);
+ (InsertMultiTabletsStatement) removeLogicalView(analysis, insertMultiTabletsStatement);
if (analysis.isFinishQueryAfterAnalyze()) {
return analysis;
}
@@ -2417,12 +2417,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitInsertRowsOfOneDevice(
- InsertRowsOfOneDeviceStatement insertRowsOfOneDeviceStatement, MPPQueryContext context) {
+ InsertRowsOfOneDeviceStatement insertRowsOfOneDeviceStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
validateSchema(analysis, insertRowsOfOneDeviceStatement, context);
InsertBaseStatement realInsertStatement =
- removeLogicalView(analysis, insertRowsOfOneDeviceStatement);
+ removeLogicalView(analysis, insertRowsOfOneDeviceStatement);
if (analysis.isFinishQueryAfterAnalyze()) {
return analysis;
}
@@ -2430,7 +2430,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (realInsertStatement instanceof InsertRowsOfOneDeviceStatement) {
InsertRowsOfOneDeviceStatement realStatement =
- (InsertRowsOfOneDeviceStatement) realInsertStatement;
+ (InsertRowsOfOneDeviceStatement) realInsertStatement;
DataPartitionQueryParam dataPartitionQueryParam = new DataPartitionQueryParam();
dataPartitionQueryParam.setDevicePath(realStatement.getDevicePath().getFullPath());
dataPartitionQueryParam.setTimePartitionSlotList(realStatement.getTimePartitionSlots());
@@ -2442,7 +2442,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void validateSchema(
- Analysis analysis, InsertBaseStatement insertStatement, MPPQueryContext context) {
+ Analysis analysis, InsertBaseStatement insertStatement, MPPQueryContext context) {
final long startTime = System.nanoTime();
try {
SchemaValidator.validate(schemaFetcher, insertStatement, context);
@@ -2451,7 +2451,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (e.getCause() instanceof IoTDBException) {
IoTDBException exception = (IoTDBException) e.getCause();
analysis.setFailStatus(
- RpcUtils.getStatus(exception.getErrorCode(), exception.getMessage()));
+ RpcUtils.getStatus(exception.getErrorCode(), exception.getMessage()));
} else {
analysis.setFailStatus(RpcUtils.getStatus(TSStatusCode.METADATA_ERROR, e.getMessage()));
}
@@ -2462,17 +2462,17 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
String partialInsertMessage;
if (hasFailedMeasurement) {
partialInsertMessage =
- String.format(
- "Fail to insert measurements %s caused by %s",
- insertStatement.getFailedMeasurements(), insertStatement.getFailedMessages());
+ String.format(
+ "Fail to insert measurements %s caused by %s",
+ insertStatement.getFailedMeasurements(), insertStatement.getFailedMessages());
logger.warn(partialInsertMessage);
analysis.setFailStatus(
- RpcUtils.getStatus(TSStatusCode.METADATA_ERROR.getStatusCode(), partialInsertMessage));
+ RpcUtils.getStatus(TSStatusCode.METADATA_ERROR.getStatusCode(), partialInsertMessage));
}
}
private InsertBaseStatement removeLogicalView(
- Analysis analysis, InsertBaseStatement insertBaseStatement) {
+ Analysis analysis, InsertBaseStatement insertBaseStatement) {
try {
return insertBaseStatement.removeLogicalView();
} catch (SemanticException e) {
@@ -2480,7 +2480,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (e.getCause() instanceof IoTDBException) {
IoTDBException exception = (IoTDBException) e.getCause();
analysis.setFailStatus(
- RpcUtils.getStatus(exception.getErrorCode(), exception.getMessage()));
+ RpcUtils.getStatus(exception.getErrorCode(), exception.getMessage()));
} else {
analysis.setFailStatus(RpcUtils.getStatus(TSStatusCode.METADATA_ERROR, e.getMessage()));
}
@@ -2504,23 +2504,23 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
logger.warn(String.format("TsFile %s is empty.", tsFile.getPath()));
}
throw new SemanticException(
- String.format(
- "TsFile %s is empty, please check it be flushed to disk correctly.",
- tsFile.getPath()));
+ String.format(
+ "TsFile %s is empty, please check it be flushed to disk correctly.",
+ tsFile.getPath()));
}
try {
analyzeTsFile(loadTsFileStatement, tsFile, device2Schemas, device2IsAligned, context);
} catch (IllegalArgumentException e) {
logger.warn(
- String.format(
- "Parse file %s to resource error, this TsFile maybe empty.", tsFile.getPath()),
- e);
+ String.format(
+ "Parse file %s to resource error, this TsFile maybe empty.", tsFile.getPath()),
+ e);
throw new SemanticException(
- String.format("TsFile %s is empty or incomplete.", tsFile.getPath()));
+ String.format("TsFile %s is empty or incomplete.", tsFile.getPath()));
} catch (Exception e) {
logger.warn(String.format("Parse file %s to resource error.", tsFile.getPath()), e);
throw new SemanticException(
- String.format("Parse file %s to resource error", tsFile.getPath()));
+ String.format("Parse file %s to resource error", tsFile.getPath()));
}
if (i + 1 == tsfileNum) {
@@ -2530,13 +2530,13 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
double progressPercentage = (i + 1) * 100.00 / tsfileNum;
logger.info(
- "Load - Analysis Stage: {}/{} tsfiles have been analyzed, progress: {}%",
- i + 1, tsfileNum, String.format("%.2f", progressPercentage));
+ "Load - Analysis Stage: {}/{} tsfiles have been analyzed, progress: {}%",
+ i + 1, tsfileNum, String.format("%.2f", progressPercentage));
}
logger.info(
- "Load - Analysis Stage:{}/{} tsfiles have been analyzed, progress: {}%",
- tsfileNum, tsfileNum, "100.00");
+ "Load - Analysis Stage:{}/{} tsfiles have been analyzed, progress: {}%",
+ tsfileNum, tsfileNum, "100.00");
// load function will query data partition in scheduler
Analysis analysis = new Analysis();
analysis.setStatement(loadTsFileStatement);
@@ -2544,11 +2544,11 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void autoCreateAndVerifySchema(
- LoadTsFileStatement loadTsFileStatement,
- Map<String, Map<MeasurementSchema, File>> device2Schemas,
- Map<String, Pair<Boolean, File>> device2IsAligned,
- MPPQueryContext context)
- throws SemanticException {
+ LoadTsFileStatement loadTsFileStatement,
+ Map<String, Map<MeasurementSchema, File>> device2Schemas,
+ Map<String, Pair<Boolean, File>> device2IsAligned,
+ MPPQueryContext context)
+ throws SemanticException {
if (device2Schemas.isEmpty()) {
return;
}
@@ -2560,10 +2560,10 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
autoCreateSg(loadTsFileStatement.getSgLevel(), device2Schemas);
}
ISchemaTree schemaTree =
- autoCreateSchema(
- device2Schemas,
- device2IsAligned,
- context); // schema fetcher will not auto create if config set
+ autoCreateSchema(
+ device2Schemas,
+ device2IsAligned,
+ context); // schema fetcher will not auto create if config set
// isAutoCreateSchemaEnabled is false.
if (loadTsFileStatement.isVerifySchema()) {
verifySchema(schemaTree, device2Schemas, device2IsAligned);
@@ -2571,9 +2571,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
} catch (Exception e) {
logger.warn("Auto create or verify schema error.", e);
throw new SemanticException(
- String.format(
- "Auto create or verify schema error when executing statement %s.",
- loadTsFileStatement));
+ String.format(
+ "Auto create or verify schema error when executing statement %s.",
+ loadTsFileStatement));
} finally {
device2Schemas.clear();
device2IsAligned.clear();
@@ -2582,29 +2582,29 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
/** get analysis according to statement and params */
private Analysis getAnalysisForWriting(
- Analysis analysis, List<DataPartitionQueryParam> dataPartitionQueryParams) {
+ Analysis analysis, List<DataPartitionQueryParam> dataPartitionQueryParams) {
DataPartition dataPartition =
- partitionFetcher.getOrCreateDataPartition(dataPartitionQueryParams);
+ partitionFetcher.getOrCreateDataPartition(dataPartitionQueryParams);
if (dataPartition.isEmpty()) {
analysis.setFinishQueryAfterAnalyze(true);
analysis.setFailStatus(
- RpcUtils.getStatus(
- TSStatusCode.DATABASE_NOT_EXIST.getStatusCode(),
- "Database not exists and failed to create automatically "
- + "because enable_auto_create_schema is FALSE."));
+ RpcUtils.getStatus(
+ TSStatusCode.DATABASE_NOT_EXIST.getStatusCode(),
+ "Database not exists and failed to create automatically "
+ + "because enable_auto_create_schema is FALSE."));
}
analysis.setDataPartitionInfo(dataPartition);
return analysis;
}
private void analyzeTsFile(
- LoadTsFileStatement statement,
- File tsFile,
- Map<String, Map<MeasurementSchema, File>> device2Schemas,
- Map<String, Pair<Boolean, File>> device2IsAligned,
- MPPQueryContext context)
- throws IOException, VerifyMetadataException {
+ LoadTsFileStatement statement,
+ File tsFile,
+ Map<String, Map<MeasurementSchema, File>> device2Schemas,
+ Map<String, Pair<Boolean, File>> device2IsAligned,
+ MPPQueryContext context)
+ throws IOException, VerifyMetadataException {
try (TsFileSequenceReader reader = new TsFileSequenceReader(tsFile.getAbsolutePath())) {
TsFileResource tsFileResource = new TsFileResource(tsFile);
final boolean isAlreadyExistBeforeLoad = tsFileResource.resourceFileExists();
@@ -2612,7 +2612,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Map<String, List<TimeseriesMetadata>> device2Metadata = reader.getAllTimeseriesMetadata(true);
if (IoTDBDescriptor.getInstance().getConfig().isAutoCreateSchemaEnabled()
- || statement.isVerifySchema()) {
+ || statement.isVerifySchema()) {
// construct schema
int deviceSize = device2Metadata.size();
int deviceCount = 0;
@@ -2627,22 +2627,22 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
int timeseriesMetadataListSize = timeseriesMetadataList.size();
for (int timeseriesIndex = 0;
- timeseriesIndex < timeseriesMetadataListSize;
- timeseriesIndex++) {
+ timeseriesIndex < timeseriesMetadataListSize;
+ timeseriesIndex++) {
TimeseriesMetadata timeseriesMetadata = timeseriesMetadataList.get(timeseriesIndex);
TSDataType dataType = timeseriesMetadata.getTsDataType();
if (!dataType.equals(TSDataType.VECTOR)) {
Pair<CompressionType, TSEncoding> pair =
- reader.readTimeseriesCompressionTypeAndEncoding(timeseriesMetadata);
+ reader.readTimeseriesCompressionTypeAndEncoding(timeseriesMetadata);
MeasurementSchema measurementSchema =
- new MeasurementSchema(
- timeseriesMetadata.getMeasurementId(),
- dataType,
- pair.getRight(),
- pair.getLeft());
+ new MeasurementSchema(
+ timeseriesMetadata.getMeasurementId(),
+ dataType,
+ pair.getRight(),
+ pair.getLeft());
device2Schemas
- .computeIfAbsent(device, o -> new HashMap<>())
- .put(measurementSchema, tsFile);
+ .computeIfAbsent(device, o -> new HashMap<>())
+ .put(measurementSchema, tsFile);
timeseriesCount++;
} else {
isAligned = true;
@@ -2652,8 +2652,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
// the last device, we should create and verify schema , and clean the device2Schemas
// and device2IsAligned map.
if (timeseriesCount > CONFIG.getMaxLoadingTimeseriesNumber()
- || (deviceCount == deviceSize
- && timeseriesIndex == timeseriesMetadataListSize - 1)) {
+ || (deviceCount == deviceSize
+ && timeseriesIndex == timeseriesMetadataListSize - 1)) {
// check if the device has the same aligned definition in all tsfiles
if (isDeviceAligned(device2IsAligned, device, tsFile, isAligned)) {
@@ -2684,15 +2684,15 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
timeseriesCount = 0;
} else {
throw new VerifyMetadataException(
- String.format(
- "Device %s has different aligned definition in tsFile %s and other TsFile.",
- device, tsFile.getParentFile()));
+ String.format(
+ "Device %s has different aligned definition in tsFile %s and other TsFile.",
+ device, tsFile.getParentFile()));
}
logger.info(
- "Load - Create and Verify Schemas Stage: the device {} in tsfile {} have been created and verified.",
- entry.getKey(),
- tsFile.getName());
+ "Load - Create and Verify Schemas Stage: the device {} in tsfile {} have been created and verified.",
+ entry.getKey(),
+ tsFile.getName());
}
}
@@ -2701,9 +2701,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
// definition in all tsfiles before going to the next device loop.
if (!isDeviceAligned(device2IsAligned, device, tsFile, isAligned)) {
throw new VerifyMetadataException(
- String.format(
- "Device %s has different aligned definition in tsFile %s and other TsFile.",
- device, tsFile.getParentFile()));
+ String.format(
+ "Device %s has different aligned definition in tsFile %s and other TsFile.",
+ device, tsFile.getParentFile()));
}
}
}
@@ -2711,25 +2711,25 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private boolean isDeviceAligned(
- Map<String, Pair<Boolean, File>> device2IsAligned,
- String device,
- File tsFile,
- boolean isAligned) {
+ Map<String, Pair<Boolean, File>> device2IsAligned,
+ String device,
+ File tsFile,
+ boolean isAligned) {
return device2IsAligned
- .computeIfAbsent(device, o -> new Pair<>(isAligned, tsFile))
- .left
- .equals(isAligned);
+ .computeIfAbsent(device, o -> new Pair<>(isAligned, tsFile))
+ .left
+ .equals(isAligned);
}
private TsFileResource constructTsFileResource(
- File tsFile,
- Map<String, List<TimeseriesMetadata>> device2Metadata,
- TsFileSequenceReader reader)
- throws IOException {
+ File tsFile,
+ Map<String, List<TimeseriesMetadata>> device2Metadata,
+ TsFileSequenceReader reader)
+ throws IOException {
TsFileResource resource = new TsFileResource(tsFile);
if (!resource.resourceFileExists()) {
FileLoaderUtils.updateTsFileResource(
- device2Metadata, resource); // serialize it in LoadSingleTsFileNode
+ device2Metadata, resource); // serialize it in LoadSingleTsFileNode
resource.updatePlanIndexes(reader.getMinPlanIndex());
resource.updatePlanIndexes(reader.getMaxPlanIndex());
} else {
@@ -2741,7 +2741,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void autoCreateSg(int sgLevel, Map<String, Map<MeasurementSchema, File>> device2Schemas)
- throws VerifyMetadataException, LoadFileException, IllegalPathException {
+ throws VerifyMetadataException, LoadFileException, IllegalPathException {
sgLevel += 1; // e.g. "root.sg" means sgLevel = 1, "root.sg.test" means sgLevel=2
Set<PartialPath> sgSet = new HashSet<>();
for (String device : device2Schemas.keySet()) {
@@ -2751,7 +2751,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
String[] sgNodes = new String[sgLevel];
if (nodes.length < sgLevel) {
throw new VerifyMetadataException(
- String.format("Sg level %d is longer than device %s.", sgLevel, device));
+ String.format("Sg level %d is longer than device %s.", sgLevel, device));
}
System.arraycopy(nodes, 0, sgNodes, 0, sgLevel);
PartialPath sgPath = new PartialPath(sgNodes);
@@ -2760,7 +2760,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
for (PartialPath sgPath : sgSet) {
DatabaseSchemaStatement statement =
- new DatabaseSchemaStatement(DatabaseSchemaStatement.DatabaseSchemaStatementType.CREATE);
+ new DatabaseSchemaStatement(DatabaseSchemaStatement.DatabaseSchemaStatementType.CREATE);
statement.setDatabasePath(sgPath);
executeSetStorageGroupStatement(statement);
}
@@ -2769,29 +2769,29 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
private void executeSetStorageGroupStatement(Statement statement) throws LoadFileException {
long queryId = SessionManager.getInstance().requestQueryId();
ExecutionResult result =
- Coordinator.getInstance()
- .execute(
- statement,
- queryId,
- null,
- "",
- partitionFetcher,
- schemaFetcher,
- IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold());
+ Coordinator.getInstance()
+ .execute(
+ statement,
+ queryId,
+ null,
+ "",
+ partitionFetcher,
+ schemaFetcher,
+ IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()
- && result.status.code != TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) {
+ && result.status.code != TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) {
logger.warn(
- "Create Database error, statement: {}, result status is: {}", statement, result.status);
+ "Create Database error, statement: {}, result status is: {}", statement, result.status);
throw new LoadFileException(
- String.format("Can not execute create database statement: %s", statement));
+ String.format("Can not execute create database statement: %s", statement));
}
}
private ISchemaTree autoCreateSchema(
- Map<String, Map<MeasurementSchema, File>> device2Schemas,
- Map<String, Pair<Boolean, File>> device2IsAligned,
- MPPQueryContext context)
- throws IllegalPathException {
+ Map<String, Map<MeasurementSchema, File>> device2Schemas,
+ Map<String, Pair<Boolean, File>> device2IsAligned,
+ MPPQueryContext context)
+ throws IllegalPathException {
List<PartialPath> deviceList = new ArrayList<>();
List<String[]> measurementList = new ArrayList<>();
List<TSDataType[]> dataTypeList = new ArrayList<>();
@@ -2823,18 +2823,18 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
return SchemaValidator.validate(
- schemaFetcher,
- deviceList,
- measurementList,
- dataTypeList,
- encodingsList,
- compressionTypesList,
- isAlignedList,
- context);
+ schemaFetcher,
+ deviceList,
+ measurementList,
+ dataTypeList,
+ encodingsList,
+ compressionTypesList,
+ isAlignedList,
+ context);
}
private void verifyLoadingMeasurements(Map<String, Map<MeasurementSchema, File>> device2Schemas)
- throws VerifyMetadataException {
+ throws VerifyMetadataException {
for (Map.Entry<String, Map<MeasurementSchema, File>> deviceEntry : device2Schemas.entrySet()) {
Map<String, MeasurementSchema> id2Schema = new HashMap<>();
Map<MeasurementSchema, File> schema2TsFile = deviceEntry.getValue();
@@ -2845,13 +2845,13 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
} else {
MeasurementSchema conflictSchema = id2Schema.get(measurementId);
String msg =
- String.format(
- "Measurement %s Conflict, TsFile %s has measurement: %s, TsFile %s has measurement %s.",
- deviceEntry.getKey() + measurementId,
- entry.getValue().getPath(),
- entry.getKey(),
- schema2TsFile.get(conflictSchema).getPath(),
- conflictSchema);
+ String.format(
+ "Measurement %s Conflict, TsFile %s has measurement: %s, TsFile %s has measurement %s.",
+ deviceEntry.getKey() + measurementId,
+ entry.getValue().getPath(),
+ entry.getKey(),
+ schema2TsFile.get(conflictSchema).getPath(),
+ conflictSchema);
logger.warn(msg);
throw new VerifyMetadataException(msg);
}
@@ -2860,27 +2860,27 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void verifySchema(
- ISchemaTree schemaTree,
- Map<String, Map<MeasurementSchema, File>> device2Schemas,
- Map<String, Pair<Boolean, File>> device2IsAligned)
- throws VerifyMetadataException, IllegalPathException {
+ ISchemaTree schemaTree,
+ Map<String, Map<MeasurementSchema, File>> device2Schemas,
+ Map<String, Pair<Boolean, File>> device2IsAligned)
+ throws VerifyMetadataException, IllegalPathException {
for (Map.Entry<String, Map<MeasurementSchema, File>> entry : device2Schemas.entrySet()) {
String device = entry.getKey();
MeasurementSchema[] tsFileSchemas =
- entry.getValue().keySet().toArray(new MeasurementSchema[0]);
+ entry.getValue().keySet().toArray(new MeasurementSchema[0]);
DeviceSchemaInfo schemaInfo =
- schemaTree.searchDeviceSchemaInfo(
- new PartialPath(device),
- Arrays.stream(tsFileSchemas)
- .map(MeasurementSchema::getMeasurementId)
- .collect(Collectors.toList()));
+ schemaTree.searchDeviceSchemaInfo(
+ new PartialPath(device),
+ Arrays.stream(tsFileSchemas)
+ .map(MeasurementSchema::getMeasurementId)
+ .collect(Collectors.toList()));
if (schemaInfo.isAligned() != Boolean.TRUE.equals(device2IsAligned.get(device).left)) {
throw new VerifyMetadataException(
- device,
- "Is aligned",
- device2IsAligned.get(device).left.toString(),
- device2IsAligned.get(device).right.getPath(),
- String.valueOf(schemaInfo.isAligned()));
+ device,
+ "Is aligned",
+ device2IsAligned.get(device).left.toString(),
+ device2IsAligned.get(device).right.getPath(),
+ String.valueOf(schemaInfo.isAligned()));
}
List<MeasurementSchema> originSchemaList = schemaInfo.getMeasurementSchemaList();
int measurementSize = originSchemaList.size();
@@ -2888,30 +2888,30 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
MeasurementSchema originSchema = originSchemaList.get(j);
MeasurementSchema tsFileSchema = tsFileSchemas[j];
String measurementPath =
- device + TsFileConstant.PATH_SEPARATOR + originSchema.getMeasurementId();
+ device + TsFileConstant.PATH_SEPARATOR + originSchema.getMeasurementId();
if (!tsFileSchema.getType().equals(originSchema.getType())) {
throw new VerifyMetadataException(
- measurementPath,
- "Datatype",
- tsFileSchema.getType().name(),
- entry.getValue().get(tsFileSchema).getPath(),
- originSchema.getType().name());
+ measurementPath,
+ "Datatype",
+ tsFileSchema.getType().name(),
+ entry.getValue().get(tsFileSchema).getPath(),
+ originSchema.getType().name());
}
if (!tsFileSchema.getEncodingType().equals(originSchema.getEncodingType())) {
logger.warn(
- "Encoding type not match, measurement: {}, TsFile: {}, TsFile encoding: {}, origin encoding: {}",
- measurementPath,
- entry.getValue().get(tsFileSchema).getPath(),
- tsFileSchema.getEncodingType().name(),
- originSchema.getEncodingType().name());
+ "Encoding type not match, measurement: {}, TsFile: {}, TsFile encoding: {}, origin encoding: {}",
+ measurementPath,
+ entry.getValue().get(tsFileSchema).getPath(),
+ tsFileSchema.getEncodingType().name(),
+ originSchema.getEncodingType().name());
}
if (!tsFileSchema.getCompressor().equals(originSchema.getCompressor())) {
logger.warn(
- "Compression type not match, measurement: {}, TsFile: {}, TsFile compression: {}, origin compression: {}",
- measurementPath,
- entry.getValue().get(tsFileSchema).getPath(),
- tsFileSchema.getCompressor().name(),
- originSchema.getCompressor().name());
+ "Compression type not match, measurement: {}, TsFile: {}, TsFile compression: {}, origin compression: {}",
+ measurementPath,
+ entry.getValue().get(tsFileSchema).getPath(),
+ tsFileSchema.getCompressor().name(),
+ originSchema.getCompressor().name());
}
}
}
@@ -2919,7 +2919,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowTimeSeries(
- ShowTimeSeriesStatement showTimeSeriesStatement, MPPQueryContext context) {
+ ShowTimeSeriesStatement showTimeSeriesStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(showTimeSeriesStatement);
@@ -2929,7 +2929,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
analysis.setSchemaPartitionInfo(schemaPartitionInfo);
Map<Integer, Template> templateMap =
- schemaFetcher.checkAllRelatedTemplate(showTimeSeriesStatement.getPathPattern());
+ schemaFetcher.checkAllRelatedTemplate(showTimeSeriesStatement.getPathPattern());
analysis.setRelatedTemplateInfo(templateMap);
if (showTimeSeriesStatement.isOrderByHeat()) {
@@ -2941,10 +2941,10 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
logger.debug("[EndFetchSchema]]");
analyzeLastSource(
- analysis,
- Collections.singletonList(
- new TimeSeriesOperand(showTimeSeriesStatement.getPathPattern())),
- schemaTree);
+ analysis,
+ Collections.singletonList(
+ new TimeSeriesOperand(showTimeSeriesStatement.getPathPattern())),
+ schemaTree);
analyzeDataPartition(analysis, new QueryStatement(), schemaTree);
}
@@ -2954,11 +2954,11 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowStorageGroup(
- ShowDatabaseStatement showDatabaseStatement, MPPQueryContext context) {
+ ShowDatabaseStatement showDatabaseStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(showDatabaseStatement);
analysis.setRespDatasetHeader(
- DatasetHeaderFactory.getShowStorageGroupHeader(showDatabaseStatement.isDetailed()));
+ DatasetHeaderFactory.getShowStorageGroupHeader(showDatabaseStatement.isDetailed()));
return analysis;
}
@@ -2972,26 +2972,26 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowDevices(
- ShowDevicesStatement showDevicesStatement, MPPQueryContext context) {
+ ShowDevicesStatement showDevicesStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(showDevicesStatement);
PathPatternTree patternTree = new PathPatternTree();
patternTree.appendPathPattern(
- showDevicesStatement.getPathPattern().concatNode(IoTDBConstant.ONE_LEVEL_PATH_WILDCARD));
+ showDevicesStatement.getPathPattern().concatNode(IoTDBConstant.ONE_LEVEL_PATH_WILDCARD));
SchemaPartition schemaPartitionInfo = partitionFetcher.getSchemaPartition(patternTree);
analysis.setSchemaPartitionInfo(schemaPartitionInfo);
analysis.setRespDatasetHeader(
- showDevicesStatement.hasSgCol()
- ? DatasetHeaderFactory.getShowDevicesWithSgHeader()
- : DatasetHeaderFactory.getShowDevicesHeader());
+ showDevicesStatement.hasSgCol()
+ ? DatasetHeaderFactory.getShowDevicesWithSgHeader()
+ : DatasetHeaderFactory.getShowDevicesHeader());
return analysis;
}
@Override
public Analysis visitShowCluster(
- ShowClusterStatement showClusterStatement, MPPQueryContext context) {
+ ShowClusterStatement showClusterStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(showClusterStatement);
if (showClusterStatement.isDetails()) {
@@ -3004,7 +3004,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitCountStorageGroup(
- CountDatabaseStatement countDatabaseStatement, MPPQueryContext context) {
+ CountDatabaseStatement countDatabaseStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(countDatabaseStatement);
analysis.setRespDatasetHeader(DatasetHeaderFactory.getCountStorageGroupHeader());
@@ -3013,12 +3013,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitSchemaFetch(
- SchemaFetchStatement schemaFetchStatement, MPPQueryContext context) {
+ SchemaFetchStatement schemaFetchStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(schemaFetchStatement);
SchemaPartition schemaPartition =
- partitionFetcher.getSchemaPartition(schemaFetchStatement.getPatternTree());
+ partitionFetcher.getSchemaPartition(schemaFetchStatement.getPatternTree());
analysis.setSchemaPartitionInfo(schemaPartition);
if (schemaPartition.isEmpty()) {
@@ -3030,13 +3030,13 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitCountDevices(
- CountDevicesStatement countDevicesStatement, MPPQueryContext context) {
+ CountDevicesStatement countDevicesStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(countDevicesStatement);
PathPatternTree patternTree = new PathPatternTree();
patternTree.appendPathPattern(
- countDevicesStatement.getPathPattern().concatNode(IoTDBConstant.ONE_LEVEL_PATH_WILDCARD));
+ countDevicesStatement.getPathPattern().concatNode(IoTDBConstant.ONE_LEVEL_PATH_WILDCARD));
SchemaPartition schemaPartitionInfo = partitionFetcher.getSchemaPartition(patternTree);
analysis.setSchemaPartitionInfo(schemaPartitionInfo);
@@ -3046,7 +3046,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitCountTimeSeries(
- CountTimeSeriesStatement countTimeSeriesStatement, MPPQueryContext context) {
+ CountTimeSeriesStatement countTimeSeriesStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(countTimeSeriesStatement);
@@ -3056,7 +3056,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
analysis.setSchemaPartitionInfo(schemaPartitionInfo);
Map<Integer, Template> templateMap =
- schemaFetcher.checkAllRelatedTemplate(countTimeSeriesStatement.getPathPattern());
+ schemaFetcher.checkAllRelatedTemplate(countTimeSeriesStatement.getPathPattern());
analysis.setRelatedTemplateInfo(templateMap);
analysis.setRespDatasetHeader(DatasetHeaderFactory.getCountTimeSeriesHeader());
@@ -3065,7 +3065,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitCountLevelTimeSeries(
- CountLevelTimeSeriesStatement countLevelTimeSeriesStatement, MPPQueryContext context) {
+ CountLevelTimeSeriesStatement countLevelTimeSeriesStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(countLevelTimeSeriesStatement);
@@ -3075,7 +3075,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
analysis.setSchemaPartitionInfo(schemaPartitionInfo);
Map<Integer, Template> templateMap =
- schemaFetcher.checkAllRelatedTemplate(countLevelTimeSeriesStatement.getPathPattern());
+ schemaFetcher.checkAllRelatedTemplate(countLevelTimeSeriesStatement.getPathPattern());
analysis.setRelatedTemplateInfo(templateMap);
analysis.setRespDatasetHeader(DatasetHeaderFactory.getCountLevelTimeSeriesHeader());
return analysis;
@@ -3089,14 +3089,14 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
PathPatternTree patternTree = new PathPatternTree();
patternTree.appendPathPattern(countStatement.getPathPattern());
SchemaNodeManagementPartition schemaNodeManagementPartition =
- partitionFetcher.getSchemaNodeManagementPartitionWithLevel(
- patternTree, countStatement.getLevel());
+ partitionFetcher.getSchemaNodeManagementPartitionWithLevel(
+ patternTree, countStatement.getLevel());
if (schemaNodeManagementPartition == null) {
return analysis;
}
if (!schemaNodeManagementPartition.getMatchedNode().isEmpty()
- && schemaNodeManagementPartition.getSchemaPartition().getSchemaPartitionMap().size() == 0) {
+ && schemaNodeManagementPartition.getSchemaPartition().getSchemaPartitionMap().size() == 0) {
analysis.setFinishQueryAfterAnalyze(true);
}
analysis.setMatchedNodes(schemaNodeManagementPartition.getMatchedNode());
@@ -3107,25 +3107,25 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowChildPaths(
- ShowChildPathsStatement showChildPathsStatement, MPPQueryContext context) {
+ ShowChildPathsStatement showChildPathsStatement, MPPQueryContext context) {
return visitSchemaNodeManagementPartition(
- showChildPathsStatement,
- showChildPathsStatement.getPartialPath(),
- DatasetHeaderFactory.getShowChildPathsHeader());
+ showChildPathsStatement,
+ showChildPathsStatement.getPartialPath(),
+ DatasetHeaderFactory.getShowChildPathsHeader());
}
@Override
public Analysis visitShowChildNodes(
- ShowChildNodesStatement showChildNodesStatement, MPPQueryContext context) {
+ ShowChildNodesStatement showChildNodesStatement, MPPQueryContext context) {
return visitSchemaNodeManagementPartition(
- showChildNodesStatement,
- showChildNodesStatement.getPartialPath(),
- DatasetHeaderFactory.getShowChildNodesHeader());
+ showChildNodesStatement,
+ showChildNodesStatement.getPartialPath(),
+ DatasetHeaderFactory.getShowChildNodesHeader());
}
@Override
public Analysis visitShowVersion(
- ShowVersionStatement showVersionStatement, MPPQueryContext context) {
+ ShowVersionStatement showVersionStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(showVersionStatement);
analysis.setRespDatasetHeader(DatasetHeaderFactory.getShowVersionHeader());
@@ -3134,20 +3134,20 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private Analysis visitSchemaNodeManagementPartition(
- Statement statement, PartialPath path, DatasetHeader header) {
+ Statement statement, PartialPath path, DatasetHeader header) {
Analysis analysis = new Analysis();
analysis.setStatement(statement);
PathPatternTree patternTree = new PathPatternTree();
patternTree.appendPathPattern(path);
SchemaNodeManagementPartition schemaNodeManagementPartition =
- partitionFetcher.getSchemaNodeManagementPartition(patternTree);
+ partitionFetcher.getSchemaNodeManagementPartition(patternTree);
if (schemaNodeManagementPartition == null) {
return analysis;
}
if (!schemaNodeManagementPartition.getMatchedNode().isEmpty()
- && schemaNodeManagementPartition.getSchemaPartition().getSchemaPartitionMap().size() == 0) {
+ && schemaNodeManagementPartition.getSchemaPartition().getSchemaPartitionMap().size() == 0) {
analysis.setFinishQueryAfterAnalyze(true);
}
analysis.setMatchedNodes(schemaNodeManagementPartition.getMatchedNode());
@@ -3158,7 +3158,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitDeleteData(
- DeleteDataStatement deleteDataStatement, MPPQueryContext context) {
+ DeleteDataStatement deleteDataStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
analysis.setStatement(deleteDataStatement);
@@ -3177,7 +3177,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
LogicalViewSchema logicalViewSchema;
PartialPath sourcePathOfAliasSeries;
for (MeasurementPath measurementPath :
- schemaTree.searchMeasurementPaths(SchemaConstant.ALL_MATCH_PATTERN).left) {
+ schemaTree.searchMeasurementPaths(SchemaConstant.ALL_MATCH_PATTERN).left) {
measurementSchema = measurementPath.getMeasurementSchema();
if (measurementSchema.isLogicalView()) {
logicalViewSchema = (LogicalViewSchema) measurementSchema;
@@ -3196,10 +3196,10 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
} else {
for (PartialPath devicePattern : patternTree.getAllDevicePaths()) {
schemaTree
- .getMatchedDevices(devicePattern)
- .forEach(
- deviceSchemaInfo ->
- deduplicatedDevicePaths.add(deviceSchemaInfo.getDevicePath().getFullPath()));
+ .getMatchedDevices(devicePattern)
+ .forEach(
+ deviceSchemaInfo ->
+ deduplicatedDevicePaths.add(deviceSchemaInfo.getDevicePath().getFullPath()));
}
}
analysis.setSchemaTree(schemaTree);
@@ -3207,13 +3207,13 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Map<String, List<DataPartitionQueryParam>> sgNameToQueryParamsMap = new HashMap<>();
deduplicatedDevicePaths.forEach(
- devicePath -> {
- DataPartitionQueryParam queryParam = new DataPartitionQueryParam();
- queryParam.setDevicePath(devicePath);
- sgNameToQueryParamsMap
- .computeIfAbsent(schemaTree.getBelongedDatabase(devicePath), key -> new ArrayList<>())
- .add(queryParam);
- });
+ devicePath -> {
+ DataPartitionQueryParam queryParam = new DataPartitionQueryParam();
+ queryParam.setDevicePath(devicePath);
+ sgNameToQueryParamsMap
+ .computeIfAbsent(schemaTree.getBelongedDatabase(devicePath), key -> new ArrayList<>())
+ .add(queryParam);
+ });
DataPartition dataPartition = partitionFetcher.getDataPartition(sgNameToQueryParamsMap);
analysis.setDataPartitionInfo(dataPartition);
@@ -3224,14 +3224,14 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitCreateSchemaTemplate(
- CreateSchemaTemplateStatement createTemplateStatement, MPPQueryContext context) {
+ CreateSchemaTemplateStatement createTemplateStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
List<String> measurements = createTemplateStatement.getMeasurements();
Set<String> measurementsSet = new HashSet<>(measurements);
if (measurementsSet.size() < measurements.size()) {
throw new SemanticException(
- "Measurement under template is not allowed to have the same measurement name");
+ "Measurement under template is not allowed to have the same measurement name");
}
Analysis analysis = new Analysis();
analysis.setStatement(createTemplateStatement);
@@ -3240,8 +3240,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowNodesInSchemaTemplate(
- ShowNodesInSchemaTemplateStatement showNodesInSchemaTemplateStatement,
- MPPQueryContext context) {
+ ShowNodesInSchemaTemplateStatement showNodesInSchemaTemplateStatement,
+ MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(showNodesInSchemaTemplateStatement);
analysis.setRespDatasetHeader(DatasetHeaderFactory.getShowNodesInSchemaTemplateHeader());
@@ -3250,7 +3250,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowSchemaTemplate(
- ShowSchemaTemplateStatement showSchemaTemplateStatement, MPPQueryContext context) {
+ ShowSchemaTemplateStatement showSchemaTemplateStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(showSchemaTemplateStatement);
analysis.setRespDatasetHeader(DatasetHeaderFactory.getShowSchemaTemplateHeader());
@@ -3260,33 +3260,33 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
private GroupByFilter initGroupByFilter(GroupByTimeComponent groupByTimeComponent) {
if (groupByTimeComponent.isIntervalByMonth() || groupByTimeComponent.isSlidingStepByMonth()) {
return new GroupByMonthFilter(
- groupByTimeComponent.getInterval(),
- groupByTimeComponent.getSlidingStep(),
- groupByTimeComponent.getStartTime(),
- groupByTimeComponent.getEndTime(),
- groupByTimeComponent.isSlidingStepByMonth(),
- groupByTimeComponent.isIntervalByMonth(),
- TimeZone.getTimeZone("+00:00"));
+ groupByTimeComponent.getInterval(),
+ groupByTimeComponent.getSlidingStep(),
+ groupByTimeComponent.getStartTime(),
+ groupByTimeComponent.getEndTime(),
+ groupByTimeComponent.isSlidingStepByMonth(),
+ groupByTimeComponent.isIntervalByMonth(),
+ TimeZone.getTimeZone("+00:00"));
} else {
long startTime =
- groupByTimeComponent.isLeftCRightO()
- ? groupByTimeComponent.getStartTime()
- : groupByTimeComponent.getStartTime() + 1;
+ groupByTimeComponent.isLeftCRightO()
+ ? groupByTimeComponent.getStartTime()
+ : groupByTimeComponent.getStartTime() + 1;
long endTime =
- groupByTimeComponent.isLeftCRightO()
- ? groupByTimeComponent.getEndTime()
- : groupByTimeComponent.getEndTime() + 1;
+ groupByTimeComponent.isLeftCRightO()
+ ? groupByTimeComponent.getEndTime()
+ : groupByTimeComponent.getEndTime() + 1;
return new GroupByFilter(
- groupByTimeComponent.getInterval(),
- groupByTimeComponent.getSlidingStep(),
- startTime,
- endTime);
+ groupByTimeComponent.getInterval(),
+ groupByTimeComponent.getSlidingStep(),
+ startTime,
+ endTime);
}
}
@Override
public Analysis visitSetSchemaTemplate(
- SetSchemaTemplateStatement setSchemaTemplateStatement, MPPQueryContext context) {
+ SetSchemaTemplateStatement setSchemaTemplateStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
analysis.setStatement(setSchemaTemplateStatement);
@@ -3295,7 +3295,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowPathSetTemplate(
- ShowPathSetTemplateStatement showPathSetTemplateStatement, MPPQueryContext context) {
+ ShowPathSetTemplateStatement showPathSetTemplateStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(showPathSetTemplateStatement);
analysis.setRespDatasetHeader(DatasetHeaderFactory.getShowPathSetTemplateHeader());
@@ -3304,7 +3304,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitActivateTemplate(
- ActivateTemplateStatement activateTemplateStatement, MPPQueryContext context) {
+ ActivateTemplateStatement activateTemplateStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
analysis.setStatement(activateTemplateStatement);
@@ -3314,12 +3314,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Pair<Template, PartialPath> templateSetInfo = schemaFetcher.checkTemplateSetInfo(activatePath);
if (templateSetInfo == null) {
throw new StatementAnalyzeException(
- new MetadataException(
- String.format(
- "Path [%s] has not been set any template.", activatePath.getFullPath())));
+ new MetadataException(
+ String.format(
+ "Path [%s] has not been set any template.", activatePath.getFullPath())));
}
analysis.setTemplateSetInfo(
- new Pair<>(templateSetInfo.left, Collections.singletonList(templateSetInfo.right)));
+ new Pair<>(templateSetInfo.left, Collections.singletonList(templateSetInfo.right)));
PathPatternTree patternTree = new PathPatternTree();
patternTree.appendPathPattern(activatePath.concatNode(ONE_LEVEL_PATH_WILDCARD));
@@ -3332,20 +3332,20 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitBatchActivateTemplate(
- BatchActivateTemplateStatement batchActivateTemplateStatement, MPPQueryContext context) {
+ BatchActivateTemplateStatement batchActivateTemplateStatement, MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
analysis.setStatement(batchActivateTemplateStatement);
Map<PartialPath, Pair<Template, PartialPath>> deviceTemplateSetInfoMap =
- new HashMap<>(batchActivateTemplateStatement.getPaths().size());
+ new HashMap<>(batchActivateTemplateStatement.getPaths().size());
for (PartialPath devicePath : batchActivateTemplateStatement.getDevicePathList()) {
Pair<Template, PartialPath> templateSetInfo = schemaFetcher.checkTemplateSetInfo(devicePath);
if (templateSetInfo == null) {
throw new StatementAnalyzeException(
- new MetadataException(
- String.format(
- "Path [%s] has not been set any template.", devicePath.getFullPath())));
+ new MetadataException(
+ String.format(
+ "Path [%s] has not been set any template.", devicePath.getFullPath())));
}
deviceTemplateSetInfoMap.put(devicePath, templateSetInfo);
}
@@ -3365,15 +3365,15 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitInternalBatchActivateTemplate(
- InternalBatchActivateTemplateStatement internalBatchActivateTemplateStatement,
- MPPQueryContext context) {
+ InternalBatchActivateTemplateStatement internalBatchActivateTemplateStatement,
+ MPPQueryContext context) {
context.setQueryType(QueryType.WRITE);
Analysis analysis = new Analysis();
analysis.setStatement(internalBatchActivateTemplateStatement);
PathPatternTree patternTree = new PathPatternTree();
for (PartialPath activatePath :
- internalBatchActivateTemplateStatement.getDeviceMap().keySet()) {
+ internalBatchActivateTemplateStatement.getDeviceMap().keySet()) {
// the devicePath is a path without wildcard
patternTree.appendFullPath(activatePath.concatNode(ONE_LEVEL_PATH_WILDCARD));
}
@@ -3386,17 +3386,17 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowPathsUsingTemplate(
- ShowPathsUsingTemplateStatement showPathsUsingTemplateStatement, MPPQueryContext context) {
+ ShowPathsUsingTemplateStatement showPathsUsingTemplateStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(showPathsUsingTemplateStatement);
analysis.setRespDatasetHeader(DatasetHeaderFactory.getShowPathsUsingTemplateHeader());
Pair<Template, List<PartialPath>> templateSetInfo =
- schemaFetcher.getAllPathsSetTemplate(showPathsUsingTemplateStatement.getTemplateName());
+ schemaFetcher.getAllPathsSetTemplate(showPathsUsingTemplateStatement.getTemplateName());
if (templateSetInfo == null
- || templateSetInfo.right == null
- || templateSetInfo.right.isEmpty()) {
+ || templateSetInfo.right == null
+ || templateSetInfo.right.isEmpty()) {
analysis.setFinishQueryAfterAnalyze(true);
return analysis;
}
@@ -3407,12 +3407,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
PartialPath rawPathPattern = showPathsUsingTemplateStatement.getPathPattern();
List<PartialPath> specifiedPatternList = new ArrayList<>();
templateSetInfo.right.forEach(
- setPath -> {
- for (PartialPath specifiedPattern : rawPathPattern.alterPrefixPath(setPath)) {
- patternTree.appendPathPattern(specifiedPattern);
- specifiedPatternList.add(specifiedPattern);
- }
- });
+ setPath -> {
+ for (PartialPath specifiedPattern : rawPathPattern.alterPrefixPath(setPath)) {
+ patternTree.appendPathPattern(specifiedPattern);
+ specifiedPatternList.add(specifiedPattern);
+ }
+ });
if (specifiedPatternList.isEmpty()) {
analysis.setFinishQueryAfterAnalyze(true);
@@ -3433,7 +3433,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowQueries(
- ShowQueriesStatement showQueriesStatement, MPPQueryContext context) {
+ ShowQueriesStatement showQueriesStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
analysis.setStatement(showQueriesStatement);
analysis.setRespDatasetHeader(DatasetHeaderFactory.getShowQueriesHeader());
@@ -3452,8 +3452,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
Set<Expression> sourceExpressions = new HashSet<>();
for (ColumnHeader columnHeader : analysis.getRespDatasetHeader().getColumnHeaders()) {
sourceExpressions.add(
- TimeSeriesOperand.constructColumnHeaderExpression(
- columnHeader.getColumnName(), columnHeader.getColumnType()));
+ TimeSeriesOperand.constructColumnHeaderExpression(
+ columnHeader.getColumnName(), columnHeader.getColumnType()));
}
analysis.setSourceExpressions(sourceExpressions);
sourceExpressions.forEach(expression -> analyzeExpressionType(analysis, expression));
@@ -3467,17 +3467,17 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
private List<TDataNodeLocation> getRunningDataNodeLocations() {
try (ConfigNodeClient client =
- ConfigNodeClientManager.getInstance().borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
+ ConfigNodeClientManager.getInstance().borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
TGetDataNodeLocationsResp showDataNodesResp = client.getRunningDataNodeLocations();
if (showDataNodesResp.getStatus().getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
throw new StatementAnalyzeException(
- "An error occurred when executing getRunningDataNodeLocations():"
- + showDataNodesResp.getStatus().getMessage());
+ "An error occurred when executing getRunningDataNodeLocations():"
+ + showDataNodesResp.getStatus().getMessage());
}
return showDataNodesResp.getDataNodeLocationList();
} catch (ClientManagerException | TException e) {
throw new StatementAnalyzeException(
- "An error occurred when executing getRunningDataNodeLocations():" + e.getMessage());
+ "An error occurred when executing getRunningDataNodeLocations():" + e.getMessage());
}
}
@@ -3488,8 +3488,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
Expression whereExpression =
- ExpressionAnalyzer.bindTypeForTimeSeriesOperand(
- whereCondition.getPredicate(), ColumnHeaderConstant.showQueriesColumnHeaders);
+ ExpressionAnalyzer.bindTypeForTimeSeriesOperand(
+ whereCondition.getPredicate(), ColumnHeaderConstant.showQueriesColumnHeaders);
TSDataType outputType = analyzeExpressionType(analysis, whereExpression);
if (outputType != TSDataType.BOOLEAN) {
@@ -3507,7 +3507,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
* @return a pair of ISchemaTree, and the number of exist paths.
*/
private Pair<ISchemaTree, Integer> fetchSchemaOfPathsAndCount(
- List<PartialPath> pathList, Analysis analysis, MPPQueryContext context) {
+ List<PartialPath> pathList, Analysis analysis, MPPQueryContext context) {
ISchemaTree schemaTree = analysis.getSchemaTree();
if (schemaTree == null) {
// source is not represented by query, thus has not done fetch schema.
@@ -3534,11 +3534,11 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
* null; else return view paths and the non-exist path.
*/
private Pair<List<PartialPath>, PartialPath> findAllViewsInPaths(
- List<PartialPath> pathList, ISchemaTree schemaTree) {
+ List<PartialPath> pathList, ISchemaTree schemaTree) {
List<PartialPath> result = new ArrayList<>();
for (PartialPath path : pathList) {
Pair<List<MeasurementPath>, Integer> measurementPathList =
- schemaTree.searchMeasurementPaths(path);
+ schemaTree.searchMeasurementPaths(path);
if (measurementPathList.left.isEmpty()) {
return new Pair<>(result, path);
}
@@ -3552,7 +3552,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private Pair<List<Expression>, Analysis> analyzeQueryInLogicalViewStatement(
- Analysis analysis, QueryStatement queryStatement, MPPQueryContext context) {
+ Analysis analysis, QueryStatement queryStatement, MPPQueryContext context) {
Analysis queryAnalysis = this.visitQuery(queryStatement, context);
analysis.setSchemaTree(queryAnalysis.getSchemaTree());
// get all expression from resultColumns
@@ -3565,17 +3565,17 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (outputExpressions == null) {
analysis.setFinishQueryAfterAnalyze(true);
analysis.setFailStatus(
- RpcUtils.getStatus(
- TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
- "Columns in the query statement is empty. Please check your SQL."));
+ RpcUtils.getStatus(
+ TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
+ "Columns in the query statement is empty. Please check your SQL."));
return new Pair<>(null, analysis);
}
if (queryAnalysis.useLogicalView()) {
analysis.setFinishQueryAfterAnalyze(true);
analysis.setFailStatus(
- RpcUtils.getStatus(
- TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
- "Can not create a view based on existing views. Check the query in your SQL."));
+ RpcUtils.getStatus(
+ TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
+ "Can not create a view based on existing views. Check the query in your SQL."));
return new Pair<>(null, analysis);
}
List<Expression> expressionList = new ArrayList<>();
@@ -3586,7 +3586,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
private void checkViewsInSource(
- Analysis analysis, List<Expression> sourceExpressionList, MPPQueryContext context) {
+ Analysis analysis, List<Expression> sourceExpressionList, MPPQueryContext context) {
List<PartialPath> pathsNeedCheck = new ArrayList<>();
for (Expression expression : sourceExpressionList) {
if (expression instanceof TimeSeriesOperand) {
@@ -3594,48 +3594,48 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
}
Pair<ISchemaTree, Integer> schemaOfNeedToCheck =
- fetchSchemaOfPathsAndCount(pathsNeedCheck, analysis, context);
+ fetchSchemaOfPathsAndCount(pathsNeedCheck, analysis, context);
if (schemaOfNeedToCheck.right != pathsNeedCheck.size()) {
// some source paths is not exist, and could not fetch schema.
analysis.setFinishQueryAfterAnalyze(true);
analysis.setFailStatus(
- RpcUtils.getStatus(
- TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
- "Can not create a view based on non-exist time series."));
+ RpcUtils.getStatus(
+ TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
+ "Can not create a view based on non-exist time series."));
return;
}
Pair<List<PartialPath>, PartialPath> viewInSourceCheckResult =
- findAllViewsInPaths(pathsNeedCheck, schemaOfNeedToCheck.left);
+ findAllViewsInPaths(pathsNeedCheck, schemaOfNeedToCheck.left);
if (viewInSourceCheckResult.right != null) {
// some source paths is not exist
analysis.setFinishQueryAfterAnalyze(true);
analysis.setFailStatus(
- RpcUtils.getStatus(
- TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
- "Path "
- + viewInSourceCheckResult.right.toString()
- + " does not exist! You can not create a view based on non-exist time series."));
+ RpcUtils.getStatus(
+ TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
+ "Path "
+ + viewInSourceCheckResult.right.toString()
+ + " does not exist! You can not create a view based on non-exist time series."));
return;
}
if (!viewInSourceCheckResult.left.isEmpty()) {
// some source paths is logical view
analysis.setFinishQueryAfterAnalyze(true);
analysis.setFailStatus(
- RpcUtils.getStatus(
- TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
- "Can not create a view based on existing views."));
+ RpcUtils.getStatus(
+ TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
+ "Can not create a view based on existing views."));
}
}
private void checkPathsInCreateLogicalView(
- Analysis analysis, CreateLogicalViewStatement createLogicalViewStatement) {
+ Analysis analysis, CreateLogicalViewStatement createLogicalViewStatement) {
Pair<Boolean, String> checkResult = createLogicalViewStatement.checkAllPaths();
if (Boolean.FALSE.equals(checkResult.left)) {
analysis.setFinishQueryAfterAnalyze(true);
analysis.setFailStatus(
- RpcUtils.getStatus(
- TSStatusCode.ILLEGAL_PATH.getStatusCode(),
- "The path " + checkResult.right + " is illegal."));
+ RpcUtils.getStatus(
+ TSStatusCode.ILLEGAL_PATH.getStatusCode(),
+ "The path " + checkResult.right + " is illegal."));
return;
}
// make sure there are no redundant paths in targets. Please note that redundant paths in source
@@ -3647,21 +3647,21 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (!repeatPathNotExist) {
analysis.setFinishQueryAfterAnalyze(true);
analysis.setFailStatus(
- RpcUtils.getStatus(
- TSStatusCode.ILLEGAL_PATH.getStatusCode(),
- String.format("Path [%s] is redundant in target paths.", path)));
+ RpcUtils.getStatus(
+ TSStatusCode.ILLEGAL_PATH.getStatusCode(),
+ String.format("Path [%s] is redundant in target paths.", path)));
return;
}
}
if (createLogicalViewStatement.getSourceExpressionList().size() != targetPathList.size()) {
analysis.setFinishQueryAfterAnalyze(true);
analysis.setFailStatus(
- RpcUtils.getStatus(
- TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
- String.format(
- "The number of target paths (%d) and sources (%d) are miss matched! Please check your SQL.",
- createLogicalViewStatement.getTargetPathList().size(),
- createLogicalViewStatement.getSourceExpressionList().size())));
+ RpcUtils.getStatus(
+ TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
+ String.format(
+ "The number of target paths (%d) and sources (%d) are miss matched! Please check your SQL.",
+ createLogicalViewStatement.getTargetPathList().size(),
+ createLogicalViewStatement.getSourceExpressionList().size())));
return;
}
// make sure all paths are NOt under any template
@@ -3672,16 +3672,16 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
} catch (Exception e) {
analysis.setFinishQueryAfterAnalyze(true);
analysis.setFailStatus(
- RpcUtils.getStatus(
- TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
- "Can not create view under template."));
+ RpcUtils.getStatus(
+ TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode(),
+ "Can not create view under template."));
}
}
// create Logical View
@Override
public Analysis visitCreateLogicalView(
- CreateLogicalViewStatement createLogicalViewStatement, MPPQueryContext context) {
+ CreateLogicalViewStatement createLogicalViewStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
context.setQueryType(QueryType.WRITE);
analysis.setStatement(createLogicalViewStatement);
@@ -3691,7 +3691,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
QueryStatement queryStatement = createLogicalViewStatement.getQueryStatement();
if (queryStatement != null) {
Pair<List<Expression>, Analysis> queryAnalysisPair =
- this.analyzeQueryInLogicalViewStatement(analysis, queryStatement, context);
+ this.analyzeQueryInLogicalViewStatement(analysis, queryStatement, context);
if (queryAnalysisPair.right.isFinishQueryAfterAnalyze()) {
return analysis;
} else if (queryAnalysisPair.left != null) {
@@ -3735,7 +3735,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowLogicalView(
- ShowLogicalViewStatement showLogicalViewStatement, MPPQueryContext context) {
+ ShowLogicalViewStatement showLogicalViewStatement, MPPQueryContext context) {
context.setQueryType(QueryType.READ);
Analysis analysis = new Analysis();
analysis.setStatement(showLogicalViewStatement);
@@ -3749,4 +3749,4 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
return analysis;
}
// endregion view
-}
+}
\ No newline at end of file
[iotdb] 03/12: [IOTDB-5134] Fix Auth Module Contain (#10545)
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5037231a1d76d156c3685a5f49c488add7dd3e93
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Thu Jul 13 19:36:55 2023 +0800
[IOTDB-5134] Fix Auth Module Contain (#10545)
---
.../Administration-Management/Administration.md | 4 +-
.../Administration-Management/Administration.md | 4 +-
.../Security-Management.md | 4 +-
docs/zh/UserGuide/SQL-Manual/SQL-Manual.md | 4 +-
.../UserGuide/User-Manuel/Authority-Management.md | 4 +-
.../java/org/apache/iotdb/db/it/IoTDBAuthIT.java | 16 ++---
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 84 ++++++++++++----------
.../auth/authorizer/LocalFileAuthorizerTest.java | 6 +-
.../iotdb/commons/auth/entity/PrivilegeType.java | 4 +-
9 files changed, 69 insertions(+), 61 deletions(-)
diff --git a/docs/UserGuide/Administration-Management/Administration.md b/docs/UserGuide/Administration-Management/Administration.md
index 2bf7d882424..c62e34d20b0 100644
--- a/docs/UserGuide/Administration-Management/Administration.md
+++ b/docs/UserGuide/Administration-Management/Administration.md
@@ -91,7 +91,7 @@ The SQL statement will not be executed and the corresponding error prompt is giv
```
IoTDB> INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
-Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES.
+Msg: 602: No permissions for this operation, please add privilege WRITE_DATA.
```
Now, we use root user to grant the two users write privileges to the corresponding databases.
@@ -144,7 +144,7 @@ Msg: The statement is executed successfully.
After revoking, ln_write_user has no permission to writing data to root.ln.**
```
INSERT INTO root.ln.wf01.wt01(timestamp, status) values(1509465600000, true)
-Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES.
+Msg: 602: No permissions for this operation, please add privilege WRITE_DATA.
```
### SQL Statements
diff --git a/docs/zh/UserGuide/Administration-Management/Administration.md b/docs/zh/UserGuide/Administration-Management/Administration.md
index e171f7513c9..e9305565cb7 100644
--- a/docs/zh/UserGuide/Administration-Management/Administration.md
+++ b/docs/zh/UserGuide/Administration-Management/Administration.md
@@ -90,7 +90,7 @@ INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
```
IoTDB> INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
-Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES.
+Msg: 602: No permissions for this operation, please add privilege WRITE_DATA.
```
现在，我们用root用户分别赋予他们向对应 database 数据的写入权限.
@@ -143,7 +143,7 @@ Msg: The statement is executed successfully.
撤销权限后，ln_write_user就没有向root.ln.**写入数据的权限了。
```
INSERT INTO root.ln.wf01.wt01(timestamp, status) values(1509465600000, true)
-Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES.
+Msg: 602: No permissions for this operation, please add privilege WRITE_DATA.
```
### SQL 语句
diff --git a/docs/zh/UserGuide/Deployment-and-Maintenance/Security-Management.md b/docs/zh/UserGuide/Deployment-and-Maintenance/Security-Management.md
index f44034b1274..299df40f3fe 100644
--- a/docs/zh/UserGuide/Deployment-and-Maintenance/Security-Management.md
+++ b/docs/zh/UserGuide/Deployment-and-Maintenance/Security-Management.md
@@ -95,7 +95,7 @@ INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
```
IoTDB> INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
-Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES.
+Msg: 602: No permissions for this operation, please add privilege WRITE_DATA.
```
现在，我们用root用户分别赋予他们向对应 database 数据的写入权限.
@@ -151,7 +151,7 @@ Msg: The statement is executed successfully.
```
INSERT INTO root.ln.wf01.wt01(timestamp, status) values(1509465600000, true)
-Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES.
+Msg: 602: No permissions for this operation, please add privilege WRITE_DATA.
```
#### SQL 语句
diff --git a/docs/zh/UserGuide/SQL-Manual/SQL-Manual.md b/docs/zh/UserGuide/SQL-Manual/SQL-Manual.md
index dba87ab6c9c..0efe43bb550 100644
--- a/docs/zh/UserGuide/SQL-Manual/SQL-Manual.md
+++ b/docs/zh/UserGuide/SQL-Manual/SQL-Manual.md
@@ -2051,7 +2051,7 @@ INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
IoTDB> INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
-Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES.
+Msg: 602: No permissions for this operation, please add privilege WRITE_DATA.
用root用户分别赋予他们向对应 database 数据的写入权限
@@ -2081,7 +2081,7 @@ REVOKE USER `ln_write_user` PRIVILEGES CREATE_USER
INSERT INTO root.ln.wf01.wt01(timestamp, status) values(1509465600000, true)
-Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES.
+Msg: 602: No permissions for this operation, please add privilege WRITE_DATA.
### 5、SQL 语句
diff --git a/docs/zh/UserGuide/User-Manuel/Authority-Management.md b/docs/zh/UserGuide/User-Manuel/Authority-Management.md
index d59c8fc31f8..dd6491e42e1 100644
--- a/docs/zh/UserGuide/User-Manuel/Authority-Management.md
+++ b/docs/zh/UserGuide/User-Manuel/Authority-Management.md
@@ -93,7 +93,7 @@ INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
```
IoTDB> INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
-Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES.
+Msg: 602: No permissions for this operation, please add privilege WRITE_DATA.
```
现在，我们用root用户分别赋予他们向对应 database 数据的写入权限.
@@ -149,7 +149,7 @@ Msg: The statement is executed successfully.
```
INSERT INTO root.ln.wf01.wt01(timestamp, status) values(1509465600000, true)
-Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES.
+Msg: 602: No permissions for this operation, please add privilege WRITE_DATA.
```
### SQL 语句
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBAuthIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBAuthIT.java
index 2df47a3588b..78dbe87e4df 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBAuthIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBAuthIT.java
@@ -362,7 +362,7 @@ public class IoTDBAuthIT {
adminStmt.execute("CREATE ROLE admin");
adminStmt.execute(
- "GRANT ROLE admin PRIVILEGES MANAGE_DATABASE,WRITE_SCHEMA,READ_DATA,WRITE_DATA on root.**");
+ "GRANT ROLE admin PRIVILEGES MANAGE_DATABASE,WRITE_SCHEMA,WRITE_DATA on root.**");
adminStmt.execute("GRANT admin TO tempuser");
userStmt.execute("CREATE DATABASE root.a");
@@ -495,15 +495,15 @@ public class IoTDBAuthIT {
String ans =
",root.a.b : READ_SCHEMA"
+ ",\n"
- + "role1,root.a.b.c : READ_DATA WRITE_DATA READ_SCHEMA"
+ + "role1,root.a.b.c : WRITE_DATA READ_SCHEMA"
+ ",\n"
- + "role1,root.d.b.c : READ_DATA WRITE_DATA READ_SCHEMA"
+ + "role1,root.d.b.c : WRITE_DATA READ_SCHEMA"
+ ",\n";
try {
validateResultSet(resultSet, ans);
resultSet = adminStmt.executeQuery("LIST PRIVILEGES USER user1 ON root.a.b.c");
- ans = "role1,root.a.b.c : READ_DATA WRITE_DATA READ_SCHEMA,\n";
+ ans = "role1,root.a.b.c : WRITE_DATA READ_SCHEMA,\n";
validateResultSet(resultSet, ans);
adminStmt.execute("REVOKE role1 from user1");
@@ -540,19 +540,17 @@ public class IoTDBAuthIT {
adminStmt.execute("GRANT ROLE role1 PRIVILEGES READ_SCHEMA,WRITE_DATA ON root.a.b.c");
adminStmt.execute("GRANT ROLE role1 PRIVILEGES READ_SCHEMA,WRITE_DATA ON root.d.b.c");
resultSet = adminStmt.executeQuery("LIST PRIVILEGES ROLE role1");
- ans =
- "root.a.b.c : READ_DATA WRITE_DATA READ_SCHEMA,\n"
- + "root.d.b.c : READ_DATA WRITE_DATA READ_SCHEMA,\n";
+ ans = "root.a.b.c : WRITE_DATA READ_SCHEMA,\n" + "root.d.b.c : WRITE_DATA READ_SCHEMA,\n";
validateResultSet(resultSet, ans);
resultSet = adminStmt.executeQuery("LIST PRIVILEGES ROLE role1 ON root.a.b.c");
- ans = "root.a.b.c : READ_DATA WRITE_DATA READ_SCHEMA,\n";
+ ans = "root.a.b.c : WRITE_DATA READ_SCHEMA,\n";
validateResultSet(resultSet, ans);
adminStmt.execute("REVOKE ROLE role1 PRIVILEGES READ_SCHEMA,WRITE_DATA ON root.a.b.c");
resultSet = adminStmt.executeQuery("LIST PRIVILEGES ROLE role1");
- ans = "root.d.b.c : READ_DATA WRITE_DATA READ_SCHEMA,\n";
+ ans = "root.d.b.c : WRITE_DATA READ_SCHEMA,\n";
validateResultSet(resultSet, ans);
resultSet = adminStmt.executeQuery("LIST PRIVILEGES ROLE role1 ON root.a.b.c");
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
index a7feb9966c8..905f895d349 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
@@ -72,26 +72,31 @@ public class AuthorityChecker {
return true;
}
- int permission = translateToPermissionId(type);
- if (permission == -1) {
- return false;
- } else if (permission == PrivilegeType.ALTER_PASSWORD.ordinal()
- && username.equals(targetUser)) {
- // A user can modify his own password
- return true;
- }
+ int[] permissions = translateToPermissionId(type);
+ for (int permission : permissions) {
+ if (permission == -1) {
+ continue;
+ } else if (permission == PrivilegeType.ALTER_PASSWORD.ordinal()
+ && username.equals(targetUser)) {
+ // A user can modify his own password
+ return true;
+ }
- List<PartialPath> allPath = new ArrayList<>();
- if (paths != null && !paths.isEmpty()) {
- for (PartialPath path : paths) {
- allPath.add(path == null ? AuthUtils.ROOT_PATH_PRIVILEGE_PATH : path);
+ List<PartialPath> allPath = new ArrayList<>();
+ if (paths != null && !paths.isEmpty()) {
+ for (PartialPath path : paths) {
+ allPath.add(path == null ? AuthUtils.ROOT_PATH_PRIVILEGE_PATH : path);
+ }
+ } else {
+ allPath.add(AuthUtils.ROOT_PATH_PRIVILEGE_PATH);
}
- } else {
- allPath.add(AuthUtils.ROOT_PATH_PRIVILEGE_PATH);
- }
- TSStatus status = authorizerManager.checkPath(username, allPath, permission);
- return status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode();
+ TSStatus status = authorizerManager.checkPath(username, allPath, permission);
+ if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ return true;
+ }
+ }
+ return false;
}
private static boolean checkOnePath(String username, PartialPath path, int permission)
@@ -113,11 +118,16 @@ public class AuthorityChecker {
long startTime = System.nanoTime();
try {
if (!checkAuthorization(statement, session.getUsername())) {
- return RpcUtils.getStatus(
- TSStatusCode.NO_PERMISSION,
- "No permissions for this operation, please add privilege "
- + PrivilegeType.values()[
- AuthorityChecker.translateToPermissionId(statement.getType())]);
+ StringBuilder prompt =
+ new StringBuilder("No permissions for this operation, please add privilege ");
+ int[] permissions = translateToPermissionId(statement.getType());
+ for (int i = 0; i < permissions.length; i++) {
+ if (i != 0) {
+ prompt.append(" or ");
+ }
+ prompt.append(PrivilegeType.values()[permissions[i]]);
+ }
+ return RpcUtils.getStatus(TSStatusCode.NO_PERMISSION, prompt.toString());
}
} catch (AuthException e) {
logger.warn("Meets error while checking authorization.", e);
@@ -150,16 +160,18 @@ public class AuthorityChecker {
username, statement.getPaths(), statement.getType(), targetUser);
}
- private static int translateToPermissionId(StatementType type) {
+ private static int[] translateToPermissionId(StatementType type) {
switch (type) {
case SHOW_SCHEMA_TEMPLATE:
case SHOW_NODES_IN_SCHEMA_TEMPLATE:
case SHOW_PATH_SET_SCHEMA_TEMPLATE:
case SHOW_PATH_USING_SCHEMA_TEMPLATE:
- return PrivilegeType.READ_SCHEMA.ordinal();
+ return new int[] {
+ PrivilegeType.READ_SCHEMA.ordinal(), PrivilegeType.WRITE_SCHEMA.ordinal()
+ };
case STORAGE_GROUP_SCHEMA:
case DELETE_STORAGE_GROUP:
- return PrivilegeType.MANAGE_DATABASE.ordinal();
+ return new int[] {PrivilegeType.MANAGE_DATABASE.ordinal()};
case TTL:
case CREATE_TIMESERIES:
case CREATE_ALIGNED_TIMESERIES:
@@ -177,7 +189,7 @@ public class AuthorityChecker {
case ALTER_LOGICAL_VIEW:
case RENAME_LOGICAL_VIEW:
case DELETE_LOGICAL_VIEW:
- return PrivilegeType.WRITE_SCHEMA.ordinal();
+ return new int[] {PrivilegeType.WRITE_SCHEMA.ordinal()};
case SHOW:
case QUERY:
case GROUP_BY_TIME:
@@ -192,7 +204,7 @@ public class AuthorityChecker {
case COUNT:
case CREATE_FUNCTION:
case DROP_FUNCTION:
- return PrivilegeType.READ_DATA.ordinal();
+ return new int[] {PrivilegeType.READ_DATA.ordinal(), PrivilegeType.WRITE_DATA.ordinal()};
case INSERT:
case DELETE:
case LOAD_DATA:
@@ -201,35 +213,35 @@ public class AuthorityChecker {
case BATCH_INSERT_ONE_DEVICE:
case BATCH_INSERT_ROWS:
case MULTI_BATCH_INSERT:
- return PrivilegeType.WRITE_DATA.ordinal();
+ return new int[] {PrivilegeType.WRITE_DATA.ordinal()};
case CREATE_USER:
case DELETE_USER:
case LIST_USER:
case LIST_USER_ROLES:
case LIST_USER_PRIVILEGE:
- return PrivilegeType.MANAGE_USER.ordinal();
+ return new int[] {PrivilegeType.MANAGE_USER.ordinal()};
case CREATE_ROLE:
case DELETE_ROLE:
case LIST_ROLE:
case LIST_ROLE_USERS:
case LIST_ROLE_PRIVILEGE:
- return PrivilegeType.MANAGE_ROLE.ordinal();
+ return new int[] {PrivilegeType.MANAGE_ROLE.ordinal()};
case MODIFY_PASSWORD:
- return PrivilegeType.ALTER_PASSWORD.ordinal();
+ return new int[] {PrivilegeType.ALTER_PASSWORD.ordinal()};
case GRANT_USER_PRIVILEGE:
case REVOKE_USER_PRIVILEGE:
case GRANT_ROLE_PRIVILEGE:
case REVOKE_ROLE_PRIVILEGE:
case GRANT_USER_ROLE:
case REVOKE_USER_ROLE:
- return PrivilegeType.GRANT_PRIVILEGE.ordinal();
+ return new int[] {PrivilegeType.GRANT_PRIVILEGE.ordinal()};
case CREATE_TRIGGER:
case DROP_TRIGGER:
- return PrivilegeType.USE_TRIGGER.ordinal();
+ return new int[] {PrivilegeType.USE_TRIGGER.ordinal()};
case CREATE_CONTINUOUS_QUERY:
case DROP_CONTINUOUS_QUERY:
case SHOW_CONTINUOUS_QUERIES:
- return PrivilegeType.USE_CQ.ordinal();
+ return new int[] {PrivilegeType.USE_CQ.ordinal()};
case CREATE_PIPEPLUGIN:
case DROP_PIPEPLUGIN:
case SHOW_PIPEPLUGINS:
@@ -238,10 +250,10 @@ public class AuthorityChecker {
case STOP_PIPE:
case DROP_PIPE:
case SHOW_PIPES:
- return PrivilegeType.USE_PIPE.ordinal();
+ return new int[] {PrivilegeType.USE_PIPE.ordinal()};
default:
logger.error("Unrecognizable operator type ({}) for AuthorityChecker.", type);
- return -1;
+ return new int[] {-1};
}
}
}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizerTest.java
index 8b532268ca5..eccde64eb02 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizerTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizerTest.java
@@ -200,10 +200,8 @@ public class LocalFileAuthorizerTest {
// a user can get all role permissions.
Set<Integer> permissions = authorizer.getPrivileges(user.getName(), nodeName);
- assertEquals(4, permissions.size());
- assertTrue(permissions.contains(0));
+ assertEquals(2, permissions.size());
assertTrue(permissions.contains(1));
- assertTrue(permissions.contains(2));
assertTrue(permissions.contains(3));
assertFalse(permissions.contains(4));
@@ -215,7 +213,7 @@ public class LocalFileAuthorizerTest {
// revoke a role from a user, the user will lose all role's permission
authorizer.revokeRoleFromUser(roleName, user.getName());
Set<Integer> revokeRolePermissions = authorizer.getPrivileges(user.getName(), nodeName);
- assertEquals(2, revokeRolePermissions.size());
+ assertEquals(1, revokeRolePermissions.size());
assertTrue(revokeRolePermissions.contains(1));
assertFalse(revokeRolePermissions.contains(2));
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java
index c3ef891ea7e..8f5f7bbd131 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java
@@ -29,9 +29,9 @@ import java.util.Set;
/** This enum class contains all available privileges in IoTDB. */
public enum PrivilegeType {
READ_DATA(true),
- WRITE_DATA(true, true, READ_DATA),
+ WRITE_DATA(true),
READ_SCHEMA(true),
- WRITE_SCHEMA(true, true, READ_SCHEMA),
+ WRITE_SCHEMA(true),
MANAGE_USER,
MANAGE_ROLE,
GRANT_PRIVILEGE,
[iotdb] 05/12: [IOTDB-5134] add MAINTAIN privilege (#10549)
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c9de5ca4c153580c75d330def04ae046f4ed414b
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Thu Jul 13 21:12:16 2023 +0800
[IOTDB-5134] add MAINTAIN privilege (#10549)
---
.../antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 5 +++++
.../java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
index d1cac40b30d..26e62b1ec49 100644
--- a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
+++ b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
@@ -917,6 +917,7 @@ PRIVILEGE_VALUE
| USE_CQ
| USE_PIPE
| MANAGE_DATABASE
+ | MAINTAIN
;
READ_DATA
@@ -967,6 +968,10 @@ MANAGE_DATABASE
: M A N A G E '_' D A T A B A S E
;
+MAINTAIN
+ : M A I N T A I N
+ ;
+
SCHEMA_REPLICATION_FACTOR
: S C H E M A '_' R E P L I C A T I O N '_' F A C T O R
;
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java
index 8f5f7bbd131..9c1203fd11d 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/entity/PrivilegeType.java
@@ -40,6 +40,7 @@ public enum PrivilegeType {
USE_CQ,
USE_PIPE,
MANAGE_DATABASE(true),
+ MAINTAIN,
READ(true, false, READ_DATA, READ_SCHEMA),
WRITE(true, false, WRITE_DATA, WRITE_SCHEMA),
ALL(
@@ -54,7 +55,8 @@ public enum PrivilegeType {
USE_TRIGGER,
USE_CQ,
USE_PIPE,
- MANAGE_DATABASE);
+ MANAGE_DATABASE,
+ MAINTAIN);
private static final int PRIVILEGE_COUNT = values().length;
[iotdb] 12/12: Fix the bug when delete view meets statement error
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch compute-resource-balance-1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5dac5193163cb33f6b829cffcfc3c5f7c5b4a9c3
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Mon Jul 17 16:18:58 2023 +0800
Fix the bug when delete view meets statement error