You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/04/28 14:48:39 UTC
[iotdb] 01/01: Merge branch 'master' into xingtanzjr/fix_some_bugs
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/fix_some_bugs
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b518a7fbe9b1f53f368517b81c733a72685a29d0
Merge: 0e86f53415 c8d7d8144e
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Thu Apr 28 22:48:25 2022 +0800
Merge branch 'master' into xingtanzjr/fix_some_bugs
.../mtree/store/disk/CachedMNodeContainer.java | 12 +-
.../apache/iotdb/db/mpp/buffer/SourceHandle.java | 4 +-
.../db/mpp/execution/FragmentInstanceManager.java | 1 +
.../db/mpp/execution/config/ConfigTaskVisitor.java | 7 +
.../org/apache/iotdb/db/mpp/memory/MemoryPool.java | 2 -
.../apache/iotdb/db/mpp/sql/analyze/Analysis.java | 10 +
.../apache/iotdb/db/mpp/sql/analyze/Analyzer.java | 16 +-
.../mpp/sql/analyze/ClusterPartitionFetcher.java | 54 +-
.../db/mpp/sql/analyze/FakeSchemaFetcherImpl.java | 2 +
.../iotdb/db/mpp/sql/analyze/TypeProvider.java | 77 +++
.../db/mpp/sql/planner/DistributionPlanner.java | 10 +-
.../db/mpp/sql/planner/LocalExecutionPlanner.java | 76 ++-
.../db/mpp/sql/planner/LogicalPlanBuilder.java | 226 ++++++++
.../iotdb/db/mpp/sql/planner/LogicalPlanner.java | 181 +++---
.../iotdb/db/mpp/sql/planner/QueryPlanBuilder.java | 364 ------------
.../sql/planner/SimpleFragmentParallelPlanner.java | 1 +
.../db/mpp/sql/planner/plan/PlanFragment.java | 25 +-
.../db/mpp/sql/planner/plan/node/PlanNode.java | 6 -
.../db/mpp/sql/planner/plan/node/PlanNodeType.java | 33 +-
.../db/mpp/sql/planner/plan/node/PlanVisitor.java | 33 +-
.../metedata/read/AbstractSchemaMergeNode.java | 18 -
.../plan/node/metedata/read/DevicesCountNode.java | 12 -
.../node/metedata/read/DevicesSchemaScanNode.java | 18 -
.../metedata/read/LevelTimeSeriesCountNode.java | 12 -
.../plan/node/metedata/read/SchemaFetchNode.java | 12 -
.../node/metedata/read/TimeSeriesCountNode.java | 12 -
.../metedata/read/TimeSeriesSchemaScanNode.java | 12 -
.../node/metedata/write/AlterTimeSeriesNode.java | 12 -
.../write/CreateAlignedTimeSeriesNode.java | 11 -
.../node/metedata/write/CreateTimeSeriesNode.java | 11 -
.../planner/plan/node/process/AggregateNode.java | 199 -------
.../planner/plan/node/process/AggregationNode.java | 186 ++++++
.../planner/plan/node/process/DeviceMergeNode.java | 160 ++----
.../planner/plan/node/process/DeviceViewNode.java | 166 ++++++
.../planner/plan/node/process/ExchangeNode.java | 12 -
.../sql/planner/plan/node/process/FillNode.java | 71 +--
.../sql/planner/plan/node/process/FilterNode.java | 103 +---
.../planner/plan/node/process/FilterNullNode.java | 57 +-
.../plan/node/process/GroupByLevelNode.java | 170 ++----
.../planner/plan/node/process/GroupByTimeNode.java | 165 ++++++
.../sql/planner/plan/node/process/LimitNode.java | 59 +-
.../sql/planner/plan/node/process/OffsetNode.java | 35 +-
.../process/{OffsetNode.java => ProjectNode.java} | 93 ++-
.../sql/planner/plan/node/process/SortNode.java | 61 +-
.../planner/plan/node/process/TimeJoinNode.java | 156 +----
.../planner/plan/node/sink/FragmentSinkNode.java | 12 -
.../source/AlignedSeriesAggregationScanNode.java | 267 +++++++++
...iesScanNode.java => AlignedSeriesScanNode.java} | 269 ++++-----
...canNode.java => SeriesAggregationScanNode.java} | 251 ++++----
.../planner/plan/node/source/SeriesScanNode.java | 239 ++++----
.../plan/node/write/InsertMultiTabletsNode.java | 11 -
.../sql/planner/plan/node/write/InsertRowNode.java | 11 -
.../planner/plan/node/write/InsertRowsNode.java | 11 -
.../plan/node/write/InsertRowsOfOneDeviceNode.java | 11 -
.../planner/plan/node/write/InsertTabletNode.java | 11 -
.../sql/planner/plan/parameter/Aggregation.java | 43 --
.../plan/parameter/AggregationDescriptor.java | 102 ++++
.../planner/plan/parameter/AggregationStep.java | 24 +
.../sql/planner/plan/parameter/FillDescriptor.java | 69 +++
.../plan/parameter/FilterNullParameter.java | 15 +-
.../db/mpp/sql/rewriter/WildcardsRemover.java | 8 +-
.../db/mpp/sql/statement/StatementVisitor.java | 4 +-
.../db/mpp/sql/statement/component/FillPolicy.java | 4 +-
.../db/mpp/sql/statement/component/OrderBy.java | 4 +-
.../mpp/common/schematree/PathPatternTreeTest.java | 4 +-
.../db/mpp/sql/plan/FragmentInstanceSerdeTest.java | 39 +-
.../iotdb/db/mpp/sql/plan/LogicalPlanPrinter.java | 228 --------
.../iotdb/db/mpp/sql/plan/LogicalPlannerTest.java | 2 -
.../db/mpp/sql/plan/QueryLogicalPlanUtil.java | 631 +++++++++++++--------
.../plan/node/process/AggregateNodeSerdeTest.java | 69 ---
...erdeTest.java => AggregationNodeSerdeTest.java} | 82 +--
.../DeviceViewNodeSerdeTest.java} | 44 +-
.../plan/node/process/ExchangeNodeSerdeTest.java | 53 +-
.../sql/plan/node/process/FillNodeSerdeTest.java | 60 +-
.../sql/plan/node/process/FilterNodeSerdeTest.java | 66 +--
.../plan/node/process/FilterNullNodeSerdeTest.java | 74 +--
.../node/process/GroupByLevelNodeSerdeTest.java | 119 ++--
.../sql/plan/node/process/LimitNodeSerdeTest.java | 86 +--
.../sql/plan/node/process/OffsetNodeSerdeTest.java | 154 +----
.../sql/plan/node/process/SortNodeSerdeTest.java | 95 +---
.../plan/node/process/TimeJoinNodeSerdeTest.java | 118 +---
...ava => SeriesAggregationScanNodeSerdeTest.java} | 43 +-
.../plan/node/source/SeriesScanNodeSerdeTest.java | 15 +-
83 files changed, 2821 insertions(+), 3490 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/memory/MemoryPool.java
index e7fb2e2b5c,e47504ad0e..5f4ea91bd2
--- a/server/src/main/java/org/apache/iotdb/db/mpp/memory/MemoryPool.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/memory/MemoryPool.java
@@@ -141,11 -141,11 +141,9 @@@ public class MemoryPool
* return 0.
*/
public synchronized long tryCancel(ListenableFuture<Void> future) {
- Validate.notNull(future);
- // If the future is not a MemoryReservationFuture, it must have been completed.
- if (future.isDone()) {
+ if (future == null || future.isDone()) {
return 0L;
}
-
- Validate.notNull(future);
Validate.isTrue(
future instanceof MemoryReservationFuture,
"invalid future type " + future.getClass().getSimpleName());
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/ExchangeNode.java
index ae97ffff0e,47746f0253..f46f8fd228
--- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/ExchangeNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/ExchangeNode.java
@@@ -21,7 -21,7 +21,6 @@@ package org.apache.iotdb.db.mpp.sql.pla
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
- import org.apache.iotdb.db.mpp.common.header.ColumnHeader;
-import org.apache.iotdb.db.mpp.sql.planner.plan.PlanFragment;
import org.apache.iotdb.db.mpp.sql.planner.plan.node.PlanNode;
import org.apache.iotdb.db.mpp.sql.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.mpp.sql.planner.plan.node.PlanNodeType;