This is an automated email from the ASF dual-hosted git repository.
yuyuankang pushed a commit to branch kyy
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/kyy by this push:
new c097dd9 remove clone
c097dd9 is described below
commit c097dd9a550d64a4d67207099adf5ec27eceddc5
Author: Ring-k <[email protected]>
AuthorDate: Thu Jul 9 13:24:13 2020 +0800
remove clone
---
.../java/org/apache/iotdb/cluster/ClusterMain.java | 3 ++-
.../cluster/server/member/MetaGroupMember.java | 12 +++++------
.../iotdb/db/qp/physical/crud/InsertPlan.java | 3 ---
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 13 ------------
.../db/qp/physical/crud/InsertTabletPlan.java | 23 ----------------------
5 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
index 1e389b7..20707ab 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
@@ -72,7 +72,8 @@ public class ClusterMain {
}
IoTDBDescriptor.getInstance().getConfig().setSyncEnable(false);
-
IoTDBDescriptor.getInstance().getConfig().setAutoCreateSchemaEnabled(false);
+ IoTDBDescriptor.getInstance().getConfig().setAutoCreateSchemaEnabled(
+
ClusterDescriptor.getInstance().getConfig().isEnableAutoCreateSchema());
logger.info("Running mode {}", mode);
try {
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
index f000c9a..aea1b36 100644
---
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
+++
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
@@ -1449,10 +1449,10 @@ public class MetaGroupMember extends RaftMember {
* @return
*/
TSStatus forwardPlan(Map<PhysicalPlan, PartitionGroup> planGroupMap,
PhysicalPlan plan) {
- InsertPlan backup = null;
- if (plan instanceof InsertPlan) {
- backup = (InsertPlan) ((InsertPlan) plan).clone();
- }
+// InsertPlan backup = null;
+// if (plan instanceof InsertPlan) {
+// backup = (InsertPlan) ((InsertPlan) plan).clone();
+// }
// the error codes from the groups that cannot execute the plan
TSStatus status;
if (planGroupMap.size() == 1) {
@@ -1468,9 +1468,9 @@ public class MetaGroupMember extends RaftMember {
&& status.getCode() ==
TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode()
&&
ClusterDescriptor.getInstance().getConfig().isEnableAutoCreateSchema()) {
// try to create timeseries
- boolean hasCreate = autoCreateTimeseries(backup);
+ boolean hasCreate = autoCreateTimeseries((InsertPlan)plan);
if (hasCreate) {
- status = forwardPlan(planGroupMap, backup);
+ status = forwardPlan(planGroupMap, (InsertPlan)plan);
} else {
logger.error("{}, Cannot auto create timeseries.", thisNode);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
index 5c81cdc..0d615fa 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
@@ -94,7 +94,4 @@ public abstract class InsertPlan extends PhysicalPlan {
measurements[index] = null;
dataTypes[index] = null;
}
-
- @Override
- public abstract Object clone();
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
index 494b29b..4b49d71 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
@@ -431,17 +431,4 @@ public class InsertRowPlan extends InsertPlan {
return new TimeValuePair(time,
TsPrimitiveType.getByType(schemas[measurementIndex].getType(), value));
}
-
- @Override
- public Object clone() {
- long timeClone = this.time;
- String deviceIdClone = this.deviceId;
- String[] measurementsClone = new String[this.measurements.length];
- System.arraycopy(this.measurements, 0, measurementsClone, 0,
measurementsClone.length);
- Object[] valuesClone = new Object[this.values.length];
- System.arraycopy(this.values, 0, valuesClone, 0, valuesClone.length);
- TSDataType[] typesClone = new TSDataType[this.dataTypes.length];
- System.arraycopy(this.dataTypes, 0, typesClone, 0, typesClone.length);
- return new InsertRowPlan(deviceIdClone, timeClone, measurementsClone,
typesClone, valuesClone);
- }
}
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 dd6b5d5..7382040 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
@@ -481,27 +481,4 @@ public class InsertTabletPlan extends InsertPlan {
super.markFailedMeasurementInsertion(index, e);
columns[index] = null;
}
-
- @Override
- public Object clone() {
- String deviceIdClone = deviceId;
- String[] measurementsClone = new String[this.measurements.length];
- System.arraycopy(this.measurements, 0, measurementsClone, 0,
measurementsClone.length);
- TSDataType[] typesClone = new TSDataType[this.dataTypes.length];
- System.arraycopy(this.dataTypes, 0, typesClone, 0, typesClone.length);
- InsertTabletPlan ret = new InsertTabletPlan(deviceIdClone,
measurementsClone);
-
- ret.setDataTypes(typesClone);
-
- long[] timesClone = new long[times.length];
- System.arraycopy(this.times, 0, timesClone, 0, times.length);
- ret.setTimes(timesClone);
- Object[] columnsClone = new Object[columns.length];
- System.arraycopy(this.columns, 0, columnsClone, 0, columns.length);
- ret.setColumns(columnsClone);
-
- ret.setRowCount(rowCount);
- return ret;
- }
-
}
