You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/08/14 12:33:10 UTC

[iotdb] 05/06: merge master

This is an automated email from the ASF dual-hosted git repository.

hui pushed a commit to branch lmh/AggOpMemoryControl
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit b58a9a9252d65cf02769f989aa7e53337f12eec5
Merge: 815b7e2059 d0a2ba4e96
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Sun Aug 14 20:28:51 2022 +0800

    merge master

 .../operator/schema/CountMergeOperator.java        |  29 ++
 .../operator/schema/DevicesCountOperator.java      |  17 +
 .../schema/LevelTimeSeriesCountOperator.java       |  17 +
 .../schema/NodeManageMemoryMergeOperator.java      |  18 +
 .../operator/schema/NodePathsConvertOperator.java  |  15 +
 .../operator/schema/NodePathsCountOperator.java    |  18 +
 .../schema/NodePathsSchemaScanOperator.java        |  17 +
 .../operator/schema/SchemaFetchMergeOperator.java  |  29 ++
 .../operator/schema/SchemaFetchScanOperator.java   |  32 +-
 .../operator/schema/SchemaQueryMergeOperator.java  |  29 ++
 .../schema/SchemaQueryOrderByHeatOperator.java     |  40 ++
 .../operator/schema/SchemaQueryScanOperator.java   |  21 +-
 .../operator/schema/TimeSeriesCountOperator.java   |  17 +
 .../mpp/execution/operator/OperatorMemoryTest.java | 470 +++++++++++++++++++--
 14 files changed, 718 insertions(+), 51 deletions(-)