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 2019/12/01 00:36:10 UTC
[incubator-iotdb] 01/02: Merge branch 'master' into last
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch last
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 9c23f065809e8176a846424f382ca835532a203a
Merge: deb04e9 5e7bff4
Author: qiaojialin <64...@qq.com>
AuthorDate: Sun Dec 1 08:29:14 2019 +0800
Merge branch 'master' into last
.travis.yml | 20 +-
.../1-DDL (Data Definition Language).md | 37 ++
.../5-Operation Manual/4-SQL Reference.md | 12 +-
.../8-System Design (Developer)/1-Hierarchy.md | 392 ++++++++++++-
.../1-DDL (Data Definition Language).md | 38 +-
.../5-Operation Manual/4-SQL Reference.md | 12 +-
.../8-System Design (Developer)/1-Hierarchy.md | 11 +-
.../apache/iotdb/hive/TSFHiveInputFormatTest.java | 8 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 2 +-
pom.xml | 10 +-
.../db/query/aggregation/impl/AvgAggrFunc.java | 2 +-
.../db/query/aggregation/impl/CountAggrFunc.java | 2 +-
.../query/aggregation/impl/FirstValueAggrFunc.java | 2 +-
.../query/aggregation/impl/LastValueAggrFunc.java | 4 +-
.../db/query/aggregation/impl/MaxTimeAggrFunc.java | 2 +-
.../query/aggregation/impl/MaxValueAggrFunc.java | 2 +-
.../db/query/aggregation/impl/MinTimeAggrFunc.java | 2 +-
.../query/aggregation/impl/MinValueAggrFunc.java | 2 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 8 +-
.../db/query/executor/AggregateEngineExecutor.java | 8 +-
.../resourceRelated/UnseqResourceMergeReader.java | 19 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 65 +--
.../db/engine/memtable/MemTableFlushTaskTest.java | 2 +-
.../merge/MaxSeriesMergeFileSelectorTest.java | 1 -
.../engine/storagegroup/TsFileProcessorTest.java | 6 +-
tsfile/format-changelist.md | 9 +
.../iotdb/tsfile/file/header/ChunkHeader.java | 57 +-
.../iotdb/tsfile/file/header/PageHeader.java | 139 +----
.../iotdb/tsfile/file/header/package-info.java | 2 +-
.../tsfile/file/metadata/ChunkGroupMetaData.java | 85 +--
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 160 +-----
.../tsfile/file/metadata/TsDeviceMetadata.java | 83 +--
.../file/metadata/statistics/BinaryStatistics.java | 194 +++----
.../metadata/statistics/BooleanStatistics.java | 184 +++----
.../file/metadata/statistics/DoubleStatistics.java | 211 +++----
.../file/metadata/statistics/FloatStatistics.java | 190 ++++---
.../metadata/statistics/IntegerStatistics.java | 191 ++++---
.../file/metadata/statistics/LongStatistics.java | 201 +++----
.../file/metadata/statistics/NoStatistics.java | 181 ------
.../file/metadata/statistics/Statistics.java | 613 ++++++++-------------
.../statistics/StatisticsClassException.java | 5 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 68 +--
.../iotdb/tsfile/read/filter/DigestForFilter.java | 154 ------
.../iotdb/tsfile/read/filter/basic/Filter.java | 10 +-
.../tsfile/read/filter/operator/AndFilter.java | 6 +-
.../iotdb/tsfile/read/filter/operator/Eq.java | 13 +-
.../iotdb/tsfile/read/filter/operator/Gt.java | 11 +-
.../iotdb/tsfile/read/filter/operator/GtEq.java | 11 +-
.../iotdb/tsfile/read/filter/operator/Lt.java | 11 +-
.../iotdb/tsfile/read/filter/operator/LtEq.java | 11 +-
.../iotdb/tsfile/read/filter/operator/NotEq.java | 13 +-
.../tsfile/read/filter/operator/NotFilter.java | 6 +-
.../tsfile/read/filter/operator/OrFilter.java | 6 +-
.../query/executor/ExecutorWithTimeGenerator.java | 2 +-
.../tsfile/read/query/executor/TsFileExecutor.java | 2 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 2 +-
.../read/reader/chunk/ChunkReaderByTimestamp.java | 2 +-
.../read/reader/chunk/ChunkReaderWithFilter.java | 10 +-
.../reader/chunk/ChunkReaderWithoutFilter.java | 2 +-
.../reader/series/FileSeriesReaderByTimestamp.java | 2 +-
.../reader/series/FileSeriesReaderWithFilter.java | 15 +-
.../tool/upgrade/TsfileUpgradeToolV0_8_0.java | 28 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 34 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 80 +--
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 10 -
.../apache/iotdb/tsfile/write/page/PageWriter.java | 149 +----
.../write/writer/RestorableTsFileIOWriter.java | 2 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 61 +-
.../iotdb/tsfile/file/header/PageHeaderTest.java | 66 +--
.../file/metadata/ChunkGroupMetaDataTest.java | 52 --
.../tsfile/file/metadata/ChunkMetaDataTest.java | 114 ----
.../tsfile/file/metadata/TsDeviceMetadataTest.java | 64 ---
.../metadata/statistics/BooleanStatisticsTest.java | 21 +-
.../metadata/statistics/DoubleStatisticsTest.java | 30 +-
.../metadata/statistics/FloatStatisticsTest.java | 30 +-
.../metadata/statistics/IntegerStatisticsTest.java | 30 +-
.../metadata/statistics/LongStatisticsTest.java | 40 +-
.../metadata/statistics/StringStatisticsTest.java | 23 +-
.../tsfile/file/metadata/utils/TestHelper.java | 112 +---
.../iotdb/tsfile/file/metadata/utils/Utils.java | 28 +-
.../iotdb/tsfile/read/ReadInPartitionTest.java | 4 +-
.../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 4 +-
.../org/apache/iotdb/tsfile/read/ReadTest.java | 16 +-
.../tsfile/read/TsFileSequenceReaderTest.java | 41 +-
.../tsfile/read/controller/ChunkLoaderTest.java | 3 +-
.../controller/IMetadataQuerierByFileImplTest.java | 4 +-
.../iotdb/tsfile/read/filter/DigestFilterTest.java | 116 ----
.../tsfile/read/filter/StatisticsFilterTest.java | 108 ++++
.../iotdb/tsfile/read/reader/ReaderTest.java | 2 +-
.../apache/iotdb/tsfile/utils/FileGenerator.java | 23 +-
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 12 +-
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 6 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 2 +-
93 files changed, 1815 insertions(+), 3031 deletions(-)