This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch IOTDB-3883
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from e98250a467 change syntax in it
add bd1894fb72 fix the potential issue for StateTracker that it cannot be
terminated sometimes (#6755)
add 3d73b16fbf [IOTDB-3848] Clear up thrift defined data structures of
cluster tools (#6716)
add 2b7dc520a7 [IOTDB-3723] Replace FilterOperator with
FilterAndProjectOperator and use batch processing for better performance (#6714)
add dbe3613940 resolve conflicts
No new revisions were added by this update.
Summary of changes:
.../response/DataNodeConfigurationResp.java | 20 +-
.../consensus/response/RegionInfoListResp.java | 2 +-
.../iotdb/confignode/manager/ConfigManager.java | 120 +++++-----
.../apache/iotdb/confignode/manager/IManager.java | 9 +-
.../iotdb/confignode/manager/NodeManager.java | 26 +--
.../iotdb/confignode/persistence/NodeInfo.java | 4 +-
.../persistence/partition/PartitionInfo.java | 2 +-
.../partition/StorageGroupPartitionTable.java | 2 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 12 +-
.../thrift/ConfigNodeRPCServiceProcessorTest.java | 6 +-
.../db/it/alignbydevice/IoTDBAlignByDeviceIT.java | 21 +-
.../withoutNull/IoTDBWithoutNullAnyFilterIT.java | 14 +-
.../commons/udf/builtin/String/UDTFEndsWith.java | 3 +
.../commons/udf/builtin/String/UDTFLower.java | 3 +
.../commons/udf/builtin/String/UDTFUpper.java | 3 +
.../apache/iotdb/commons/udf/builtin/UDTFAbs.java | 3 +
.../apache/iotdb/commons/udf/builtin/UDTFMath.java | 3 +
.../iotdb/commons/udf/builtin/UDTFOnOff.java | 3 +
.../apache/iotdb/db/client/ConfigNodeClient.java | 6 +-
.../operator/process/FilterAndProjectOperator.java | 193 ++++++++++++++++
.../execution/operator/process/FilterOperator.java | 243 ---------------------
.../mpp/plan/execution/config/ShowClusterTask.java | 4 +-
.../plan/execution/config/ShowDataNodesTask.java | 19 +-
.../mpp/plan/execution/config/ShowRegionTask.java | 2 +-
.../config/executor/ClusterConfigTaskExecutor.java | 8 +-
.../iotdb/db/mpp/plan/expression/Expression.java | 15 ++
.../plan/expression/binary/AdditionExpression.java | 12 +
.../plan/expression/binary/BinaryExpression.java | 73 +++++++
.../plan/expression/binary/DivisionExpression.java | 12 +
.../plan/expression/binary/EqualToExpression.java | 11 +
.../expression/binary/GreaterEqualExpression.java | 12 +
.../expression/binary/GreaterThanExpression.java | 12 +
.../expression/binary/LessEqualExpression.java | 12 +
.../plan/expression/binary/LessThanExpression.java | 12 +
.../plan/expression/binary/LogicAndExpression.java | 11 +
.../plan/expression/binary/LogicOrExpression.java | 11 +
.../plan/expression/binary/ModuloExpression.java | 12 +
.../binary/MultiplicationExpression.java | 12 +
.../plan/expression/binary/NonEqualExpression.java | 12 +
.../expression/binary/SubtractionExpression.java | 12 +
.../mpp/plan/expression/leaf/ConstantOperand.java | 31 +++
.../db/mpp/plan/expression/leaf/LeafOperand.java | 6 +
.../plan/expression/leaf/TimeSeriesOperand.java | 30 +++
.../mpp/plan/expression/leaf/TimestampOperand.java | 29 +++
.../plan/expression/multi/FunctionExpression.java | 104 ++++++++-
.../plan/expression/ternary/BetweenExpression.java | 25 +++
.../plan/expression/ternary/TernaryExpression.java | 92 ++++++++
.../db/mpp/plan/expression/unary/InExpression.java | 9 +
.../plan/expression/unary/IsNullExpression.java | 14 ++
.../mpp/plan/expression/unary/LikeExpression.java | 9 +
.../plan/expression/unary/LogicNotExpression.java | 9 +
.../plan/expression/unary/NegationExpression.java | 9 +
.../plan/expression/unary/RegularExpression.java | 9 +
.../mpp/plan/expression/unary/UnaryExpression.java | 60 +++++
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 121 +++++++++-
.../scheduler/FixedRateFragInsStateTracker.java | 12 +-
.../mpp/transformation/dag/column/ColumnCache.java | 56 +++++
.../dag/column/ColumnTransformer.java | 78 +++++++
.../ArithmeticAdditionColumnTransformer.java} | 25 +--
.../binary/ArithmeticBinaryColumnTransformer.java | 57 +++++
.../ArithmeticDivisionColumnTransformer.java} | 25 +--
.../binary/ArithmeticModuloColumnTransformer.java} | 25 +--
...ArithmeticMultiplicationColumnTransformer.java} | 24 +-
.../ArithmeticSubtractionColumnTransformer.java} | 25 +--
.../dag/column/binary/BinaryColumnTransformer.java | 65 ++++++
.../binary/CompareBinaryColumnTransformer.java | 89 ++++++++
.../binary/CompareEqualToColumnTransformer.java | 47 ++++
.../CompareGreaterEqualColumnTransformer.java} | 25 +--
.../CompareGreaterThanColumnTransformer.java} | 25 +--
.../binary/CompareLessEqualColumnTransformer.java} | 25 +--
.../binary/CompareLessThanColumnTransformer.java} | 25 +--
.../binary/CompareNonEqualColumnTransformer.java | 47 ++++
.../column/binary/LogicAndColumnTransformer.java} | 25 +--
.../binary/LogicBinaryColumnTransformer.java | 65 ++++++
.../column/binary/LogicOrColumnTransformer.java} | 25 +--
.../column/leaf/ConstantColumnTransformer.java} | 26 +--
.../column/leaf/IdentityColumnTransformer.java} | 31 +--
.../dag/column/leaf/LeafColumnTransformer.java} | 28 +--
.../dag/column/leaf/TimeColumnTransformer.java} | 24 +-
.../column/multi/MappableUDFColumnTransformer.java | 91 ++++++++
.../column/ternary/BetweenColumnTransformer.java | 93 ++++++++
.../ternary/CompareTernaryColumnTransformer.java | 74 +++++++
.../column/ternary/TernaryColumnTransformer.java | 44 ++++
.../unary/ArithmeticNegationColumnTransformer.java | 51 +++++
.../dag/column/unary/InColumnTransformer.java | 207 ++++++++++++++++++
.../dag/column/unary/IsNullColumnTransformer.java} | 29 +--
.../column/unary/LogicNotColumnTransformer.java | 52 +++++
.../dag/column/unary/RegularColumnTransformer.java | 61 ++++++
.../dag/column/unary/UnaryColumnTransformer.java | 51 +++++
.../dag/transformer/Transformer.java | 21 --
.../binary/CompareBinaryTransformer.java | 21 --
.../binary/CompareEqualToTransformer.java | 3 +-
.../binary/CompareGreaterEqualTransformer.java | 3 +-
.../binary/CompareGreaterThanTransformer.java | 3 +-
.../binary/CompareLessEqualTransformer.java | 3 +-
.../binary/CompareLessThanTransformer.java | 3 +-
.../binary/CompareNonEqualTransformer.java | 3 +-
.../transformer/ternary/BetweenTransformer.java | 5 +-
.../mpp/transformation/dag/udf/UDTFExecutor.java | 29 ++-
...eInferrer.java => UDTFInformationInferrer.java} | 64 ++++--
.../transformation/dag/util/TransformUtils.java | 99 +++++++++
thrift-commons/src/main/thrift/common.thrift | 21 --
.../src/main/thrift/confignode.thrift | 65 ++++--
.../iotdb/tsfile/read/common/type/BinaryType.java | 55 +++++
.../iotdb/tsfile/read/common/type/BooleanType.java | 55 +++++
.../iotdb/tsfile/read/common/type/DoubleType.java | 85 +++++++
.../iotdb/tsfile/read/common/type/FloatType.java | 85 +++++++
.../iotdb/tsfile/read/common/type/IntType.java | 85 +++++++
.../iotdb/tsfile/read/common/type/LongType.java | 85 +++++++
.../apache/iotdb/tsfile/read/common/type/Type.java | 104 +++++++++
.../iotdb/tsfile/read/common/type/TypeEnum.java | 26 +--
.../iotdb/tsfile/read/common/type/TypeFactory.java | 40 ++--
112 files changed, 3339 insertions(+), 805 deletions(-)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/FilterAndProjectOperator.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/FilterOperator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ColumnCache.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ColumnTransformer.java
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java}
(59%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java}
(59%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java}
(59%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=>
transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java}
(59%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=>
transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java}
(59%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/BinaryColumnTransformer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/CompareBinaryColumnTransformer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/CompareEqualToColumnTransformer.java
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java}
(59%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java}
(59%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/binary/CompareLessEqualColumnTransformer.java}
(59%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/binary/CompareLessThanColumnTransformer.java}
(59%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/binary/LogicAndColumnTransformer.java} (59%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/LogicBinaryColumnTransformer.java
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/binary/LogicOrColumnTransformer.java} (59%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/leaf/ConstantColumnTransformer.java} (55%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/leaf/IdentityColumnTransformer.java} (54%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/leaf/LeafColumnTransformer.java} (60%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/leaf/TimeColumnTransformer.java} (59%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/multi/MappableUDFColumnTransformer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/BetweenColumnTransformer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/TernaryColumnTransformer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/unary/InColumnTransformer.java
copy
server/src/main/java/org/apache/iotdb/db/mpp/{plan/expression/leaf/LeafOperand.java
=> transformation/dag/column/unary/IsNullColumnTransformer.java} (50%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/unary/LogicNotColumnTransformer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/unary/RegularColumnTransformer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/unary/UnaryColumnTransformer.java
rename
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/{UDTFTypeInferrer.java
=> UDTFInformationInferrer.java} (53%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/util/TransformUtils.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/BinaryType.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/BooleanType.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/DoubleType.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/FloatType.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/IntType.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/LongType.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/Type.java
copy
server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/leaf/LeafOperand.java
=> tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/TypeEnum.java
(57%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/leaf/LeafOperand.java
=>
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/TypeFactory.java
(53%)
