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 205c3baf63d840cb50d68f0c53aa24259dd047eb Author: Steve Yurong Su <[email protected]> AuthorDate: Mon Sep 6 16:14:19 2021 +0800 rename --- .../apache/iotdb/db/query/expression/binary/BinaryExpression.java | 4 ++-- .../apache/iotdb/db/query/expression/unary/FunctionExpression.java | 5 +++-- .../apache/iotdb/db/query/expression/unary/NegationExpression.java | 4 ++-- .../apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java | 4 ++-- ...yer.java => MultiInputColumnMultiReferenceIntermediateLayer.java} | 4 ++-- ...er.java => MultiInputColumnSingleReferenceIntermediateLayer.java} | 4 ++-- ...er.java => SingleInputColumnMultiReferenceIntermediateLayer.java} | 4 ++-- ...r.java => SingleInputColumnSingleReferenceIntermediateLayer.java} | 4 ++-- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/BinaryExpression.java b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/BinaryExpression.java index b793ef9..feb51d8 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/BinaryExpression.java +++ b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/BinaryExpression.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; 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.IntermediateLayer; -import org.apache.iotdb.db.query.udf.core.layer.SingleInputMultiOutputIntermediateLayer; +import org.apache.iotdb.db.query.udf.core.layer.SingleInputColumnMultiReferenceIntermediateLayer; import org.apache.iotdb.db.query.udf.core.layer.UDFLayer; import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader; import org.apache.iotdb.db.query.udf.core.transformer.ArithmeticBinaryTransformer; @@ -126,7 +126,7 @@ public abstract class BinaryExpression extends Expression { expressionIntermediateLayerMap.put( this, - new SingleInputMultiOutputIntermediateLayer( + new SingleInputColumnMultiReferenceIntermediateLayer( constructTransformer( leftParentIntermediateLayer.constructPointReader(), rightParentIntermediateLayer.constructPointReader()), 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 d484769..10b3811 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 @@ -28,7 +28,7 @@ import org.apache.iotdb.db.qp.strategy.optimizer.ConcatPathOptimizer; 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.IntermediateLayer; -import org.apache.iotdb.db.query.udf.core.layer.MultiInputMultiOutputIntermediateLayer; +import org.apache.iotdb.db.query.udf.core.layer.MultiInputColumnMultiReferenceIntermediateLayer; import org.apache.iotdb.db.query.udf.core.layer.UDFLayer; import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader; @@ -165,7 +165,8 @@ public class FunctionExpression extends Expression { } expressionIntermediateLayerMap.put( - this, new MultiInputMultiOutputIntermediateLayer(parentLayerPointReaders, -1, -1)); + this, + new MultiInputColumnMultiReferenceIntermediateLayer(parentLayerPointReaders, -1, -1)); } return expressionIntermediateLayerMap.get(this); diff --git a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java index 326d1af..57a7a69 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java +++ b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; 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.IntermediateLayer; -import org.apache.iotdb.db.query.udf.core.layer.SingleInputMultiOutputIntermediateLayer; +import org.apache.iotdb.db.query.udf.core.layer.SingleInputColumnMultiReferenceIntermediateLayer; import org.apache.iotdb.db.query.udf.core.layer.UDFLayer; import org.apache.iotdb.db.query.udf.core.transformer.ArithmeticNegationTransformer; @@ -89,7 +89,7 @@ public class NegationExpression extends Expression { expressionIntermediateLayerMap.put( this, - new SingleInputMultiOutputIntermediateLayer( + new SingleInputColumnMultiReferenceIntermediateLayer( new ArithmeticNegationTransformer(parentIntermediateLayer.constructPointReader()), -1, -1)); diff --git a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java index a67e621..15a24e1 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java +++ b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; 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.IntermediateLayer; -import org.apache.iotdb.db.query.udf.core.layer.SingleInputMultiOutputIntermediateLayer; +import org.apache.iotdb.db.query.udf.core.layer.SingleInputColumnMultiReferenceIntermediateLayer; import org.apache.iotdb.db.query.udf.core.layer.UDFLayer; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -80,7 +80,7 @@ public class TimeSeriesOperand extends Expression { if (!expressionIntermediateLayerMap.containsKey(this)) { expressionIntermediateLayerMap.put( this, - new SingleInputMultiOutputIntermediateLayer( + new SingleInputColumnMultiReferenceIntermediateLayer( rawTimeSeriesInputLayer.constructPointReader( udtfPlan.getReaderIndex(path.getFullPath())), -1, diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputMultiOutputIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnMultiReferenceIntermediateLayer.java similarity index 92% rename from server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputMultiOutputIntermediateLayer.java rename to server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnMultiReferenceIntermediateLayer.java index 2a70a7b..861fd7d 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputMultiOutputIntermediateLayer.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnMultiReferenceIntermediateLayer.java @@ -27,9 +27,9 @@ import org.apache.iotdb.db.query.udf.core.reader.LayerRowWindowReader; import java.util.List; -public class MultiInputMultiOutputIntermediateLayer extends IntermediateLayer { +public class MultiInputColumnMultiReferenceIntermediateLayer extends IntermediateLayer { - public MultiInputMultiOutputIntermediateLayer( + public MultiInputColumnMultiReferenceIntermediateLayer( long queryId, float memoryBudgetInMB, List<LayerPointReader> parentLayerPointReaders) { super(queryId, memoryBudgetInMB); } diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputSingleOutputIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnSingleReferenceIntermediateLayer.java similarity index 92% rename from server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputSingleOutputIntermediateLayer.java rename to server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnSingleReferenceIntermediateLayer.java index c63b1be..9ef769d 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputSingleOutputIntermediateLayer.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnSingleReferenceIntermediateLayer.java @@ -27,9 +27,9 @@ import org.apache.iotdb.db.query.udf.core.reader.LayerRowWindowReader; import java.util.List; -public class MultiInputSingleOutputIntermediateLayer extends IntermediateLayer { +public class MultiInputColumnSingleReferenceIntermediateLayer extends IntermediateLayer { - public MultiInputSingleOutputIntermediateLayer( + public MultiInputColumnSingleReferenceIntermediateLayer( long queryId, float memoryBudgetInMB, List<LayerPointReader> parentLayerPointReaders) { super(queryId, memoryBudgetInMB); } diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputMultiOutputIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnMultiReferenceIntermediateLayer.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputMultiOutputIntermediateLayer.java rename to server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnMultiReferenceIntermediateLayer.java index b243e54..7bde88c 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputMultiOutputIntermediateLayer.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnMultiReferenceIntermediateLayer.java @@ -36,7 +36,7 @@ import org.apache.iotdb.tsfile.utils.Binary; import java.io.IOException; -public class SingleInputMultiOutputIntermediateLayer extends IntermediateLayer { +public class SingleInputColumnMultiReferenceIntermediateLayer extends IntermediateLayer { private static final int CACHE_BLOCK_SIZE = 2; @@ -45,7 +45,7 @@ public class SingleInputMultiOutputIntermediateLayer extends IntermediateLayer { private final ElasticSerializableTVList tvList; private final SafetyLine safetyLine; - public SingleInputMultiOutputIntermediateLayer( + public SingleInputColumnMultiReferenceIntermediateLayer( long queryId, float memoryBudgetInMB, LayerPointReader parentLayerPointReader) throws QueryProcessException { super(queryId, memoryBudgetInMB); diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputSingleOutputIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputSingleOutputIntermediateLayer.java rename to server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java index 86111c1..08946b0 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputSingleOutputIntermediateLayer.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java @@ -34,12 +34,12 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import java.io.IOException; -public class SingleInputSingleOutputIntermediateLayer extends IntermediateLayer { +public class SingleInputColumnSingleReferenceIntermediateLayer extends IntermediateLayer { private final LayerPointReader parentLayerPointReader; private final TSDataType dataType; - public SingleInputSingleOutputIntermediateLayer( + public SingleInputColumnSingleReferenceIntermediateLayer( long queryId, float memoryBudgetInMB, LayerPointReader parentLayerPointReader) { super(queryId, memoryBudgetInMB); this.parentLayerPointReader = parentLayerPointReader;
