Skip to content

Refactor: extract shared table-model PlanNode and Operator code from datanode #17526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shuwenwei wants to merge 47 commits into
base: master
Choose a base branch
from
Open

Refactor: extract shared table-model PlanNode and Operator code from datanode #17526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
dd1cf55
refactor: add IPlanVisitor
Apr 10, 2026
85a6612
refactor TableOperatorGenerator
Apr 10, 2026
35344fd
move some plannodes
Apr 13, 2026
604a747
move rowpattern
Apr 13, 2026
41fe408
add IAstVisitor
Apr 13, 2026
bcbd6d6
move ast node
Apr 13, 2026
f80cb25
move ast nodes
shuwenwei Apr 13, 2026
5702c49
fix tests
shuwenwei Apr 13, 2026
ec3e3eb
fix
Apr 13, 2026
9525a62
move dag
Apr 13, 2026
bbef7b8
move some plannodes
Apr 13, 2026
6d37835
move ExpressionFormatter
Apr 14, 2026
f89e868
move some ast nodes
Apr 14, 2026
82fe2ec
add IPlanNodeDeserializer
Apr 14, 2026
d19de0b
fix
Apr 15, 2026
2a9df45
move SessionInfo
Apr 15, 2026
7266836
fix
Apr 15, 2026
919761e
move transformation.dag.column
Apr 15, 2026
3f9f693
move fill
Apr 15, 2026
9012ade
move aggregation
Apr 15, 2026
cef127a
move some operators
Apr 15, 2026
ffc0774
move operators
Apr 16, 2026
e618ef3
fix
shuwenwei Apr 16, 2026
9cc8309
move partial sql formatter
shuwenwei Apr 16, 2026
5f1639c
refactor
Apr 16, 2026
5f7ac0c
fix
shuwenwei Apr 16, 2026
8f9dc14
move ReservedIdentifiers
shuwenwei Apr 16, 2026
cfa5b7d
delete some methods
Apr 16, 2026
bd3b343
add abstract methods
shuwenwei Apr 17, 2026
e78fb69
add ITableOperatorGeneratorContext
shuwenwei Apr 17, 2026
10eef61
add ITableTypeProvider
shuwenwei Apr 17, 2026
c48b443
modify serializeUseTemplate
shuwenwei Apr 17, 2026
0839a5d
refactor Metadata
shuwenwei Apr 17, 2026
3a1aa55
move some configs
shuwenwei Apr 17, 2026
02bc3f2
move TemporaryQueryDataFileService
shuwenwei Apr 20, 2026
6bedeaf
fix
shuwenwei Apr 20, 2026
6eb454a
refactor operator context
shuwenwei Apr 20, 2026
bfcbb91
move ObjectTypeUtils
shuwenwei Apr 20, 2026
e40a0d9
fix
shuwenwei Apr 20, 2026
c402ac6
fix
shuwenwei Apr 20, 2026
cbac473
move node_commons
Apr 21, 2026
2c8d6cb
move calc_commons
Apr 21, 2026
11fd615
move templates
shuwenwei Apr 21, 2026
127e6fa
rename package
Apr 21, 2026
4cd24c1
Merge branch 'iotdb_master' into calc_commons
Apr 21, 2026
3626a42
update pom.xml
Apr 21, 2026
97af27f
Merge branch 'iotdb_master' into calc_commons
shuwenwei Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.queryengine.common.SqlDialect;
import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
import org.apache.iotdb.db.auth.AuthorityChecker;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.protocol.session.IClientSession;
import org.apache.iotdb.db.protocol.session.MqttClientSession;
import org.apache.iotdb.db.protocol.session.SessionManager;
import org.apache.iotdb.db.queryengine.plan.Coordinator;
Expand All @@ -42,7 +43,6 @@
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement;
import org.apache.iotdb.db.utils.CommonUtils;
import org.apache.iotdb.db.utils.TimestampPrecisionUtils;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.TSProtocolVersion;

