You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/03/23 04:09:32 UTC
[iotdb] 01/02: format cofde
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch add_mpp_interface
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit dbcec6aa85c9d728da817dfc287882dea780d35f
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Wed Mar 23 09:20:53 2022 +0800
format cofde
---
.../iotdb/commons/partition/DataPartitionInfo.java | 9 ++++--
.../commons/partition/DataPartitionQueryParam.java | 3 +-
.../commons/partition/DataRegionPlaceInfo.java | 3 +-
.../iotdb/commons/partition/PartitionInfo.java | 3 +-
.../commons/partition/SchemaRegionPlaceInfo.java | 3 +-
.../iotdb/db/mpp/common/MPPQueryContext.java | 6 ++--
.../apache/iotdb/db/mpp/execution/Coordinator.java | 18 +++++------
.../iotdb/db/mpp/execution/QueryExecution.java | 9 +++---
.../execution/scheduler/StandaloneScheduler.java | 4 +--
.../apache/iotdb/db/mpp/sql/analyze/Analysis.java | 7 ++--
.../apache/iotdb/db/mpp/sql/analyze/Analyzer.java | 6 ++--
.../mpp/sql/analyze/ClusterPartitionFetcher.java | 4 +--
.../db/mpp/sql/analyze/ClusterSchemaFetcher.java | 3 +-
.../db/mpp/sql/analyze/IPartitionFetcher.java | 4 +--
.../iotdb/db/mpp/sql/analyze/ISchemaFetcher.java | 3 +-
.../apache/iotdb/db/mpp/sql/analyze/QueryType.java | 3 +-
.../sql/analyze/StandalonePartitionFetcher.java | 3 +-
.../mpp/sql/analyze/StandaloneSchemaFetcher.java | 7 ++--
.../iotdb/db/mpp/sql/planner/LogicalPlanner.java | 5 ++-
.../sql/planner/plan/node/write/InsertNode.java | 3 +-
.../planner/plan/node/write/InsertTabletNode.java | 4 +--
.../sql/statement/crud/InsertBaseStatement.java | 4 +--
.../sql/statement/crud/InsertTabletStatement.java | 6 ++--
.../iotdb/db/query/control/SessionManager.java | 1 -
.../db/service/thrift/impl/TSServiceImpl.java | 37 ++++++++++++----------
25 files changed, 80 insertions(+), 78 deletions(-)
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionInfo.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionInfo.java
index 910a649..b60100e 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionInfo.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionInfo.java
@@ -24,14 +24,17 @@ import java.util.Map;
public class DataPartitionInfo {
// Map<StorageGroup, Map<DeviceGroupID, Map<TimePartitionId, List<DataRegionPlaceInfo>>>>
- private Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<DataRegionPlaceInfo>>>> dataPartitionInfo;
+ private Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<DataRegionPlaceInfo>>>>
+ dataPartitionInfo;
- public Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<DataRegionPlaceInfo>>>> getDataPartitionInfo() {
+ public Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<DataRegionPlaceInfo>>>>
+ getDataPartitionInfo() {
return dataPartitionInfo;
}
public void setDataPartitionInfo(
- Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<DataRegionPlaceInfo>>>> dataPartitionInfo) {
+ Map<String, Map<DeviceGroupId, Map<TimePartitionId, List<DataRegionPlaceInfo>>>>
+ dataPartitionInfo) {
this.dataPartitionInfo = dataPartitionInfo;
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionQueryParam.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionQueryParam.java
index 6b88de4..60cdf7c 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionQueryParam.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionQueryParam.java
@@ -37,8 +37,7 @@ public class DataPartitionQueryParam {
return timePartitionIdList;
}
- public void setTimePartitionIdList(
- List<TimePartitionId> timePartitionIdList) {
+ public void setTimePartitionIdList(List<TimePartitionId> timePartitionIdList) {
this.timePartitionIdList = timePartitionIdList;
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionPlaceInfo.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionPlaceInfo.java
index bd79fc3..507f9b8 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionPlaceInfo.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionPlaceInfo.java
@@ -18,9 +18,10 @@
*/
package org.apache.iotdb.commons.partition;
-import java.util.List;
import org.apache.iotdb.service.rpc.thrift.EndPoint;
+import java.util.List;
+
public class DataRegionPlaceInfo {
private DataRegionId dataRegionId;
private List<EndPoint> endPointList;
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/PartitionInfo.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/PartitionInfo.java
index 286ab4f..90a22a7 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/PartitionInfo.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/PartitionInfo.java
@@ -35,8 +35,7 @@ public class PartitionInfo {
return schemaPartitionInfo;
}
- public void setSchemaPartitionInfo(
- SchemaPartitionInfo schemaPartitionInfo) {
+ public void setSchemaPartitionInfo(SchemaPartitionInfo schemaPartitionInfo) {
this.schemaPartitionInfo = schemaPartitionInfo;
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionPlaceInfo.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionPlaceInfo.java
index ffbe063..e522a67 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionPlaceInfo.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionPlaceInfo.java
@@ -18,9 +18,10 @@
*/
package org.apache.iotdb.commons.partition;
-import java.util.List;
import org.apache.iotdb.service.rpc.thrift.EndPoint;
+import java.util.List;
+
public class SchemaRegionPlaceInfo {
private SchemaRegionId schemaRegionId;
private List<EndPoint> endPointList;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/MPPQueryContext.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/MPPQueryContext.java
index f34a6e3..2a348d3 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/MPPQueryContext.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/MPPQueryContext.java
@@ -27,11 +27,9 @@ public class MPPQueryContext {
private QueryId queryId;
private SessionInfo session;
- public MPPQueryContext() {
- }
+ public MPPQueryContext() {}
- public MPPQueryContext(String sql, QueryId queryId,
- SessionInfo session) {
+ public MPPQueryContext(String sql, QueryId queryId, SessionInfo session) {
this.sql = sql;
this.queryId = queryId;
this.session = session;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/Coordinator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/Coordinator.java
index c74bf63..65d92b4 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/Coordinator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/Coordinator.java
@@ -18,16 +18,13 @@
*/
package org.apache.iotdb.db.mpp.execution;
-import static org.apache.iotdb.rpc.RpcUtils.getStatus;
-
import org.apache.iotdb.db.mpp.common.MPPQueryContext;
import org.apache.iotdb.db.mpp.common.QueryId;
-
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.iotdb.db.mpp.common.SessionInfo;
import org.apache.iotdb.db.mpp.sql.analyze.QueryType;
import org.apache.iotdb.db.mpp.sql.statement.Statement;
-import org.apache.iotdb.db.query.control.QueryResourceManager;
+
+import java.util.concurrent.ConcurrentHashMap;
/**
* The coordinator for MPP. It manages all the queries which are executed in current Node. And it
@@ -38,7 +35,9 @@ public class Coordinator {
private ConcurrentHashMap<QueryId, QueryExecution> queryExecutionMap;
- public static Coordinator getInstance(){return new Coordinator();}
+ public static Coordinator getInstance() {
+ return new Coordinator();
+ }
private QueryExecution createQueryExecution(Statement statement, MPPQueryContext queryContext) {
return new QueryExecution(statement, queryContext);
@@ -48,9 +47,11 @@ public class Coordinator {
return null;
}
- public ExecutionResult execute(Statement statement, QueryId queryId, QueryType queryType, SessionInfo session, String sql) {
+ public ExecutionResult execute(
+ Statement statement, QueryId queryId, QueryType queryType, SessionInfo session, String sql) {
- QueryExecution execution = createQueryExecution(statement, new MPPQueryContext(sql, queryId, session));
+ QueryExecution execution =
+ createQueryExecution(statement, new MPPQueryContext(sql, queryId, session));
queryExecutionMap.put(queryId, execution);
execution.start();
@@ -58,7 +59,6 @@ public class Coordinator {
return execution.getResult();
}
-
// private TQueryResponse executeQuery(TQueryRequest request) {
//
// }
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryExecution.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryExecution.java
index ead15b2..b8a7821 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryExecution.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryExecution.java
@@ -18,8 +18,6 @@
*/
package org.apache.iotdb.db.mpp.execution;
-import static org.apache.iotdb.rpc.RpcUtils.getStatus;
-
import org.apache.iotdb.db.mpp.common.MPPQueryContext;
import org.apache.iotdb.db.mpp.execution.scheduler.ClusterScheduler;
import org.apache.iotdb.db.mpp.execution.scheduler.IScheduler;
@@ -29,11 +27,13 @@ import org.apache.iotdb.db.mpp.sql.optimization.PlanOptimizer;
import org.apache.iotdb.db.mpp.sql.planner.DistributionPlanner;
import org.apache.iotdb.db.mpp.sql.planner.LogicalPlanner;
import org.apache.iotdb.db.mpp.sql.planner.plan.*;
+import org.apache.iotdb.db.mpp.sql.statement.Statement;
+import org.apache.iotdb.rpc.TSStatusCode;
import java.nio.ByteBuffer;
import java.util.List;
-import org.apache.iotdb.db.mpp.sql.statement.Statement;
-import org.apache.iotdb.rpc.TSStatusCode;
+
+import static org.apache.iotdb.rpc.RpcUtils.getStatus;
/**
* QueryExecution stores all the status of a query which is being prepared or running inside the MPP
@@ -72,7 +72,6 @@ public class QueryExecution {
return new Analyzer(context).analyze(statement);
}
-
private void schedule() {
this.scheduler = new ClusterScheduler(this.stateMachine, this.fragmentInstances);
this.scheduler.start();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/scheduler/StandaloneScheduler.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/scheduler/StandaloneScheduler.java
index bcf2bbd..10de6b5 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/scheduler/StandaloneScheduler.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/scheduler/StandaloneScheduler.java
@@ -33,9 +33,7 @@ public class StandaloneScheduler implements IScheduler {
private static final SchemaEngine SCHEMA_ENGINE = SchemaEngine.getInstance();
@Override
- public void start() {
-
- }
+ public void start() {}
@Override
public void abort() {}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analysis.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analysis.java
index 60e3da1..313ec97 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analysis.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analysis.java
@@ -22,7 +22,6 @@ package org.apache.iotdb.db.mpp.sql.analyze;
import org.apache.iotdb.commons.partition.DataPartitionInfo;
import org.apache.iotdb.commons.partition.SchemaPartitionInfo;
import org.apache.iotdb.commons.partition.TimePartitionId;
-import org.apache.iotdb.db.metadata.SchemaRegion;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.mpp.common.DataRegion;
import org.apache.iotdb.db.mpp.sql.statement.Statement;
@@ -46,8 +45,7 @@ public class Analysis {
// DataPartitionInfo
// DeviceGroup -> DataRegionTimeSlice -> List<DataRegion>
- @Deprecated
- private Map<String, Map<TimePartitionId, List<DataRegion>>> dataPartitionInfoOld;
+ @Deprecated private Map<String, Map<TimePartitionId, List<DataRegion>>> dataPartitionInfoOld;
private DataPartitionInfo dataPartitionInfo;
@@ -91,8 +89,7 @@ public class Analysis {
return schemaPartitionInfo;
}
- public void setSchemaPartitionInfo(
- SchemaPartitionInfo schemaPartitionInfo) {
+ public void setSchemaPartitionInfo(SchemaPartitionInfo schemaPartitionInfo) {
this.schemaPartitionInfo = schemaPartitionInfo;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analyzer.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analyzer.java
index 001662b..2b60718 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analyzer.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analyzer.java
@@ -124,13 +124,13 @@ public class Analyzer {
}
@Override
- public Analysis visitInsertTablet(InsertTabletStatement insertTabletStatement,
- MPPQueryContext context) {
+ public Analysis visitInsertTablet(
+ InsertTabletStatement insertTabletStatement, MPPQueryContext context) {
// TODO(INSERT) device + time range -> PartitionInfo
DataPartitionQueryParam dataPartitionQueryParam = new DataPartitionQueryParam();
dataPartitionQueryParam.setDeviceId(insertTabletStatement.getDevicePath().getFullPath());
// TODO(INSERT) calculate the time partition id list
-// dataPartitionQueryParam.setTimePartitionIdList();
+ // dataPartitionQueryParam.setTimePartitionIdList();
PartitionInfo partitionInfo = partitionFetcher.fetchPartitionInfo(dataPartitionQueryParam);
Analysis analysis = new Analysis();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterPartitionFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterPartitionFetcher.java
index a4b85bc..cdecf45 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterPartitionFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterPartitionFetcher.java
@@ -18,14 +18,14 @@
*/
package org.apache.iotdb.db.mpp.sql.analyze;
-import java.util.List;
import org.apache.iotdb.commons.partition.DataPartitionInfo;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
import org.apache.iotdb.commons.partition.PartitionInfo;
import org.apache.iotdb.commons.partition.SchemaPartitionInfo;
-public class ClusterPartitionFetcher implements IPartitionFetcher {
+import java.util.List;
+public class ClusterPartitionFetcher implements IPartitionFetcher {
@Override
public DataPartitionInfo fetchDataPartitionInfo(DataPartitionQueryParam parameter) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterSchemaFetcher.java
index 7ffadf0..c5a7437 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterSchemaFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ClusterSchemaFetcher.java
@@ -18,9 +18,10 @@
*/
package org.apache.iotdb.db.mpp.sql.analyze;
+import org.apache.iotdb.db.metadata.path.PartialPath;
+
import java.util.List;
import java.util.Map;
-import org.apache.iotdb.db.metadata.path.PartialPath;
public class ClusterSchemaFetcher implements ISchemaFetcher {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/IPartitionFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/IPartitionFetcher.java
index 36fce5c..d29c601 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/IPartitionFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/IPartitionFetcher.java
@@ -18,12 +18,13 @@
*/
package org.apache.iotdb.db.mpp.sql.analyze;
-import java.util.List;
import org.apache.iotdb.commons.partition.DataPartitionInfo;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
import org.apache.iotdb.commons.partition.PartitionInfo;
import org.apache.iotdb.commons.partition.SchemaPartitionInfo;
+import java.util.List;
+
public interface IPartitionFetcher {
DataPartitionInfo fetchDataPartitionInfo(DataPartitionQueryParam parameter);
@@ -37,5 +38,4 @@ public interface IPartitionFetcher {
PartitionInfo fetchPartitionInfo(DataPartitionQueryParam parameter);
PartitionInfo fetchPartitionInfos(List<DataPartitionQueryParam> parameterList);
-
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ISchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ISchemaFetcher.java
index b0a3b19..a4d42f2 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ISchemaFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/ISchemaFetcher.java
@@ -19,9 +19,10 @@
package org.apache.iotdb.db.mpp.sql.analyze;
+import org.apache.iotdb.db.metadata.path.PartialPath;
+
import java.util.List;
import java.util.Map;
-import org.apache.iotdb.db.metadata.path.PartialPath;
/**
* This interface is used to fetch the metadata information required in execution plan generating.
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/QueryType.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/QueryType.java
index 310e024..8682628 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/QueryType.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/QueryType.java
@@ -19,5 +19,6 @@
package org.apache.iotdb.db.mpp.sql.analyze;
public enum QueryType {
- WRITE, READ;
+ WRITE,
+ READ;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java
index 4de401f..ca274a5 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java
@@ -18,12 +18,13 @@
*/
package org.apache.iotdb.db.mpp.sql.analyze;
-import java.util.List;
import org.apache.iotdb.commons.partition.DataPartitionInfo;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
import org.apache.iotdb.commons.partition.PartitionInfo;
import org.apache.iotdb.commons.partition.SchemaPartitionInfo;
+import java.util.List;
+
public class StandalonePartitionFetcher implements IPartitionFetcher {
private StandalonePartitionFetcher() {}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandaloneSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandaloneSchemaFetcher.java
index 471be54..9623b1d 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandaloneSchemaFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandaloneSchemaFetcher.java
@@ -18,15 +18,14 @@
*/
package org.apache.iotdb.db.mpp.sql.analyze;
+import org.apache.iotdb.db.metadata.path.PartialPath;
+
import java.util.List;
import java.util.Map;
-import org.apache.iotdb.db.metadata.path.PartialPath;
public class StandaloneSchemaFetcher implements ISchemaFetcher {
- private StandaloneSchemaFetcher() {
-
- }
+ private StandaloneSchemaFetcher() {}
public static StandaloneSchemaFetcher getInstance() {
return new StandaloneSchemaFetcher();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/LogicalPlanner.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/LogicalPlanner.java
index a60560e..f724e99 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/LogicalPlanner.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/LogicalPlanner.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.db.mpp.sql.analyze.Analysis;
import org.apache.iotdb.db.mpp.sql.optimization.PlanOptimizer;
import org.apache.iotdb.db.mpp.sql.planner.plan.LogicalQueryPlan;
import org.apache.iotdb.db.mpp.sql.planner.plan.node.PlanNode;
-import org.apache.iotdb.db.mpp.sql.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.mpp.sql.planner.plan.node.PlanNodeIdAllocator;
import org.apache.iotdb.db.mpp.sql.planner.plan.node.metedata.write.CreateTimeSeriesNode;
import org.apache.iotdb.db.mpp.sql.planner.plan.node.write.InsertTabletNode;
@@ -87,8 +86,8 @@ public class LogicalPlanner {
}
@Override
- public PlanNode visitInsertTablet(InsertTabletStatement insertTabletStatement,
- MPPQueryContext context) {
+ public PlanNode visitInsertTablet(
+ InsertTabletStatement insertTabletStatement, MPPQueryContext context) {
// TODO(INSERT) change the InsertTabletStatement to InsertTabletNode
InsertTabletNode node = new InsertTabletNode(PlanNodeIdAllocator.generateId());
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertNode.java
index f217f63..fdb1d2a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertNode.java
@@ -58,7 +58,8 @@ public abstract class InsertNode extends PlanNode {
super(id);
}
- // TODO(INSERT) split this insert node into multiple InsertNode according to the data partition info
+ // TODO(INSERT) split this insert node into multiple InsertNode according to the data partition
+ // info
public abstract List<InsertNode> splitByPartition(Analysis analysis);
public boolean needSplit() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertTabletNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertTabletNode.java
index 15266ab..c1bc1aa 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertTabletNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertTabletNode.java
@@ -18,14 +18,14 @@
*/
package org.apache.iotdb.db.mpp.sql.planner.plan.node.write;
-import java.nio.ByteBuffer;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.mpp.sql.analyze.Analysis;
import org.apache.iotdb.db.mpp.sql.planner.plan.node.PlanNode;
import org.apache.iotdb.db.mpp.sql.planner.plan.node.PlanNodeId;
+import org.apache.iotdb.tsfile.utils.BitMap;
+import java.nio.ByteBuffer;
import java.util.List;
-import org.apache.iotdb.tsfile.utils.BitMap;
public class InsertTabletNode extends InsertNode {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertBaseStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertBaseStatement.java
index 3ea7d96..25406b4 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertBaseStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertBaseStatement.java
@@ -18,13 +18,13 @@
*/
package org.apache.iotdb.db.mpp.sql.statement.crud;
-import java.util.List;
import org.apache.iotdb.db.metadata.idtable.entry.IDeviceID;
-import org.apache.iotdb.db.metadata.mnode.IMeasurementMNode;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.mpp.sql.statement.Statement;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+import java.util.List;
+
public abstract class InsertBaseStatement extends Statement {
/**
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertTabletStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertTabletStatement.java
index 2e9987f..58804da 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertTabletStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertTabletStatement.java
@@ -18,11 +18,12 @@
*/
package org.apache.iotdb.db.mpp.sql.statement.crud;
-import java.nio.ByteBuffer;
-import java.util.List;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.tsfile.utils.BitMap;
+import java.nio.ByteBuffer;
+import java.util.List;
+
public class InsertTabletStatement extends InsertBaseStatement {
private long[] times; // times should be sorted. It is done in the session API.
@@ -48,5 +49,4 @@ public class InsertTabletStatement extends InsertBaseStatement {
private List<Integer> range;
private List<Object> failedColumns;
-
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
index 6bb3f18..810ed6d 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
@@ -60,7 +60,6 @@ public class SessionManager {
private final Map<Long, IoTDBConstant.ClientVersion> sessionIdToClientVersion =
new ConcurrentHashMap<>();
-
// TODO sessionIdToUsername and sessionIdToZoneId should be replaced with this
private final Map<Long, SessionInfo> sessionIdToSessionInfo = new ConcurrentHashMap<>();
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
index 9a1c0ba..75c74e7 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
@@ -36,7 +36,6 @@ import org.apache.iotdb.db.metadata.path.MeasurementPath;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.metadata.template.TemplateQueryType;
import org.apache.iotdb.db.mpp.common.QueryId;
-import org.apache.iotdb.db.mpp.common.SessionInfo;
import org.apache.iotdb.db.mpp.execution.Coordinator;
import org.apache.iotdb.db.mpp.execution.ExecutionResult;
import org.apache.iotdb.db.mpp.sql.analyze.QueryType;
@@ -608,8 +607,6 @@ public class TSServiceImpl implements TSIService.Iface {
: RpcUtils.getStatus(result);
}
-
-
@Override
public TSExecuteStatementResp executeStatement(TSExecuteStatementReq req) {
String statement = req.getStatement();
@@ -1604,24 +1601,32 @@ public class TSServiceImpl implements TSIService.Iface {
// Step 1: TODO(INSERT) transfer from TSInsertTabletReq to Statement
InsertTabletStatement statement = new InsertTabletStatement();
-// InsertTabletPlan insertTabletPlan =
-// new InsertTabletPlan(new PartialPath(req.getPrefixPath()), req.measurements);
-// insertTabletPlan.setTimes(QueryDataSetUtils.readTimesFromBuffer(req.timestamps, req.size));
-// insertTabletPlan.setColumns(
-// QueryDataSetUtils.readValuesFromBuffer(
-// req.values, req.types, req.types.size(), req.size));
-// insertTabletPlan.setBitMaps(
-// QueryDataSetUtils.readBitMapsFromBuffer(req.values, req.types.size(), req.size));
-// insertTabletPlan.setRowCount(req.size);
-// insertTabletPlan.setDataTypes(req.types);
-// insertTabletPlan.setAligned(req.isAligned);
+ // InsertTabletPlan insertTabletPlan =
+ // new InsertTabletPlan(new PartialPath(req.getPrefixPath()), req.measurements);
+ // insertTabletPlan.setTimes(QueryDataSetUtils.readTimesFromBuffer(req.timestamps,
+ // req.size));
+ // insertTabletPlan.setColumns(
+ // QueryDataSetUtils.readValuesFromBuffer(
+ // req.values, req.types, req.types.size(), req.size));
+ // insertTabletPlan.setBitMaps(
+ // QueryDataSetUtils.readBitMapsFromBuffer(req.values, req.types.size(), req.size));
+ // insertTabletPlan.setRowCount(req.size);
+ // insertTabletPlan.setDataTypes(req.types);
+ // insertTabletPlan.setAligned(req.isAligned);
// Step 2: call the coordinator
long queryId = SESSION_MANAGER.requestQueryId(false);
- ExecutionResult result = coordinator.execute(statement, new QueryId(String.valueOf(queryId)), QueryType.WRITE, SESSION_MANAGER.getSessionInfo(req.sessionId), "");
+ ExecutionResult result =
+ coordinator.execute(
+ statement,
+ new QueryId(String.valueOf(queryId)),
+ QueryType.WRITE,
+ SESSION_MANAGER.getSessionInfo(req.sessionId),
+ "");
// TODO(INSERT) do this check in analyze
-// TSStatus status = serviceProvider.checkAuthority(insertTabletPlan, req.getSessionId());
+ // TSStatus status = serviceProvider.checkAuthority(insertTabletPlan,
+ // req.getSessionId());
return result.status;
} catch (Exception e) {
return onNPEOrUnexpectedException(