This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new b484f2e [IOTDB-1511] Rename Template Enum (#3657)
b484f2e is described below
commit b484f2e9a1f0e6471d93281d491343115d985137
Author: zyk990424 <[email protected]>
AuthorDate: Sat Jul 31 15:04:15 2021 +0800
[IOTDB-1511] Rename Template Enum (#3657)
---
server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 4 ++--
.../main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +-
server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java | 4 ++--
.../main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java | 8 ++++----
.../apache/iotdb/db/qp/physical/crud/SetSchemaTemplatePlan.java | 8 ++++----
.../iotdb/db/qp/physical/sys/SetUsingSchemaTemplatePlan.java | 8 ++++----
.../src/main/java/org/apache/iotdb/db/tools/mlog/MLogParser.java | 4 ++--
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index a435829..d72338f 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@ -386,11 +386,11 @@ public class MManager {
CreateTemplatePlan createTemplatePlan = (CreateTemplatePlan) plan;
createSchemaTemplate(createTemplatePlan);
break;
- case SET_DEVICE_TEMPLATE:
+ case SET_SCHEMA_TEMPLATE:
SetSchemaTemplatePlan setSchemaTemplatePlan = (SetSchemaTemplatePlan)
plan;
setSchemaTemplate(setSchemaTemplatePlan);
break;
- case SET_USING_DEVICE_TEMPLATE:
+ case SET_USING_SCHEMA_TEMPLATE:
SetUsingSchemaTemplatePlan setUsingSchemaTemplatePlan =
(SetUsingSchemaTemplatePlan) plan;
setUsingSchemaTemplate(setUsingSchemaTemplatePlan);
break;
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 b092469..1939617 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
@@ -361,7 +361,7 @@ public class PlanExecutor implements IPlanExecutor {
return true;
case CREATE_TEMPLATE:
return createSchemaTemplate((CreateTemplatePlan) plan);
- case SET_DEVICE_TEMPLATE:
+ case SET_SCHEMA_TEMPLATE:
return setSchemaTemplate((SetSchemaTemplatePlan) plan);
case CREATE_CONTINUOUS_QUERY:
return operateCreateContinuousQuery((CreateContinuousQueryPlan) plan);
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 53234cb..f7eba0a 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
@@ -148,8 +148,8 @@ public abstract class Operator {
STOP_TRIGGER,
CREATE_TEMPLATE,
- SET_DEVICE_TEMPLATE,
- SET_USING_DEVICE_TEMPLATE,
+ SET_SCHEMA_TEMPLATE,
+ SET_USING_SCHEMA_TEMPLATE,
MERGE,
FULL_MERGE,
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
index 13546d7..3c3611f 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
@@ -377,10 +377,10 @@ public abstract class PhysicalPlan {
case CREATE_TEMPLATE:
plan = new CreateTemplatePlan();
break;
- case SET_DEVICE_TEMPLATE:
+ case SET_SCHEMA_TEMPLATE:
plan = new SetSchemaTemplatePlan();
break;
- case SET_USING_DEVICE_TEMPLATE:
+ case SET_USING_SCHEMA_TEMPLATE:
plan = new SetUsingSchemaTemplatePlan();
break;
case AUTO_CREATE_DEVICE_MNODE:
@@ -458,8 +458,8 @@ public abstract class PhysicalPlan {
BATCH_INSERT_ROWS,
SHOW_DEVICES,
CREATE_TEMPLATE,
- SET_DEVICE_TEMPLATE,
- SET_USING_DEVICE_TEMPLATE,
+ SET_SCHEMA_TEMPLATE,
+ SET_USING_SCHEMA_TEMPLATE,
AUTO_CREATE_DEVICE_MNODE,
CREATE_ALIGNED_TIMESERIES,
CLUSTER_LOG,
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/SetSchemaTemplatePlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/SetSchemaTemplatePlan.java
index 23949f7..6e8bc6a 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/SetSchemaTemplatePlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/SetSchemaTemplatePlan.java
@@ -34,11 +34,11 @@ public class SetSchemaTemplatePlan extends PhysicalPlan {
String prefixPath;
public SetSchemaTemplatePlan() {
- super(false, OperatorType.SET_DEVICE_TEMPLATE);
+ super(false, OperatorType.SET_SCHEMA_TEMPLATE);
}
public SetSchemaTemplatePlan(String templateName, String prefixPath) {
- super(false, OperatorType.SET_DEVICE_TEMPLATE);
+ super(false, OperatorType.SET_SCHEMA_TEMPLATE);
this.templateName = templateName;
this.prefixPath = prefixPath;
}
@@ -66,7 +66,7 @@ public class SetSchemaTemplatePlan extends PhysicalPlan {
@Override
public void serialize(ByteBuffer buffer) {
- buffer.put((byte) PhysicalPlanType.SET_DEVICE_TEMPLATE.ordinal());
+ buffer.put((byte) PhysicalPlanType.SET_SCHEMA_TEMPLATE.ordinal());
ReadWriteIOUtils.write(templateName, buffer);
ReadWriteIOUtils.write(prefixPath, buffer);
@@ -84,7 +84,7 @@ public class SetSchemaTemplatePlan extends PhysicalPlan {
@Override
public void serialize(DataOutputStream stream) throws IOException {
- stream.writeByte((byte) PhysicalPlanType.SET_DEVICE_TEMPLATE.ordinal());
+ stream.writeByte((byte) PhysicalPlanType.SET_SCHEMA_TEMPLATE.ordinal());
ReadWriteIOUtils.write(templateName, stream);
ReadWriteIOUtils.write(prefixPath, stream);
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetUsingSchemaTemplatePlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetUsingSchemaTemplatePlan.java
index 107a1fe..79d18fe 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetUsingSchemaTemplatePlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetUsingSchemaTemplatePlan.java
@@ -39,11 +39,11 @@ public class SetUsingSchemaTemplatePlan extends
PhysicalPlan {
PartialPath prefixPath;
public SetUsingSchemaTemplatePlan() {
- super(false, OperatorType.SET_USING_DEVICE_TEMPLATE);
+ super(false, OperatorType.SET_USING_SCHEMA_TEMPLATE);
}
public SetUsingSchemaTemplatePlan(PartialPath prefixPath) {
- super(false, OperatorType.SET_USING_DEVICE_TEMPLATE);
+ super(false, OperatorType.SET_USING_SCHEMA_TEMPLATE);
this.prefixPath = prefixPath;
}
@@ -58,7 +58,7 @@ public class SetUsingSchemaTemplatePlan extends PhysicalPlan {
@Override
public void serialize(ByteBuffer buffer) {
- buffer.put((byte) PhysicalPlanType.SET_USING_DEVICE_TEMPLATE.ordinal());
+ buffer.put((byte) PhysicalPlanType.SET_USING_SCHEMA_TEMPLATE.ordinal());
ReadWriteIOUtils.write(prefixPath.getFullPath(), buffer);
buffer.putLong(index);
}
@@ -76,7 +76,7 @@ public class SetUsingSchemaTemplatePlan extends PhysicalPlan {
@Override
public void serialize(DataOutputStream stream) throws IOException {
- stream.writeByte((byte)
PhysicalPlanType.SET_USING_DEVICE_TEMPLATE.ordinal());
+ stream.writeByte((byte)
PhysicalPlanType.SET_USING_SCHEMA_TEMPLATE.ordinal());
ReadWriteIOUtils.write(prefixPath.getFullPath(), stream);
stream.writeLong(index);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/tools/mlog/MLogParser.java
b/server/src/main/java/org/apache/iotdb/db/tools/mlog/MLogParser.java
index 53a7d05..3ce6169 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/mlog/MLogParser.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/mlog/MLogParser.java
@@ -217,10 +217,10 @@ public class MLogParser {
case CREATE_TEMPLATE:
mLogTxtWriter.createTemplate((CreateTemplatePlan) plan);
break;
- case SET_DEVICE_TEMPLATE:
+ case SET_SCHEMA_TEMPLATE:
mLogTxtWriter.setTemplate((SetSchemaTemplatePlan) plan);
break;
- case SET_USING_DEVICE_TEMPLATE:
+ case SET_USING_SCHEMA_TEMPLATE:
mLogTxtWriter.setUsingTemplate((SetUsingSchemaTemplatePlan) plan);
break;
case AUTO_CREATE_DEVICE_MNODE:
