You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2020/11/18 08:13:18 UTC
[iotdb] 01/01: Merge branch 'master' of
https://github.com/apache/iotdb into memtable_sort_in_query
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch memtable_sort_in_query
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a57e27bb3df7bcfb36bca3043c5b8e85f8b5e4b8
Merge: f6b0d91 1229b86
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Wed Nov 18 16:05:51 2020 +0800
Merge branch 'master' of https://github.com/apache/iotdb into memtable_sort_in_query
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 52 +++--
.../java/org/apache/iotdb/cli/AbstractCli.java | 9 +-
cli/src/main/java/org/apache/iotdb/cli/Cli.java | 2 +-
cli/src/main/java/org/apache/iotdb/cli/WinCli.java | 8 +-
.../java/org/apache/iotdb/cli/AbstractCliIT.java | 29 ++-
.../resources/conf/iotdb-engine.properties | 31 ++-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 5 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 79 ++++++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 22 ++
.../db/conf/directories/DirectoryManager.java | 4 +
.../engine/compaction/utils/CompactionUtils.java | 3 +
.../index/DistanceMetricException.java} | 17 +-
.../index/IllegalIndexParamException.java} | 17 +-
.../db/exception/index/IndexManagerException.java | 35 ++++
.../index/IndexRuntimeException.java} | 20 +-
.../db/exception/index/QueryIndexException.java | 30 +++
.../index/UnsupportedIndexTypeException.java | 31 +++
.../iotdb/db/index/common/IndexConstant.java | 37 ++++
.../apache/iotdb/db/index/common/IndexType.java | 87 ++++++++
.../apache/iotdb/db/index/common/IndexUtils.java | 36 ++++
.../iotdb/db/metadata/MetadataOperationType.java | 2 +
.../main/java/org/apache/iotdb/db/qp/Planner.java | 5 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 5 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 7 +
.../org/apache/iotdb/db/qp/logical/Operator.java | 3 +-
.../logical/crud/QueryIndexOperator.java} | 41 +++-
.../db/qp/logical/sys/CreateIndexOperator.java | 62 ++++++
.../logical/sys/DropIndexOperator.java} | 32 ++-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 12 +-
.../iotdb/db/qp/physical/crud/QueryIndexPlan.java | 75 +++++++
.../iotdb/db/qp/physical/sys/CreateIndexPlan.java | 182 ++++++++++++++++
.../iotdb/db/qp/physical/sys/DropIndexPlan.java | 132 ++++++++++++
.../iotdb/db/qp/strategy/LogicalGenerator.java | 229 ++++++++++++++++++++-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 23 +++
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 15 +-
.../iotdb/db/utils/datastructure/BinaryTVList.java | 5 +
.../db/utils/datastructure/BooleanTVList.java | 5 +
.../iotdb/db/utils/datastructure/DoubleTVList.java | 5 +
.../iotdb/db/utils/datastructure/FloatTVList.java | 5 +
.../iotdb/db/utils/datastructure/IntTVList.java | 5 +
.../iotdb/db/utils/datastructure/LongTVList.java | 5 +
.../iotdb/db/utils/datastructure/TVList.java | 5 +
.../iotdb/db/qp/plan/IndexLogicalPlanTest.java | 156 ++++++++++++++
.../qp/plan/IndexSubMatchingPhysicalPlanTest.java | 160 ++++++++++++++
.../plan/IndexWholeMatchingPhysicalPlanTest.java | 154 ++++++++++++++
server/src/test/resources/iotdb-engine.properties | 3 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 4 +
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 23 +++
48 files changed, 1807 insertions(+), 107 deletions(-)