You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/11/30 15:22:52 UTC
[incubator-iotdb] branch fix_travis updated (fc6980a -> e0f4653)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch fix_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from fc6980a fix jdk path in Win of Travis
add 094aefd Revert "Move the vulnera-checks section into the apache-release profile (#590)" (#599)
add 8437ad5 Revert "[IOTDB-298] Refactor the "last" and "first" aggregators" (#601)
add af831ab [IOTDB-325] Refactor Statistics (#587)
add e0f4653 Merge branch 'master' into fix_travis
No new revisions were added by this update.
Summary of changes:
.travis.yml | 3 +-
.../5-Operation Manual/4-SQL Reference.md | 14 +-
.../5-Operation Manual/4-SQL Reference.md | 18 +-
.../apache/iotdb/hive/TSFHiveInputFormatTest.java | 8 +-
pom.xml | 160 +++---
.../db/query/aggregation/impl/AvgAggrFunc.java | 2 +-
.../db/query/aggregation/impl/CountAggrFunc.java | 2 +-
...{FirstValueAggrFunc.java => FirstAggrFunc.java} | 6 +-
.../{LastValueAggrFunc.java => LastAggrFunc.java} | 8 +-
.../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 | 14 +-
.../iotdb/db/query/factory/AggreFuncFactory.java | 12 +-
.../resourceRelated/UnseqResourceMergeReader.java | 19 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 4 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 65 +--
.../db/engine/memtable/MemTableFlushTaskTest.java | 2 +-
.../merge/MaxSeriesMergeFileSelectorTest.java | 1 -
.../engine/storagegroup/TsFileProcessorTest.java | 6 +-
.../org/apache/iotdb/db/integration/Constant.java | 8 +-
.../iotdb/db/integration/IOTDBGroupByIT.java | 28 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 34 +-
.../integration/IoTDBAggregationLargeDataIT.java | 80 ++-
.../integration/IoTDBAggregationSmallDataIT.java | 32 +-
tsfile/format-changelist.md | 9 +
.../tsfile/common/constant/StatisticConstant.java | 4 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 54 +-
.../iotdb/tsfile/file/header/PageHeader.java | 128 +----
.../iotdb/tsfile/file/header/package-info.java | 2 +-
.../tsfile/file/metadata/ChunkGroupMetaData.java | 81 +--
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 159 +-----
.../tsfile/file/metadata/TsDeviceMetadata.java | 83 +--
.../file/metadata/statistics/BinaryStatistics.java | 192 +++----
.../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 | 609 ++++++++-------------
.../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 | 14 +
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 70 +--
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 10 -
.../apache/iotdb/tsfile/write/page/PageWriter.java | 64 +--
.../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 | 109 +---
.../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 | 4 +-
.../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 +-
96 files changed, 1464 insertions(+), 3079 deletions(-)
rename server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{FirstValueAggrFunc.java => FirstAggrFunc.java} (96%)
rename server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{LastValueAggrFunc.java => LastAggrFunc.java} (95%)
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/NoStatistics.java
delete mode 100755 tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/DigestForFilter.java
delete mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaDataTest.java
delete mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataTest.java
delete mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/DigestFilterTest.java
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/StatisticsFilterTest.java