This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch merge in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 8b272324bf2519f7dc1f1b8cecc539bdeca98af2 Merge: e55e752 d70758c Author: qiaojialin <[email protected]> AuthorDate: Wed Aug 12 16:04:36 2020 +0800 Merge remote-tracking branch 'origin/master' into merge Jenkinsfile | 1 + RELEASE_NOTES.md | 26 +++ .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 192 +++++++++++++++++++++ distribution/src/assembly/distribution.xml | 3 + docs/Blog/index.md | 2 +- docs/SystemDesign/Architecture/Architecture.md | 22 +-- docs/SystemDesign/DataQuery/AlignByDeviceQuery.md | 4 +- docs/SystemDesign/DataQuery/DataQuery.md | 18 +- docs/SystemDesign/DataQuery/QueryFundamentals.md | 2 +- docs/SystemDesign/QueryEngine/QueryEngine.md | 4 +- .../QueryEngine/ResultSetConstruction.md | 4 +- .../SystemDesign/StorageEngine/DataManipulation.md | 14 +- docs/SystemDesign/StorageEngine/Recover.md | 106 ++++++++++++ docs/SystemDesign/StorageEngine/StorageEngine.md | 8 +- docs/SystemDesign/TsFile/TsFile.md | 6 +- docs/UserGuide/Architecture/Files.md | 8 +- docs/UserGuide/Client/Programming - TsFile API.md | 2 +- docs/UserGuide/Client/Status Codes.md | 1 + docs/UserGuide/Concept/Compression.md | 2 +- docs/UserGuide/Concept/Data Type.md | 2 +- docs/UserGuide/Concept/Encoding.md | 2 +- .../Ecosystem Integration/Spark TsFile.md | 18 +- docs/UserGuide/Get Started/QuickStart.md | 6 +- docs/UserGuide/Operation Manual/Administration.md | 2 +- .../DDL Data Definition Language.md | 4 +- .../DML Data Manipulation Language.md | 22 +-- docs/UserGuide/Operation Manual/SQL Reference.md | 15 -- docs/UserGuide/Overview/Architecture.md | 2 +- docs/UserGuide/Server/Download.md | 2 +- .../System Tools/Monitor and Log Tools.md | 4 +- docs/UserGuide/UserGuideReadme.md | 7 +- docs/zh/SystemDesign/Architecture/Architecture.md | 22 +-- .../SystemDesign/DataQuery/AlignByDeviceQuery.md | 4 +- docs/zh/SystemDesign/DataQuery/DataQuery.md | 18 +- .../zh/SystemDesign/DataQuery/QueryFundamentals.md | 2 +- docs/zh/SystemDesign/QueryEngine/QueryEngine.md | 4 +- .../QueryEngine/ResultSetConstruction.md | 4 +- .../SystemDesign/StorageEngine/DataManipulation.md | 14 +- docs/zh/SystemDesign/StorageEngine/FileLists.md | 16 ++ docs/zh/SystemDesign/StorageEngine/Recover.md | 107 ++++++++++++ .../zh/SystemDesign/StorageEngine/StorageEngine.md | 8 +- docs/zh/SystemDesign/TsFile/TsFile.md | 6 +- docs/zh/UserGuide/Architecture/Files.md | 8 +- .../UserGuide/Client/Programming - TsFile API.md | 2 +- docs/zh/UserGuide/Client/Status Codes.md | 1 + docs/zh/UserGuide/Concept/Compression.md | 2 +- docs/zh/UserGuide/Concept/Data Type.md | 2 +- docs/zh/UserGuide/Concept/Encoding.md | 2 +- .../Ecosystem Integration/Spark TsFile.md | 18 +- docs/zh/UserGuide/Get Started/QuickStart.md | 6 +- .../UserGuide/Operation Manual/Administration.md | 2 +- .../DDL Data Definition Language.md | 4 +- .../DML Data Manipulation Language.md | 18 +- .../zh/UserGuide/Operation Manual/SQL Reference.md | 15 -- docs/zh/UserGuide/Overview/Architecture.md | 2 +- docs/zh/UserGuide/Server/Download.md | 2 +- .../System Tools/Monitor and Log Tools.md | 6 +- docs/zh/UserGuide/UserGuideReadme.md | 7 +- .../apache/iotdb/tsfile/TsFileWriteWithTablet.java | 11 +- hive-connector/pom.xml | 25 +++ pom.xml | 7 + server/src/assembly/resources/conf/iotdb-env.bat | 1 + server/src/assembly/resources/conf/iotdb-env.sh | 1 + server/src/assembly/resources/conf/logback.xml | 1 + .../org/apache/iotdb/db/auth/AuthorityChecker.java | 1 + .../iotdb/db/auth/authorizer/OpenIdAuthorizer.java | 18 +- .../db/conf/adapter/ActiveTimeSeriesCounter.java | 6 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 4 +- .../db/engine/cache/TimeSeriesMetadataCache.java | 6 +- .../db/engine/querycontext/ReadOnlyMemChunk.java | 4 +- .../db/engine/storagegroup/TsFileResource.java | 2 +- .../org/apache/iotdb/db/metadata/MManager.java | 29 ++-- .../java/org/apache/iotdb/db/metadata/MTree.java | 12 +- .../org/apache/iotdb/db/metadata/mnode/MNode.java | 4 +- .../iotdb/db/metadata/mnode/MeasurementMNode.java | 6 +- .../apache/iotdb/db/metrics/server/JettyUtil.java | 26 +-- .../iotdb/db/metrics/server/MetricsSystem.java | 26 +-- .../iotdb/db/metrics/server/QueryServlet.java | 26 +-- .../iotdb/db/metrics/server/ServerArgument.java | 26 +-- .../iotdb/db/metrics/server/SqlArgument.java | 26 +-- .../apache/iotdb/db/metrics/sink/ConsoleSink.java | 26 +-- .../iotdb/db/metrics/sink/MetricsServletSink.java | 26 +-- .../org/apache/iotdb/db/metrics/sink/Sink.java | 26 +-- .../apache/iotdb/db/metrics/source/JvmSource.java | 26 +-- .../iotdb/db/metrics/source/MetricsSource.java | 26 +-- .../org/apache/iotdb/db/metrics/source/Source.java | 26 +-- .../apache/iotdb/db/metrics/ui/MetricsPage.java | 27 +-- .../apache/iotdb/db/metrics/ui/MetricsWebUI.java | 26 +-- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 31 ++-- .../qp/logical/sys/CreateTimeSeriesOperator.java | 6 +- .../db/qp/physical/sys/CreateTimeSeriesPlan.java | 6 +- .../iotdb/db/qp/strategy/LogicalGenerator.java | 3 +- .../db/query/dataset/ShowTimeseriesDataSet.java | 7 +- .../iotdb/db/service/MetricsServiceMBean.java | 26 +-- .../org/apache/iotdb/db/service/TSServiceImpl.java | 5 +- .../java/org/apache/iotdb/db/utils/QueryUtils.java | 5 +- .../org/apache/iotdb/db/utils/SchemaUtils.java | 47 ++++- .../db/auth/authorizer/OpenIdAuthorizerTest.java | 18 +- .../iotdb/db/integration/IoTDBAuthorizationIT.java | 2 + .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 1 - .../iotdb/db/integration/IoTDBSimpleQueryIT.java | 80 +++++++++ .../iotdb/db/metadata/MManagerImproveTest.java | 2 +- .../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 15 ++ .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + .../org/apache/iotdb/session/pool/SessionPool.java | 15 +- .../org/apache/iotdb/session/IoTDBSessionIT.java | 8 +- .../apache/iotdb/session/pool/SessionPoolTest.java | 69 ++++---- site/src/main/.vuepress/config.js | 6 +- spark-iotdb-connector/pom.xml | 5 - .../tsfile/write/schema/MeasurementSchema.java | 12 +- .../write/schema/converter/SchemaBuilderTest.java | 6 +- 111 files changed, 1193 insertions(+), 473 deletions(-)
