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 2021/09/22 03:14:32 UTC

[iotdb] 02/06: make DAGBuilder prittier

This is an automated email from the ASF dual-hosted git repository.

rong pushed a commit to branch nested-operations
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 9576c943a7a7c404a429a3dd9961f50fefe06007
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Sep 17 20:08:01 2021 +0800

    make DAGBuilder prittier
---
 .../src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java  | 1 +
 .../java/org/apache/iotdb/db/query/udf/core/layer/DAGBuilder.java     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java
index 09d41e2..88af012 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java
@@ -116,6 +116,7 @@ public abstract class UDTFDataSet extends QueryDataSet {
                   UDF_TRANSFORMER_MEMORY_BUDGET_IN_MB + UDF_COLLECTOR_MEMORY_BUDGET_IN_MB)
               .buildLayerMemoryAssigner()
               .buildResultColumnPointReaders()
+              .setDataSetResultColumnDataTypes()
               .getResultColumnPointReaders();
     } finally {
       UDFRegistrationService.getInstance().releaseRegistrationLock();
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/DAGBuilder.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/DAGBuilder.java
index ee637a0..1847534 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/DAGBuilder.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/DAGBuilder.java
@@ -90,11 +90,13 @@ public class DAGBuilder {
                   memoryAssigner)
               .constructPointReader();
     }
+    return this;
+  }
 
+  public DAGBuilder setDataSetResultColumnDataTypes() {
     for (ResultColumn resultColumn : udtfPlan.getResultColumns()) {
       resultColumn.setDataType(expressionDataTypeMap.get(resultColumn.getExpression()));
     }
-
     return this;
   }