You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/11/22 10:15:27 UTC

[iotdb] 16/21: Merge remote-tracking branch 'origin/master'

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

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 889dae8e11a8351a050df85d8fdef53c7e3b4281
Merge: 6eb6fd3 f2e9161
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Nov 18 20:08:20 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../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 ++-
 server/src/assembly/resources/sbin/start-server.sh |   2 +
 .../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 +
 .../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 ++++
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  15 +-
 .../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 +-
 .../query/dataset/groupby/GroupByFillDataSet.java  |  15 +-
 .../iotdb/db/query/executor/LastQueryExecutor.java | 199 ++++++++++--------
 .../iotdb/db/service/thrift/ThriftService.java     |   6 +-
 .../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 +
 .../apache/iotdb/db/integration/IoTDBLastIT.java   |   2 -
 .../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 +++
 53 files changed, 1941 insertions(+), 209 deletions(-)