You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2022/05/21 17:54:17 UTC
[iotdb] 04/04: simplify PlanExecutor
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch iotdb-3250
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5282f4ee43f258c9e16c514ea0d4fb8693875a5d
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Sun May 22 01:32:47 2022 +0800
simplify PlanExecutor
---
.../org/apache/iotdb/db/qp/executor/PlanExecutor.java | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
index 491b0f6d74..37fc2a6a21 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
@@ -126,7 +126,6 @@ import org.apache.iotdb.db.qp.physical.sys.SettlePlan;
import org.apache.iotdb.db.qp.physical.sys.ShowChildNodesPlan;
import org.apache.iotdb.db.qp.physical.sys.ShowChildPathsPlan;
import org.apache.iotdb.db.qp.physical.sys.ShowDevicesPlan;
-import org.apache.iotdb.db.qp.physical.sys.ShowFunctionsPlan;
import org.apache.iotdb.db.qp.physical.sys.ShowLockInfoPlan;
import org.apache.iotdb.db.qp.physical.sys.ShowNodesInTemplatePlan;
import org.apache.iotdb.db.qp.physical.sys.ShowPathsSetTemplatePlan;
@@ -742,7 +741,7 @@ public class PlanExecutor implements IPlanExecutor {
case QUERY_PROCESSLIST:
return processShowQueryProcesslist();
case FUNCTIONS:
- return processShowFunctions((ShowFunctionsPlan) showPlan);
+ return processShowFunctions();
case TRIGGERS:
return processShowTriggers();
case CONTINUOUS_QUERY:
@@ -1070,8 +1069,7 @@ public class PlanExecutor implements IPlanExecutor {
return listDataSet;
}
- private QueryDataSet processShowFunctions(ShowFunctionsPlan showPlan)
- throws QueryProcessException {
+ private QueryDataSet processShowFunctions() throws QueryProcessException {
ListDataSet listDataSet =
new ListDataSet(
Arrays.asList(
@@ -1080,8 +1078,8 @@ public class PlanExecutor implements IPlanExecutor {
new PartialPath(COLUMN_FUNCTION_CLASS, false)),
Arrays.asList(TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT));
- appendUDFs(listDataSet, showPlan);
- appendNativeFunctions(listDataSet, showPlan);
+ appendUDFs(listDataSet);
+ appendNativeFunctions(listDataSet);
listDataSet.sort(
(r1, r2) ->
@@ -1090,8 +1088,7 @@ public class PlanExecutor implements IPlanExecutor {
return listDataSet;
}
- private void appendUDFs(ListDataSet listDataSet, ShowFunctionsPlan showPlan)
- throws QueryProcessException {
+ private void appendUDFs(ListDataSet listDataSet) throws QueryProcessException {
for (UDFRegistrationInformation info :
UDFRegistrationService.getInstance().getRegistrationInformation()) {
RowRecord rowRecord = new RowRecord(0); // ignore timestamp
@@ -1241,7 +1238,7 @@ public class PlanExecutor implements IPlanExecutor {
return listDataSet;
}
- private void appendNativeFunctions(ListDataSet listDataSet, ShowFunctionsPlan showPlan) {
+ private void appendNativeFunctions(ListDataSet listDataSet) {
final Binary functionType = Binary.valueOf(FUNCTION_TYPE_NATIVE);
final Binary className = Binary.valueOf("");
for (String functionName : BuiltinAggregationFunction.getNativeFunctionNames()) {