You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/11/22 10:15:31 UTC
[iotdb] 20/21: Merge remote-tracking branch 'origin/master'
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit bb220eb8091a2726c13e59e7a21c8c722f331958
Merge: 1c4a2fb c815166
Author: qiaojialin <64...@qq.com>
AuthorDate: Sun Nov 22 17:50:14 2020 +0800
Merge remote-tracking branch 'origin/master'
docs/Development/ContributeGuide.md | 2 +-
docs/SystemDesign/TsFile/Format.md | 18 +-
docs/UserGuide/Client/Programming - Native API.md | 22 +-
.../DML Data Manipulation Language.md | 16 +-
docs/zh/Development/ContributeGuide.md | 2 +-
docs/zh/SystemDesign/TsFile/Format.md | 20 +-
.../UserGuide/Client/Programming - Native API.md | 18 +
.../DML Data Manipulation Language.md | 15 +-
.../iotdb/flink/tsfile/TsFileOutputFormat.java | 17 +-
.../apache/iotdb/hadoop/fileSystem/HDFSFile.java | 6 +-
.../iotdb/db/auth/authorizer/OpenIdAuthorizer.java | 2 +-
.../org/apache/iotdb/db/concurrent/ThreadName.java | 2 +-
.../iotdb/db/cost/statistic/Measurement.java | 4 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 2 +-
.../compaction/CompactionMergeTaskPoolManager.java | 10 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 1 -
.../iotdb/db/engine/merge/manage/MergeManager.java | 16 +-
.../merge/selector/MaxFileMergeFileSelector.java | 4 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 2 +-
.../engine/storagegroup/StorageGroupProcessor.java | 4 +-
.../db/engine/storagegroup/TsFileProcessor.java | 4 +-
.../org/apache/iotdb/db/metadata/MManager.java | 44 +-
.../iotdb/db/metrics/server/MetricsSystem.java | 6 +-
.../iotdb/db/metrics/server/ServerArgument.java | 8 +-
.../org/apache/iotdb/db/mqtt/PublishHandler.java | 4 +-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 1 -
.../db/qp/physical/crud/AlignByDevicePlan.java | 2 +-
.../db/query/executor/fill/LastPointReader.java | 4 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 16 +-
.../java/org/apache/iotdb/db/service/IService.java | 4 +-
.../org/apache/iotdb/db/service/StartupChecks.java | 10 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 4 +-
.../apache/iotdb/db/sync/conf/SyncConstant.java | 2 +-
.../db/sync/receiver/transfer/SyncServiceImpl.java | 14 +-
.../iotdb/db/sync/sender/transfer/SyncClient.java | 24 +-
.../db/tools/watermark/WatermarkDetector.java | 1 -
.../iotdb/db/utils/datastructure/BinaryTVList.java | 2 +-
.../db/utils/datastructure/BooleanTVList.java | 2 +-
.../iotdb/db/utils/datastructure/DoubleTVList.java | 2 +-
.../iotdb/db/utils/datastructure/FloatTVList.java | 2 +-
.../iotdb/db/utils/datastructure/IntTVList.java | 2 +-
.../iotdb/db/utils/datastructure/LongTVList.java | 2 +-
.../iotdb/db/utils/datastructure/TVList.java | 8 +-
.../src/main/resources/iotdb/ui/static/index.html | 2 +-
.../engine/storagegroup/TsFileProcessorTest.java | 8 +-
.../iotdb/db/integration/IOTDBGroupByIT.java | 2 +-
.../integration/IOTDBGroupByInnerIntervalIT.java | 2 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 8 +-
.../integration/IoTDBAggregationLargeDataIT.java | 4 +-
.../integration/IoTDBAggregationSmallDataIT.java | 4 +-
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 2 +-
.../apache/iotdb/db/integration/IoTDBDaemonIT.java | 2 +-
.../db/integration/IoTDBDeleteStorageGroupIT.java | 10 +-
.../db/integration/IoTDBFloatPrecisionIT.java | 2 +-
.../iotdb/db/integration/IoTDBGroupByFillIT.java | 2 +-
.../integration/IoTDBGroupByFillWithRangeIT.java | 2 +-
.../iotdb/db/integration/IoTDBInsertNaNIT.java | 2 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 4 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 2 +-
.../iotdb/db/integration/IoTDBRecoverIT.java | 6 +-
.../db/integration/IoTDBRecoverUnclosedIT.java | 2 +-
.../iotdb/db/integration/IoTDBSimpleQueryIT.java | 3 +-
.../apache/iotdb/db/integration/IoTDBTagIT.java | 16 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 3 +-
.../java/org/apache/iotdb/session/Session.java | 2 +-
site/README-zh.md | 8 +-
site/README.md | 8 +-
site/pom.xml | 769 +++++++++++----------
thrift/src/main/thrift/rpc.thrift | 206 +++---
thrift/src/main/thrift/sync.thrift | 18 +-
.../read/controller/MetadataQuerierByFileImpl.java | 2 +-
.../iotdb/tsfile/utils/RamUsageEstimator.java | 4 +-
.../tsfile/utils/ReadWriteForEncodingUtils.java | 4 +-
.../iotdb/tsfile/read/ReadInPartitionTest.java | 4 +-
74 files changed, 758 insertions(+), 706 deletions(-)