You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/04/21 02:47:58 UTC
[incubator-iotdb] branch fix_query_deletion_test updated (0ed2d2c
-> 882a331)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch fix_query_deletion_test
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 0ed2d2c fix java doc.
new e0d4e33 [IOTDB-47][IOTDB-54][IOTDB-59][IOTDB-60]Aggregate+GroupBy+Fill (#97)
new afea492 Fix [IOTDB-37]A WAL check tool script is desired
new 9749349 Merge pull request #129 from FLOW4215/WalChecker
new acb850d Add create timeseries Operator (#130)
new 96c87a0 remove system.exit() on Test for better checking the problem when running test
new d3fda08 Merge pull request #134 from apache/remove_system_exit
new f949dd9 replace renameTo() with FileUtils.moveFile()
new 6aacb62 Merge pull request #136 from apache/fix_rename_in_version
new f1d3f44 Fix a bug of reading data with value filter (#135)
new cc70b51 mvn -B (#141)
new c161120 bug fix: version files of different storage groups are placed into the same place (#138)
new 38147ac fix the future instance is replaced when the flush frequency is high (#145)
new 3702c4c add a log appender: put info, warn, error log into one file; disable log_info by default (#147)
new 8e89b5d small refactors in memcontrol (#144)
new 4456629 FileNodeManager: call the `Future#get()` returned from the merge thread (#146)
new 0fa0749 fix an unproperly initialized var (#148)
new 4d5082b update import/export script (#150)
new b2bb8ea fix sync thread bug (#151)
new bfc27eb fix log level and stack print in test (#156)
new 013c30c [IOTDB-80] Support custom export file name (#159)
new ff3aaa9 update travis for supporinting JDK on Win
new 4c8db59 Merge pull request #160 from xiaoyekanren/travis_jdk11_win
new fa385af fix iotdb-82, close TsFileInput before remove the tsfile
new 440c50f Merge pull request #161 from apache/fix_file_close_in_pageHeaderTest
new 66695b1 make TsFileWriter as AutoClosable; make TsFileReadWriteTest more concise (#133)
new a8ffbd9 set parsing incorrect cmd as tracing level log in ParseDriver; set TsserviceImple failed executing as info leve log (#153)
new f888966 print apache-rat violation result on console
new 4cf0920 Merge pull request #162 from apache/print_asf_rat_lost_on_console
new 882a331 Merge branch 'master' into fix_query_deletion_test
The 1584 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 47 +-
iotdb-cli/cli/bin/export-csv.bat | 5 +-
iotdb-cli/cli/bin/export-csv.sh | 5 +-
iotdb-cli/cli/bin/import-csv.bat | 5 +-
iotdb-cli/cli/bin/import-csv.sh | 5 +-
.../org/apache/iotdb/cli/tool/AbstractCsvTool.java | 3 +-
.../java/org/apache/iotdb/cli/tool/ExportCsv.java | 64 +-
.../java/org/apache/iotdb/cli/tool/ImportCsv.java | 66 +-
.../apache/iotdb/cli/client/AbstractScript.java | 65 ++
.../iotdb/cli/client/StartClientScriptIT.java | 51 +-
.../org/apache/iotdb/cli/tool/ExportCsvTestIT.java | 75 ++
.../org/apache/iotdb/cli/tool/ImportCsvTestIT.java | 77 ++
.../bin/{start-server.bat => start-WalChecker.bat} | 22 +-
.../bin/{start-server.sh => start-WalChecker.sh} | 29 +-
iotdb/iotdb/conf/logback.xml | 22 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 2 +
.../apache/iotdb/db/auth/entity/PrivilegeType.java | 2 +-
.../engine/bufferwrite/BufferWriteProcessor.java | 49 +-
.../iotdb/db/engine/filenode/FileNodeManager.java | 23 +-
.../db/engine/filenode/FileNodeProcessor.java | 36 +-
.../iotdb/db/engine/filenode/TsFileResource.java | 4 +
.../db/engine/memcontrol/BasicMemController.java | 24 +-
.../db/engine/memcontrol/JVMMemController.java | 4 +-
.../db/engine/memcontrol/RecordMemController.java | 59 +-
.../db/engine/overflow/io/OverflowProcessor.java | 65 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 7 -
.../version/SimpleFileVersionController.java | 31 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 2 +-
.../org/apache/iotdb/db/qp/QueryProcessor.java | 1 +
.../iotdb/db/qp/executor/OverflowQPExecutor.java | 45 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 99 ++-
.../org/apache/iotdb/db/qp/logical/Operator.java | 2 +-
.../iotdb/db/qp/logical/sys/MetadataOperator.java | 4 +-
.../iotdb/db/qp/physical/sys/MetadataPlan.java | 6 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 +
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 6 +-
.../db/query/aggregation/AggreFuncFactory.java | 79 ++
.../db/query/aggregation/AggreResultData.java | 192 +++++
.../db/query/aggregation/AggregateFunction.java | 135 ++++
.../db/query/aggregation/impl/CountAggrFunc.java | 155 ++++
.../db/query/aggregation/impl/FirstAggrFunc.java | 154 ++++
.../db/query/aggregation/impl/LastAggrFunc.java | 151 ++++
.../db/query/aggregation/impl/MaxTimeAggrFunc.java | 135 ++++
.../query/aggregation/impl/MaxValueAggrFunc.java | 170 ++++
.../db/query/aggregation/impl/MeanAggrFunc.java | 163 ++++
.../db/query/aggregation/impl/MinTimeAggrFunc.java | 156 ++++
.../query/aggregation/impl/MinValueAggrFunc.java | 166 ++++
.../db/query/aggregation/impl/SumAggrFunc.java | 24 +-
.../iotdb/db/query/context/QueryContext.java | 17 +
...edFilePathsManager.java => JobFileManager.java} | 78 +-
.../db/query/control/QueryDataSourceManager.java | 53 --
...TokenManager.java => QueryResourceManager.java} | 86 +-
.../query/dataset/AggreResultDataPointReader.java | 52 ++
.../dataset/EngineDataSetWithTimeGenerator.java | 51 +-
.../dataset/EngineDataSetWithoutTimeGenerator.java | 16 +-
.../db/query/executor/AggregateEngineExecutor.java | 330 ++++++++
.../executor/EngineExecutorWithTimeGenerator.java | 55 +-
.../EngineExecutorWithoutTimeGenerator.java | 41 +-
.../iotdb/db/query/executor/EngineQueryRouter.java | 180 ++++-
.../db/query/executor/FillEngineExecutor.java | 91 +++
.../executor/groupby/GroupByEngineDataSet.java | 167 ++++
.../GroupByWithOnlyTimeFilterDataSetDataSet.java | 314 +++++++
.../GroupByWithValueFilterDataSetDataSet.java | 160 ++++
.../db/query/factory/SeriesReaderFactory.java | 129 ++-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 79 +-
.../org/apache/iotdb/db/query/fill/LinearFill.java | 90 ++-
.../apache/iotdb/db/query/fill/PreviousFill.java | 36 +-
.../iotdb/db/query/reader/AllDataReader.java | 129 +++
.../iotdb/db/query/reader/IAggregateReader.java | 21 +-
.../apache/iotdb/db/query/reader/IBatchReader.java | 10 +-
.../apache/iotdb/db/query/reader/IPointReader.java | 12 +-
.../org/apache/iotdb/db/query/reader/IReader.java | 14 +-
...nkReaderWithFilter.java => MemChunkReader.java} | 57 +-
.../reader/mem/MemChunkReaderByTimestamp.java | 37 +-
.../reader/mem/MemChunkReaderWithoutFilter.java | 70 --
.../reader/merge/EngineReaderByTimeStamp.java | 8 +-
.../db/query/reader/merge/PriorityMergeReader.java | 56 +-
.../merge/PriorityMergeReaderByTimestamp.java | 60 +-
.../query/reader/sequence/SealedTsFilesReader.java | 151 ++--
.../sequence/SealedTsFilesReaderByTimestamp.java | 136 ++++
.../query/reader/sequence/SequenceDataReader.java | 106 ++-
.../sequence/SequenceDataReaderByTimestamp.java | 108 +++
.../reader/sequence/UnSealedTsFileReader.java | 65 +-
.../sequence/UnSealedTsFilesReaderByTimestamp.java | 64 ++
.../query/reader/unsequence/EngineChunkReader.java | 39 +-
.../unsequence/EngineChunkReaderByTimestamp.java | 77 ++
.../db/query/timegenerator/EngineLeafNode.java | 11 +-
.../query/timegenerator/EngineNodeConstructor.java | 22 +-
.../query/timegenerator/EngineTimeGenerator.java | 10 +-
.../modification => rescon}/package-info.java | 5 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 8 +-
.../IoTDBShutdownHook.java} | 19 +-
.../org/apache/iotdb/db/service/JDBCService.java | 4 +-
.../iotdb/db/service/JDBCServiceEventHandler.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 78 +-
.../org/apache/iotdb/db/sql/parse/ParseDriver.java | 2 +-
.../receiver/SyncServiceEventHandler.java} | 39 +-
...cServerManager.java => SyncServiceManager.java} | 69 +-
.../java/org/apache/iotdb/db/utils/AuthUtils.java | 2 +
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 3 +
.../apache/iotdb/db/utils/TimeValuePairUtils.java | 26 +
.../org/apache/iotdb/db/utils/TsPrimitiveType.java | 2 +-
.../writelog/transfer/PhysicalPlanLogTransfer.java | 1 +
.../db/engine/memcontrol/MemControllerTest.java | 18 +-
.../engine/modification/DeletionFileNodeTest.java | 25 +-
.../db/engine/modification/DeletionQueryTest.java | 16 +-
.../version/SimpleFileVersionControllerTest.java | 15 +-
.../apache/iotdb/db/integration/IOTDBFillIT.java | 351 ++++++++
.../iotdb/db/integration/IOTDBGroupByIT.java | 532 ++++++++++++
.../iotdb/db/integration/IoTDBAggregationIT.java | 550 +++++++++++++
.../integration/IoTDBAggregationLargeDataIT.java | 900 +++++++++++++++++++++
.../integration/IoTDBAggregationSmallDataIT.java | 757 +++++++++++++++++
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 33 +-
.../iotdb/db/integration/IoTDBCompleteIT.java | 38 +
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 20 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 4 -
.../iotdb/db/integration/IoTDBLimitSlimitIT.java | 4 +-
.../db/integration/IoTDBSequenceDataQueryIT.java | 23 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 29 +-
.../iotdb/db/integration/IoTDBVersionIT.java | 84 ++
.../org/apache/iotdb/db/qp/QueryProcessorTest.java | 60 ++
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 7 +-
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 31 +-
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 27 +-
.../db/query/control/FileReaderManagerTest.java | 11 +-
...agerTest.java => QueryResourceManagerTest.java} | 2 +-
.../EngineDataSetWithTimeGeneratorTest.java | 123 +++
.../query/executor/GroupByEngineDataSetTest.java | 153 ++++
.../iotdb/db/query/reader/AllDataReaderTest.java | 76 ++
.../iotdb/db/query/reader/FakedIBatchPoint.java | 108 +++
.../iotdb/db/query/reader/FakedIPointReader.java | 74 ++
.../query/reader/FakedSeriesReaderByTimestamp.java | 76 ++
.../merge/PriorityMergeReaderByTimestampTest.java | 72 +-
.../reader/merge/PriorityMergeReaderTest.java | 28 +-
.../reader/merge/SeriesMergeSortReaderTest.java | 27 +-
.../SequenceDataReaderByTimestampTest.java | 91 +++
.../apache/iotdb/db/utils/EnvironmentUtils.java | 13 +-
.../transfer/PhysicalPlanLogTransferTest.java | 29 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 8 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 9 +-
pom.xml | 1 +
service-rpc/src/main/thrift/rpc.thrift | 2 +
.../apache/iotdb/tsfile/read/common/BatchData.java | 97 ++-
.../iotdb/tsfile/read/filter/basic/Filter.java | 8 +
.../tsfile/read/filter/operator/AndFilter.java | 6 +
.../iotdb/tsfile/read/filter/operator/Eq.java | 14 +
.../iotdb/tsfile/read/filter/operator/Gt.java | 17 +-
.../iotdb/tsfile/read/filter/operator/GtEq.java | 17 +-
.../iotdb/tsfile/read/filter/operator/Lt.java | 14 +
.../iotdb/tsfile/read/filter/operator/LtEq.java | 14 +
.../iotdb/tsfile/read/filter/operator/NotEq.java | 14 +
.../tsfile/read/filter/operator/NotFilter.java | 5 +
.../tsfile/read/filter/operator/OrFilter.java | 6 +
.../tsfile/read/query/dataset/QueryDataSet.java | 7 +
.../tsfile/read/reader/chunk/ChunkReader.java | 54 +-
.../read/reader/series/FileSeriesReader.java | 45 +-
.../reader/series/SeriesReaderByTimestamp.java | 33 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 2 +-
.../iotdb/tsfile/file/header/PageHeaderTest.java | 8 +-
.../read/filter/MinTimeMaxTimeFilterTest.java | 52 +-
.../iotdb/tsfile/read/filter/OperatorTest.java | 1 +
.../iotdb/tsfile/write/TsFileReadWriteTest.java | 183 ++---
162 files changed, 9711 insertions(+), 1555 deletions(-)
create mode 100644 iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractScript.java
create mode 100644 iotdb-cli/src/test/java/org/apache/iotdb/cli/tool/ExportCsvTestIT.java
create mode 100644 iotdb-cli/src/test/java/org/apache/iotdb/cli/tool/ImportCsvTestIT.java
copy iotdb/iotdb/bin/{start-server.bat => start-WalChecker.bat} (87%)
mode change 100755 => 100644
copy iotdb/iotdb/bin/{start-server.sh => start-WalChecker.sh} (79%)
mode change 100755 => 100644
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggreFuncFactory.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggreResultData.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastAggrFunc.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MeanAggrFunc.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrFunc.java
copy spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryProcessorException.java => iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrFunc.java (66%)
mode change 100755 => 100644
rename iotdb/src/main/java/org/apache/iotdb/db/query/control/{OpenedFilePathsManager.java => JobFileManager.java} (55%)
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryDataSourceManager.java
rename iotdb/src/main/java/org/apache/iotdb/db/query/control/{QueryTokenManager.java => QueryResourceManager.java} (64%)
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/dataset/AggreResultDataPointReader.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByEngineDataSet.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithOnlyTimeFilterDataSetDataSet.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithValueFilterDataSetDataSet.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/AllDataReader.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithoutFilter.java => iotdb/src/main/java/org/apache/iotdb/db/query/reader/IAggregateReader.java (69%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java => iotdb/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java (80%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java => iotdb/src/main/java/org/apache/iotdb/db/query/reader/IPointReader.java (82%)
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/{MemChunkReaderWithFilter.java => MemChunkReader.java} (56%)
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderWithoutFilter.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SealedTsFilesReaderByTimestamp.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceDataReaderByTimestamp.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/UnSealedTsFilesReaderByTimestamp.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/unsequence/EngineChunkReaderByTimestamp.java
copy iotdb/src/main/java/org/apache/iotdb/db/{engine/modification => rescon}/package-info.java (83%)
copy iotdb/src/main/java/org/apache/iotdb/db/{engine/memcontrol/NoActPolicy.java => service/IoTDBShutdownHook.java} (62%)
copy iotdb/src/main/java/org/apache/iotdb/db/{service/JDBCServiceEventHandler.java => sync/receiver/SyncServiceEventHandler.java} (55%)
rename iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/{SyncServerManager.java => SyncServiceManager.java} (62%)
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/integration/IOTDBFillIT.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/qp/QueryProcessorTest.java
rename iotdb/src/test/java/org/apache/iotdb/db/query/control/{QueryTokenManagerTest.java => QueryResourceManagerTest.java} (93%)
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithTimeGeneratorTest.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/reader/AllDataReaderTest.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/reader/FakedIBatchPoint.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/reader/FakedIPointReader.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/reader/FakedSeriesReaderByTimestamp.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/reader/sequence/SequenceDataReaderByTimestampTest.java