This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 69f31952845de32ac1779c941c2db2a3e2c19233 Merge: 6efe9e5 f635105 Author: Xiangdong Huang <[email protected]> AuthorDate: Thu Jan 24 21:31:48 2019 +0800 Merge pull request #25 from apache/fix_sonar Fix many code debt reported by sonar .../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 +- .../bufferwrite/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 | 66 ++---- .../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 | 33 ++- .../engine/overflow/ioV2/OverflowSeriesImpl.java | 12 +- .../db/engine/overflow/ioV2/OverflowSupport.java | 12 +- .../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 - .../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 -- .../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/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/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 +- .../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 +- 181 files changed, 1107 insertions(+), 3354 deletions(-)
