You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ej...@apache.org on 2020/11/04 03:43:56 UTC
[iotdb] 01/02: Merge branch 'master' of github.com:apache/iotdb
This is an automated email from the ASF dual-hosted git repository.
ejttianyu pushed a commit to branch storage_test_block_fix
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a5b1fc643047cfd768a61ba346460a78c6924e1b
Merge: 247e7aa 4696f0f
Author: EJTTianyu <16...@qq.com>
AuthorDate: Wed Nov 4 11:39:46 2020 +0800
Merge branch 'master' of github.com:apache/iotdb
RELEASE_NOTES.md | 71 +++++
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 14 -
.../java/org/apache/iotdb/cli/AbstractCli.java | 8 +-
client-py/pom.xml | 126 ++++++++
{thrift/src => client-py}/pypi/README.md | 12 +-
{thrift/src => client-py}/pypi/setup.py | 2 +-
client-py/readme.md | 13 +-
client-py/src/Session.py | 12 +-
client-py/src/SessionExample.py | 2 +-
.../memory-tool.sh => client-py/src/__init__.py | 29 --
.../src/main/Dockerfile-0.11.0 | 50 ++--
docs/Blog/Release0_93.md | 2 +-
docs/UserGuide/Client/Command Line Interface.md | 2 +-
docs/UserGuide/Comparison/TSDB-Comparison.md | 2 +-
.../UserGuide/Ecosystem Integration/Hive TsFile.md | 2 +-
docs/UserGuide/Server/Config Manual.md | 10 +-
.../System Tools/Memory Estimation Tool.md | 84 ------
.../{TsFileManagement.md => Compaction.md} | 49 ++--
docs/zh/SystemDesign/TsFile/Format.md | 4 +-
docs/zh/UserGuide/Server/Config Manual.md | 19 +-
.../System Tools/Memory Estimation Tool.md | 88 ------
grafana/readme.md | 8 +-
grafana/readme_zh.md | 8 +-
pom.xml | 1 +
.../file-changelists/TsFileResource-changelist.md | 22 ++
server/file-changelists/mlog-changelist.md | 20 ++
server/file-changelists/role-changelist.md | 20 ++
.../storage_group_version-changelist.md | 20 ++
.../system.properties-changelist.md | 20 ++
server/file-changelists/tlog-changelist.md | 20 ++
server/file-changelists/user-changelist.md | 20 ++
server/file-changelists/wal-changelist.md | 20 ++
server/server-changelist.md | 16 +-
.../resources/conf/iotdb-engine.properties | 118 ++++----
.../src/assembly/resources/tools/memory-tool.bat | 65 -----
.../org/apache/iotdb/db/concurrent/ThreadName.java | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 220 +++++++++-----
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 -
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 66 +++--
.../db/conf/adapter/ActiveTimeSeriesCounter.java | 159 ----------
.../iotdb/db/conf/adapter/CompressionRatio.java | 17 --
.../db/conf/adapter/IActiveTimeSeriesCounter.java | 61 ----
.../iotdb/db/conf/adapter/IDynamicAdapter.java | 47 ---
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 300 -------------------
.../db/conf/adapter/ManageDynamicParameters.java | 135 ---------
.../conf/adapter/ManageDynamicParametersMBean.java | 46 ---
.../org/apache/iotdb/db/engine/StorageEngine.java | 6 +-
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 2 -
.../CompactionMergeTaskPoolManager.java} | 32 +-
.../CompactionStrategy.java} | 20 +-
.../TsFileManagement.java | 43 +--
.../level/LevelCompactionTsFileManagement.java} | 93 +++---
.../no/NoCompactionTsFileManagement.java} | 10 +-
.../utils/CompactionLogAnalyzer.java} | 31 +-
.../utils/CompactionLogger.java} | 16 +-
.../utils/CompactionUtils.java} | 52 ++--
.../iotdb/db/engine/flush/MemTableFlushTask.java | 13 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 53 +++-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 29 +-
.../db/engine/memtable/IWritableMemChunk.java | 13 +-
.../db/engine/memtable/PrimitiveMemTable.java | 3 +
.../iotdb/db/engine/memtable/WritableMemChunk.java | 31 --
.../iotdb/db/engine/merge/manage/MergeManager.java | 17 --
.../db/engine/merge/task/MergeMultiChunkTask.java | 3 +-
.../db/engine/storagegroup/StorageGroupInfo.java | 105 +++++++
.../engine/storagegroup/StorageGroupProcessor.java | 111 +++++--
.../db/engine/storagegroup/TsFileProcessor.java | 256 +++++++++++++---
.../engine/storagegroup/TsFileProcessorInfo.java | 65 +++++
.../db/engine/storagegroup/TsFileResource.java | 31 ++
.../db/exception/ConfigAdjusterException.java | 31 --
.../org/apache/iotdb/db/metadata/MManager.java | 239 +++++++--------
.../main/java/org/apache/iotdb/db/qp/Planner.java | 11 +
.../apache/iotdb/db/qp/constant/SQLConstant.java | 3 -
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 51 ----
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 2 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 6 -
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 35 ++-
.../org/apache/iotdb/db/rescon/MemTablePool.java | 114 --------
.../iotdb/db/rescon/PrimitiveArrayManager.java | 322 +++++++++++++++++++++
.../apache/iotdb/db/rescon/PrimitiveArrayPool.java | 166 -----------
.../org/apache/iotdb/db/rescon/SystemInfo.java | 185 ++++++++++++
.../apache/iotdb/db/rescon/TVListAllocator.java | 4 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 15 +-
.../org/apache/iotdb/db/service/ServiceType.java | 3 +-
.../org/apache/iotdb/db/service/StaticResps.java | 5 -
.../org/apache/iotdb/db/service/TSServiceImpl.java | 22 +-
.../iotdb/db/tools/memestimation/MemEstTool.java | 92 ------
.../db/tools/memestimation/MemEstToolCmd.java | 120 --------
.../java/org/apache/iotdb/db/utils/MemUtils.java | 29 +-
.../iotdb/db/utils/datastructure/BinaryTVList.java | 52 +---
.../db/utils/datastructure/BooleanTVList.java | 53 +---
.../iotdb/db/utils/datastructure/DoubleTVList.java | 53 +---
.../iotdb/db/utils/datastructure/FloatTVList.java | 52 +---
.../iotdb/db/utils/datastructure/IntTVList.java | 52 +---
.../iotdb/db/utils/datastructure/LongTVList.java | 52 +---
.../iotdb/db/utils/datastructure/TVList.java | 64 ++--
.../db/writelog/node/ExclusiveWriteLogNode.java | 3 +-
.../conf/adapter/ActiveTimeSeriesCounterTest.java | 125 --------
.../db/conf/adapter/CompressionRatioTest.java | 1 -
.../iotdb/db/conf/adapter/HyperLogLogTest.java | 65 -----
.../adapter/IoTDBConfigDynamicAdapterTest.java | 138 ---------
.../db/engine/cache/ChunkMetadataCacheTest.java | 2 -
.../db/engine/memtable/MemTableFlushTaskTest.java | 2 -
.../iotdb/db/engine/memtable/MemTablePoolTest.java | 82 ------
.../db/engine/memtable/MemtableBenchmark.java | 3 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 1 +
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 2 +-
.../iotdb/db/engine/merge/MergePerfTest.java | 2 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 2 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 6 +-
.../engine/modification/DeletionFileNodeTest.java | 2 -
.../db/engine/modification/DeletionQueryTest.java | 2 -
.../engine/modification/ModificationFileTest.java | 2 -
.../storagegroup/StorageGroupProcessorTest.java | 20 +-
.../engine/storagegroup/TsFileProcessorTest.java | 37 ++-
.../db/integration/IoTDBDeleteTimeseriesIT.java | 10 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 6 +-
.../iotdb/db/integration/IoTDBMergeTest.java | 10 +-
.../db/integration/IoTDBRemovePartitionIT.java | 2 -
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 12 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 26 --
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 3 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 8 -
.../iotdb/db/query/reader/ReaderTestHelper.java | 69 -----
.../apache/iotdb/db/utils/EnvironmentUtils.java | 19 +-
.../db/utils/datastructure/LongTVListTest.java | 18 +-
.../recover/RecoverResourceFromReaderTest.java | 3 -
.../db/writelog/recover/SeqTsFileRecoverTest.java | 3 -
.../writelog/recover/UnseqTsFileRecoverTest.java | 3 -
.../iotdb/session/IoTDBSessionComplexIT.java | 2 +-
site/src/main/.vuepress/config.js | 2 -
.../apache/iotdb/spark/db/EnvironmentUtils.java | 8 -
spark-tsfile/README.md | 4 +-
thrift/pom.xml | 103 -------
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 5 +
.../tsfile/file/metadata/enums/TSDataType.java | 18 ++
.../file/metadata/statistics/BinaryStatistics.java | 4 +-
.../metadata/statistics/BooleanStatistics.java | 2 +-
.../file/metadata/statistics/DoubleStatistics.java | 2 +-
.../file/metadata/statistics/FloatStatistics.java | 2 +-
.../metadata/statistics/IntegerStatistics.java | 2 +-
.../file/metadata/statistics/LongStatistics.java | 2 +-
.../file/metadata/statistics/Statistics.java | 19 ++
143 files changed, 2387 insertions(+), 3378 deletions(-)