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/08 10:14:33 UTC
[iotdb] 01/02: fix build
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 5158e10d5447fc4b0bbe4b4e43203816a922ddfa
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Tue Sep 7 17:09:41 2021 +0800
fix build
---
.../query/expression/binary/BinaryExpression.java | 31 +++++++++++-----------
.../query/expression/unary/FunctionExpression.java | 24 ++++++++---------
.../query/expression/unary/NegationExpression.java | 23 ++++++++--------
.../query/expression/unary/TimeSeriesOperand.java | 15 +++++------
.../iotdb/db/query/udf/core/layer/DAGBuilder.java | 6 +++--
.../db/query/udf/core/layer/IntermediateLayer.java | 4 ++-
.../layer/MultiInputColumnIntermediateLayer.java | 6 +++--
...InputColumnMultiReferenceIntermediateLayer.java | 2 --
...nputColumnSingleReferenceIntermediateLayer.java | 4 +--
9 files changed, 57 insertions(+), 58 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 feb51d8..0ae46e0 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,6 @@ 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.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;
@@ -117,21 +116,21 @@ public abstract class BinaryExpression extends Expression {
Map<Expression, IntermediateLayer> expressionIntermediateLayerMap)
throws QueryProcessException {
if (!expressionIntermediateLayerMap.containsKey(this)) {
- IntermediateLayer leftParentIntermediateLayer =
- leftExpression.constructIntermediateLayer(
- udtfPlan, rawTimeSeriesInputLayer, expressionIntermediateLayerMap);
- IntermediateLayer rightParentIntermediateLayer =
- rightExpression.constructIntermediateLayer(
- udtfPlan, rawTimeSeriesInputLayer, expressionIntermediateLayerMap);
-
- expressionIntermediateLayerMap.put(
- this,
- new SingleInputColumnMultiReferenceIntermediateLayer(
- constructTransformer(
- leftParentIntermediateLayer.constructPointReader(),
- rightParentIntermediateLayer.constructPointReader()),
- -1,
- -1));
+ // IntermediateLayer leftParentIntermediateLayer =
+ // leftExpression.constructIntermediateLayer(
+ // udtfPlan, rawTimeSeriesInputLayer, expressionIntermediateLayerMap);
+ // IntermediateLayer rightParentIntermediateLayer =
+ // rightExpression.constructIntermediateLayer(
+ // udtfPlan, rawTimeSeriesInputLayer, expressionIntermediateLayerMap);
+ //
+ // expressionIntermediateLayerMap.put(
+ // this,
+ // new SingleInputColumnMultiReferenceIntermediateLayer(
+ // constructTransformer(
+ // leftParentIntermediateLayer.constructPointReader(),
+ // rightParentIntermediateLayer.constructPointReader()),
+ // -1,
+ // -1));
}
return expressionIntermediateLayerMap.get(this);
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 462ba07..b1d0efb 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,9 +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.MultiInputColumnIntermediateLayer;
import org.apache.iotdb.db.query.udf.core.layer.UDFLayer;
-import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader;
import java.io.IOException;
import java.util.ArrayList;
@@ -156,17 +154,17 @@ public class FunctionExpression extends Expression {
Map<Expression, IntermediateLayer> expressionIntermediateLayerMap)
throws QueryProcessException, IOException {
if (!expressionIntermediateLayerMap.containsKey(this)) {
- List<LayerPointReader> parentLayerPointReaders = new ArrayList<>();
- for (Expression expression : expressions) {
- parentLayerPointReaders.add(
- expression
- .constructIntermediateLayer(
- udtfPlan, rawTimeSeriesInputLayer, expressionIntermediateLayerMap)
- .constructPointReader());
- }
-
- expressionIntermediateLayerMap.put(
- this, new MultiInputColumnIntermediateLayer(-1, -1, parentLayerPointReaders));
+ // List<LayerPointReader> parentLayerPointReaders = new ArrayList<>();
+ // for (Expression expression : expressions) {
+ // parentLayerPointReaders.add(
+ // expression
+ // .constructIntermediateLayer(
+ // udtfPlan, rawTimeSeriesInputLayer, expressionIntermediateLayerMap)
+ // .constructPointReader());
+ // }
+ //
+ // expressionIntermediateLayerMap.put(
+ // this, new MultiInputColumnIntermediateLayer(-1, -1, parentLayerPointReaders));
}
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 57a7a69..8a13b27 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,9 +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.SingleInputColumnMultiReferenceIntermediateLayer;
import org.apache.iotdb.db.query.udf.core.layer.UDFLayer;
-import org.apache.iotdb.db.query.udf.core.transformer.ArithmeticNegationTransformer;
import java.util.ArrayList;
import java.util.List;
@@ -83,16 +81,17 @@ public class NegationExpression extends Expression {
Map<Expression, IntermediateLayer> expressionIntermediateLayerMap)
throws QueryProcessException {
if (!expressionIntermediateLayerMap.containsKey(this)) {
- IntermediateLayer parentIntermediateLayer =
- expression.constructIntermediateLayer(
- udtfPlan, rawTimeSeriesInputLayer, expressionIntermediateLayerMap);
-
- expressionIntermediateLayerMap.put(
- this,
- new SingleInputColumnMultiReferenceIntermediateLayer(
- new ArithmeticNegationTransformer(parentIntermediateLayer.constructPointReader()),
- -1,
- -1));
+ // IntermediateLayer parentIntermediateLayer =
+ // expression.constructIntermediateLayer(
+ // udtfPlan, rawTimeSeriesInputLayer, expressionIntermediateLayerMap);
+ //
+ // expressionIntermediateLayerMap.put(
+ // this,
+ // new SingleInputColumnMultiReferenceIntermediateLayer(
+ // new
+ // ArithmeticNegationTransformer(parentIntermediateLayer.constructPointReader()),
+ // -1,
+ // -1));
}
return expressionIntermediateLayerMap.get(this);
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 15a24e1..a8db711 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,6 @@ 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.SingleInputColumnMultiReferenceIntermediateLayer;
import org.apache.iotdb.db.query.udf.core.layer.UDFLayer;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -78,13 +77,13 @@ public class TimeSeriesOperand extends Expression {
Map<Expression, IntermediateLayer> expressionIntermediateLayerMap)
throws QueryProcessException {
if (!expressionIntermediateLayerMap.containsKey(this)) {
- expressionIntermediateLayerMap.put(
- this,
- new SingleInputColumnMultiReferenceIntermediateLayer(
- rawTimeSeriesInputLayer.constructPointReader(
- udtfPlan.getReaderIndex(path.getFullPath())),
- -1,
- -1));
+ // expressionIntermediateLayerMap.put(
+ // this,
+ // new SingleInputColumnMultiReferenceIntermediateLayer(
+ // rawTimeSeriesInputLayer.constructPointReader(
+ // udtfPlan.getReaderIndex(path.getFullPath())),
+ // -1,
+ // -1));
}
return expressionIntermediateLayerMap.get(this);
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 6a107d7..5f398b4 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
@@ -25,6 +25,7 @@ import org.apache.iotdb.db.query.expression.Expression;
import org.apache.iotdb.db.query.expression.ResultColumn;
import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -46,7 +47,8 @@ public class DAGBuilder {
// make sure that only one point reader will be built for one expression.
private final Map<Expression, IntermediateLayer> expressionIntermediateLayerMap;
- public DAGBuilder(UDTFPlan udtfPlan, UDFLayer inputLayer) throws QueryProcessException {
+ public DAGBuilder(UDTFPlan udtfPlan, UDFLayer inputLayer)
+ throws QueryProcessException, IOException {
this.udtfPlan = udtfPlan;
this.rawTimeSeriesInputLayer = inputLayer;
@@ -61,7 +63,7 @@ public class DAGBuilder {
build();
}
- public DAGBuilder build() throws QueryProcessException {
+ public DAGBuilder build() throws QueryProcessException, IOException {
for (int i = 0; i < resultColumnExpressions.size(); ++i) {
resultColumnPointReaders[i] =
resultColumnExpressions
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/IntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/IntermediateLayer.java
index c7ae82c..23f7f6b 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/IntermediateLayer.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/IntermediateLayer.java
@@ -31,6 +31,8 @@ import java.io.IOException;
public abstract class IntermediateLayer {
+ protected static final int CACHE_BLOCK_SIZE = 2;
+
protected final long queryId;
protected final float memoryBudgetInMB;
@@ -44,7 +46,7 @@ public abstract class IntermediateLayer {
public abstract LayerRowReader constructRowReader();
public final LayerRowWindowReader constructRowWindowReader(
- AccessStrategy strategy, float memoryBudgetInMB) throws QueryProcessException {
+ AccessStrategy strategy, float memoryBudgetInMB) throws QueryProcessException, IOException {
switch (strategy.getAccessStrategyType()) {
case SLIDING_TIME_WINDOW:
return constructRowSlidingTimeWindowReader(
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnIntermediateLayer.java
index 1766ff4..0a6686d 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnIntermediateLayer.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/MultiInputColumnIntermediateLayer.java
@@ -191,7 +191,8 @@ public class MultiInputColumnIntermediateLayer extends IntermediateLayer
private final int slidingStep = strategy.getSlidingStep();
private final ElasticSerializableRowRecordList rowRecordList =
- new ElasticSerializableRowRecordList(dataTypes, queryId, memoryBudgetInMB, 2);
+ new ElasticSerializableRowRecordList(
+ dataTypes, queryId, memoryBudgetInMB, CACHE_BLOCK_SIZE);
private final ElasticSerializableRowRecordListBackedMultiColumnWindow window =
new ElasticSerializableRowRecordListBackedMultiColumnWindow(rowRecordList);
@@ -250,7 +251,8 @@ public class MultiInputColumnIntermediateLayer extends IntermediateLayer
final UDFInputDataSet udfInputDataSet = this;
final ElasticSerializableRowRecordList rowRecordList =
- new ElasticSerializableRowRecordList(dataTypes, queryId, memoryBudgetInMB, 2);
+ new ElasticSerializableRowRecordList(
+ dataTypes, queryId, memoryBudgetInMB, CACHE_BLOCK_SIZE);
final ElasticSerializableRowRecordListBackedMultiColumnWindow window =
new ElasticSerializableRowRecordListBackedMultiColumnWindow(rowRecordList);
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnMultiReferenceIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnMultiReferenceIntermediateLayer.java
index 7bde88c..7e81904 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnMultiReferenceIntermediateLayer.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnMultiReferenceIntermediateLayer.java
@@ -38,8 +38,6 @@ import java.io.IOException;
public class SingleInputColumnMultiReferenceIntermediateLayer extends IntermediateLayer {
- private static final int CACHE_BLOCK_SIZE = 2;
-
private final LayerPointReader parentLayerPointReader;
private final TSDataType dataType;
private final ElasticSerializableTVList tvList;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java
index 08946b0..f935189 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/SingleInputColumnSingleReferenceIntermediateLayer.java
@@ -104,7 +104,7 @@ public class SingleInputColumnSingleReferenceIntermediateLayer extends Intermedi
private final ElasticSerializableTVList tvList =
ElasticSerializableTVList.newElasticSerializableTVList(
- dataType, queryId, memoryBudgetInMB, 2);
+ dataType, queryId, memoryBudgetInMB, CACHE_BLOCK_SIZE);
private final ElasticSerializableTVListBackedSingleColumnWindow window =
new ElasticSerializableTVListBackedSingleColumnWindow(tvList);
@@ -163,7 +163,7 @@ public class SingleInputColumnSingleReferenceIntermediateLayer extends Intermedi
final ElasticSerializableTVList tvList =
ElasticSerializableTVList.newElasticSerializableTVList(
- dataType, queryId, memoryBudgetInMB, 2);
+ dataType, queryId, memoryBudgetInMB, CACHE_BLOCK_SIZE);
final ElasticSerializableTVListBackedSingleColumnWindow window =
new ElasticSerializableTVListBackedSingleColumnWindow(tvList);