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 2019/11/15 04:36:34 UTC
[incubator-iotdb] 03/06: Merge remote-tracking branch
'origin/master' into fix_show_info
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch fix_show_info
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit fbe0227364e8adbe6bd011322a2f67f986fe6ba6
Merge: d6ca9de 8c2e5e3
Author: lta <li...@163.com>
AuthorDate: Thu Nov 14 19:50:38 2019 +0800
Merge remote-tracking branch 'origin/master' into fix_show_info
RELEASE_NOTES.md | 277 +++++++----
...e(CLI).md => 1-Command Line Interface (CLI).md} | 2 +-
.../UserGuide/4-Client/2-Programming - JDBC.md | 27 +-
.../5-Operation Manual/4-SQL Reference.md | 2 +-
...e Hadoop Connector.md => 2-MapReduce TsFile.md} | 2 +-
...TsFile Spark Connector.md => 3-Spark TsFile.md} | 0
...4-Spark IoTDB Connector.md => 4-Spark IoTDB.md} | 0
...5-Tsfile Hive Connector.md => 5-Hive TsFile.md} | 0
.../8-System Design (Developer)/2-Files.md | 34 +-
docs/Documentation/UserGuide/0-Content.md | 10 +-
.../UserGuide/3-Server/4-Config Manual.md | 2 +-
... (Cli).md => 1-Command Line Interface (CLI).md} | 4 +-
.../UserGuide/4-Client/2-Programming - JDBC.md | 30 +-
.../5-Operation Manual/4-SQL Reference.md | 4 +-
.../7-Ecosystem Integration/2-MapReduce TsFile.md | 2 +-
.../7-Ecosystem Integration/4-Spark IoTDB.md | 8 +-
.../8-System Design (Developer)/1-Hierarchy.md | 190 +++-----
.../8-System Design (Developer)/2-Files.md | 6 +-
grafana/readme.md | 68 ++-
grafana/readme_zh.md | 106 ++--
hadoop/README.md | 192 +++++++-
jdbc/README.md | 96 +++-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 17 +-
server/server-changelist.md | 39 ++
.../resources/conf/iotdb-engine.properties | 9 +
.../resources/tools/upgrade/config.properties | 27 ++
.../resources/tools/upgrade/offline-upgrade.bat | 67 +++
.../resources/tools/upgrade/offline-upgrade.sh | 47 ++
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 19 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 13 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 5 +-
.../directories/strategy/DirectoryStrategy.java | 3 +-
.../iotdb/db/cost/statistic/Measurement.java | 5 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 84 +++-
.../db/engine/cache/CacheHitRatioMonitor.java | 5 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 5 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 2 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 20 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 6 +-
.../db/engine/merge/manage/MergeResource.java | 10 +-
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 4 +-
.../merge/selector/MaxFileMergeFileSelector.java | 32 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 8 +-
.../iotdb/db/engine/merge/task/MergeTask.java | 4 +-
.../db/engine/merge/task/RecoverMergeTask.java | 4 +-
.../engine/storagegroup/StorageGroupProcessor.java | 81 +++-
.../db/engine/storagegroup/TsFileProcessor.java | 6 +-
.../db/engine/storagegroup/TsFileResource.java | 23 +-
.../upgrade/UpgradeCheckStatus.java} | 21 +-
.../apache/iotdb/db/engine/upgrade/UpgradeLog.java | 88 ++++
.../iotdb/db/engine/upgrade/UpgradeTask.java | 81 ++++
.../db/exception/ConfigAdjusterException.java | 18 +-
.../db/exception/DeltaEngineRunningException.java | 45 --
.../exception/DiskSpaceInsufficientException.java | 8 +-
.../apache/iotdb/db/exception/MergeException.java | 16 +-
...ysCheckException.java => ProcessException.java} | 17 +-
.../iotdb/db/exception/ProcessorException.java | 47 --
...on.java => QueryInBatchStatementException.java} | 18 +-
.../iotdb/db/exception/StartupException.java | 19 +-
.../iotdb/db/exception/StorageEngineException.java | 19 +-
.../db/exception/SyncConnectionException.java | 11 +-
.../SyncDeviceOwnerConflictException.java | 18 +-
...rorException.java => SystemCheckException.java} | 16 +-
.../db/exception/TsFileProcessorException.java | 22 +-
.../MetadataException.java} | 20 +-
.../TimeseriesAlreadyExistException.java} | 16 +-
.../MTreePathException.java} | 21 +-
.../{ => path}/NotStorageGroupException.java | 11 +-
.../PTreePathException.java} | 11 +-
.../PathException.java} | 17 +-
.../db/exception/qp/IllegalASTFormatException.java | 39 --
.../db/exception/qp/QueryProcessorException.java | 40 --
.../exception/query/IllegalASTFormatException.java | 68 +++
.../{qp => query}/LogicalOperatorException.java | 22 +-
.../{qp => query}/LogicalOptimizeException.java | 20 +-
.../exception/{ => query}/OutOfTTLException.java | 9 +-
.../QueryProcessException.java} | 20 +-
.../{ => query}/UnSupportedFillTypeException.java | 19 +-
.../{ => runtime}/FlushRunTimeException.java | 17 +-
.../StorageEngineFailureException.java | 17 +-
.../{ => storageGroup}/StorageGroupException.java | 20 +-
.../storageGroup/StorageGroupNotSetException.java} | 12 +-
.../storageGroup/StorageGroupPathException.java} | 13 +-
.../StorageGroupProcessorException.java | 29 +-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 94 ++--
.../org/apache/iotdb/db/metadata/MManager.java | 239 ++++-----
.../java/org/apache/iotdb/db/metadata/MTree.java | 190 ++++----
.../java/org/apache/iotdb/db/metadata/PNode.java | 10 +-
.../java/org/apache/iotdb/db/metadata/PTree.java | 49 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 22 +-
.../org/apache/iotdb/db/qp/QueryProcessor.java | 52 +-
.../apache/iotdb/db/qp/constant/DatetimeUtils.java | 4 +-
.../qp/executor/AbstractQueryProcessExecutor.java | 46 +-
.../db/qp/executor/IQueryProcessExecutor.java | 33 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 148 +++---
.../db/qp/logical/crud/BasicFunctionOperator.java | 11 +-
.../db/qp/logical/crud/BasicOperatorType.java | 2 +-
.../iotdb/db/qp/logical/crud/FilterOperator.java | 47 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 6 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 143 +++---
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 46 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 38 +-
.../qp/strategy/optimizer/DnfFilterOptimizer.java | 6 +-
.../db/qp/strategy/optimizer/IFilterOptimizer.java | 6 +-
.../qp/strategy/optimizer/ILogicalOptimizer.java | 2 +-
.../optimizer/MergeSingleFilterOptimizer.java | 2 +-
.../qp/strategy/optimizer/RemoveNotOptimizer.java | 15 +-
.../db/query/aggregation/AggregateFunction.java | 42 +-
.../db/query/aggregation/impl/FirstAggrFunc.java | 6 +-
.../iotdb/db/query/control/FileReaderManager.java | 4 +-
.../db/query/control/QueryResourceManager.java | 2 +-
.../db/query/dataset/DeviceIterateDataSet.java | 6 +-
.../dataset/groupby/GroupByEngineDataSet.java | 7 +-
.../groupby/GroupByWithValueFilterDataSet.java | 6 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 16 +-
.../db/query/executor/AggregateEngineExecutor.java | 19 +-
.../iotdb/db/query/executor/EngineExecutor.java | 9 +-
.../iotdb/db/query/executor/EngineQueryRouter.java | 22 +-
.../db/query/executor/FillEngineExecutor.java | 8 +-
.../db/query/executor/IEngineQueryRouter.java | 16 +-
.../externalsort/SimpleExternalSortEngine.java | 4 +-
.../iotdb/db/query/factory/AggreFuncFactory.java | 8 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 3 +-
.../org/apache/iotdb/db/query/fill/LinearFill.java | 9 +-
.../query/timegenerator/EngineNodeConstructor.java | 2 +-
.../apache/iotdb/db/rescon/TVListAllocator.java | 5 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 1 +
.../org/apache/iotdb/db/service/JDBCService.java | 4 +-
.../org/apache/iotdb/db/service/JMXService.java | 8 +-
.../apache/iotdb/db/service/MetricsService.java | 2 +-
.../java/org/apache/iotdb/db/service/Monitor.java | 5 +-
.../org/apache/iotdb/db/service/ServiceType.java | 1 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 151 +++---
.../org/apache/iotdb/db/service/UpgradeSevice.java | 118 +++++
.../db/sync/receiver/load/FileLoaderManager.java | 4 +-
.../db/sync/receiver/transfer/SyncServiceImpl.java | 8 +-
.../iotdb/db/sync/sender/client/SyncClient.java | 1 -
.../db/sync/sender/manage/SyncFileManager.java | 4 +
.../java/org/apache/iotdb/db/tools/WalChecker.java | 10 +-
.../iotdb/db/tools/upgrade/OfflineUpgradeTool.java | 68 +++
.../db/tools/watermark/WatermarkDetector.java | 10 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 130 +++++
.../writelog/manager/MultiFileLogNodeManager.java | 5 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 27 +-
.../writelog/recover/TsFileRecoverPerformer.java | 29 +-
.../adapter/IoTDBConfigDynamicAdapterTest.java | 8 +-
.../db/engine/cache/DeviceMetaDataCacheTest.java | 6 +-
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 6 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 7 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 6 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 8 +-
.../iotdb/db/engine/merge/MergeUpgradeTest.java | 160 ++++++
.../engine/modification/DeletionFileNodeTest.java | 20 +-
.../db/engine/modification/DeletionQueryTest.java | 27 +-
.../storagegroup/FileNodeManagerBenchmark.java | 18 +-
.../storagegroup/StorageGroupProcessorTest.java | 26 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 52 +-
.../engine/storagegroup/TsFileProcessorTest.java | 11 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 2 +-
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 6 +-
.../org/apache/iotdb/db/metadata/MGraphTest.java | 6 +-
.../iotdb/db/metadata/MManagerAdvancedTest.java | 14 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 81 ++--
.../iotdb/db/metadata/MManagerImproveTest.java | 20 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 152 +++---
.../org/apache/iotdb/db/metadata/MetadataTest.java | 8 +-
.../iotdb/db/qp/bench/QueryParseBenchmark.java | 12 +-
.../iotdb/db/qp/other/TSPlanContextAuthorTest.java | 9 +-
.../db/qp/other/TSPlanContextPropertyTest.java | 9 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 56 +--
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 74 ++-
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 37 +-
.../iotdb/db/qp/plan/TestConcatOptimizer.java | 17 +-
.../iotdb/db/qp/strategy/LogicalGeneratorTest.java | 2 +-
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 14 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 6 +-
.../fileRelated/UnSealedTsFileReaderTest.java | 4 +-
.../resourceRelated/SeqResourceReaderTest.java | 4 +-
.../resourceRelated/UnseqResourceReaderTest.java | 4 +-
.../db/sql/DatetimeQueryDataSetUtilsTest.java | 2 +-
.../db/sync/receiver/load/FileLoaderTest.java | 6 +-
.../recover/SyncReceiverLogAnalyzerTest.java | 6 +-
.../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 15 +-
.../org/apache/iotdb/db/tools/WalCheckerTest.java | 12 +-
.../apache/iotdb/db/writelog/PerformanceTest.java | 10 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 8 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 8 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 10 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 20 +-
spark-iotdb-connector/Readme.md | 19 +-
spark-tsfile/README.md | 109 +++--
.../apache/iotdb/tsfile/common/cache/LRUCache.java | 45 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 2 +
.../tsfile/common/constant/TsFileConstant.java | 1 +
.../iotdb/tsfile/file/metadata/TsFileMetaData.java | 52 +-
.../fileOutputFactory/HDFSOutputFactory.java | 1 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 98 ++--
.../tool/upgrade/TsfileUpgradeToolV0_8_0.java | 539 +++++++++++++++++++++
.../iotdb/tsfile/tool/upgrade/UpgradeTool.java | 108 +++++
.../iotdb/tsfile/write/chunk/ChunkBuffer.java | 45 +-
.../tsfile/file/metadata/TsFileMetaDataTest.java | 2 +-
202 files changed, 4234 insertions(+), 2281 deletions(-)