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/10/26 08:50:12 UTC
[iotdb] 01/03: resolve conflicts
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch CQTest
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1b1ca83caa4452007ee34c506bd1ae2c2d57dc63
Merge: 1ed166b534 c69748d613
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Wed Oct 26 15:52:51 2022 +0800
resolve conflicts
.github/workflows/client-go.yml | 2 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 4 +-
client-go | 2 +-
.../client/async/AsyncDataNodeClientPool.java | 8 +-
.../iotdb/confignode/manager/ConfigManager.java | 13 +-
.../iotdb/confignode/manager/UDFManager.java | 17 +--
.../iotdb/confignode/persistence/UDFInfo.java | 2 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 12 +-
.../org/apache/iotdb/consensus/IConsensus.java | 24 ++++
.../iotdb/consensus/ratis/RatisConsensus.java | 60 +++++++-
.../iotdb/consensus/ratis/RatisConsensusTest.java | 14 ++
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 23 ++-
.../org/apache/iotdb/db/it/IoTDBNestedQueryIT.java | 8 +-
.../db/it/IoTDBSyntaxConventionIdentifierIT.java | 3 +
.../it/IoTDBSyntaxConventionStringLiteralIT.java | 5 +
.../db/it/aggregation/IoTDBTagAggregationIT.java | 16 +++
.../iotdb/db/it/udf/IoTDBUDFManagementIT.java | 3 +
.../db/it/udf/IoTDBUDFOtherWindowQueryIT.java | 3 +
.../iotdb/db/it/udf/IoTDBUDFWindowQueryIT.java | 2 +
.../db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java | 3 +
.../db/it/udf/IoTDBUDTFBuiltinFunctionIT.java | 3 +
.../iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java | 2 +
.../iotdb/db/it/udf/IoTDBUDTFNonAlignQueryIT.java | 2 +
node-commons/pom.xml | 5 +
.../apache/iotdb/commons/udf/UDFInformation.java | 83 ++++++++---
.../org/apache/iotdb/commons/udf/UDFTable.java | 24 ++++
.../commons/udf/service/UDFManagementService.java | 151 ++++++++++++++++----
.../apache/iotdb/db/client/ConfigNodeClient.java | 16 +++
.../execution/schedule/AbstractDriverThread.java | 60 +++++---
.../db/mpp/execution/schedule/DriverScheduler.java | 38 ++++-
.../mpp/execution/schedule/DriverTaskThread.java | 5 +-
.../schedule/DriverTaskTimeoutSentinelThread.java | 5 +-
.../db/mpp/execution/schedule/ThreadProducer.java | 32 +++++
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 11 +-
.../config/executor/ClusterConfigTaskExecutor.java | 113 ++++++++++++++-
.../config/executor/IConfigTaskExecutor.java | 8 +-
.../executor/StandaloneConfigTaskExecutor.java | 21 ++-
.../config/metadata/CreateFunctionTask.java | 15 +-
.../config/metadata/ShowFunctionsTask.java | 155 ++++++++-------------
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 59 ++++----
.../db/mpp/plan/statement/StatementVisitor.java | 1 +
.../db/mpp/plan/statement/crud/QueryStatement.java | 19 ++-
.../metadata/CreateFunctionStatement.java | 21 ++-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 22 ++-
.../java/org/apache/iotdb/db/service/DataNode.java | 2 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 26 ++--
.../trigger/service/TriggerManagementService.java | 18 ++-
.../DriverTaskTimeoutSentinelThreadTest.java | 23 ++-
.../iotdb/db/mpp/plan/plan/LogicalPlannerTest.java | 40 ++++++
.../iotdb/db/qp/physical/PhysicalPlanTest.java | 8 +-
.../query/dataset/UDTFAlignByTimeDataSetTest.java | 2 +
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 5 +
.../src/main/thrift/confignode.thrift | 15 +-
thrift/src/main/thrift/datanode.thrift | 16 +--
54 files changed, 925 insertions(+), 325 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
index 320b5025cb,144cd3dcb3..396ab2f851
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@@ -1047,10 -1058,6 +1053,11 @@@ public class AnalyzeVisitor extends Sta
&& queryStatement.getResultTimeOrder() == Ordering.DESC) {
throw new SemanticException("Group by month doesn't support order by time desc now.");
}
+ if (!queryStatement.isCqQueryBody()
+ && (groupByTimeComponent.getStartTime() == 0 && groupByTimeComponent.getEndTime() == 0)) {
- throw new SemanticException("The query time range should be specified in the GROUP BY TIME clause.");
++ throw new SemanticException(
++ "The query time range should be specified in the GROUP BY TIME clause.");
+ }
analysis.setGroupByTimeParameter(new GroupByTimeParameter(groupByTimeComponent));
}
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java
index f2903a073c,46526e6642..7ed50ae64f
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java
@@@ -31,8 -31,9 +31,10 @@@ import org.apache.iotdb.commons.executa
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
import org.apache.iotdb.commons.trigger.service.TriggerExecutableManager;
+ import org.apache.iotdb.commons.udf.service.UDFClassLoader;
+ import org.apache.iotdb.commons.udf.service.UDFExecutableManager;
import org.apache.iotdb.confignode.rpc.thrift.TCountStorageGroupResp;
+import org.apache.iotdb.confignode.rpc.thrift.TCreateCQReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateFunctionReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateTriggerReq;
@@@ -53,9 -53,9 +55,10 @@@ import org.apache.iotdb.confignode.rpc.
import org.apache.iotdb.confignode.rpc.thrift.TGetTimeSlotListReq;
import org.apache.iotdb.confignode.rpc.thrift.TGetTimeSlotListResp;
import org.apache.iotdb.confignode.rpc.thrift.TGetTriggerTableResp;
+ import org.apache.iotdb.confignode.rpc.thrift.TGetUDFTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TPipeSinkInfo;
import org.apache.iotdb.confignode.rpc.thrift.TSetStorageGroupReq;
+import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
@@@ -81,8 -80,8 +84,9 @@@ import org.apache.iotdb.db.mpp.plan.exe
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.SetStorageGroupTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowClusterTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowConfigNodesTask;
+import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowContinuousQueriesTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowDataNodesTask;
+ import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowFunctionsTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowRegionTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowStorageGroupTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowTTLTask;
@@@ -93,7 -92,7 +97,8 @@@ import org.apache.iotdb.db.mpp.plan.exe
import org.apache.iotdb.db.mpp.plan.execution.config.sys.sync.ShowPipeSinkTask;
import org.apache.iotdb.db.mpp.plan.execution.config.sys.sync.ShowPipeTask;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateContinuousQueryStatement;
+ import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateFunctionStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTriggerStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteTimeSeriesStatement;
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/IConfigTaskExecutor.java
index 97839e9275,0ade284110..9c2f5e07d1
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/IConfigTaskExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/IConfigTaskExecutor.java
@@@ -23,7 -23,7 +23,8 @@@ import org.apache.iotdb.common.rpc.thri
import org.apache.iotdb.commons.cluster.NodeStatus;
import org.apache.iotdb.db.mpp.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateContinuousQueryStatement;
+ import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateFunctionStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTriggerStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteTimeSeriesStatement;
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java
index a6de0f0da2,d53f646d61..bc1aad48bf
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java
@@@ -41,7 -41,7 +41,8 @@@ import org.apache.iotdb.db.mpp.plan.exe
import org.apache.iotdb.db.mpp.plan.execution.config.sys.sync.ShowPipeSinkTask;
import org.apache.iotdb.db.mpp.plan.execution.config.sys.sync.ShowPipeTask;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateContinuousQueryStatement;
+ import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateFunctionStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTriggerStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteTimeSeriesStatement;
diff --cc server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
index 10075520d7,e79d7d7b61..55afe02880
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@@ -134,9 -113,8 +133,9 @@@ import org.apache.iotdb.mpp.rpc.thrift.
import org.apache.iotdb.mpp.rpc.thrift.TDeleteDataForDeleteSchemaReq;
import org.apache.iotdb.mpp.rpc.thrift.TDeleteTimeSeriesReq;
import org.apache.iotdb.mpp.rpc.thrift.TDisableDataNodeReq;
- import org.apache.iotdb.mpp.rpc.thrift.TDropFunctionRequest;
+ import org.apache.iotdb.mpp.rpc.thrift.TDropFunctionInstanceReq;
import org.apache.iotdb.mpp.rpc.thrift.TDropTriggerInstanceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TExecuteCQ;
import org.apache.iotdb.mpp.rpc.thrift.TFetchFragmentInstanceStateReq;
import org.apache.iotdb.mpp.rpc.thrift.TFetchSchemaBlackListReq;
import org.apache.iotdb.mpp.rpc.thrift.TFetchSchemaBlackListResp;