This is an automated email from the ASF dual-hosted git repository. ejttianyu pushed a commit to branch win_e_option in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 505d68c628c90572df86a81790e94e37c2639026 Merge: 46e4393 e92f24e Author: EJTTianyu <[email protected]> AuthorDate: Thu Apr 23 15:14:27 2020 +0800 Merge branch 'master' of https://github.com/apache/incubator-iotdb into origin_master Jenkinsfile | 41 +- LICENSE-binary | 2 +- .../src/assembly/resources/sbin/start-client.bat | 6 +- .../org/apache/iotdb/client/AbstractClient.java | 83 +- docs/Community/Feedback.md | 48 ++ docs/Community/Materials.md | 100 +++ docs/Development/Committer.md | 77 ++ docs/Development/ContributeGuide.md | 30 +- docs/Development/HowToCommit.md | 139 ++++ docs/Development/VoteRelease.md | 4 - docs/SystemDesign/5-DataQuery/1-DataQuery.md | 4 +- .../5-DataQuery/10-GroupByFillQuery.md | 177 +++++ docs/UserGuide/3-Server/4-Config Manual.md | 9 + docs/UserGuide/4-Client/6-Programming - MQTT.md | 6 +- .../1-DDL Data Definition Language.md | 29 +- .../2-DML Data Manipulation Language.md | 70 +- .../5-Operation Manual/4-SQL Reference.md | 71 +- .../UserGuide/7-Ecosystem Integration/1-Grafana.md | 70 +- docs/zh/Community/Feedback.md | 44 ++ docs/zh/Community/Materials.md | 95 +++ docs/zh/Development/Committer.md | 78 ++ docs/zh/Development/ContributeGuide.md | 24 +- docs/zh/Development/HowToCommit.md | 139 ++++ docs/zh/SystemDesign/1-TsFile/2-Format.md | 2 +- docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md | 2 + .../5-DataQuery/10-GroupByFillQuery.md | 176 +++++ docs/zh/UserGuide/3-Server/4-Config Manual.md | 17 +- docs/zh/UserGuide/4-Client/6-Programming - MQTT.md | 2 +- .../1-DDL Data Definition Language.md | 29 +- .../2-DML Data Manipulation Language.md | 70 +- .../5-Operation Manual/4-SQL Reference.md | 77 +- .../UserGuide/7-Ecosystem Integration/1-Grafana.md | 65 +- .../main/java/org/apache/iotdb/JDBCExample.java | 19 +- .../main/java/org/apache/iotdb/kafka/Constant.java | 11 +- .../apache/iotdb/kafka/KafkaConsumerThread.java | 2 +- .../main/java/org/apache/iotdb/SessionExample.java | 68 +- grafana/readme.md | 74 +- grafana/readme_zh.md | 95 ++- .../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 70 +- .../main/resources}/application.properties | 10 +- pom.xml | 4 +- .../resources/conf/iotdb-engine.properties | 95 +-- .../src/assembly/resources/sbin/start-server.bat | 11 +- .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 73 +- .../db/concurrent/IoTDBThreadPoolFactory.java | 6 +- .../iotdb/db/concurrent/WrappedRunnable.java | 10 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 30 +- .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 17 + .../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 + .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 + .../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 33 +- .../apache/iotdb/db/engine/cache/ChunkCache.java | 2 +- .../iotdb/db/engine/cache/ChunkMetadataCache.java | 27 +- .../db/engine/cache/TimeSeriesMetadataCache.java | 2 +- .../iotdb/db/engine/flush/MemTableFlushTask.java | 9 +- .../iotdb/db/engine/memtable/AbstractMemTable.java | 4 +- .../db/engine/merge/manage/MergeResource.java | 2 +- .../merge/selector/MaxFileMergeFileSelector.java | 62 +- .../engine/storagegroup/StorageGroupProcessor.java | 2 +- .../db/engine/storagegroup/TsFileProcessor.java | 45 +- .../metadata/AliasAlreadyExistException.java} | 17 +- .../db/exception/metadata/MetadataException.java | 2 +- .../org/apache/iotdb/db/metadata/MLogWriter.java | 164 ++++ .../org/apache/iotdb/db/metadata/MManager.java | 515 ++++++++----- .../java/org/apache/iotdb/db/metadata/MTree.java | 80 +- .../org/apache/iotdb/db/metadata/MetaUtils.java | 8 +- .../apache/iotdb/db/metadata/MetadataConstant.java | 1 + .../org/apache/iotdb/db/metadata/TagLogFile.java | 143 ++++ .../iotdb/db/metadata/mnode/InternalMNode.java | 21 +- .../apache/iotdb/db/metadata/mnode/LeafMNode.java | 48 +- .../org/apache/iotdb/db/metadata/mnode/MNode.java | 17 +- .../apache/iotdb/db/qp/constant/SQLConstant.java | 2 + .../apache/iotdb/db/qp/executor/PlanExecutor.java | 162 ++-- .../org/apache/iotdb/db/qp/logical/Operator.java | 2 +- .../iotdb/db/qp/logical/crud/QueryOperator.java | 10 + .../iotdb/db/qp/logical/crud/SelectOperator.java | 5 +- .../qp/logical/sys/CreateTimeSeriesOperator.java | 31 +- .../db/qp/logical/sys/ShowTimeSeriesOperator.java | 45 ++ .../crud/GroupByFillPlan.java} | 27 +- .../iotdb/db/qp/physical/crud/GroupByPlan.java | 11 + .../db/qp/physical/sys/CreateTimeSeriesPlan.java | 100 ++- .../db/qp/physical/sys/ShowTimeSeriesPlan.java | 40 +- .../iotdb/db/qp/strategy/LogicalGenerator.java | 295 ++++---- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 40 +- .../dataset/RawQueryDataSetWithValueFilter.java | 22 +- .../db/query/dataset/ShowTimeSeriesResult.java | 71 ++ .../dataset/groupby/GroupByEngineDataSet.java | 20 +- .../query/dataset/groupby/GroupByFillDataSet.java | 119 +++ .../groupby/GroupByWithValueFilterDataSet.java | 7 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 7 +- .../iotdb/db/query/executor/FillQueryExecutor.java | 2 - .../iotdb/db/query/executor/IQueryRouter.java | 16 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 62 +- .../iotdb/db/query/executor/QueryRouter.java | 12 +- .../db/query/executor/RawDataQueryExecutor.java | 9 +- .../apache/iotdb/db/query/fill/PreviousFill.java | 87 ++- .../iotdb/db/query/reader/chunk/MemPageReader.java | 5 + .../chunk/metadata/DiskChunkMetadataLoader.java | 9 +- .../query/reader/series/SeriesAggregateReader.java | 19 +- .../iotdb/db/query/reader/series/SeriesReader.java | 74 +- .../query/timegenerator/ServerTimeGenerator.java | 2 +- .../org/apache/iotdb/db/service/RPCService.java | 43 +- .../iotdb/db/service/RPCServiceEventHandler.java | 56 -- .../org/apache/iotdb/db/service/TSServiceImpl.java | 107 ++- .../iotdb/db/sync/receiver/SyncServerManager.java | 28 +- .../db/sync/thrift/SyncServiceEventHandler.java | 56 -- .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 55 +- .../java/org/apache/iotdb/db/utils/MemUtils.java | 48 +- .../java/org/apache/iotdb/db/utils/QueryUtils.java | 2 +- .../db/writelog/node/ExclusiveWriteLogNode.java | 8 +- .../db/concurrent/IoTDBThreadPoolFactoryTest.java | 32 +- .../iotdb/db/engine/MetadataManagerHelper.java | 4 +- .../engine/modification/DeletionFileNodeTest.java | 23 +- .../db/engine/modification/DeletionQueryTest.java | 36 +- .../storagegroup/FileNodeManagerBenchmark.java | 7 +- .../apache/iotdb/db/integration/IoTDBDaemonIT.java | 38 +- .../apache/iotdb/db/integration/IoTDBFillIT.java | 77 ++ .../iotdb/db/integration/IoTDBGroupByFillIT.java | 545 ++++++++++++++ .../apache/iotdb/db/integration/IoTDBLastIT.java | 67 +- .../db/integration/IoTDBLoadExternalTsfileIT.java | 21 +- .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 18 +- .../IoTDBMultiOverlappedChunkInUnseqIT.java | 109 +++ .../db/integration/IoTDBMultiOverlappedPageIT.java | 146 ++++ .../db/integration/IoTDBOverlappedPageIT.java | 131 ++++ .../iotdb/db/integration/IoTDBSimpleQueryIT.java | 25 + .../apache/iotdb/db/integration/IoTDBTagIT.java | 835 +++++++++++++++++++++ .../iotdb/db/metadata/MManagerAdvancedTest.java | 56 +- .../iotdb/db/metadata/MManagerBasicTest.java | 4 + .../iotdb/db/metadata/MManagerImproveTest.java | 10 +- .../org/apache/iotdb/db/metadata/MTreeTest.java | 131 +++- .../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 15 +- .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 199 ++++- .../apache/iotdb/db/sql/CheckPathValidityTest.java | 49 ++ .../db/sync/receiver/load/FileLoaderTest.java | 22 +- .../recover/SyncReceiverLogAnalyzerTest.java | 26 +- .../apache/iotdb/db/writelog/PerformanceTest.java | 21 +- .../iotdb/db/writelog/recover/LogReplayerTest.java | 7 +- .../db/writelog/recover/SeqTsFileRecoverTest.java | 8 +- .../writelog/recover/UnseqTsFileRecoverTest.java | 21 +- server/src/test/resources/logback.xml | 4 + service-rpc/rpc-changelist.md | 3 + .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + service-rpc/src/main/thrift/rpc.thrift | 18 + .../main/java/org/apache/iotdb/session/Config.java | 14 - .../java/org/apache/iotdb/session/Session.java | 84 ++- .../org/apache/iotdb/session/pool/SessionPool.java | 105 ++- .../iotdb/session/CheckPathValidityTest.java | 49 -- .../org/apache/iotdb/session/IoTDBSessionIT.java | 41 +- site/src/main/.vuepress/config.js | 16 +- site/src/main/.vuepress/theme/components/Page.vue | 2 +- .../.vuepress/theme/global-components/IoTDB.vue | 4 +- .../.vuepress/theme/global-components/IoTDBZH.vue | 6 +- site/src/main/.vuepress/theme/noopModule.js | 18 - site/src/main/.vuepress/theme/styles/code.styl | 2 +- site/src/main/package.json | 8 +- tsfile/format-changelist.md | 1 + .../iotdb/tsfile/file/header/PageHeader.java | 9 + .../iotdb/tsfile/file/metadata/ChunkMetadata.java | 10 + .../tsfile/file/metadata/TimeseriesMetadata.java | 11 +- .../iotdb/tsfile/file/metadata/TsFileMetadata.java | 20 +- .../file/metadata/statistics/BinaryStatistics.java | 24 +- .../metadata/statistics/BooleanStatistics.java | 24 +- .../file/metadata/statistics/DoubleStatistics.java | 30 +- .../file/metadata/statistics/FloatStatistics.java | 31 +- .../metadata/statistics/IntegerStatistics.java | 31 +- .../file/metadata/statistics/LongStatistics.java | 31 +- .../file/metadata/statistics/Statistics.java | 14 +- .../read/controller/MetadataQuerierByFileImpl.java | 7 +- .../query/executor/ExecutorWithTimeGenerator.java | 25 +- .../read/query/timegenerator/TimeGenerator.java | 5 + .../iotdb/tsfile/read/reader/IPageReader.java | 2 + .../tsfile/read/reader/chunk/ChunkReader.java | 2 +- .../iotdb/tsfile/read/reader/page/PageReader.java | 5 + .../iotdb/tsfile/utils/ReadWriteIOUtils.java | 62 +- .../write/writer/ForceAppendTsFileWriter.java | 16 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 3 + .../metadata/statistics/BooleanStatisticsTest.java | 29 +- .../metadata/statistics/DoubleStatisticsTest.java | 32 +- .../metadata/statistics/FloatStatisticsTest.java | 38 +- .../metadata/statistics/IntegerStatisticsTest.java | 32 +- .../metadata/statistics/LongStatisticsTest.java | 36 +- .../metadata/statistics/StringStatisticsTest.java | 36 +- .../write/writer/ForceAppendTsFileWriterTest.java | 61 ++ 183 files changed, 7242 insertions(+), 1750 deletions(-)
