You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yu...@apache.org on 2020/07/14 15:30:23 UTC
[incubator-iotdb] branch kyy2 updated: rename method
This is an automated email from the ASF dual-hosted git repository.
yuyuankang pushed a commit to branch kyy2
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/kyy2 by this push:
new b6c6bcb rename method
b6c6bcb is described below
commit b6c6bcbb6bb0f480215f0357ff6bebafd28c76cd
Author: Ring-k <yu...@hotmail.com>
AuthorDate: Tue Jul 14 23:29:57 2020 +0800
rename method
---
.../java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java | 2 +-
.../main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java | 2 +-
.../main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java | 4 ++--
.../java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
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 3ac4df2..dfd7e4a 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
@@ -1554,7 +1554,7 @@ public class MetaGroupMember extends RaftMember {
&& ClusterDescriptor.getInstance().getConfig().isEnableAutoCreateSchema()) {
// try to create timeseries
if (((InsertPlan) plan).getFailedMeasurements() != null) {
- ((InsertPlan) plan).transform();
+ ((InsertPlan) plan).getPlanFromFailed();
}
boolean hasCreate = autoCreateTimeseries((InsertPlan) plan);
if (hasCreate) {
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 3b5d577..ad63697 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
@@ -108,7 +108,7 @@ public abstract class InsertPlan extends PhysicalPlan {
dataTypes[index] = null;
}
- public InsertPlan transform() {
+ public InsertPlan getPlanFromFailed() {
if (failedMeasurements == null) {
return null;
}
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 a93338a..cdb7297 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
@@ -465,8 +465,8 @@ public class InsertRowPlan extends InsertPlan {
}
@Override
- public InsertPlan transform() {
- if (super.transform() == null) {
+ public InsertPlan getPlanFromFailed() {
+ if (super.getPlanFromFailed() == null) {
return null;
}
values = failedValues.toArray(new Object[0]);
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 c258967..4c78e67 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
@@ -515,8 +515,8 @@ public class InsertTabletPlan extends InsertPlan {
@Override
- public InsertPlan transform() {
- if (super.transform() == null) {
+ public InsertPlan getPlanFromFailed() {
+ if (super.getPlanFromFailed() == null) {
return null;
}
// TODO anything else?