You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2020/04/20 13:39:07 UTC
[incubator-iotdb] 01/01: merge master
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch fix_oom
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 74446b3595e0e8362e0293221a345f0fde8d6412
Merge: fadc454 3c7c16a
Author: lta <li...@163.com>
AuthorDate: Mon Apr 20 21:38:41 2020 +0800
merge master
Jenkinsfile | 41 +-
.../src/assembly/resources/sbin/start-client.bat | 6 +-
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/4-Client/6-Programming - MQTT.md | 6 +-
.../2-DML Data Manipulation Language.md | 70 ++-
.../5-Operation Manual/4-SQL Reference.md | 29 +-
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/4-Client/6-Programming - MQTT.md | 2 +-
.../2-DML Data Manipulation Language.md | 70 ++-
.../5-Operation Manual/4-SQL Reference.md | 35 +-
.../main/java/org/apache/iotdb/JDBCExample.java | 19 +-
.../main/java/org/apache/iotdb/kafka/Constant.java | 11 +-
.../apache/iotdb/kafka/KafkaConsumerThread.java | 2 +-
pom.xml | 2 +-
.../resources/conf/iotdb-engine.properties | 2 +-
.../src/assembly/resources/sbin/start-server.bat | 11 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 23 +-
.../db/concurrent/IoTDBThreadPoolFactory.java | 6 +-
.../iotdb/db/concurrent/WrappedRunnable.java | 9 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 11 +-
.../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 +-
.../engine/storagegroup/StorageGroupProcessor.java | 3 +-
.../db/engine/storagegroup/TsFileProcessor.java | 43 +-
.../org/apache/iotdb/db/metadata/MManager.java | 124 +++--
.../apache/iotdb/db/qp/constant/SQLConstant.java | 2 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 16 +-
.../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 +-
.../physical/crud/GroupByFillPlan.java} | 31 +-
.../iotdb/db/qp/physical/crud/GroupByPlan.java | 11 +
.../iotdb/db/qp/strategy/LogicalGenerator.java | 199 +++-----
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 32 +-
.../dataset/RawQueryDataSetWithValueFilter.java | 22 +-
.../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 | 83 ++--
.../chunk/metadata/DiskChunkMetadataLoader.java | 9 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 49 +-
.../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 | 1 +
.../iotdb/db/sync/receiver/SyncServerManager.java | 28 +-
.../db/sync/thrift/SyncServiceEventHandler.java | 56 ---
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 53 +-
.../db/concurrent/IoTDBThreadPoolFactoryTest.java | 32 +-
.../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 +--
.../IoTDBMultiOverlappedChunkInUnseqIT.java | 109 +++++
.../db/integration/IoTDBMultiOverlappedPageIT.java | 146 ++++++
.../db/integration/IoTDBOverlappedPageIT.java | 131 +++++
.../iotdb/db/metadata/MManagerBasicTest.java | 4 +
.../iotdb/db/metadata/MManagerImproveTest.java | 4 -
.../org/apache/iotdb/db/metadata/MTreeTest.java | 2 +
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 177 ++++++-
server/src/test/resources/logback.xml | 5 +
.../org/apache/iotdb/session/pool/SessionPool.java | 54 ++
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/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 | 1 +
.../read/controller/MetadataQuerierByFileImpl.java | 7 +-
.../query/executor/ExecutorWithTimeGenerator.java | 25 +-
.../read/query/timegenerator/TimeGenerator.java | 5 +
.../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 +++
113 files changed, 3779 insertions(+), 851 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
index 110e477,a6a5bb8..6d1c746
--- a/server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
@@@ -225,10 -227,10 +228,11 @@@ public class IoTDBConfigDynamicAdapter
CONFIG.setMaxMemtableNumber(maxMemTableNum);
return;
}
+
if (!tryToAdaptParameters()) {
totalStorageGroup -= diff;
- maxMemTableNum -= IoTDBDescriptor.getInstance().getConfig().getMemtableNumInEachStorageGroup() * diff;
+ maxMemTableNum -=
+ IoTDBDescriptor.getInstance().getConfig().getMemtableNumInEachStorageGroup() * diff;
throw new ConfigAdjusterException(CREATE_STORAGE_GROUP);
}
}