Expand Down Expand Up @@ -105,7 +105,7 @@ public void onConnect(InterceptConnectMessage msg) {
ZoneId.systemDefault().toString(),
TSProtocolVersion.IOTDB_SERVICE_PROTOCOL_V3,
ClientVersion.V_1_0,
useTableInsert ? IClientSession.SqlDialect.TABLE : IClientSession.SqlDialect.TREE);
useTableInsert ? SqlDialect.TABLE : SqlDialect.TREE);
sessionManager.registerSessionForMqtt(session);
clientIdToSessionMap.put(msg.getClientID(), session);
}
Expand Down Expand Up @@ -173,7 +173,7 @@ private void insertTable(TableMessage message, MqttClientSession session) {
TimestampPrecisionUtils.checkTimestampPrecision(message.getTimestamp());
InsertTabletStatement insertTabletStatement = constructInsertTabletStatement(message);
session.setDatabaseName(message.getDatabase().toLowerCase());
session.setSqlDialect(IClientSession.SqlDialect.TABLE);
session.setSqlDialect(SqlDialect.TABLE);
long queryId = sessionManager.requestQueryId();
SqlParser relationSqlParser = new SqlParser();
Metadata metadata = LocalExecutionPlanner.getInstance().metadata;
Expand Down
6 changes: 6 additions & 0 deletions external-service-impl/rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@
<version>2.0.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>calc-commons</artifactId>
<version>2.0.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-session</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions .../rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@

package org.apache.iotdb.rest.protocol.table.v1.handler;

import org.apache.iotdb.calc.exception.QueryProcessException;
import org.apache.iotdb.commons.auth.AuthException;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.exception.SemanticException;
import org.apache.iotdb.commons.exception.auth.AccessDeniedException;
import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.exception.sql.StatementAnalyzeException;
import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException;
import org.apache.iotdb.rest.protocol.model.ExecutionStatus;
import org.apache.iotdb.rpc.TSStatusCode;

Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@

package org.apache.iotdb.rest.protocol.table.v1.handler;

import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query;
import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowAIDevices;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowAINodes;
Expand Down Expand Up @@ -49,7 +50,6 @@
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTopics;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVariables;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVersion;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.plan.relational.type.AuthorRType;

import java.util.HashSet;
Expand Down
4 changes: 2 additions & 2 deletions ...st/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
package org.apache.iotdb.rest.protocol.table.v1.handler;

import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query;
import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.rest.protocol.model.ExecutionStatus;
import org.apache.iotdb.rest.protocol.table.v1.model.QueryDataSet;
import org.apache.iotdb.rpc.TSStatusCode;
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
import org.apache.iotdb.db.exception.WriteProcessRejectException;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement;
import org.apache.iotdb.db.utils.TimestampPrecisionUtils;
import org.apache.iotdb.rest.protocol.table.v1.model.InsertTabletRequest;

import org.apache.tsfile.enums.ColumnCategory;
Expand Down
7 changes: 4 additions & 3 deletions ...l/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package org.apache.iotdb.rest.protocol.table.v1.impl;

import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.queryengine.common.SqlDialect;
import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor;
Expand All @@ -31,7 +33,6 @@
import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement;
import org.apache.iotdb.db.utils.CommonUtils;
Expand Down Expand Up @@ -155,7 +156,7 @@ public Response insertTablet(
StatementConstructionHandler.constructInsertTabletStatement(insertTabletRequest);
IClientSession clientSession = SESSION_MANAGER.getCurrSession();
clientSession.setDatabaseName(insertTabletRequest.getDatabase());
clientSession.setSqlDialect(IClientSession.SqlDialect.TABLE);
clientSession.setSqlDialect(SqlDialect.TABLE);
queryId = SESSION_MANAGER.requestQueryId();
Metadata metadata = LocalExecutionPlanner.getInstance().metadata;

Expand Down Expand Up @@ -285,7 +286,7 @@ private Statement createStatement(
clientSession.setDatabaseName(sql.getDatabase());
}

clientSession.setSqlDialect(IClientSession.SqlDialect.TABLE);
clientSession.setSqlDialect(SqlDialect.TABLE);
return relationSqlParser.createStatement(
sql.getSql(), clientSession.getZoneId(), clientSession);
}
Expand Down
4 changes: 2 additions & 2 deletions ...e-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@

package org.apache.iotdb.rest.protocol.v1.handler;

import org.apache.iotdb.calc.exception.QueryProcessException;
import org.apache.iotdb.commons.auth.AuthException;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.exception.SemanticException;
import org.apache.iotdb.commons.exception.auth.AccessDeniedException;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.exception.sql.StatementAnalyzeException;
import org.apache.iotdb.rest.protocol.v1.model.ExecutionStatus;
import org.apache.iotdb.rpc.TSStatusCode;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
package org.apache.iotdb.rest.protocol.v1.handler;

import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils;
import org.apache.iotdb.commons.utils.PathUtils;
import org.apache.iotdb.db.exception.WriteProcessRejectException;
import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement;
import org.apache.iotdb.db.utils.TimestampPrecisionUtils;
import org.apache.iotdb.rest.protocol.v1.model.InsertTabletRequest;

import org.apache.tsfile.enums.TSDataType;
Expand Down
4 changes: 2 additions & 2 deletions ...e-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@

package org.apache.iotdb.rest.protocol.v2.handler;

import org.apache.iotdb.calc.exception.QueryProcessException;
import org.apache.iotdb.commons.auth.AuthException;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.exception.SemanticException;
import org.apache.iotdb.commons.exception.auth.AccessDeniedException;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.exception.sql.StatementAnalyzeException;
import org.apache.iotdb.rest.protocol.model.ExecutionStatus;
import org.apache.iotdb.rpc.TSStatusCode;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
package org.apache.iotdb.rest.protocol.v2.handler;

import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils;
import org.apache.iotdb.commons.utils.PathUtils;
import org.apache.iotdb.db.exception.WriteProcessRejectException;
import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException;
import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowsStatement;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement;
import org.apache.iotdb.db.utils.TimestampPrecisionUtils;
import org.apache.iotdb.rest.protocol.utils.InsertRowDataUtils;
import org.apache.iotdb.rest.protocol.v2.model.InsertRecordsRequest;
import org.apache.iotdb.rest.protocol.v2.model.InsertTabletRequest;
Expand Down
2 changes: 1 addition & 1 deletion ...ce-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@

import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.queryengine.common.SessionInfo;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor;
import org.apache.iotdb.db.protocol.session.IClientSession;
import org.apache.iotdb.db.protocol.session.SessionManager;
import org.apache.iotdb.db.protocol.thrift.OperationType;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
import org.apache.iotdb.db.queryengine.plan.Coordinator;
import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher;
import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher;
Expand Down
5 changes: 5 additions & 0 deletions integration-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@
<artifactId>node-commons</artifactId>
<version>2.0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>calc-commons</artifactId>
<version>2.0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-thrift-commons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import static org.apache.iotdb.commons.queryengine.utils.DateTimeUtils.convertLongToDate;
import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS;
import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS_V2;
import static org.apache.iotdb.consensus.ConsensusFactory.RATIS_CONSENSUS;
import static org.apache.iotdb.consensus.ConsensusFactory.SIMPLE_CONSENSUS;
import static org.apache.iotdb.db.utils.DateTimeUtils.convertLongToDate;
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CLUSTER_CONFIGURATIONS;
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_CONFIG_NODE_NUM;
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_DATA_NODE_NUM;
Expand Down
9 changes: 4 additions & 5 deletions ...n-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

package org.apache.iotdb.itbase.constant;

import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinAggregationFunction;

import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
Expand Down Expand Up @@ -56,11 +58,8 @@ public String getFunctionName() {

private static final Set<String> NATIVE_FUNCTION_NAMES =
new HashSet<>(
Arrays.stream(
org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction.values())
.map(
org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction
::getFunctionName)
Arrays.stream(BuiltinAggregationFunction.values())
.map(BuiltinAggregationFunction::getFunctionName)
.collect(Collectors.toList()));

public static Set<String> getNativeFunctionNames() {
Expand Down
2 changes: 1 addition & 1 deletion ...ion-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBTimePartitionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.iotdb.confignode.it.partition;

import org.apache.iotdb.calc.utils.constant.SqlConstant;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.SchemaConstant;
Expand All @@ -28,7 +29,6 @@
import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
Expand Down
2 changes: 1 addition & 1 deletion ...gration-test/src/test/java/org/apache/iotdb/confignode/it/procedure/IoTDBProcedureIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.iotdb.confignode.it.procedure;

import org.apache.iotdb.calc.utils.constant.SqlConstant;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.SchemaConstant;
Expand All @@ -28,7 +29,6 @@
import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.confignode.rpc.thrift.TTestOperation;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
Expand Down
8 changes: 4 additions & 4 deletions ...c/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiTAGsWithAttributesTableIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
import java.sql.Statement;
import java.util.Arrays;

import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.FULL;
import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER;
import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT;
import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.RIGHT;
import static org.apache.iotdb.db.it.utils.TestUtils.tableAssertTestFail;
import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.FULL;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.RIGHT;
import static org.junit.Assert.fail;

/** In this IT, table has more than one TAGs and Attributes. */
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/org/apache/iotdb/relational/it/db/it/udf/IoTDBSQLFunctionManagementIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
*/
package org.apache.iotdb.relational.it.db.it.udf;

import org.apache.iotdb.commons.queryengine.plan.relational.function.TableBuiltinTableFunction;
import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction;
import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction;
import org.apache.iotdb.db.queryengine.plan.relational.function.TableBuiltinTableFunction;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.TableClusterIT;
Expand Down
2 changes: 1 addition & 1 deletion ...apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar;

import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.TableClusterIT;
Expand Down
2 changes: 1 addition & 1 deletion ...ache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar;

import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.TableClusterIT;
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.iotdb.relational.it.query.old.query;

import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.TableClusterIT;
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/apache/iotdb/relational/it/query/view/old/query/IoTDBArithmeticTableViewIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.iotdb.relational.it.query.view.old.query;

import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.TableClusterIT;
Expand Down
5 changes: 5 additions & 0 deletions iotdb-client/cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
<artifactId>iotdb-server</artifactId>
<version>2.0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>calc-commons</artifactId>
<version>2.0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>isession</artifactId>
Expand Down
Loading
Loading