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/04/04 14:45:50 UTC
[incubator-iotdb] branch refactor_bufferwrite updated (24c3b4d ->
2d05053)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch refactor_bufferwrite
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 24c3b4d merge with master, solve conflict with InsertPlan
new 5309448 [IOTDB-39]Refactor auto repair for TsFile reader and TsFile writer (#100)
new 306a681 set SQL parse error as debug level log; fix some sonar issues
new f205900 Merge pull request #112 from apache/fix_jira_62
new bd3a798 [IOTDB-63] Use TsFileInput instead of FileChannel as the parameter passed to methods (#110)
new e3f9728 call valueDecoder reset() when reading data from a new Page
new a92c7b3 Merge pull request #113 from apache/fix_jira_67_valueDecoder_reset
new d637989 add check SG for MManager, MGraph and MTree (#114)
new abc189c fix channel close bug in merge process (#103)
new 8829460 check whether tsfile is deleted in ut
new d21409f Merge pull request #116 from apache/fix_check_whether_file_is_deleted_in_ut
new 0e74fa1 Reorganized the start and close of sync thread
new 6e4bc04 Merge pull request #118 from apache/fix_sync_thread_bug
new 1f626c4 add metadata plan codec
new 6e2dcea add author and loaddata plan codec
new 20d5513 add property plan codec
new e0f265b add physical codec unit test
new 30c89ff Merge pull request #115 from apache/serialize-physicalplan
new 693841f fix jira issue 70 71
new 59e2af7 Merge pull request #120 from apache/fix_70_71
new 922bcbe move all generated tsfiles for test into the target folder
new b50c80d Merge pull request #117 from apache/fix_move_all_testfiles_into_target
new c7ad2af fix long size (#121)
new 8e4b05b add check sg exists of path for cluster (#126)
new f83b601 Add method getAllSGByFile() for MManager (#125)
new 5f75d81 fix a doc bug of Readme.md (#128)
new ef6ca4c Log debug the FileNotFoundException, throws the IOException (#122)
new 0a85c19 Minor modification of README.md (#127)
new a0ed9ad merge with master
new 2d05053 merge with master
The 1581 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:
Readme.md => README.md | 40 +-
.../bin/{start-server.bat => start-WalChecker.bat} | 22 +-
.../bin/{start-server.sh => start-WalChecker.sh} | 29 +-
iotdb/iotdb/bin/start-sync-client.bat | 2 +-
iotdb/iotdb/bin/start-sync-client.sh | 2 +-
.../bufferwrite/RestorableTsFileIOWriter.java | 2 +-
.../db/engine/filenode/FileNodeProcessor.java | 36 +-
.../db/engine/overflow/io/OverflowProcessor.java | 2 +
.../db/engine/overflow/io/OverflowResource.java | 41 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 7 -
.../db/engine/tsfiledata/TsFileProcessor.java | 6 +-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 27 +
.../org/apache/iotdb/db/metadata/MManager.java | 43 +
.../java/org/apache/iotdb/db/metadata/MTree.java | 103 ++-
.../iotdb/db/qp/executor/OverflowQPExecutor.java | 44 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 99 ++-
.../iotdb/db/qp/logical/sys/AuthorOperator.java | 95 ++-
.../iotdb/db/qp/logical/sys/MetadataOperator.java | 39 +-
.../iotdb/db/qp/logical/sys/PropertyOperator.java | 47 +-
.../iotdb/db/qp/physical/sys/AuthorPlan.java | 30 +
.../iotdb/db/qp/physical/sys/LoadDataPlan.java | 19 +
.../iotdb/db/qp/physical/sys/MetadataPlan.java | 28 +-
.../iotdb/db/qp/physical/sys/PropertyPlan.java | 20 +
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 1 +
.../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 +
.../iotdb/db/query/control/FileReaderManager.java | 2 +-
...edFilePathsManager.java => JobFileManager.java} | 74 +-
.../db/query/control/QueryDataSourceManager.java | 80 --
...TokenManager.java => QueryResourceManager.java} | 113 ++-
.../query/dataset/AggreResultDataPointReader.java | 52 ++
.../dataset/EngineDataSetWithTimeGenerator.java | 7 +-
.../dataset/EngineDataSetWithoutTimeGenerator.java | 16 +-
.../db/query/executor/AggregateEngineExecutor.java | 330 ++++++++
.../executor/EngineExecutorWithTimeGenerator.java | 55 +-
.../EngineExecutorWithoutTimeGenerator.java | 57 +-
.../iotdb/db/query/executor/EngineQueryRouter.java | 190 ++++-
.../db/query/executor/FillEngineExecutor.java | 91 +++
.../executor/groupby/GroupByEngineDataSet.java | 167 ++++
.../GroupByWithOnlyTimeFilterDataSetDataSet.java | 314 +++++++
.../GroupByWithValueFilterDataSetDataSet.java | 160 ++++
.../db/query/factory/SeriesReaderFactory.java | 130 ++-
.../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 | 9 +-
.../org/apache/iotdb/db/service/ServiceType.java | 4 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 89 +-
.../iotdb/db/sync/receiver/ServerManager.java | 101 ---
.../iotdb/db/sync/receiver/SyncServerManager.java | 143 ++++
...ServerServiceImpl.java => SyncServiceImpl.java} | 4 +-
.../{FileManager.java => SyncFileManager.java} | 14 +-
.../sender/{FileSender.java => SyncSender.java} | 4 +-
.../{FileSenderImpl.java => SyncSenderImpl.java} | 27 +-
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 3 +
.../apache/iotdb/db/utils/TimeValuePairUtils.java | 26 +
.../org/apache/iotdb/db/utils/TsPrimitiveType.java | 2 +-
.../apache/iotdb/db/writelog/transfer/Codec.java | 1 +
.../iotdb/db/writelog/transfer/CodecInstances.java | 471 +++++++++++
.../db/writelog/transfer/PhysicalPlanCodec.java | 186 +----
.../writelog/transfer/PhysicalPlanLogTransfer.java | 32 +-
.../db/writelog/transfer/SystemLogOperator.java | 8 +-
.../engine/modification/DeletionFileNodeTest.java | 25 +-
.../db/engine/modification/DeletionQueryTest.java | 22 +-
.../db/engine/tsfiledata/TsFileProcessorTest.java | 25 +-
.../version/SysTimeVersionControllerTest.java | 14 +-
.../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/IoTDBCompleteIT.java | 38 +
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 20 +-
.../db/integration/IoTDBFlushQueryMergeTest.java | 130 +++
.../iotdb/db/integration/IoTDBLargeDataIT.java | 4 -
.../db/integration/IoTDBSequenceDataQueryIT.java | 23 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 29 +-
.../integration/QueryDataFromUnclosedTsFileIT.java | 15 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 80 ++
.../org/apache/iotdb/db/metadata/MTreeTest.java | 80 ++
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 2 +-
.../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 +-
.../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 +++
.../iotdb/db/sync/sender/SingleClientSyncTest.java | 2 +-
...leManagerTest.java => SyncFileManagerTest.java} | 6 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 10 +-
.../transfer/PhysicalPlanLogTransferTest.java | 157 ++++
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 8 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 8 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 9 +-
mvnw.sh | 0
service-rpc/src/main/thrift/rpc.thrift | 2 +
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 1 +
.../iotdb/tsfile/file/footer/ChunkGroupFooter.java | 10 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 12 +-
.../iotdb/tsfile/file/header/PageHeader.java | 14 +-
.../file/metadata/statistics/BinaryStatistics.java | 6 +-
.../file/metadata/statistics/Statistics.java | 16 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 48 +-
.../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 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 34 +-
.../decoder/delta/DeltaBinaryEncoderLongTest.java | 85 +-
.../iotdb/tsfile/file/header/PageHeaderTest.java | 7 +-
.../read/filter/MinTimeMaxTimeFilterTest.java | 52 +-
.../iotdb/tsfile/read/filter/OperatorTest.java | 1 +
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 19 +-
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 12 +-
.../org/apache/iotdb/tsfile/write/PerfTest.java | 6 +-
.../org/apache/iotdb/tsfile/write/WriteTest.java | 6 +-
168 files changed, 10566 insertions(+), 1605 deletions(-)
rename Readme.md => README.md (86%)
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} (56%)
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%)
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/ServerManager.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerManager.java
rename iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/{ServerServiceImpl.java => SyncServiceImpl.java} (99%)
rename iotdb/src/main/java/org/apache/iotdb/db/sync/sender/{FileManager.java => SyncFileManager.java} (94%)
rename iotdb/src/main/java/org/apache/iotdb/db/sync/sender/{FileSender.java => SyncSender.java} (95%)
rename iotdb/src/main/java/org/apache/iotdb/db/sync/sender/{FileSenderImpl.java => SyncSenderImpl.java} (95%)
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/writelog/transfer/CodecInstances.java
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/IoTDBFlushQueryMergeTest.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/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
rename iotdb/src/test/java/org/apache/iotdb/db/sync/sender/{FileManagerTest.java => SyncFileManagerTest.java} (98%)
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/writelog/transfer/PhysicalPlanLogTransferTest.java
mode change 100644 => 100755 mvnw.sh