You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2021/06/06 07:08:32 UTC
[iotdb] 01/04: resort operator type
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch removeTokenType
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4c5b056facf45d092d13d4037740628012f9c9f4
Author: Alima777 <wx...@gmail.com>
AuthorDate: Fri Jun 4 10:57:29 2021 +0800
resort operator type
---
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 4 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +-
.../org/apache/iotdb/db/qp/logical/Operator.java | 91 ++++++++++++----------
.../iotdb/db/qp/logical/sys/LoadDataOperator.java | 2 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 2 +-
.../iotdb/db/qp/physical/crud/GroupByTimePlan.java | 2 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 8 +-
.../iotdb/db/qp/physical/sys/LoadDataPlan.java | 2 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 3 +-
.../db/query/dataset/AlignByDeviceDataSet.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +-
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 2 +-
12 files changed, 67 insertions(+), 55 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java b/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
index 136ca1a..1b1bdc7 100644
--- a/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
+++ b/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
@@ -124,7 +124,7 @@ public class AuthorityChecker {
case DROP_INDEX:
return PrivilegeType.DELETE_TIMESERIES.ordinal();
case QUERY:
- case GROUPBYTIME:
+ case GROUP_BY_TIME:
case QUERY_INDEX:
case AGGREGATION:
case UDAF:
@@ -134,7 +134,7 @@ public class AuthorityChecker {
case GROUP_BY_FILL:
return PrivilegeType.READ_TIMESERIES.ordinal();
case INSERT:
- case LOADDATA:
+ case LOAD_DATA:
case CREATE_INDEX:
return PrivilegeType.INSERT_TIMESERIES.ordinal();
case LIST_ROLE:
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
index 8918a2b..f4c828f 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
@@ -244,7 +244,7 @@ public class PlanExecutor implements IPlanExecutor {
case BATCH_INSERT_ROWS:
insert((InsertRowsPlan) plan);
return true;
- case BATCHINSERT:
+ case BATCH_INSERT:
insertTablet((InsertTabletPlan) plan);
return true;
case MULTI_BATCH_INSERT:
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java b/server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
index cc10c82..ba9b7bb 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
@@ -66,20 +66,10 @@ public abstract class Operator {
/** If you want to add new OperatorType, you must add it in the last. */
public enum OperatorType {
- GROUPBYTIME,
NULL,
- INSERT,
- BATCHINSERT,
- DELETE,
- QUERY,
- AGGREGATION,
+
AUTHOR,
- LOADDATA,
- METADATA,
- FILL,
- SET_STORAGE_GROUP,
- CREATE_TIMESERIES,
- DELETE_TIMESERIES,
+ LOAD_DATA,
CREATE_USER,
DELETE_USER,
MODIFY_PASSWORD,
@@ -99,49 +89,72 @@ public abstract class Operator {
LIST_ROLE_USERS,
GRANT_WATERMARK_EMBEDDING,
REVOKE_WATERMARK_EMBEDDING,
- TTL,
+
+ SET_STORAGE_GROUP,
DELETE_STORAGE_GROUP,
- LOAD_CONFIGURATION,
- SHOW,
- LOAD_FILES,
- REMOVE_FILE,
- MOVE_FILE,
+ CREATE_TIMESERIES,
+ CREATE_ALIGNED_TIMESERIES,
+ CREATE_MULTI_TIMESERIES,
+ DELETE_TIMESERIES,
+ ALTER_TIMESERIES,
+ CHANGE_ALIAS,
+ CHANGE_TAG_OFFSET,
+
+ INSERT,
+ BATCH_INSERT,
+ BATCH_INSERT_ROWS,
+ BATCH_INSERT_ONE_DEVICE,
+ MULTI_BATCH_INSERT,
+
+ DELETE,
+
+ QUERY,
LAST,
+ GROUP_BY_TIME,
GROUP_BY_FILL,
- ALTER_TIMESERIES,
- FLUSH,
- MERGE,
- FULL_MERGE,
- CLEAR_CACHE,
- SHOW_MERGE_STATUS,
- CREATE_SCHEMA_SNAPSHOT,
- TRACING,
- DELETE_PARTITION,
+ AGGREGATION,
+ FILL,
UDAF,
UDTF,
+
CREATE_FUNCTION,
DROP_FUNCTION,
- CREATE_ALIGNED_TIMESERIES,
- CREATE_MULTI_TIMESERIES,
- AUTO_CREATE_DEVICE_MNODE,
+
+ SHOW,
+ SHOW_MERGE_STATUS,
+
CREATE_INDEX,
DROP_INDEX,
QUERY_INDEX,
- KILL,
- CHANGE_TAG_OFFSET,
- CHANGE_ALIAS,
- MNODE,
- MEASUREMENT_MNODE,
- STORAGE_GROUP_MNODE,
- BATCH_INSERT_ONE_DEVICE,
- MULTI_BATCH_INSERT,
- BATCH_INSERT_ROWS,
+
+ LOAD_FILES,
+ REMOVE_FILE,
+ MOVE_FILE,
+
CREATE_TRIGGER,
DROP_TRIGGER,
START_TRIGGER,
STOP_TRIGGER,
+
CREATE_TEMPLATE,
SET_DEVICE_TEMPLATE,
SET_USING_DEVICE_TEMPLATE,
+
+ MERGE,
+ FULL_MERGE,
+
+ MNODE,
+ MEASUREMENT_MNODE,
+ STORAGE_GROUP_MNODE,
+ AUTO_CREATE_DEVICE_MNODE,
+
+ TTL,
+ KILL,
+ FLUSH,
+ TRACING,
+ CLEAR_CACHE,
+ DELETE_PARTITION,
+ LOAD_CONFIGURATION,
+ CREATE_SCHEMA_SNAPSHOT,
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java b/server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java
index 74d4cd6..7142e04 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java
@@ -31,7 +31,7 @@ public class LoadDataOperator extends Operator {
/** Constructor of LoadDataOperator. */
public LoadDataOperator(int tokenIntType, String inputFilePath, String measureType) {
super(tokenIntType);
- operatorType = OperatorType.LOADDATA;
+ operatorType = OperatorType.LOAD_DATA;
this.inputFilePath = inputFilePath;
this.measureType = measureType;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AlignByDevicePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AlignByDevicePlan.java
index 3f79a19..55a75eb 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AlignByDevicePlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AlignByDevicePlan.java
@@ -121,7 +121,7 @@ public class AlignByDevicePlan extends QueryPlan {
public void setGroupByTimePlan(GroupByTimePlan groupByTimePlan) {
this.groupByTimePlan = groupByTimePlan;
- this.setOperatorType(OperatorType.GROUPBYTIME);
+ this.setOperatorType(OperatorType.GROUP_BY_TIME);
}
public FillQueryPlan getFillQueryPlan() {
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByTimePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByTimePlan.java
index 6c906bf..d3a54a3 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByTimePlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByTimePlan.java
@@ -38,7 +38,7 @@ public class GroupByTimePlan extends AggregationPlan {
public GroupByTimePlan() {
super();
- setOperatorType(Operator.OperatorType.GROUPBYTIME);
+ setOperatorType(Operator.OperatorType.GROUP_BY_TIME);
}
public long getStartTime() {
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
index 267c28c..36a3a54 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
@@ -77,25 +77,25 @@ public class InsertTabletPlan extends InsertPlan {
private List<Object> failedColumns;
public InsertTabletPlan() {
- super(OperatorType.BATCHINSERT);
+ super(OperatorType.BATCH_INSERT);
}
public InsertTabletPlan(PartialPath deviceId, List<String> measurements) {
- super(OperatorType.BATCHINSERT);
+ super(OperatorType.BATCH_INSERT);
this.deviceId = deviceId;
this.measurements = measurements.toArray(new String[0]);
this.canBeSplit = true;
}
public InsertTabletPlan(PartialPath deviceId, String[] measurements) {
- super(OperatorType.BATCHINSERT);
+ super(OperatorType.BATCH_INSERT);
this.deviceId = deviceId;
this.measurements = measurements;
this.canBeSplit = true;
}
public InsertTabletPlan(PartialPath deviceId, String[] measurements, List<Integer> dataTypes) {
- super(OperatorType.BATCHINSERT);
+ super(OperatorType.BATCH_INSERT);
this.deviceId = deviceId;
this.measurements = measurements;
setDataTypes(dataTypes);
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java
index 0c94e20..569843e 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java
@@ -33,7 +33,7 @@ public class LoadDataPlan extends PhysicalPlan {
/** Constructor of LoadDataPlan. */
public LoadDataPlan(String inputFilePath, String measureType) {
- super(false, Operator.OperatorType.LOADDATA);
+ super(false, Operator.OperatorType.LOAD_DATA);
this.inputFilePath = inputFilePath;
this.measureType = measureType;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java b/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
index 597177b..f920018 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
@@ -182,10 +182,9 @@ public class PhysicalGenerator {
case REVOKE_WATERMARK_EMBEDDING:
DataAuthOperator dataAuthOperator = (DataAuthOperator) operator;
return new DataAuthPlan(dataAuthOperator.getType(), dataAuthOperator.getUsers());
- case LOADDATA:
+ case LOAD_DATA:
LoadDataOperator loadData = (LoadDataOperator) operator;
return new LoadDataPlan(loadData.getInputFilePath(), loadData.getMeasureType());
- case METADATA:
case SET_STORAGE_GROUP:
SetStorageGroupOperator setStorageGroup = (SetStorageGroupOperator) operator;
return new SetStorageGroupPlan(setStorageGroup.getPath());
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java
index c236e59..31038cd 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java
@@ -92,7 +92,7 @@ public class AlignByDeviceDataSet extends QueryDataSet {
this.measurementTypeMap = alignByDevicePlan.getMeasurementTypeMap();
switch (alignByDevicePlan.getOperatorType()) {
- case GROUPBYTIME:
+ case GROUP_BY_TIME:
this.dataSetType = DataSetType.GROUPBYTIME;
this.groupByTimePlan = alignByDevicePlan.getGroupByTimePlan();
this.groupByTimePlan.setAscending(alignByDevicePlan.isAscending());
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index f09454e..5d8bf57 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -1036,7 +1036,7 @@ public class TSServiceImpl implements TSIService.Iface {
}
break;
case AGGREGATION:
- case GROUPBYTIME:
+ case GROUP_BY_TIME:
case GROUP_BY_FILL:
List<String> aggregations = plan.getAggregations();
if (aggregations.size() != paths.size()) {
diff --git a/server/src/test/java/org/apache/iotdb/db/qp/PlannerTest.java b/server/src/test/java/org/apache/iotdb/db/qp/PlannerTest.java
index e1e5386..5b4c0fb 100644
--- a/server/src/test/java/org/apache/iotdb/db/qp/PlannerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/qp/PlannerTest.java
@@ -179,7 +179,7 @@ public class PlannerTest {
String groupbyStatement =
"select sum(*) from root.vehicle where root.vehicle.device1.sensor1 > 50 group by ([100,1100), 20ms)";
PhysicalPlan plan9 = processor.parseSQLToPhysicalPlan(groupbyStatement);
- assertEquals(OperatorType.GROUPBYTIME, plan9.getOperatorType());
+ assertEquals(OperatorType.GROUP_BY_TIME, plan9.getOperatorType());
String fillStatement =
"select sensor1 from root.vehicle.device1 where time = 50 Fill(int32[linear, 5m, 5m], boolean[previous, 5m])";