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 2022/03/24 03:50:39 UTC
[iotdb] 01/01: fix compile error
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/fix-master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a03d5ff4a5b4548c87a329702f3e08459b71d7b3
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Thu Mar 24 11:49:35 2022 +0800
fix compile error
---
.../org/apache/iotdb/db/mpp/common/FragmentInstanceId.java | 11 ++++++-----
.../iotdb/db/mpp/schedule/task/FragmentInstanceTask.java | 4 ++--
.../iotdb/db/mpp/schedule/task/FragmentInstanceTaskID.java | 4 ++--
.../iotdb/db/mpp/sql/planner/plan/FragmentInstance.java | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/FragmentInstanceId.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/FragmentInstanceId.java
index 8e9de62..a7c0de0 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/FragmentInstanceId.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/FragmentInstanceId.java
@@ -23,14 +23,15 @@ public class FragmentInstanceId {
private final String fullId;
private final QueryId queryId;
- private final FragmentId fragmentId;
+ private final PlanFragmentId fragmentId;
private final String instanceId;
- public FragmentInstanceId(QueryId queryId, FragmentId fragmentId, String instanceId) {
- this.queryId = queryId;
+ public FragmentInstanceId(PlanFragmentId fragmentId, String instanceId) {
+ this.queryId = fragmentId.getQueryId();
this.fragmentId = fragmentId;
this.instanceId = instanceId;
- this.fullId = String.format("%s.%d.%s", queryId.getId(), fragmentId.getId(), instanceId);
+ this.fullId =
+ String.format("%s.%d.%s", fragmentId.getQueryId().getId(), fragmentId.getId(), instanceId);
}
public String getFullId() {
@@ -41,7 +42,7 @@ public class FragmentInstanceId {
return queryId;
}
- public FragmentId getFragmentId() {
+ public PlanFragmentId getFragmentId() {
return fragmentId;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTask.java
index 13cc5b7..f9f2f52 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTask.java
@@ -18,8 +18,8 @@
*/
package org.apache.iotdb.db.mpp.schedule.task;
-import org.apache.iotdb.db.mpp.common.FragmentId;
import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
+import org.apache.iotdb.db.mpp.common.PlanFragmentId;
import org.apache.iotdb.db.mpp.common.QueryId;
import org.apache.iotdb.db.mpp.execution.ExecFragmentInstance;
import org.apache.iotdb.db.mpp.schedule.ExecutionContext;
@@ -180,7 +180,7 @@ public class FragmentInstanceTask implements IDIndexedAccessible {
private static final QueryId stubQueryId = new QueryId("stub-query");
private static final FragmentInstanceId stubInstance =
- new FragmentInstanceId(stubQueryId, new FragmentId(stubQueryId, 0), "stub-instance");
+ new FragmentInstanceId(new PlanFragmentId(stubQueryId, 0), "stub-instance");
@Override
public boolean isFinished() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTaskID.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTaskID.java
index 9796489..6ea8b7d 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTaskID.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTaskID.java
@@ -18,8 +18,8 @@
*/
package org.apache.iotdb.db.mpp.schedule.task;
-import org.apache.iotdb.db.mpp.common.FragmentId;
import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
+import org.apache.iotdb.db.mpp.common.PlanFragmentId;
import org.apache.iotdb.db.mpp.common.QueryId;
import org.apache.iotdb.db.mpp.schedule.queue.ID;
@@ -50,7 +50,7 @@ public class FragmentInstanceTaskID implements ID, Comparable<FragmentInstanceTa
return id.getInstanceId();
}
- public FragmentId getFragmentId() {
+ public PlanFragmentId getFragmentId() {
return id.getFragmentId();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/FragmentInstance.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/FragmentInstance.java
index 5749c36..bc8f620 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/FragmentInstance.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/FragmentInstance.java
@@ -44,7 +44,7 @@ public class FragmentInstance {
}
public static FragmentInstanceId generateId(PlanFragmentId id, int index) {
- return new FragmentInstanceId(String.format("%s.%d", id, index));
+ return new FragmentInstanceId(id, String.valueOf(index));
}
public DataRegionReplicaSet getDataRegionId() {