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 8672e1a64ee02ac3cb0f5299e9fd206cebc7a469 Author: Steve Yurong Su <[email protected]> AuthorDate: Thu Sep 2 16:40:42 2021 +0800 MultiInputSingleOutputIntermediateLayer & MultiInputMultiOutputIntermediateLayer --- .../apache/iotdb/db/query/expression/unary/FunctionExpression.java | 4 ++-- ...rmediateLayer.java => MultiInputMultiOutputIntermediateLayer.java} | 4 ++-- ...mediateLayer.java => MultiInputSingleOutputIntermediateLayer.java} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java index 7f55995..696e2d2 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java +++ b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java @@ -29,7 +29,7 @@ import org.apache.iotdb.db.qp.utils.WildcardsRemover; import org.apache.iotdb.db.query.expression.Expression; import org.apache.iotdb.db.query.udf.core.layer.InputLayer; import org.apache.iotdb.db.query.udf.core.layer.IntermediateLayer; -import org.apache.iotdb.db.query.udf.core.layer.MultiInputIntermediateLayer; +import org.apache.iotdb.db.query.udf.core.layer.MultiInputMultiOutputIntermediateLayer; import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader; import java.util.ArrayList; @@ -164,7 +164,7 @@ public class FunctionExpression extends Expression { } expressionIntermediateLayerMap.put( - this, new MultiInputIntermediateLayer(parentLayerPointReaders, -1, -1)); + this, new MultiInputMultiOutputIntermediateLayer(parentLayerPointReaders, -1, -1)); } return expressionIntermediateLayerMap.get(this); diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputMultiOutputIntermediateLayer.java similarity index 89% copy from server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputIntermediateLayer.java copy to server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputMultiOutputIntermediateLayer.java index 260c308..9cd5422 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputIntermediateLayer.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputMultiOutputIntermediateLayer.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader; import java.util.List; -public class MultiInputIntermediateLayer implements IntermediateLayer { +public class MultiInputMultiOutputIntermediateLayer implements IntermediateLayer { - public MultiInputIntermediateLayer( + public MultiInputMultiOutputIntermediateLayer( List<LayerPointReader> parentLayerPointReaders, long queryId, float memoryBudgetInMB) {} @Override diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputSingleOutputIntermediateLayer.java similarity index 89% rename from server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputIntermediateLayer.java rename to server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputSingleOutputIntermediateLayer.java index 260c308..71a4f06 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputIntermediateLayer.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputSingleOutputIntermediateLayer.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader; import java.util.List; -public class MultiInputIntermediateLayer implements IntermediateLayer { +public class MultiInputSingleOutputIntermediateLayer implements IntermediateLayer { - public MultiInputIntermediateLayer( + public MultiInputSingleOutputIntermediateLayer( List<LayerPointReader> parentLayerPointReaders, long queryId, float memoryBudgetInMB) {} @Override
