You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2021/01/21 06:27:38 UTC
[iotdb] 01/01: Merge branch 'master' of
https://github.com/apache/iotdb into add_python_interface
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch add_python_interface
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b62fdeff55ce7132e6c26bff4ce4d0f70040bd4c
Merge: e33d479 cf9b35d
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Thu Jan 21 14:26:54 2021 +0800
Merge branch 'master' of https://github.com/apache/iotdb into add_python_interface
LICENSE-binary | 20 +-
cluster/pom.xml | 16 +
.../iotdb/cluster/ClusterFileFlushPolicy.java | 2 +-
.../cluster/client/async/AsyncClientFactory.java | 6 +-
.../cluster/client/async/AsyncDataClient.java | 11 +-
.../iotdb/cluster/coordinator/Coordinator.java | 165 ++--
.../cluster/log/applier/AsyncDataLogApplier.java | 13 +-
.../iotdb/cluster/log/applier/BaseApplier.java | 2 +-
.../iotdb/cluster/log/applier/DataLogApplier.java | 13 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 26 +-
.../cluster/query/ClusterPhysicalGenerator.java | 15 +-
.../iotdb/cluster/query/ClusterPlanRouter.java | 74 ++
.../cluster/query/filter/SlotTsFileFilter.java | 4 +-
.../iotdb/cluster/query/LoadConfigurationTest.java | 122 +++
.../DDL Data Definition Language.md | 2 +
.../DML Data Manipulation Language.md | 37 +-
docs/UserGuide/Operation Manual/Kill Query.md | 2 +-
.../DDL Data Definition Language.md | 2 +
.../DML Data Manipulation Language.md | 42 -
docs/zh/UserGuide/Operation Manual/Kill Query.md | 2 +-
.../zh/UserGuide/Operation Manual/SQL Reference.md | 6 +-
.../main/java/org/apache/iotdb/JDBCExample.java | 25 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 62 +-
.../apache/iotdb/hadoop/fileSystem/HDFSInput.java | 11 +
.../apache/iotdb/hadoop/fileSystem/HDFSOutput.java | 5 +
.../iotdb/hadoop/tsfile/record/HDFSTSRecord.java | 4 +-
.../main/java/org/apache/iotdb/jdbc/Config.java | 4 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 4 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 18 +-
pom.xml | 12 +-
server/file-changelists/TsFileMods-changelist.md | 11 +
.../system.properties-changelist.md | 9 +
server/pom.xml | 5 +
.../resources/conf/iotdb-engine.properties | 10 +-
.../resources/tools/upgrade/config.properties | 27 -
.../resources/tools/upgrade/offline-upgrade.bat | 67 --
.../resources/tools/upgrade/offline-upgrade.sh | 47 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 30 +-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 207 +++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 14 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 605 ++++++------
.../apache/iotdb/db/engine/cache/ChunkCache.java | 5 +-
.../level/LevelCompactionTsFileManagement.java | 9 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 169 ++--
.../merge/selector/MaxFileMergeFileSelector.java | 4 +-
.../iotdb/db/engine/merge/task/MergeTask.java | 28 +-
.../io/LocalTextModificationAccessor.java | 8 +-
.../db/engine/storagegroup/StorageGroupInfo.java | 51 +-
.../engine/storagegroup/StorageGroupProcessor.java | 479 +++++----
.../db/engine/storagegroup/TsFileProcessor.java | 38 +-
.../db/engine/storagegroup/TsFileResource.java | 50 +-
.../virtualSg/HashVirtualPartitioner.java | 67 ++
.../storagegroup/virtualSg/VirtualPartitioner.java | 32 +-
.../virtualSg/VirtualStorageGroupManager.java | 434 +++++++++
.../iotdb/db/engine/upgrade/UpgradeTask.java | 107 +-
.../org/apache/iotdb/db/metadata/MManager.java | 89 +-
.../iotdb/db/metadata/logfile/MLogWriter.java | 6 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 14 +-
.../apache/iotdb/db/qp/executor/IPlanExecutor.java | 8 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 20 +-
.../org/apache/iotdb/db/qp/logical/Operator.java | 2 +-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 7 +-
.../db/qp/physical/crud/InsertMultiTabletPlan.java | 326 +++++++
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 4 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 10 +-
.../db/query/aggregation/AggregateResult.java | 2 +-
.../db/query/aggregation/impl/AvgAggrResult.java | 12 +-
.../db/query/aggregation/impl/SumAggrResult.java | 10 +-
.../iotdb/db/query/control/FileReaderManager.java | 16 +-
.../iotdb/db/query/control/QueryTimeManager.java | 80 +-
.../db/query/dataset/NonAlignEngineDataSet.java | 22 +-
.../dataset/RawQueryDataSetWithValueFilter.java | 68 +-
.../dataset/RawQueryDataSetWithoutValueFilter.java | 138 +--
.../iotdb/db/query/dataset/UDFInputDataSet.java | 19 +-
.../db/query/dataset/UDTFAlignByTimeDataSet.java | 6 +-
.../db/query/executor/RawDataQueryExecutor.java | 11 +-
.../FixLengthIExternalSortFileDeserializer.java | 2 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 5 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 23 +-
.../iotdb/db/query/udf/core/access/RowImpl.java | 23 +-
.../iotdb/db/query/udf/core/input/InputLayer.java | 122 ++-
.../iotdb/db/query/udf/core/input/SafetyLine.java | 40 +-
.../iotdb/db/query/udf/datastructure/Cache.java | 99 ++
.../primitive/ElasticSerializableIntList.java | 25 +-
.../row/ElasticSerializableRowRecordList.java | 69 +-
.../row/SerializableRowRecordList.java | 98 +-
.../tv/ElasticSerializableTVList.java | 28 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 28 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 99 +-
.../org/apache/iotdb/db/service/UpgradeSevice.java | 3 -
.../apache/iotdb/db/tools/TsFileSketchTool.java | 36 +-
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 451 +++------
.../db/tools/virtualsg/DeviceMappingViewer.java | 61 ++
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 12 +-
.../java/org/apache/iotdb/db/utils/MmapUtil.java | 30 +-
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 9 +
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 112 ++-
.../iotdb/db/utils/datastructure/TimeSelector.java | 155 +++
.../writelog/manager/MultiFileLogNodeManager.java | 27 +-
.../db/writelog/manager/WriteLogNodeManager.java | 7 +-
.../db/writelog/node/ExclusiveWriteLogNode.java | 18 +-
.../iotdb/db/writelog/node/WriteLogNode.java | 8 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 18 +-
.../writelog/recover/TsFileRecoverPerformer.java | 16 +-
.../db/engine/cache/ChunkMetadataCacheTest.java | 2 +-
.../engine/merge/MaxFileMergeFileSelectorTest.java | 4 +-
.../merge/MaxSeriesMergeFileSelectorTest.java | 8 +-
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 1 +
.../iotdb/db/engine/merge/MergeOverLapTest.java | 1 -
.../iotdb/db/engine/merge/MergeTaskTest.java | 1 +
.../engine/modification/DeletionFileNodeTest.java | 27 +-
.../storagegroup/StorageGroupProcessorTest.java | 15 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 34 +-
.../virtualSg/HashVirtualPartitionerTest.java | 64 ++
.../iotdb/db/integration/IoTDBCompleteIT.java | 5 +
.../iotdb/db/integration/IoTDBDisableAlignIT.java | 6 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 33 +-
.../iotdb/db/integration/IoTDBMultiDeviceIT.java | 322 +++++++
.../db/integration/IoTDBNewTsFileCompactionIT.java | 1018 ++++++++++++++++++++
.../iotdb/db/integration/IoTDBRestartIT.java | 16 +
.../db/integration/IoTDBUDTFNonAlignQueryIT.java | 2 +-
.../db/integration/auth/IoTDBAuthorizationIT.java | 21 -
.../iotdb/db/monitor/IoTDBStatMonitorTest.java | 21 +-
.../db/qp/physical/InsertTabletMultiPlanTest.java | 99 ++
.../iotdb/db/qp/physical/InsertTabletPlanTest.java | 105 ++
.../ElasticSerializableRowRecordListTest.java | 61 +-
.../iotdb/db/query/udf/datastructure/LRUCache.java | 59 ++
.../db/query/udf/datastructure/LRUCacheTest.java | 115 +++
.../udf/datastructure/SerializableListTest.java | 2 +
.../SerializableRowRecordListTest.java | 49 +-
.../db/sync/receiver/load/FileLoaderTest.java | 38 +-
.../recover/SyncReceiverLogAnalyzerTest.java | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 3 +
.../db/utils/datastructure/TimeSelectorTest.java | 217 +++++
.../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 25 +-
.../apache/iotdb/db/writelog/PerformanceTest.java | 48 +-
.../iotdb/db/writelog/WriteLogNodeManagerTest.java | 63 +-
.../apache/iotdb/db/writelog/WriteLogNodeTest.java | 71 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 24 +-
.../recover/RecoverResourceFromReaderTest.java | 54 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 53 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 31 +-
.../main/java/org/apache/iotdb/session/Config.java | 3 +-
.../java/org/apache/iotdb/session/Session.java | 4 +-
.../apache/iotdb/session/SessionConnection.java | 2 +-
.../org/apache/iotdb/session/SessionDataSet.java | 3 +-
.../org/apache/iotdb/session/pool/SessionPool.java | 22 +
.../iotdb/session/IoTDBSessionIteratorIT.java | 2 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 33 +-
.../apache/iotdb/spark/tsfile/HDFSInputTest.java | 4 +-
thrift/rpc-changelist.md | 24 +
tsfile/format-changelist.md | 4 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 6 +-
.../iotdb/tsfile/encoding/decoder/Decoder.java | 8 +-
.../tsfile/encoding/decoder/FloatDecoder.java | 11 +-
.../tsfile/encoding/decoder/IntRleDecoder.java | 11 +-
.../tsfile/encoding/decoder/LongRleDecoder.java | 11 +-
.../tsfile/encoding/decoder/PlainDecoder.java | 21 +-
.../iotdb/tsfile/encoding/decoder/RleDecoder.java | 15 +-
.../tsfile/encoding/encoder/FloatEncoder.java | 6 +-
.../tsfile/encoding/encoder/IntRleEncoder.java | 8 +-
.../tsfile/encoding/encoder/LongRleEncoder.java | 6 +-
.../tsfile/encoding/encoder/PlainEncoder.java | 57 +-
.../iotdb/tsfile/encoding/encoder/RleEncoder.java | 20 +-
.../tsfile/encoding/encoder/TSEncodingBuilder.java | 13 +-
.../org/apache/iotdb/tsfile/file/MetaMarker.java | 17 +-
.../iotdb/tsfile/file/footer/ChunkGroupFooter.java | 156 ---
.../iotdb/tsfile/file/header/ChunkGroupHeader.java | 117 +++
.../iotdb/tsfile/file/header/ChunkHeader.java | 151 +--
.../iotdb/tsfile/file/header/PageHeader.java | 54 +-
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 35 +-
.../file/metadata/MetadataIndexConstructor.java | 5 +-
.../tsfile/file/metadata/MetadataIndexEntry.java | 4 +-
.../tsfile/file/metadata/MetadataIndexNode.java | 12 +-
.../tsfile/file/metadata/TimeseriesMetadata.java | 36 +-
.../iotdb/tsfile/file/metadata/TsFileMetadata.java | 45 +-
.../file/metadata/enums/CompressionType.java | 64 +-
.../file/metadata/enums/MetadataIndexNodeType.java | 57 +-
.../tsfile/file/metadata/enums/TSDataType.java | 113 +--
.../tsfile/file/metadata/enums/TSEncoding.java | 94 +-
.../file/metadata/statistics/BinaryStatistics.java | 13 +-
.../metadata/statistics/BooleanStatistics.java | 48 +-
.../file/metadata/statistics/DoubleStatistics.java | 23 +-
.../file/metadata/statistics/FloatStatistics.java | 23 +-
.../metadata/statistics/IntegerStatistics.java | 48 +-
.../file/metadata/statistics/LongStatistics.java | 31 +-
.../file/metadata/statistics/Statistics.java | 22 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 404 ++++----
.../apache/iotdb/tsfile/read/common/BatchData.java | 2 +-
.../org/apache/iotdb/tsfile/read/common/Chunk.java | 99 +-
.../read/controller/CachedChunkLoaderImpl.java | 3 +-
.../iotdb/tsfile/read/reader/LocalTsFileInput.java | 40 +-
.../iotdb/tsfile/read/reader/TsFileInput.java | 5 +
.../tsfile/read/reader/chunk/ChunkReader.java | 105 +-
.../iotdb/tsfile/read/reader/page/PageReader.java | 14 +-
.../tsfile/utils/ReadWriteForEncodingUtils.java | 96 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 103 +-
.../v1/file/metadata/ChunkGroupMetaDataV1.java | 118 ---
.../tsfile/v1/file/metadata/ChunkMetadataV1.java | 131 ---
.../v1/file/metadata/TsDeviceMetadataIndexV1.java | 78 --
.../v1/file/metadata/TsDeviceMetadataV1.java | 87 --
.../iotdb/tsfile/v1/file/metadata/TsDigestV1.java | 75 --
.../tsfile/v1/file/metadata/TsFileMetadataV1.java | 106 --
.../metadata/statistics/BinaryStatisticsV1.java | 84 --
.../metadata/statistics/BooleanStatisticsV1.java | 80 --
.../metadata/statistics/DoubleStatisticsV1.java | 79 --
.../metadata/statistics/FloatStatisticsV1.java | 79 --
.../metadata/statistics/IntegerStatisticsV1.java | 79 --
.../file/metadata/statistics/LongStatisticsV1.java | 80 --
.../v1/file/metadata/statistics/StatisticsV1.java | 225 -----
.../iotdb/tsfile/v1/file/utils/HeaderUtils.java | 141 ---
.../tsfile/v1/read/TsFileSequenceReaderForV1.java | 409 --------
.../tsfile/v2/file/footer/ChunkGroupFooterV2.java | 86 ++
.../iotdb/tsfile/v2/file/header/ChunkHeaderV2.java | 108 +++
.../iotdb/tsfile/v2/file/header/PageHeaderV2.java | 51 +
.../tsfile/v2/file/metadata/ChunkMetadataV2.java | 52 +
.../file/metadata/MetadataIndexEntryV2.java} | 23 +-
.../v2/file/metadata/MetadataIndexNodeV2.java | 47 +
.../v2/file/metadata/TimeseriesMetadataV2.java | 42 +
.../tsfile/v2/file/metadata/TsFileMetadataV2.java | 75 ++
.../v2/file/metadata/statistics/StatisticsV2.java | 104 ++
.../tsfile/v2/read/TsFileSequenceReaderForV2.java | 581 +++++++++++
.../tsfile/v2/read/reader/page/PageReaderV2.java | 85 ++
.../apache/iotdb/tsfile/write/TsFileWriter.java | 2 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 84 +-
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 11 +-
.../apache/iotdb/tsfile/write/page/PageWriter.java | 30 +-
.../tsfile/write/schema/MeasurementSchema.java | 38 +-
.../write/writer/ForceAppendTsFileWriter.java | 3 -
.../tsfile/write/writer/LocalTsFileOutput.java | 5 +
.../write/writer/RestorableTsFileIOWriter.java | 1 -
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 54 +-
.../iotdb/tsfile/write/writer/TsFileOutput.java | 8 +
.../tsfile/encoding/decoder/IntRleDecoderTest.java | 83 +-
.../encoding/decoder/LongRleDecoderTest.java | 17 +-
.../iotdb/tsfile/file/header/PageHeaderTest.java | 2 +-
.../metadata/statistics/DoubleStatisticsTest.java | 10 +-
.../metadata/statistics/FloatStatisticsTest.java | 11 +-
.../metadata/statistics/IntegerStatisticsTest.java | 10 +-
.../metadata/statistics/LongStatisticsTest.java | 15 +-
.../iotdb/tsfile/file/metadata/utils/Utils.java | 36 +-
.../iotdb/tsfile/read/GetAllDevicesTest.java | 14 +-
.../tsfile/read/TsFileSequenceReaderTest.java | 66 +-
.../iotdb/tsfile/read/reader/PageReaderTest.java | 54 +-
.../utils/ReadWriteForEncodingUtilsTest.java | 54 ++
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 20 +-
.../iotdb/tsfile/write/writer/PageWriterTest.java | 54 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 15 +-
248 files changed, 9181 insertions(+), 5408 deletions(-)