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/27 04:26:08 UTC
[iotdb] branch IOTDB-4619 updated (ad322e8b42 -> f686632034)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch IOTDB-4619
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from ad322e8b42 Fix CI by adding username
add da959a6f24 [IOTDB-4713] Log TException in ConfigNodeClient (#7729)
add 56ef925047 [IOTDB-4667] update the detailed usage method to the cpp-client readme doc (#7640)
add c26f6559e8 [IOTDB-4722][IOTDB-4723]modify Show & Drop UDF process on ConfigNode
add baed39decc [IOTDB-4693] Support broken tsfile rewrite (#7677)
add 89e5957683 Change AsyncDataNodeInternalServiceClient level from info to error and make it simple (#7747)
add dff3d3727e [IOTDB-4679] Unable to connect to iotdb in private-network using port-mapping (#7721)
new f686632034 resolve conflicts
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
client-cpp/README.md | 41 +-
.../consensus/request/ConfigPhysicalPlan.java | 4 +
.../consensus/request/ConfigPhysicalPlanType.java | 3 +-
...TriggersPlan.java => GetFunctionTablePlan.java} | 8 +-
...{TriggerJarResp.java => FunctionTableResp.java} | 32 +-
.../iotdb/confignode/manager/ConfigManager.java | 9 +
.../apache/iotdb/confignode/manager/IManager.java | 3 +
.../iotdb/confignode/manager/UDFManager.java | 44 +-
.../iotdb/confignode/persistence/UDFInfo.java | 25 +-
.../persistence/executor/ConfigPlanExecutor.java | 2 +
.../thrift/ConfigNodeRPCServiceProcessor.java | 4 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 9 +
docs/UserGuide/API/Interface-Comparison.md | 44 +-
docs/UserGuide/API/Programming-Java-Native-API.md | 2 +-
docs/zh/UserGuide/API/Interface-Comparison.md | 44 +-
.../UserGuide/API/Programming-Java-Native-API.md | 2 +-
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 8 +-
.../org/apache/iotdb/db/it/env/StandaloneEnv.java | 4 +-
.../db/integration/IoTDBRewriteTsFileToolIT.java | 523 ++++++++++++++++-
.../apache/iotdb/session/pool/SessionPoolTest.java | 4 +-
.../async/AsyncDataNodeInternalServiceClient.java | 2 +-
.../org/apache/iotdb/commons/udf/UDFTable.java | 8 +
.../java/org/apache/iotdb/RewriteTsFileTool.java | 620 +++++++++++++++------
.../resources/conf/iotdb-datanode.properties | 1 +
.../apache/iotdb/db/client/ConfigNodeClient.java | 295 ++++++++++
.../java/org/apache/iotdb/db/service/DataNode.java | 4 -
.../java/org/apache/iotdb/session/ISession.java | 4 +-
.../java/org/apache/iotdb/session/Session.java | 258 ++++++---
.../org/apache/iotdb/session/SessionConfig.java | 2 +-
.../org/apache/iotdb/session/pool/SessionPool.java | 48 +-
.../apache/iotdb/session/SessionCacheLeaderUT.java | 4 +-
.../java/org/apache/iotdb/db/sql/ClusterIT.java | 2 +-
32 files changed, 1654 insertions(+), 409 deletions(-)
copy confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{GetTransferringTriggersPlan.java => GetFunctionTablePlan.java} (83%)
copy confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{TriggerJarResp.java => FunctionTableResp.java} (56%)
[iotdb] 01/01: resolve conflicts
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch IOTDB-4619
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f68663203403de3c06bb6b94c3252fcaa7151f13
Merge: ad322e8b42 dff3d3727e
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Thu Oct 27 12:26:00 2022 +0800
resolve conflicts
client-cpp/README.md | 41 +-
.../consensus/request/ConfigPhysicalPlan.java | 4 +
.../consensus/request/ConfigPhysicalPlanType.java | 3 +-
.../request/read/GetFunctionTablePlan.java | 42 ++
.../consensus/response/FunctionTableResp.java | 70 +++
.../iotdb/confignode/manager/ConfigManager.java | 9 +
.../apache/iotdb/confignode/manager/IManager.java | 3 +
.../iotdb/confignode/manager/UDFManager.java | 44 +-
.../iotdb/confignode/persistence/UDFInfo.java | 25 +-
.../persistence/executor/ConfigPlanExecutor.java | 2 +
.../thrift/ConfigNodeRPCServiceProcessor.java | 4 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 9 +
docs/UserGuide/API/Interface-Comparison.md | 44 +-
docs/UserGuide/API/Programming-Java-Native-API.md | 2 +-
docs/zh/UserGuide/API/Interface-Comparison.md | 44 +-
.../UserGuide/API/Programming-Java-Native-API.md | 2 +-
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 8 +-
.../org/apache/iotdb/db/it/env/StandaloneEnv.java | 4 +-
.../db/integration/IoTDBRewriteTsFileToolIT.java | 523 ++++++++++++++++-
.../apache/iotdb/session/pool/SessionPoolTest.java | 4 +-
.../async/AsyncDataNodeInternalServiceClient.java | 2 +-
.../org/apache/iotdb/commons/udf/UDFTable.java | 8 +
.../java/org/apache/iotdb/RewriteTsFileTool.java | 620 +++++++++++++++------
.../resources/conf/iotdb-datanode.properties | 1 +
.../apache/iotdb/db/client/ConfigNodeClient.java | 295 ++++++++++
.../java/org/apache/iotdb/db/service/DataNode.java | 4 -
.../java/org/apache/iotdb/session/ISession.java | 4 +-
.../java/org/apache/iotdb/session/Session.java | 258 ++++++---
.../org/apache/iotdb/session/SessionConfig.java | 2 +-
.../org/apache/iotdb/session/pool/SessionPool.java | 48 +-
.../apache/iotdb/session/SessionCacheLeaderUT.java | 4 +-
.../java/org/apache/iotdb/db/sql/ClusterIT.java | 2 +-
32 files changed, 1737 insertions(+), 398 deletions(-)
diff --cc confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java
index 3c968bfa93,b3261bf166..f654cc9c98
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java
@@@ -331,21 -327,10 +332,24 @@@ public abstract class ConfigPhysicalPla
break;
case GetTransferringTriggers:
req = new GetTransferringTriggersPlan();
+ case ACTIVE_CQ:
+ req = new ActiveCQPlan();
+ break;
+ case ADD_CQ:
+ req = new AddCQPlan();
+ break;
+ case DROP_CQ:
+ req = new DropCQPlan();
+ break;
+ case UPDATE_CQ_LAST_EXEC_TIME:
+ req = new UpdateCQLastExecTimePlan();
+ break;
+ case SHOW_CQ:
+ req = new ShowCQPlan();
break;
+ case GetFunctionTable:
+ req = new GetFunctionTablePlan();
+ break;
default:
throw new IOException("unknown PhysicalPlan type: " + typeNum);
}
diff --cc confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanType.java
index a845f6b693,45a5e74ae4..7c32094199
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanType.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanType.java
@@@ -98,10 -98,6 +98,11 @@@ public enum ConfigPhysicalPlanType
UpdateTriggerLocation,
GetTransferringTriggers,
GetTriggerLocation,
+ DROP_CQ,
+ ACTIVE_CQ,
+ ADD_CQ,
+ UPDATE_CQ_LAST_EXEC_TIME,
+ SHOW_CQ,
- GetTemplateSetInfo
+ GetTemplateSetInfo,
+ GetFunctionTable
}
diff --cc confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java
index 2e866485e6,5d0b429b6c..259df98fe3
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java
@@@ -213,8 -203,8 +213,10 @@@ public class ConfigPlanExecutor
return partitionInfo.getTimeSlotList((GetTimeSlotListPlan) req);
case GetSeriesSlotList:
return partitionInfo.getSeriesSlotList((GetSeriesSlotListPlan) req);
+ case SHOW_CQ:
+ return cqInfo.showCQ((ShowCQPlan) req);
+ case GetFunctionTable:
+ return udfInfo.getUDFTable();
default:
throw new UnknownPhysicalPlanTypeException(req.getType());
}