You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/04/22 07:38:01 UTC
[iotdb] branch standaloneMPPWrite updated (5714d1ea93 -> 6855315a2a)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch standaloneMPPWrite
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 5714d1ea93 merge master
add 75620dd4d6 [IOTDB-2971] Fix sink handle memory leak (#5626)
add b2520b31b0 [IOTDB-2880] Fix import check style (#5629)
add f9226c380d Add FragmentInstanceStateMachine for FragmentInstance State change (#5615)
add 9522cfb39e [IOTDB-2835]Fix empty page in selfcheck method of TsFileSequenceReader (#5552)
add 650a7a8e94 fix the bug when matching multi-wildcard in pattern tree (#5631)
add 6952eed0e6 Add block cancel when GetBlockTask throws exception (#5628)
add 1a2ea0c03a Add ColumnMerger to merge multipul input columns of same sensor into one column (#5630)
add 25983540e7 Fix CI (#5639)
add 7a500adb6e [IOTDB-2880] Fix NPE occured in ci test (#5634)
add f037de3705 fix concurrent bug of CachedMNodeContainer.putIfAbsent (#5632)
add 8df96c5ce2 Fix the issue that EndTime in FragmentInstanceContext is not set (#5636)
add dc344e5b70 [IOTDB-2740] Equal size bucket sampling UDFs: EQUAL_SIZE_BUCKET_RANDOM_SAMPLE, EQUAL_SIZE_BUCKET_AGG_SAMPLE, EQUAL_SIZE_BUCKET_M4_SAMPLE (#5518)
add 677f58763b change jenkins timeout from 2 hours to 3 hours
new 6855315a2a Merge branch 'master' of https://github.com/apache/iotdb into standaloneMPPWrite
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 2 +-
docs/UserGuide/Query-Data/Select-Expression.md | 143 ++++++
docs/zh/UserGuide/Query-Data/Select-Expression.md | 143 ++++++
.../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 190 ++++++++
pom.xml | 5 +
.../iotdb/procedure/CompletedProcedureCleaner.java | 20 +-
.../java/org/apache/iotdb/procedure/Procedure.java | 6 +-
.../apache/iotdb/procedure/ProcedureExecutor.java | 18 +-
.../apache/iotdb/procedure/store/ProcedureWAL.java | 5 +-
.../apache/iotdb/procedure/TestProcedureBase.java | 2 +-
.../iotdb/procedure/store/TestProcedureStore.java | 9 +-
server/pom.xml | 4 +
.../mtree/store/disk/CachedMNodeContainer.java | 15 +
.../iotdb/db/mpp/buffer/DataBlockManager.java | 24 +-
.../apache/iotdb/db/mpp/buffer/ISinkHandle.java | 20 +-
.../apache/iotdb/db/mpp/buffer/ISourceHandle.java | 10 +-
.../org/apache/iotdb/db/mpp/buffer/SinkHandle.java | 45 +-
.../apache/iotdb/db/mpp/buffer/SourceHandle.java | 19 +-
.../apache/iotdb/db/mpp/buffer/StubSinkHandle.java | 4 +-
.../mpp/common/schematree/SchemaTreeVisitor.java | 6 +-
.../apache/iotdb/db/mpp/execution/Coordinator.java | 5 +-
.../apache/iotdb/db/mpp/execution/DataDriver.java | 189 +-------
.../org/apache/iotdb/db/mpp/execution/Driver.java | 426 +++++++++++++++++-
.../iotdb/db/mpp/execution/DriverContext.java | 13 +-
.../db/mpp/execution/FragmentInstanceContext.java | 98 +++--
.../mpp/execution/FragmentInstanceExecution.java | 66 ++-
.../execution/FragmentInstanceFailureListener.java | 10 +-
.../db/mpp/execution/FragmentInstanceManager.java | 57 ++-
.../db/mpp/execution/FragmentInstanceState.java | 2 +-
.../execution/FragmentInstanceStateMachine.java | 182 ++++++++
.../{config/IConfigTask.java => IDriver.java} | 20 +-
.../iotdb/db/mpp/execution/QueryExecution.java | 3 +-
.../iotdb/db/mpp/execution/SchemaDriver.java | 140 +-----
.../org/apache/iotdb/db/mpp/operator/Operator.java | 4 +-
.../db/mpp/operator/process/LimitOperator.java | 4 +-
.../db/mpp/operator/process/TimeJoinOperator.java | 56 ++-
.../db/mpp/operator/process/TransformOperator.java | 2 +-
.../mpp/operator/process/merge/ColumnMerger.java | 58 +++
.../operator/process/merge/SingleColumnMerger.java | 74 ++++
.../mpp/operator/schema/SchemaFetchOperator.java | 3 +-
.../db/mpp/operator/source/ExchangeOperator.java | 2 +-
.../schedule/FragmentInstanceAbortedException.java | 4 +-
.../db/mpp/schedule/FragmentInstanceScheduler.java | 4 +-
.../mpp/schedule/FragmentInstanceTaskExecutor.java | 4 +-
.../mpp/schedule/IFragmentInstanceScheduler.java | 6 +-
.../db/mpp/schedule/task/FragmentInstanceTask.java | 16 +-
.../db/mpp/sql/planner/LocalExecutionPlanner.java | 28 +-
.../db/mpp/sql/planner/plan/OutputColumn.java | 14 +
.../planner/plan/node/process/TimeJoinNode.java | 8 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 8 +-
.../db/query/udf/builtin/BuiltinFunction.java | 5 +-
.../udf/builtin/UDTFEqualSizeBucketAggSample.java | 487 +++++++++++++++++++++
.../udf/builtin/UDTFEqualSizeBucketM4Sample.java | 238 ++++++++++
...s.java => UDTFEqualSizeBucketRandomSample.java} | 40 +-
...ontains.java => UDTFEqualSizeBucketSample.java} | 38 +-
.../thrift/impl/DataNodeTSIServiceImpl.java | 5 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 6 +-
.../apache/iotdb/db/mpp/buffer/SinkHandleTest.java | 157 ++++---
.../iotdb/db/mpp/buffer/SourceHandleTest.java | 93 +++-
.../db/mpp/common/schematree/SchemaTreeTest.java | 14 +
.../iotdb/db/mpp/execution/DataDriverTest.java | 37 +-
.../iotdb/db/mpp/operator/LimitOperatorTest.java | 26 +-
.../operator/SeriesAggregateScanOperatorTest.java | 15 +-
.../db/mpp/operator/SeriesScanOperatorTest.java | 19 +-
.../db/mpp/operator/SingleColumnMergerTest.java | 117 +++++
.../db/mpp/operator/TimeJoinOperatorTest.java | 144 +++++-
.../operator/schema/SchemaScanOperatorTest.java | 32 +-
.../db/mpp/schedule/DefaultTaskSchedulerTest.java | 16 +-
.../schedule/FragmentInstanceSchedulerTest.java | 12 +-
.../FragmentInstanceTimeoutSentinelTest.java | 12 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 18 +-
.../iotdb/tsfile/read/common/block/TsBlock.java | 10 +-
.../common/block/column/BinaryColumnBuilder.java | 19 +-
.../common/block/column/BooleanColumnBuilder.java | 19 +-
.../read/common/block/column/ColumnBuilder.java | 17 +-
.../common/block/column/DoubleColumnBuilder.java | 19 +-
.../common/block/column/FloatColumnBuilder.java | 15 +-
.../read/common/block/column/IntColumnBuilder.java | 19 +-
.../common/block/column/LongColumnBuilder.java | 19 +-
.../common/block/column/TimeColumnBuilder.java | 16 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 4 -
.../tsfile/read/TsFileSequenceReaderTest.java | 47 ++
82 files changed, 3123 insertions(+), 808 deletions(-)
copy cluster/src/main/java/org/apache/iotdb/cluster/exception/LogExecutionException.java => server/src/main/java/org/apache/iotdb/db/mpp/execution/FragmentInstanceFailureListener.java (78%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/FragmentInstanceStateMachine.java
copy server/src/main/java/org/apache/iotdb/db/mpp/execution/{config/IConfigTask.java => IDriver.java} (68%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/operator/process/merge/ColumnMerger.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/operator/process/merge/SingleColumnMerger.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFEqualSizeBucketAggSample.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFEqualSizeBucketM4Sample.java
copy server/src/main/java/org/apache/iotdb/db/query/udf/builtin/{UDTFAbs.java => UDTFEqualSizeBucketRandomSample.java} (64%)
copy server/src/main/java/org/apache/iotdb/db/query/udf/builtin/{UDTFContains.java => UDTFEqualSizeBucketSample.java} (53%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/mpp/operator/SingleColumnMergerTest.java
[iotdb] 01/01: Merge branch 'master' of https://github.com/apache/iotdb into standaloneMPPWrite
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch standaloneMPPWrite
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6855315a2acade0f65381b02860f5877ef7c91f7
Merge: 5714d1ea93 677f58763b
Author: HTHou <hh...@outlook.com>
AuthorDate: Fri Apr 22 15:37:37 2022 +0800
Merge branch 'master' of https://github.com/apache/iotdb into standaloneMPPWrite
Jenkinsfile | 2 +-
docs/UserGuide/Query-Data/Select-Expression.md | 143 ++++++
docs/zh/UserGuide/Query-Data/Select-Expression.md | 143 ++++++
.../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 190 ++++++++
pom.xml | 5 +
.../iotdb/procedure/CompletedProcedureCleaner.java | 20 +-
.../java/org/apache/iotdb/procedure/Procedure.java | 6 +-
.../apache/iotdb/procedure/ProcedureExecutor.java | 18 +-
.../apache/iotdb/procedure/store/ProcedureWAL.java | 5 +-
.../apache/iotdb/procedure/TestProcedureBase.java | 2 +-
.../iotdb/procedure/store/TestProcedureStore.java | 9 +-
server/pom.xml | 4 +
.../mtree/store/disk/CachedMNodeContainer.java | 15 +
.../iotdb/db/mpp/buffer/DataBlockManager.java | 24 +-
.../apache/iotdb/db/mpp/buffer/ISinkHandle.java | 20 +-
.../apache/iotdb/db/mpp/buffer/ISourceHandle.java | 10 +-
.../org/apache/iotdb/db/mpp/buffer/SinkHandle.java | 45 +-
.../apache/iotdb/db/mpp/buffer/SourceHandle.java | 19 +-
.../apache/iotdb/db/mpp/buffer/StubSinkHandle.java | 4 +-
.../mpp/common/schematree/SchemaTreeVisitor.java | 6 +-
.../apache/iotdb/db/mpp/execution/Coordinator.java | 5 +-
.../apache/iotdb/db/mpp/execution/DataDriver.java | 189 +-------
.../org/apache/iotdb/db/mpp/execution/Driver.java | 426 +++++++++++++++++-
.../iotdb/db/mpp/execution/DriverContext.java | 13 +-
.../db/mpp/execution/FragmentInstanceContext.java | 98 +++--
.../mpp/execution/FragmentInstanceExecution.java | 66 ++-
...t.java => FragmentInstanceFailureListener.java} | 29 +-
.../db/mpp/execution/FragmentInstanceManager.java | 57 ++-
.../db/mpp/execution/FragmentInstanceState.java | 2 +-
.../execution/FragmentInstanceStateMachine.java | 182 ++++++++
.../execution/{DriverContext.java => IDriver.java} | 30 +-
.../iotdb/db/mpp/execution/QueryExecution.java | 3 +-
.../iotdb/db/mpp/execution/SchemaDriver.java | 140 +-----
.../org/apache/iotdb/db/mpp/operator/Operator.java | 4 +-
.../db/mpp/operator/process/LimitOperator.java | 4 +-
.../db/mpp/operator/process/TimeJoinOperator.java | 56 ++-
.../db/mpp/operator/process/TransformOperator.java | 2 +-
.../mpp/operator/process/merge/ColumnMerger.java | 58 +++
.../operator/process/merge/SingleColumnMerger.java | 74 ++++
.../mpp/operator/schema/SchemaFetchOperator.java | 3 +-
.../db/mpp/operator/source/ExchangeOperator.java | 2 +-
.../schedule/FragmentInstanceAbortedException.java | 4 +-
.../db/mpp/schedule/FragmentInstanceScheduler.java | 4 +-
.../mpp/schedule/FragmentInstanceTaskExecutor.java | 4 +-
.../mpp/schedule/IFragmentInstanceScheduler.java | 6 +-
.../db/mpp/schedule/task/FragmentInstanceTask.java | 16 +-
.../db/mpp/sql/planner/LocalExecutionPlanner.java | 28 +-
.../db/mpp/sql/planner/plan/OutputColumn.java | 14 +
.../planner/plan/node/process/TimeJoinNode.java | 8 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 8 +-
.../db/query/udf/builtin/BuiltinFunction.java | 5 +-
.../udf/builtin/UDTFEqualSizeBucketAggSample.java | 487 +++++++++++++++++++++
.../udf/builtin/UDTFEqualSizeBucketM4Sample.java | 238 ++++++++++
.../builtin/UDTFEqualSizeBucketRandomSample.java | 68 +++
.../udf/builtin/UDTFEqualSizeBucketSample.java | 48 ++
.../thrift/impl/DataNodeTSIServiceImpl.java | 5 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 6 +-
.../apache/iotdb/db/mpp/buffer/SinkHandleTest.java | 157 ++++---
.../iotdb/db/mpp/buffer/SourceHandleTest.java | 93 +++-
.../db/mpp/common/schematree/SchemaTreeTest.java | 14 +
.../iotdb/db/mpp/execution/DataDriverTest.java | 37 +-
.../iotdb/db/mpp/operator/LimitOperatorTest.java | 26 +-
.../operator/SeriesAggregateScanOperatorTest.java | 15 +-
.../db/mpp/operator/SeriesScanOperatorTest.java | 19 +-
.../db/mpp/operator/SingleColumnMergerTest.java | 117 +++++
.../db/mpp/operator/TimeJoinOperatorTest.java | 144 +++++-
.../operator/schema/SchemaScanOperatorTest.java | 32 +-
.../db/mpp/schedule/DefaultTaskSchedulerTest.java | 16 +-
.../schedule/FragmentInstanceSchedulerTest.java | 12 +-
.../FragmentInstanceTimeoutSentinelTest.java | 12 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 18 +-
.../iotdb/tsfile/read/common/block/TsBlock.java | 10 +-
.../common/block/column/BinaryColumnBuilder.java | 19 +-
.../common/block/column/BooleanColumnBuilder.java | 19 +-
.../read/common/block/column/ColumnBuilder.java | 17 +-
.../common/block/column/DoubleColumnBuilder.java | 19 +-
.../common/block/column/FloatColumnBuilder.java | 15 +-
.../read/common/block/column/IntColumnBuilder.java | 19 +-
.../common/block/column/LongColumnBuilder.java | 19 +-
.../common/block/column/TimeColumnBuilder.java | 16 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 4 -
.../tsfile/read/TsFileSequenceReaderTest.java | 47 ++
82 files changed, 3196 insertions(+), 802 deletions(-)