You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/08/31 07:13:13 UTC

[iotdb] 04/04: Merge branch 'master' of github.com:apache/iotdb into nested-operations

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

rong pushed a commit to branch nested-operations
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit fef36dc3d1767c8cc98eccfc10a2206e786ab8e1
Merge: 076f518 e562445
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Tue Aug 31 15:12:32 2021 +0800

    Merge branch 'master' of github.com:apache/iotdb into nested-operations

 .gitattributes                                     |    1 +
 README.md                                          |    8 +
 README_ZH.md                                       |    8 +
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4   |   36 +-
 client-cpp/src/main/Session.cpp                    | 2190 ++++++++++----------
 client-cpp/src/main/Session.h                      | 1474 ++++++-------
 .../iotdb/cluster/coordinator/Coordinator.java     |   33 +-
 .../apache/iotdb/cluster/metadata/CMManager.java   |    8 +-
 .../iotdb/cluster/query/LocalQueryExecutor.java    |    2 +-
 .../iotdb/cluster/server/MetaClusterServer.java    |    1 +
 .../cluster/server/heartbeat/HeartbeatThread.java  |   34 +-
 .../cluster/server/member/DataGroupMember.java     |   54 +
 .../iotdb/cluster/server/member/RaftMember.java    |   17 +
 docs/Download/README.md                            |   10 +
 docs/SystemDesign/DataQuery/RawDataQuery.md        |   26 +-
 docs/SystemDesign/DataQuery/SeriesReader.md        |   36 +-
 .../QueryEngine/ResultSetConstruction.md           |   10 +-
 docs/SystemDesign/SchemaManager/SchemaManager.md   |    4 +-
 docs/UserGuide/API/Programming-JDBC.md             |    4 +
 docs/UserGuide/API/Programming-Java-Native-API.md  |    6 +-
 .../Advanced-Features/UDF-User-Defined-Function.md |    7 +-
 docs/UserGuide/Appendix/Config-Manual.md           |    9 -
 docs/UserGuide/Appendix/SQL-Reference.md           |   59 +-
 docs/UserGuide/Cluster/Cluster-Setup-Example.md    |  191 +-
 docs/UserGuide/Cluster/Cluster-Setup.md            |  545 +++--
 .../Data-Concept/Data-Model-and-Terminology.md     |    6 +-
 .../UserGuide/Data-Concept/Measurement-Template.md |   84 +
 .../DML-Data-Manipulation-Language.md              |   30 +-
 .../IoTDB-SQL-Language/Maintenance-Command.md      |   28 +-
 docs/zh/Download/README.md                         |   12 +-
 docs/zh/SystemDesign/DataQuery/OrderByTimeQuery.md |    2 +-
 docs/zh/SystemDesign/DataQuery/RawDataQuery.md     |   26 +-
 docs/zh/SystemDesign/DataQuery/SeriesReader.md     |   36 +-
 .../QueryEngine/ResultSetConstruction.md           |   10 +-
 .../zh/SystemDesign/SchemaManager/SchemaManager.md |    4 +-
 docs/zh/UserGuide/API/Programming-JDBC.md          |    3 +
 .../UserGuide/API/Programming-Java-Native-API.md   |    8 +-
 .../Advanced-Features/Continuous-Query.md          |    4 +
 .../Advanced-Features/UDF-User-Defined-Function.md |    7 +-
 docs/zh/UserGuide/Appendix/Config-Manual.md        |    9 -
 docs/zh/UserGuide/Appendix/SQL-Reference.md        |   62 +-
 docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md |  225 +-
 docs/zh/UserGuide/Cluster/Cluster-Setup.md         |  509 +++--
 .../Data-Concept/Data-Model-and-Terminology.md     |    4 +-
 .../UserGuide/Data-Concept/Measurement-Template.md |   81 +
 .../DDL-Data-Definition-Language.md                |   45 +-
 .../DML-Data-Manipulation-Language.md              |   36 +-
 .../IoTDB-SQL-Language/Maintenance-Command.md      |   31 +-
 .../main/java/org/apache/iotdb/SessionExample.java |    2 +-
 pom.xml                                            |    1 +
 .../resources/conf/iotdb-engine.properties         |   43 +-
 server/src/assembly/resources/conf/iotdb-env.sh    |   27 +
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   82 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  135 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  160 +-
 .../apache/iotdb/db/engine/cache/ChunkCache.java   |   62 +-
 .../db/engine/cache/TimeSeriesMetadataCache.java   |  100 +-
 .../level/LevelCompactionTsFileManagement.java     |   12 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |    2 +-
 .../iotdb/db/engine/memtable/WritableMemChunk.java |   22 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  133 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |   13 +-
 .../virtualSg/VirtualStorageGroupManager.java      |   24 +-
 .../exception/metadata/IllegalPathException.java   |    6 +
 .../metadata/StorageGroupAlreadySetException.java  |    7 +
 .../org/apache/iotdb/db/metadata/MManager.java     |   25 +-
 .../java/org/apache/iotdb/db/metadata/MTree.java   |   87 +-
 .../apache/iotdb/db/metadata/MeasurementMeta.java  |   85 -
 .../org/apache/iotdb/db/metadata/Metadata.java     |  120 --
 .../org/apache/iotdb/db/metadata/PartialPath.java  |    1 +
 .../iotdb/db/metadata/logfile/MLogTxtWriter.java   |    1 -
 .../iotdb/db/metadata/logfile/MLogWriter.java      |    1 -
 .../{ => logfile}/MetadataOperationType.java       |    2 +-
 .../iotdb/db/metadata/mnode/InternalMNode.java     |    2 +-
 .../db/metadata/{logfile => tag}/TagLogFile.java   |   10 +-
 .../apache/iotdb/db/metadata/tag/TagManager.java   |    1 -
 .../db/metadata/template/TemplateManager.java      |   10 +
 .../iotdb/db/metadata/utils/MetaFormatUtils.java   |  169 ++
 .../iotdb/db/metadata/{ => utils}/MetaUtils.java   |    5 +-
 .../iotdb/db/qp/constant/FilterConstant.java       |    3 +
 .../apache/iotdb/db/qp/constant/SQLConstant.java   |    2 +
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |    8 +
 .../org/apache/iotdb/db/qp/logical/Operator.java   |    3 +-
 .../iotdb/db/qp/logical/crud/LikeOperator.java     |    5 -
 .../iotdb/db/qp/logical/crud/QueryOperator.java    |    9 +-
 .../{LikeOperator.java => RegexpOperator.java}     |   32 +-
 .../db/qp/logical/sys/SetSystemModeOperator.java   |   53 +
 .../physical/sys/SetSystemModePlan.java}           |   30 +-
 .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java    |   38 +-
 .../iotdb/db/query/control/QueryFileManager.java   |    2 +-
 .../iotdb/db/query/executor/LastQueryExecutor.java |   11 +-
 .../iotdb/db/rescon/PrimitiveArrayManager.java     |   17 +-
 .../java/org/apache/iotdb/db/service/IoTDB.java    |    9 +
 .../org/apache/iotdb/db/service/StaticResps.java   |    6 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   14 +-
 .../apache/iotdb/db/tools/TsFileRewriteTool.java   |    2 +-
 .../org/apache/iotdb/db/utils/FilePathUtils.java   |    2 +-
 .../writelog/manager/MultiFileLogNodeManager.java  |    9 +-
 .../db/writelog/node/ExclusiveWriteLogNode.java    |   89 +-
 .../db/engine/memtable/PrimitiveMemTableTest.java  |   27 +
 .../storagegroup/StorageGroupProcessorTest.java    |  130 +-
 .../iotdb/db/integration/IoTDBAlignByDeviceIT.java |   38 +-
 .../org/apache/iotdb/db/integration/IoTDBAsIT.java |   10 +-
 .../iotdb/db/integration/IoTDBDeletionIT.java      |   81 +
 .../apache/iotdb/db/integration/IoTDBFillIT.java   |    2 +-
 .../apache/iotdb/db/integration/IoTDBLastIT.java   |  131 +-
 .../apache/iotdb/db/integration/IoTDBLikeIT.java   |  169 ++
 .../iotdb/db/integration/IoTDBQueryDemoIT.java     |   10 +-
 .../IoTDBSetSystemReadOnlyWritableIT.java          |  266 +++
 .../iotdb/db/integration/IoTDBTimePartitionIT.java |   92 +
 .../aggregation/IoTDBAggregationSmallDataIT.java   |    8 +-
 .../iotdb/db/metadata/MManagerBasicTest.java       |  144 ++
 .../apache/iotdb/db/metadata/MetaUtilsTest.java    |    1 +
 .../apache/iotdb/db/metadata/mnode/MNodeTest.java  |    2 +-
 .../iotdb/db/qp/logical/LogicalPlanSmallTest.java  |    4 +-
 .../iotdb/db/qp/physical/PhysicalPlanTest.java     |    4 +-
 .../apache/iotdb/db/writelog/WriteLogNodeTest.java |   26 +
 .../java/org/apache/iotdb/session/Session.java     |   29 +-
 .../org/apache/iotdb/session/pool/SessionPool.java |  258 ++-
 .../iotdb/session/IoTDBSessionComplexIT.java       |    2 +-
 .../iotdb/session/IoTDBSessionIteratorIT.java      |   26 +-
 .../java/org/apache/iotdb/session/SessionTest.java |    6 +-
 .../apache/iotdb/session/pool/SessionPoolTest.java |  103 +-
 site/src/main/.vuepress/config.js                  |   12 +-
 .../test/java/org/apache/iotdb/db/sql/Cases.java   |    4 +-
 .../iotdb/tsfile/common/conf/TSFileConfig.java     |    9 +-
 .../iotdb/tsfile/common/conf/TSFileDescriptor.java |    2 -
 .../read/expression/util/ExpressionOptimizer.java  |   34 +-
 .../iotdb/tsfile/read/filter/ValueFilter.java      |   27 +
 .../read/filter/factory/FilterSerializeId.java     |    1 +
 .../iotdb/tsfile/read/filter/operator/Like.java    |   50 +-
 .../filter/operator/{Like.java => Regexp.java}     |   14 +-
 .../read/query/timegenerator/node/LeafNode.java    |    2 +-
 .../tsfile/write/schema/MeasurementSchema.java     |    3 +-
 .../tsfile/write/schema/TimeseriesSchema.java      |    3 +-
 .../write/schema/VectorMeasurementSchema.java      |    3 +-
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  |   10 +
 .../iotdb/tsfile/read/ReadOnlyTsFileTest.java      |   69 +
 .../tsfile/write/MetadataIndexConstructorTest.java |    3 +-
 139 files changed, 6012 insertions(+), 3532 deletions(-)