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/01/24 14:20:57 UTC
[incubator-iotdb] branch delete_dev2 updated (12adb38 -> e86f93a)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch delete_dev2
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 12adb38 Merge branch 'delete_dev1' into delete_dev2
new 3b8a9c3 add more output for debuging..
new bddd285 disable test of tsfile, jdbc, iotdb-cli for testing iotdb quickly
new 505eb7b using UnixOperatingSystemMXBean to replace lsof command for counting the opened files totally
new 1af3103 enable all tests
new 884f526 disable debug log for OpenFileNumUtil
new 6937260 skip OpenFileNum test
new 45c531e Merge pull request #19 from MyXOF/master
new 25fb174 merge with master
new 25c7c4c Merge pull request #20 from apache/fix_OpenFileNumUtilTest_failure
new f5955aa fix vulnera of pathPrivilege
new 5a1d000 fix smells, vulnerabilities and bugs before write package
new 3e8a36b fix the sonar problem in iotdb query package
new c182815 fix sonar
new 9326ceb change iotdb-cli according to sonar
new 35e98ec Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
new 6c89da5 Merge remote-tracking branch 'origin/fix_sonar' into fix_sonar
new a0d03ba fix sonar
new 575f690 fix the sonar problem in query control, dataset, executor and fill package
new 537a1d3 Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
new f813d67 Merge remote-tracking branch 'origin/fix_sonar' into fix_sonar
new 215f381 Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar No conflict, maven test successfully
new 1129c60 delete iotdb component and externalsort package
new d37c8ed fix sonar problem in query and read package
new ad08ec9 write finished. test passed
new 8c654f2 Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
new 8cecd26 Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
new a251841 remove unused if()
new 66571d2 fix sonar problem in tsfile read query and reader package
new 231381c Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
new dd90d8b Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
new 6b0d060 fix vulnerability in Role.java
new 82f4aaa fix tsfile read package by sonar code
new a7f06e0 fix sonar problem
new 73fe916 fix checkstyle problem, assert and unused getMaxBytesForCompression() calling in ChunkBuffer, and delete a bad fileSize count method
new 17b6e05 fix sonar problem
new 2ba1de8 fit bufferwrite with sonar
new 383ca1e modify the bufferwrite according to the sonarlist
new 6edb3e5 fix some problem by sonarlint
new 1860aaf resolve the conflict
new 16fe041 modity the code suppotted by sonarlint
new c5e6ab6 fix sonar
new 98be1f9 fix two conversations proposed by jt.
new f5563c1 Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
new f54663f Merge remote-tracking branch 'origin/fix_sonar' into fix_sonar
new ef7f57a Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
new a5c8dde Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
new 179662d remove generated thrift file of postback service function
new 6efe9e5 Merge pull request #27 from apache/remove_thrift
new f635105 Merge branch 'master' into fix_sonar
new 69f3195 Merge pull request #25 from apache/fix_sonar
new 2ffc23a Merge branch 'delete_main' into delete_dev1
new e86f93a Merge branch 'delete_dev1' into delete_dev2
The 1380 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:
.../apache/iotdb/cli/client/AbstractClient.java | 34 +-
.../java/org/apache/iotdb/cli/client/Client.java | 100 +-
.../org/apache/iotdb/cli/client/WinClient.java | 91 +-
.../org/apache/iotdb/cli/tool/AbstractCsvTool.java | 3 +-
.../org/apache/iotdb/cli/tool/CsvTestDataGen.java | 1 -
.../java/org/apache/iotdb/cli/tool/ExportCsv.java | 29 +-
.../java/org/apache/iotdb/cli/tool/ImportCsv.java | 13 +-
.../apache/iotdb/cli/client/AbstractClientIT.java | 89 +-
.../iotdb/cli/client/StartClientScriptIT.java | 4 +-
.../apache/iotdb/db/auth/entity/PathPrivilege.java | 36 +-
.../java/org/apache/iotdb/db/auth/entity/Role.java | 24 +-
.../java/org/apache/iotdb/db/auth/entity/User.java | 4 +-
.../iotdb/db/auth/role/LocalFileRoleAccessor.java | 16 +-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 7 +-
.../org/apache/iotdb/db/concurrent/HashLock.java | 8 +-
.../strategy/MaxDiskUsableSpaceFirstStrategy.java | 12 +-
.../java/org/apache/iotdb/db/engine/Processor.java | 6 -
.../apache/iotdb/db/engine/bufferwrite/Action.java | 3 +-
.../{Action.java => ActionException.java} | 13 +-
.../engine/bufferwrite/BufferWriteProcessor.java | 29 +-
.../db/engine/bufferwrite/FileNodeConstants.java | 6 +-
.../bufferwrite/RestorableTsFileIOWriter.java | 20 +-
.../engine/cache/RowGroupBlockMetaDataCache.java | 18 +-
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 6 +-
.../iotdb/db/engine/cache/TsFileMetadataUtils.java | 8 +-
.../iotdb/db/engine/filenode/FileNodeManager.java | 12 +-
.../db/engine/filenode/FileNodeProcessor.java | 67 +-
.../iotdb/db/engine/filenode/IntervalFileNode.java | 10 +-
.../org/apache/iotdb/db/engine/filenode/Main.java | 26 -
.../db/engine/filenode/OverflowChangeType.java | 3 -
.../iotdb/db/engine/filenode/SerializeUtil.java | 3 -
.../db/engine/filenodev2/TimeIntervalTsFile.java | 2 -
.../db/engine/memtable/MemTableFlushUtil.java | 10 +-
.../iotdb/db/engine/overflow/ioV2/OverflowIO.java | 117 +-
.../db/engine/overflow/ioV2/OverflowProcessor.java | 32 +-
.../db/engine/overflow/ioV2/OverflowResource.java | 32 +-
.../engine/overflow/ioV2/OverflowSeriesImpl.java | 12 +-
.../db/engine/overflow/ioV2/OverflowSupport.java | 16 -
.../engine/overflow/metadata/OFFileMetadata.java | 5 +-
.../overflow/metadata/OFRowGroupListMetadata.java | 5 +-
.../overflow/metadata/OFSeriesListMetadata.java | 5 +-
.../utils/OverflowReadWriteThriftFormatUtils.java | 53 -
.../iotdb/db/engine/overflow/utils/TimePair.java | 2 +-
.../apache/iotdb/db/engine/utils/FlushStatus.java | 2 -
.../iotdb/db/postback/receiver/ServerService.java | 7908 --------------------
.../db/postback/receiver/ServerServiceImpl.java | 24 +-
.../iotdb/db/postback/sender/FileSenderImpl.java | 14 +-
.../iotdb/db/qp/executor/OverflowQPExecutor.java | 12 +-
.../query/component/executor/QueryJobExecutor.java | 52 -
.../iotdb/db/query/component/job/QueryEngine.java | 43 -
.../db/query/component/job/QueryEngineImpl.java | 155 -
.../iotdb/db/query/component/job/QueryJob.java | 142 -
.../db/query/component/job/QueryJobContext.java | 23 -
.../db/query/component/job/QueryJobDispatcher.java | 27 -
.../component/job/QueryJobExecutionMessage.java | 36 -
.../db/query/component/job/QueryJobFuture.java | 53 -
.../db/query/component/job/QueryJobFutureImpl.java | 76 -
.../db/query/component/job/QueryJobStatus.java | 23 -
.../iotdb/db/query/component/job/QueryJobType.java | 23 -
.../db/query/component/resource/QueryResource.java | 27 -
.../iotdb/db/query/control/FileReaderManager.java | 8 +-
.../db/query/control/OpenedFilePathsManager.java | 3 +-
.../db/query/control/QueryDataSourceManager.java | 3 +
.../iotdb/db/query/control/QueryTokenManager.java | 5 +-
.../dataset/EngineDataSetWithoutTimeGenerator.java | 12 +-
.../iotdb/db/query/executor/EngineQueryRouter.java | 20 +-
.../db/query/externalsort/ExternalSortJob.java | 45 -
.../query/externalsort/ExternalSortJobEngine.java | 47 -
.../db/query/externalsort/ExternalSortJobPart.java | 44 -
.../externalsort/ExternalSortJobScheduler.java | 42 -
.../iotdb/db/query/externalsort/LineMerger.java | 51 -
.../MultiSourceExternalSortJobPart.java | 56 -
.../externalsort/SimpleExternalSortEngine.java | 97 -
.../SingleSourceExternalSortJobPart.java | 37 -
.../serialize/TimeValuePairDeserializer.java | 34 -
.../serialize/TimeValuePairSerializer.java | 29 -
.../impl/FixLengthTimeValuePairDeserializer.java | 200 -
.../impl/FixLengthTimeValuePairSerializer.java | 165 -
.../impl/SimpleTimeValuePairDeserializer.java | 80 -
.../impl/SimpleTimeValuePairSerializer.java | 65 -
.../db/query/factory/SeriesReaderFactory.java | 14 +-
.../org/apache/iotdb/db/query/fill/LinearFill.java | 21 +-
.../apache/iotdb/db/query/fill/PreviousFill.java | 18 +-
.../reader/mem/MemChunkReaderByTimestamp.java | 4 +-
.../query/reader/mem/MemChunkReaderWithFilter.java | 4 +-
.../reader/mem/MemChunkReaderWithoutFilter.java | 5 +-
.../db/query/reader/merge/PriorityMergeReader.java | 17 +-
.../query/reader/sequence/SealedTsFilesReader.java | 6 +-
.../query/reader/sequence/SequenceDataReader.java | 2 -
.../SequenceInsertDataByTimeStampReader.java | 244 -
.../reader/sequence/UnSealedTsFileReader.java | 14 +-
.../query/reader/unsequence/EngineChunkReader.java | 3 -
.../db/query/timegenerator/EngineLeafNode.java | 21 -
.../query/timegenerator/EngineTimeGenerator.java | 2 +-
.../apache/iotdb/db/service/CloseMergeService.java | 17 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 8 +-
.../org/apache/iotdb/db/sql/parse/ParseDriver.java | 10 +-
.../java/org/apache/iotdb/db/utils/AuthUtils.java | 36 +-
.../org/apache/iotdb/db/utils/CommonUtils.java | 2 +-
.../java/org/apache/iotdb/db/utils/IOUtils.java | 13 +-
.../org/apache/iotdb/db/utils/LoadDataUtils.java | 5 +-
.../java/org/apache/iotdb/db/utils/MemUtils.java | 23 +-
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 46 +-
.../org/apache/iotdb/db/utils/PostbackUtils.java | 13 +-
.../org/apache/iotdb/db/utils/TimeValuePair.java | 5 +
.../org/apache/iotdb/db/utils/TsPrimitiveType.java | 28 +-
.../org/apache/iotdb/db/writelog/LogPosition.java | 6 +-
.../org/apache/iotdb/db/writelog/io/LogWriter.java | 6 +-
.../apache/iotdb/db/writelog/io/RAFLogReader.java | 5 +
.../writelog/manager/MultiFileLogNodeManager.java | 2 +
iotdb/src/main/thrift/ServerService.thrift | 16 +
.../iotdb/db/auth/LocalFIleRoleAccessorTest.java | 14 +-
.../iotdb/db/auth/LocalFileRoleManagerTest.java | 42 +-
.../iotdb/db/auth/LocalFileUserAccessorTest.java | 2 +-
.../iotdb/db/auth/LocalFileUserManagerTest.java | 2 +-
.../engine/bufferwrite/BufferWriteBenchmark.java | 6 +-
.../bufferwrite/BufferWriteProcessorNewTest.java | 6 +-
.../bufferwrite/BufferWriteProcessorTest.java | 6 +-
.../memcontrol/BufferwriteFileSizeControlTest.java | 7 +-
.../memcontrol/BufferwriteMetaSizeControlTest.java | 7 +-
.../memcontrol/OverflowFileSizeControlTest.java | 9 +-
.../memcontrol/OverflowMetaSizeControlTest.java | 9 +-
.../overflow/ioV2/OverflowProcessorBenchmark.java | 5 +-
.../overflow/ioV2/OverflowProcessorTest.java | 5 +-
.../iotdb/db/integration/IoTDBCompleteIT.java | 16 +-
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 4 +-
.../query/control/OpenedFilePathsManagerTest.java | 23 -
.../db/query/control/QueryTokenManagerTest.java | 2 +-
.../apache/iotdb/db/utils/OpenFileNumUtilTest.java | 62 +-
iotdb/src/test/resources/logback.xml | 41 +
.../cn/edu/tsinghua/tsfile/TsFileSequenceRead.java | 2 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 38 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 16 +-
.../tsfile/common/constant/JsonFormatConstant.java | 7 +-
.../tsfile/common/constant/QueryConstant.java | 2 +
.../tsfile/common/constant/StatisticConstant.java | 2 +
.../tsfile/common/constant/SystemConstant.java | 2 +
.../apache/iotdb/tsfile/compress/Compressor.java | 4 -
.../write/UnknownColumnTypeException.java | 2 -
.../exception/write/WriteProcessException.java | 2 +-
.../org/apache/iotdb/tsfile/file/MetaMarker.java | 8 +-
.../iotdb/tsfile/file/footer/ChunkGroupFooter.java | 15 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 20 +-
.../iotdb/tsfile/file/header/PageHeader.java | 59 +-
.../iotdb/tsfile/file/header/package-info.java | 2 +-
.../tsfile/file/metadata/ChunkGroupMetaData.java | 11 +-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 4 -
.../tsfile/file/metadata/TsDeviceMetadata.java | 3 +-
.../file/metadata/TsDeviceMetadataIndex.java | 4 +-
.../iotdb/tsfile/file/metadata/TsDigest.java | 1 +
.../iotdb/tsfile/file/metadata/TsFileMetaData.java | 2 +-
.../tsfile/file/metadata/enums/TSDataType.java | 4 +-
.../metadata/statistics/BooleanStatistics.java | 4 +-
.../file/metadata/statistics/NoStatistics.java | 14 +-
.../file/metadata/statistics/Statistics.java | 50 +-
.../statistics/StatisticsDeserializer.java | 23 -
.../iotdb/tsfile/read/TsFileSequenceReader.java | 17 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 184 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 17 +-
.../apache/iotdb/tsfile/read/common/RowRecord.java | 4 -
.../query/dataset/DataSetWithoutTimeGenerator.java | 3 -
.../read/reader/chunk/ChunkReaderByTimestamp.java | 2 +-
.../read/reader/chunk/ChunkReaderWithFilter.java | 6 +-
.../reader/chunk/ChunkReaderWithoutFilter.java | 2 +-
.../iotdb/tsfile/read/reader/page/PageReader.java | 98 +-
.../reader/series/SeriesReaderByTimestamp.java | 2 +-
.../java/org/apache/iotdb/tsfile/utils/Binary.java | 5 +-
.../org/apache/iotdb/tsfile/utils/BytesUtils.java | 83 +-
.../java/org/apache/iotdb/tsfile/utils/Loader.java | 2 +-
.../tsfile/utils/ReadWriteForEncodingUtils.java | 17 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 17 +-
.../apache/iotdb/tsfile/utils/StringContainer.java | 17 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 24 +-
.../iotdb/tsfile/write/chunk/ChunkBuffer.java | 19 +-
.../tsfile/write/chunk/ChunkGroupWriterImpl.java | 2 +-
.../apache/iotdb/tsfile/write/page/PageWriter.java | 2 +-
.../iotdb/tsfile/write/schema/FileSchema.java | 11 +-
.../iotdb/tsfile/write/schema/JsonConverter.java | 4 +-
.../tsfile/write/schema/MeasurementSchema.java | 10 +-
.../iotdb/tsfile/write/schema/SchemaBuilder.java | 2 +-
.../tsfile/write/writer/DefaultTsFileOutput.java | 5 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 8 +-
.../org/apache/iotdb/tsfile/read/ReadTest.java | 64 +-
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 68 +-
.../controller/MetadataQuerierByFileImplTest.java | 2 +-
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 6 +-
187 files changed, 1227 insertions(+), 11338 deletions(-)
copy iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/{Action.java => ActionException.java} (82%)
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/Main.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/OverflowReadWriteThriftFormatUtils.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerService.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/executor/QueryJobExecutor.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryEngine.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryEngineImpl.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJob.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobContext.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobDispatcher.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobExecutionMessage.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobFuture.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobFutureImpl.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobStatus.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobType.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/component/resource/QueryResource.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJob.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobEngine.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobPart.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobScheduler.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/LineMerger.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/MultiSourceExternalSortJobPart.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/SimpleExternalSortEngine.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/SingleSourceExternalSortJobPart.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/TimeValuePairDeserializer.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/TimeValuePairSerializer.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairDeserializer.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairSerializer.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/SimpleTimeValuePairDeserializer.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/SimpleTimeValuePairSerializer.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceInsertDataByTimeStampReader.java
create mode 100755 iotdb/src/main/thrift/ServerService.thrift
delete mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/control/OpenedFilePathsManagerTest.java
create mode 100644 iotdb/src/test/resources/logback.xml
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsDeserializer.java