From 505787ee7c7617c2d06705e57b61c40e4df3ad0c Mon Sep 17 00:00:00 2001 From: kr11 <3095717866@qq.com> Date: Thu, 24 Jan 2019 14:23:57 +0800 Subject: [PATCH] move sonar changes from apache-incubator --- Jenkinsfile | 183 +++++++++++++ Readme.md | 29 ++- asf.header | 13 +- checkstyle.xml | 13 +- codecov.yml | 13 +- grafana/conf/application.properties | 13 +- grafana/pom.xml | 59 ++++- grafana/readme.md | 21 ++ grafana/readme_zh.md | 21 ++ .../web/grafana/TsfileWebDemoApplication.java | 13 +- .../iotdb/web/grafana/bean/TimeValues.java | 13 +- .../web/grafana/conf/MyConfiguration.java | 13 +- .../controller/DatabaseConnectController.java | 13 +- .../iotdb/web/grafana/dao/BasicDao.java | 13 +- .../web/grafana/dao/impl/BasicDaoImpl.java | 13 +- .../service/DatabaseConnectService.java | 13 +- .../impl/DatabaseConnectServiceImpl.java | 13 +- hadoop/README.md | 21 ++ hadoop/pom.xml | 13 +- .../tsfile/hadoop/TSFHadoopException.java | 13 +- .../iotdb/tsfile/hadoop/TSFInputFormat.java | 13 +- .../iotdb/tsfile/hadoop/TSFInputSplit.java | 13 +- .../iotdb/tsfile/hadoop/TSFOutputFormat.java | 13 +- .../iotdb/tsfile/hadoop/TSFRecordReader.java | 13 +- .../iotdb/tsfile/hadoop/TSFRecordWriter.java | 13 +- .../org/apache/iotdb/tsfile/hadoop/TSRow.java | 13 +- .../hadoop/example/TSFMRReadExample.java | 13 +- .../tsfile/hadoop/example/TsFileHelper.java | 13 +- .../tsfile/hadoop/io/HDFSInputStream.java | 13 +- .../tsfile/hadoop/io/HDFSOutputStream.java | 13 +- .../tsfile/hadoop/InputOutputStreamTest.java | 13 +- .../edu/thu/tsfile/hadoop/TSFHadoopTest.java | 13 +- .../thu/tsfile/hadoop/TSFInputSplitTest.java | 13 +- .../thu/tsfile/hadoop/TsFileTestHelper.java | 13 +- iotdb-cli/cli/bin/export-csv.bat | 13 +- iotdb-cli/cli/bin/export-csv.sh | 13 +- iotdb-cli/cli/bin/import-csv.bat | 13 +- iotdb-cli/cli/bin/import-csv.sh | 13 +- iotdb-cli/cli/bin/run-client.bat | 13 +- iotdb-cli/cli/bin/start-client.bat | 13 +- iotdb-cli/cli/bin/start-client.sh | 13 +- iotdb-cli/pom.xml | 53 +++- .../iotdb/cli/client/AbstractClient.java | 47 ++-- .../org/apache/iotdb/cli/client/Client.java | 112 +++----- .../apache/iotdb/cli/client/WinClient.java | 108 +++----- .../cli/exception/ArgsErrorException.java | 13 +- .../iotdb/cli/tool/AbstractCsvTool.java | 16 +- .../apache/iotdb/cli/tool/CsvTestDataGen.java | 14 +- .../org/apache/iotdb/cli/tool/ExportCsv.java | 42 ++- .../org/apache/iotdb/cli/tool/ImportCsv.java | 26 +- ...tClientTest.java => AbstractClientIT.java} | 104 +++----- ...riptTest.java => StartClientScriptIT.java} | 20 +- iotdb-cli/src/test/resources/logback.xml | 20 ++ iotdb/iotdb/bin/start-postBackClient.bat | 13 +- iotdb/iotdb/bin/start-postBackClient.sh | 13 +- iotdb/iotdb/bin/start-server.bat | 13 +- iotdb/iotdb/bin/start-server.sh | 13 +- iotdb/iotdb/bin/stop-postBackClient.bat | 13 +- iotdb/iotdb/bin/stop-postBackClient.sh | 13 +- iotdb/iotdb/bin/stop-server.bat | 13 +- iotdb/iotdb/bin/stop-server.sh | 13 +- iotdb/iotdb/conf/error_info_cn.properties | 13 +- iotdb/iotdb/conf/error_info_en.properties | 13 +- iotdb/iotdb/conf/iotdb-engine.properties | 59 ++++- iotdb/iotdb/conf/iotdb-env.bat | 13 +- iotdb/iotdb/conf/iotdb-env.sh | 13 +- .../conf/iotdb-postbackClient.properties | 13 +- iotdb/iotdb/conf/logback.xml | 13 +- iotdb/iotdb/conf/tsfile-format.properties | 13 +- iotdb/pom.xml | 60 +++-- .../org/apache/iotdb/db/sql/parse/TSLexer.g | 13 +- .../org/apache/iotdb/db/sql/parse/TSParser.g | 13 +- .../apache/iotdb/db/auth/AuthException.java | 13 +- .../iotdb/db/auth/AuthorityChecker.java | 13 +- .../db/auth/authorizer/BasicAuthorizer.java | 13 +- .../iotdb/db/auth/authorizer/IAuthorizer.java | 13 +- .../auth/authorizer/LocalFileAuthorizer.java | 13 +- .../iotdb/db/auth/entity/PathPrivilege.java | 49 +++- .../iotdb/db/auth/entity/PrivilegeType.java | 13 +- .../org/apache/iotdb/db/auth/entity/Role.java | 37 ++- .../org/apache/iotdb/db/auth/entity/User.java | 17 +- .../iotdb/db/auth/role/BasicRoleManager.java | 13 +- .../iotdb/db/auth/role/IRoleAccessor.java | 13 +- .../iotdb/db/auth/role/IRoleManager.java | 13 +- .../db/auth/role/LocalFileRoleAccessor.java | 29 +-- .../db/auth/role/LocalFileRoleManager.java | 13 +- .../iotdb/db/auth/user/BasicUserManager.java | 13 +- .../iotdb/db/auth/user/IUserAccessor.java | 13 +- .../iotdb/db/auth/user/IUserManager.java | 13 +- .../db/auth/user/LocalFileUserAccessor.java | 20 +- .../db/auth/user/LocalFileUserManager.java | 13 +- .../apache/iotdb/db/concurrent/HashLock.java | 21 +- .../IoTDBDefaultThreadExceptionHandler.java | 13 +- .../db/concurrent/IoTDBThreadPoolFactory.java | 13 +- .../iotdb/db/concurrent/IoTThreadFactory.java | 13 +- .../iotdb/db/concurrent/ThreadName.java | 41 +-- .../org/apache/iotdb/db/conf/IoTDBConfig.java | 66 ++--- .../apache/iotdb/db/conf/IoTDBConstant.java | 13 +- .../apache/iotdb/db/conf/IoTDBDescriptor.java | 21 +- .../db/conf/directories/Directories.java | 13 +- .../strategy/DirectoryStrategy.java | 13 +- .../MaxDiskUsableSpaceFirstStrategy.java | 17 +- .../MinDirOccupiedSpaceFirstStrategy.java | 13 +- .../MinFolderOccupiedSpaceFirstStrategy.java | 13 +- .../strategy/SequenceStrategy.java | 13 +- .../org/apache/iotdb/db/engine/Processor.java | 13 +- .../iotdb/db/engine/bufferwrite/Action.java | 13 +- .../bufferwrite/BufferWriteProcessor.java | 13 +- .../engine/bufferwrite/FileNodeConstants.java | 13 +- .../bufferwrite/RestorableTsFileIOWriter.java | 13 +- .../cache/RowGroupBlockMetaDataCache.java | 13 +- .../db/engine/cache/TsFileMetaDataCache.java | 13 +- .../db/engine/cache/TsFileMetadataUtils.java | 15 +- .../db/engine/filenode/FileNodeManager.java | 13 +- .../db/engine/filenode/FileNodeProcessor.java | 13 +- .../filenode/FileNodeProcessorStatus.java | 13 +- .../filenode/FileNodeProcessorStore.java | 13 +- .../db/engine/filenode/IntervalFileNode.java | 13 +- .../apache/iotdb/db/engine/filenode/Main.java | 27 -- .../engine/filenode/OverflowChangeType.java | 13 +- .../db/engine/filenode/SerializeUtil.java | 13 +- .../engine/filenodev2/TimeIntervalTsFile.java | 13 +- .../engine/memcontrol/BasicMemController.java | 13 +- .../engine/memcontrol/FlushPartialPolicy.java | 13 +- .../memcontrol/ForceFLushAllPolicy.java | 13 +- .../engine/memcontrol/JVMMemController.java | 13 +- .../engine/memcontrol/MemMonitorThread.java | 13 +- .../engine/memcontrol/MemStatisticThread.java | 13 +- .../db/engine/memcontrol/NoActPolicy.java | 13 +- .../iotdb/db/engine/memcontrol/Policy.java | 13 +- .../memcontrol/RecordMemController.java | 13 +- .../db/engine/memtable/AbstractMemTable.java | 13 +- .../iotdb/db/engine/memtable/IMemTable.java | 13 +- .../db/engine/memtable/IWritableMemChunk.java | 13 +- .../engine/memtable/MemSeriesLazyMerger.java | 13 +- .../db/engine/memtable/MemTableFlushUtil.java | 13 +- .../db/engine/memtable/PrimitiveMemTable.java | 13 +- .../memtable/TimeValuePairInMemTable.java | 13 +- .../engine/memtable/TimeValuePairSorter.java | 13 +- .../db/engine/memtable/WritableMemChunk.java | 13 +- .../db/engine/overflow/ioV2/OverflowIO.java | 13 +- .../overflow/ioV2/OverflowProcessor.java | 13 +- .../overflow/ioV2/OverflowResource.java | 13 +- .../overflow/ioV2/OverflowSeriesImpl.java | 13 +- .../engine/overflow/ioV2/OverflowSupport.java | 13 +- .../overflow/metadata/OFFileMetadata.java | 13 +- .../metadata/OFRowGroupListMetadata.java | 13 +- .../metadata/OFSeriesListMetadata.java | 13 +- .../db/engine/overflow/utils/MergeStatus.java | 13 +- .../engine/overflow/utils/OverflowOpType.java | 13 +- .../OverflowReadWriteThriftFormatUtils.java | 13 +- .../db/engine/overflow/utils/TimePair.java | 13 +- .../iotdb/db/engine/pool/FlushManager.java | 13 +- .../iotdb/db/engine/pool/MergeManager.java | 13 +- .../GlobalSortedSeriesDataSource.java | 13 +- .../querycontext/MergeSeriesDataSource.java | 13 +- .../querycontext/OverflowInsertFile.java | 13 +- .../OverflowSeriesDataSource.java | 13 +- .../OverflowUpdateDeleteFile.java | 13 +- .../engine/querycontext/QueryDataSource.java | 13 +- .../engine/querycontext/ReadOnlyMemChunk.java | 13 +- .../engine/querycontext/UnsealedTsFile.java | 13 +- .../iotdb/db/engine/utils/FlushStatus.java | 13 +- .../db/exception/ArgsErrorException.java | 13 +- .../BufferWriteProcessorException.java | 13 +- .../DeltaEngineRunningException.java | 13 +- .../db/exception/ErrorDebugException.java | 13 +- .../exception/FileNodeManagerException.java | 13 +- .../exception/FileNodeNotExistException.java | 13 +- .../exception/FileNodeProcessorException.java | 13 +- .../exception/MetadataArgsErrorException.java | 13 +- .../db/exception/NotConsistentException.java | 13 +- .../exception/OverflowProcessorException.java | 13 +- .../OverflowWrongParameterException.java | 13 +- .../db/exception/PathErrorException.java | 13 +- .../db/exception/ProcessorException.java | 13 +- .../exception/ProcessorRuntimException.java | 13 +- .../iotdb/db/exception/RecoverException.java | 13 +- .../iotdb/db/exception/StartupException.java | 13 +- .../UnSupportedFillTypeException.java | 13 +- .../UnSupportedOverflowOpTypeException.java | 13 +- .../db/exception/WALOverSizedException.java | 13 +- .../exception/builder/ExceptionBuilder.java | 13 +- .../codebased/AuthPluginException.java | 13 +- .../codebased/ConnectionFailedException.java | 13 +- .../codebased/ConnectionHostException.java | 13 +- .../codebased/InsecureAPIException.java | 13 +- .../codebased/InvalidParameterException.java | 13 +- .../exception/codebased/IoTDBException.java | 13 +- .../codebased/NoParameterException.java | 13 +- .../NoPreparedStatementException.java | 13 +- .../codebased/OutOfMemoryException.java | 13 +- .../exception/codebased/UnknownException.java | 13 +- .../qp/GeneratePhysicalPlanException.java | 13 +- .../qp/IllegalASTFormatException.java | 13 +- .../qp/LogicalOperatorException.java | 13 +- .../qp/LogicalOptimizeException.java | 13 +- .../exception/qp/QueryProcessorException.java | 13 +- .../iotdb/db/metadata/ColumnSchema.java | 13 +- .../org/apache/iotdb/db/metadata/MGraph.java | 13 +- .../apache/iotdb/db/metadata/MManager.java | 13 +- .../org/apache/iotdb/db/metadata/MNode.java | 13 +- .../org/apache/iotdb/db/metadata/MTree.java | 13 +- .../apache/iotdb/db/metadata/Metadata.java | 13 +- .../iotdb/db/metadata/MetadataConstant.java | 13 +- .../db/metadata/MetadataOperationType.java | 13 +- .../org/apache/iotdb/db/metadata/PNode.java | 13 +- .../org/apache/iotdb/db/metadata/PTree.java | 13 +- .../apache/iotdb/db/monitor/IStatistic.java | 13 +- .../iotdb/db/monitor/MonitorConstants.java | 13 +- .../apache/iotdb/db/monitor/StatMonitor.java | 13 +- .../postback/conf/PostBackSenderConfig.java | 13 +- .../conf/PostBackSenderDescriptor.java | 13 +- .../db/postback/receiver/ServerManager.java | 13 +- .../db/postback/receiver/ServerService.java | 13 +- .../postback/receiver/ServerServiceImpl.java | 37 ++- .../iotdb/db/postback/sender/FileManager.java | 13 +- .../iotdb/db/postback/sender/FileSender.java | 13 +- .../db/postback/sender/FileSenderImpl.java | 25 +- .../db/postback/utils/CreateDataSender1.java | 13 +- .../db/postback/utils/CreateDataSender2.java | 13 +- .../db/postback/utils/CreateDataSender3.java | 13 +- .../iotdb/db/postback/utils/RandomNum.java | 13 +- .../apache/iotdb/db/postback/utils/Utils.java | 13 +- .../apache/iotdb/db/qp/QueryProcessor.java | 13 +- .../iotdb/db/qp/constant/DatetimeUtils.java | 28 +- .../iotdb/db/qp/constant/SQLConstant.java | 13 +- .../db/qp/constant/TSParserConstant.java | 13 +- .../qp/exception/DateTimeFormatException.java | 13 +- .../db/qp/executor/OverflowQPExecutor.java | 23 +- .../db/qp/executor/QueryProcessExecutor.java | 13 +- .../apache/iotdb/db/qp/logical/Operator.java | 13 +- .../iotdb/db/qp/logical/RootOperator.java | 13 +- .../logical/crud/BasicFunctionOperator.java | 13 +- .../db/qp/logical/crud/BasicOperatorType.java | 13 +- .../db/qp/logical/crud/DeleteOperator.java | 13 +- .../db/qp/logical/crud/FilterOperator.java | 13 +- .../db/qp/logical/crud/FromOperator.java | 13 +- .../db/qp/logical/crud/FunctionOperator.java | 13 +- .../db/qp/logical/crud/InsertOperator.java | 13 +- .../db/qp/logical/crud/QueryOperator.java | 13 +- .../iotdb/db/qp/logical/crud/SFWOperator.java | 13 +- .../db/qp/logical/crud/SelectOperator.java | 13 +- .../db/qp/logical/crud/UpdateOperator.java | 13 +- .../db/qp/logical/sys/AuthorOperator.java | 13 +- .../db/qp/logical/sys/LoadDataOperator.java | 13 +- .../db/qp/logical/sys/MetadataOperator.java | 13 +- .../db/qp/logical/sys/PropertyOperator.java | 13 +- .../iotdb/db/qp/physical/PhysicalPlan.java | 13 +- .../db/qp/physical/crud/AggregationPlan.java | 13 +- .../iotdb/db/qp/physical/crud/DeletePlan.java | 13 +- .../db/qp/physical/crud/FillQueryPlan.java | 13 +- .../db/qp/physical/crud/GroupByPlan.java | 13 +- .../iotdb/db/qp/physical/crud/InsertPlan.java | 13 +- .../iotdb/db/qp/physical/crud/QueryPlan.java | 13 +- .../iotdb/db/qp/physical/crud/UpdatePlan.java | 13 +- .../iotdb/db/qp/physical/sys/AuthorPlan.java | 13 +- .../db/qp/physical/sys/LoadDataPlan.java | 13 +- .../db/qp/physical/sys/MetadataPlan.java | 13 +- .../db/qp/physical/sys/PropertyPlan.java | 13 +- .../db/qp/strategy/LogicalGenerator.java | 13 +- .../db/qp/strategy/PhysicalGenerator.java | 13 +- .../optimizer/ConcatPathOptimizer.java | 13 +- .../optimizer/DnfFilterOptimizer.java | 13 +- .../strategy/optimizer/IFilterOptimizer.java | 13 +- .../strategy/optimizer/ILogicalOptimizer.java | 13 +- .../optimizer/MergeSingleFilterOptimizer.java | 13 +- .../optimizer/RemoveNotOptimizer.java | 13 +- .../component/executor/QueryJobExecutor.java | 53 ---- .../db/query/component/job/QueryEngine.java | 44 ---- .../query/component/job/QueryEngineImpl.java | 156 ----------- .../db/query/component/job/QueryJob.java | 143 ---------- .../query/component/job/QueryJobContext.java | 24 -- .../component/job/QueryJobDispatcher.java | 28 -- .../job/QueryJobExecutionMessage.java | 37 --- .../query/component/job/QueryJobFuture.java | 54 ---- .../component/job/QueryJobFutureImpl.java | 77 ------ .../query/component/job/QueryJobStatus.java | 24 -- .../db/query/component/job/QueryJobType.java | 24 -- .../component/resource/QueryResource.java | 28 -- .../db/query/control/FileReaderManager.java | 21 +- .../query/control/OpenedFilePathsManager.java | 16 +- .../query/control/QueryDataSourceManager.java | 16 +- .../db/query/control/QueryTokenManager.java | 18 +- .../EngineDataSetWithTimeGenerator.java | 13 +- .../EngineDataSetWithoutTimeGenerator.java | 25 +- .../EngineExecutorWithTimeGenerator.java | 13 +- .../EngineExecutorWithoutTimeGenerator.java | 13 +- .../db/query/executor/EngineQueryRouter.java | 33 +-- .../query/externalsort/ExternalSortJob.java | 46 ---- .../externalsort/ExternalSortJobEngine.java | 48 ---- .../externalsort/ExternalSortJobPart.java | 45 ---- .../ExternalSortJobScheduler.java | 43 --- .../db/query/externalsort/LineMerger.java | 52 ---- .../MultiSourceExternalSortJobPart.java | 57 ---- .../SimpleExternalSortEngine.java | 98 ------- .../SingleSourceExternalSortJobPart.java | 38 --- .../serialize/TimeValuePairDeserializer.java | 35 --- .../serialize/TimeValuePairSerializer.java | 30 --- .../FixLengthTimeValuePairDeserializer.java | 201 -------------- .../FixLengthTimeValuePairSerializer.java | 166 ------------ .../impl/SimpleTimeValuePairDeserializer.java | 81 ------ .../impl/SimpleTimeValuePairSerializer.java | 66 ----- .../db/query/factory/SeriesReaderFactory.java | 27 +- .../org/apache/iotdb/db/query/fill/IFill.java | 13 +- .../iotdb/db/query/fill/LinearFill.java | 34 +-- .../iotdb/db/query/fill/PreviousFill.java | 31 +-- .../apache/iotdb/db/query/reader/IReader.java | 13 +- .../reader/mem/MemChunkReaderByTimestamp.java | 17 +- .../reader/mem/MemChunkReaderWithFilter.java | 17 +- .../mem/MemChunkReaderWithoutFilter.java | 18 +- .../reader/merge/EngineReaderByTimeStamp.java | 13 +- .../reader/merge/PriorityMergeReader.java | 30 ++- .../merge/PriorityMergeReaderByTimestamp.java | 13 +- .../reader/sequence/SealedTsFilesReader.java | 19 +- .../reader/sequence/SequenceDataReader.java | 15 +- .../SequenceInsertDataByTimeStampReader.java | 245 ------------------ .../reader/sequence/UnSealedTsFileReader.java | 27 +- .../reader/unsequence/EngineChunkReader.java | 16 +- .../query/timegenerator/EngineLeafNode.java | 34 +-- .../timegenerator/EngineNodeConstructor.java | 13 +- .../timegenerator/EngineTimeGenerator.java | 15 +- .../iotdb/db/service/CloseMergeService.java | 30 +-- .../org/apache/iotdb/db/service/IService.java | 13 +- .../org/apache/iotdb/db/service/IoTDB.java | 15 +- .../apache/iotdb/db/service/IoTDBMBean.java | 13 +- .../apache/iotdb/db/service/JDBCService.java | 13 +- .../db/service/JDBCServiceEventHandler.java | 13 +- .../iotdb/db/service/JDBCServiceMBean.java | 13 +- .../apache/iotdb/db/service/JMXService.java | 13 +- .../org/apache/iotdb/db/service/Monitor.java | 13 +- .../apache/iotdb/db/service/MonitorMBean.java | 13 +- .../iotdb/db/service/RegisterManager.java | 13 +- .../apache/iotdb/db/service/ServiceType.java | 13 +- .../apache/iotdb/db/service/StartupCheck.java | 13 +- .../iotdb/db/service/StartupChecks.java | 13 +- .../iotdb/db/service/TSServiceImpl.java | 13 +- .../org/apache/iotdb/db/service/Utils.java | 13 +- .../apache/iotdb/db/sql/ParseGenerator.java | 13 +- .../iotdb/db/sql/parse/AstErrorNode.java | 13 +- .../apache/iotdb/db/sql/parse/AstNode.java | 13 +- .../iotdb/db/sql/parse/AstNodeOrigin.java | 13 +- .../org/apache/iotdb/db/sql/parse/Node.java | 13 +- .../iotdb/db/sql/parse/ParseDriver.java | 13 +- .../apache/iotdb/db/sql/parse/ParseError.java | 13 +- .../iotdb/db/sql/parse/ParseException.java | 13 +- .../apache/iotdb/db/sql/parse/ParseUtils.java | 13 +- .../org/apache/iotdb/db/utils/AuthUtils.java | 49 ++-- .../apache/iotdb/db/utils/CommonUtils.java | 15 +- .../iotdb/db/utils/FileSchemaUtils.java | 13 +- .../org/apache/iotdb/db/utils/FileUtils.java | 13 +- .../org/apache/iotdb/db/utils/IOUtils.java | 26 +- .../apache/iotdb/db/utils/LoadDataUtils.java | 16 +- .../org/apache/iotdb/db/utils/MemUtils.java | 27 +- .../iotdb/db/utils/OpenFileNumUtil.java | 57 ++-- .../apache/iotdb/db/utils/PostbackUtils.java | 26 +- .../iotdb/db/utils/PrimitiveArrayList.java | 13 +- .../db/utils/PrimitiveArrayListFactory.java | 13 +- .../iotdb/db/utils/RandomDeleteCache.java | 13 +- .../apache/iotdb/db/utils/RecordUtils.java | 13 +- .../apache/iotdb/db/utils/TimeValuePair.java | 18 +- .../iotdb/db/utils/TimeValuePairUtils.java | 13 +- .../iotdb/db/utils/TsPrimitiveType.java | 41 ++- .../apache/iotdb/db/writelog/LogPosition.java | 19 +- .../iotdb/db/writelog/RecoverStage.java | 13 +- .../iotdb/db/writelog/io/ILogReader.java | 13 +- .../iotdb/db/writelog/io/ILogWriter.java | 15 +- .../iotdb/db/writelog/io/LogWriter.java | 33 ++- .../iotdb/db/writelog/io/RAFLogReader.java | 13 +- .../manager/MultiFileLogNodeManager.java | 75 +++++- .../writelog/manager/WriteLogNodeManager.java | 13 +- .../writelog/node/ExclusiveWriteLogNode.java | 48 +++- .../iotdb/db/writelog/node/WriteLogNode.java | 18 +- .../recover/ExclusiveLogRecoverPerformer.java | 13 +- .../recover/FileNodeRecoverPerformer.java | 13 +- .../db/writelog/recover/RecoverPerformer.java | 13 +- .../writelog/replay/ConcreteLogReplayer.java | 13 +- .../iotdb/db/writelog/replay/LogReplayer.java | 13 +- .../iotdb/db/writelog/transfer/Codec.java | 13 +- .../writelog/transfer/PhysicalPlanCodec.java | 13 +- .../transfer/PhysicalPlanLogTransfer.java | 13 +- .../writelog/transfer/SystemLogOperator.java | 13 +- iotdb/src/test/java/PerformanceTest.java | 13 +- .../db/auth/LocalFIleRoleAccessorTest.java | 27 +- .../db/auth/LocalFileAuthorizerTest.java | 13 +- .../db/auth/LocalFileRoleManagerTest.java | 55 ++-- .../db/auth/LocalFileUserAccessorTest.java | 15 +- .../db/auth/LocalFileUserManagerTest.java | 15 +- ...oTDBDefaultThreadExceptionHandlerTest.java | 13 +- .../IoTDBThreadPoolFactoryTest.java | 13 +- .../db/engine/MetadataManagerHelper.java | 13 +- .../org/apache/iotdb/db/engine/PathUtils.java | 13 +- .../apache/iotdb/db/engine/ProcessorTest.java | 13 +- .../bufferwrite/BufferWriteBenchmark.java | 13 +- .../BufferWriteProcessorNewTest.java | 13 +- .../bufferwrite/BufferWriteProcessorTest.java | 13 +- .../RestorableTsFileIOWriterTest.java | 13 +- .../db/engine/filenode/SerializeUtilTest.java | 13 +- .../filenodev2/FileNodeManagerBenchmark.java | 13 +- .../BufferwriteFileSizeControlTest.java | 13 +- .../BufferwriteMetaSizeControlTest.java | 13 +- .../memcontrol/IoTDBMemControlTest.java | 13 +- .../engine/memcontrol/MemControllerTest.java | 13 +- .../OverflowFileSizeControlTest.java | 13 +- .../OverflowMetaSizeControlTest.java | 13 +- .../db/engine/memtable/MemTableTestUtils.java | 13 +- .../db/engine/memtable/MemtableBenchmark.java | 13 +- .../memtable/PrimitiveMemTableTest.java | 13 +- .../engine/overflow/ioV2/OverflowIOTest.java | 13 +- .../ioV2/OverflowProcessorBenchmark.java | 13 +- .../overflow/ioV2/OverflowProcessorTest.java | 13 +- .../overflow/ioV2/OverflowResourceTest.java | 13 +- .../overflow/ioV2/OverflowSupportTest.java | 13 +- .../overflow/ioV2/OverflowTestUtils.java | 13 +- .../overflow/metadata/OFFileMetadataTest.java | 13 +- .../metadata/OFRowGroupListMetadataTest.java | 13 +- .../metadata/OFSeriesListMetadataTest.java | 13 +- .../overflow/metadata/OverflowTestHelper.java | 13 +- .../overflow/metadata/OverflowUtils.java | 13 +- .../db/exception/ExceptionBuilderTest.java | 13 +- .../apache/iotdb/db/integration/Constant.java | 13 +- ...ionTest.java => IoTDBAuthorizationIT.java} | 17 +- ...CompleteTest.java => IoTDBCompleteIT.java} | 15 +- ...oTDBDaemonTest.java => IoTDBDaemonIT.java} | 15 +- ...t.java => IoTDBEngineTimeGeneratorIT.java} | 15 +- ...rgeDataTest.java => IoTDBLargeDataIT.java} | 15 +- ...limitTest.java => IoTDBLimitSlimitIT.java} | 15 +- ...tchTest.java => IoTDBMetadataFetchIT.java} | 15 +- ...eriesTest.java => IoTDBMultiSeriesIT.java} | 15 +- ...est.java => IoTDBSequenceDataQueryIT.java} | 15 +- ...aderTest.java => IoTDBSeriesReaderIT.java} | 15 +- ...TimeZoneTest.java => IoTDBTimeZoneIT.java} | 15 +- .../db/metadata/MManagerAdvancedTest.java | 13 +- .../iotdb/db/metadata/MManagerBasicTest.java | 13 +- .../db/metadata/MManagerEfficiencyTest.java | 13 +- .../db/metadata/MManagerImproveTest.java | 13 +- .../apache/iotdb/db/metadata/MTreeTest.java | 13 +- .../apache/iotdb/db/monitor/MonitorTest.java | 13 +- .../db/postback/sender/FileManagerTest.java | 13 +- .../sender/IoTDBSingleClientPostBackTest.java | 13 +- .../sender/MultipleClientPostBackTest.java | 13 +- .../db/qp/bench/QueryParseBenchmark.java | 13 +- .../db/qp/other/TSPlanContextAuthorTest.java | 13 +- .../qp/other/TSPlanContextPropertyTest.java | 13 +- .../db/qp/plan/LogicalPlanSmallTest.java | 13 +- .../iotdb/db/qp/plan/PhysicalPlanTest.java | 13 +- .../apache/iotdb/db/qp/plan/QPUpdateTest.java | 13 +- .../iotdb/db/qp/plan/TestConcatOptimizer.java | 13 +- .../db/qp/strategy/LogicalGeneratorTest.java | 13 +- .../iotdb/db/qp/utils/MemIntQpExecutor.java | 13 +- .../db/query/component/SimpleFileWriter.java | 13 +- .../query/control/FileReaderManagerTest.java | 13 +- .../control/OpenedFilePathsManagerTest.java | 24 -- .../query/control/QueryTokenManagerTest.java | 15 +- .../PriorityMergeReaderByTimestampTest.java | 13 +- .../reader/merge/PriorityMergeReaderTest.java | 13 +- .../merge/SeriesMergeSortReaderTest.java | 13 +- .../db/script/IoTDBStartServerScriptTest.java | 13 +- .../iotdb/db/sql/DatetimeUtilsTest.java | 87 +++---- .../apache/iotdb/db/sql/SQLParserTest.java | 13 +- .../iotdb/db/utils/EnvironmentUtils.java | 13 +- .../iotdb/db/utils/OpenFileNumUtilTest.java | 79 +++--- .../db/utils/PrimitiveArrayListTest.java | 13 +- .../db/writelog/IoTDBLogFileSizeTest.java | 13 +- .../iotdb/db/writelog/PerformanceTest.java | 104 ++++---- .../apache/iotdb/db/writelog/RecoverTest.java | 13 +- .../db/writelog/WriteLogNodeManagerTest.java | 13 +- .../iotdb/db/writelog/WriteLogNodeTest.java | 13 +- .../db/writelog/io/LogWriterReaderTest.java | 13 +- iotdb/src/test/resources/logback.xml | 41 +++ .../src/test/resources/start-postBackTest.sh | 18 ++ iotdb/src/test/resources/stop-postBackTest.sh | 18 ++ java-google-style.xml | 13 +- jdbc/README.md | 21 ++ jdbc/example/readme.md | 21 ++ .../iotdb/jdbc/jdbcDemo/SendDataToIotdb.java | 13 +- .../jdbc/kafka_iotdbDemo/KafkaConsumer.java | 13 +- .../jdbc/kafka_iotdbDemo/KafkaProducer.java | 13 +- jdbc/package.sh | 13 +- jdbc/pom.xml | 58 ++++- .../java/org/apache/iotdb/jdbc/Config.java | 13 +- .../java/org/apache/iotdb/jdbc/Constant.java | 13 +- .../apache/iotdb/jdbc/IoTDBConnection.java | 13 +- .../iotdb/jdbc/IoTDBConnectionParams.java | 13 +- .../iotdb/jdbc/IoTDBDatabaseMetadata.java | 13 +- .../org/apache/iotdb/jdbc/IoTDBDriver.java | 13 +- .../jdbc/IoTDBMetadataResultMetadata.java | 13 +- .../iotdb/jdbc/IoTDBMetadataResultSet.java | 13 +- .../iotdb/jdbc/IoTDBPrepareStatement.java | 13 +- .../iotdb/jdbc/IoTDBQueryResultSet.java | 13 +- .../iotdb/jdbc/IoTDBResultMetadata.java | 13 +- .../apache/iotdb/jdbc/IoTDBSQLException.java | 13 +- .../org/apache/iotdb/jdbc/IoTDBStatement.java | 13 +- .../apache/iotdb/jdbc/IoTDBURLException.java | 13 +- .../java/org/apache/iotdb/jdbc/Utils.java | 13 +- .../java/org/apache/iotdb/jdbc/BatchTest.java | 13 +- .../iotdb/jdbc/IoTDBConnectionTest.java | 13 +- .../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 13 +- .../jdbc/IoTDBMetadataResultMetadataTest.java | 13 +- .../iotdb/jdbc/IoTDBPrepareStatementTest.java | 13 +- .../iotdb/jdbc/IoTDBQueryResultSetTest.java | 13 +- .../iotdb/jdbc/IoTDBResultMetadataTest.java | 13 +- .../apache/iotdb/jdbc/IoTDBStatementTest.java | 13 +- .../java/org/apache/iotdb/jdbc/UtilsTest.java | 13 +- .../apache/iotdb/jdbc/demo/MetadataDemo.java | 13 +- .../iotdb/jdbc/demo/PrepareStatementDemo.java | 13 +- .../apache/iotdb/jdbc/demo/StatementDemo.java | 13 +- jenkins.pom | 67 +++++ mvnw.cmd | 13 +- mvnw.sh | 13 +- pom.xml | 199 ++++++++------ service-rpc/pom.xml | 63 ++++- service-rpc/src/main/thrift/rpc.thrift | 13 +- spark/README.md | 21 ++ spark/pom.xml | 13 +- .../apache/iotdb/tsfile/io/CreateTSFile.java | 13 +- .../iotdb/tsfile/io/HDFSInputStream.java | 13 +- .../iotdb/tsfile/io/HDFSOutputStream.java | 13 +- .../iotdb/tsfile/io/TsFileOutputFormat.java | 13 +- .../iotdb/tsfile/io/TsFileRecordWriter.java | 13 +- .../org/apache/iotdb/tsfile/qp/Executor.java | 13 +- .../iotdb/tsfile/qp/QueryProcessor.java | 13 +- .../iotdb/tsfile/qp/common/BasicOperator.java | 13 +- .../tsfile/qp/common/FilterOperator.java | 13 +- .../iotdb/tsfile/qp/common/Operator.java | 13 +- .../iotdb/tsfile/qp/common/SQLConstant.java | 13 +- .../iotdb/tsfile/qp/common/SingleQuery.java | 13 +- .../iotdb/tsfile/qp/common/TSQueryPlan.java | 13 +- .../qp/exception/BasicOperatorException.java | 13 +- .../qp/exception/DNFOptimizeException.java | 13 +- .../exception/LogicalOptimizeException.java | 13 +- .../qp/exception/MergeFilterException.java | 13 +- .../qp/exception/QueryOperatorException.java | 13 +- .../qp/exception/QueryProcessorException.java | 13 +- .../qp/exception/RemoveNotException.java | 13 +- .../qp/optimizer/DNFFilterOptimizer.java | 13 +- .../tsfile/qp/optimizer/IFilterOptimizer.java | 13 +- .../optimizer/MergeSingleFilterOptimizer.java | 13 +- .../qp/optimizer/PhysicalOptimizer.java | 13 +- .../qp/optimizer/RemoveNotOptimizer.java | 13 +- .../org/apache/iotdb/tsfile/Converter.scala | 13 +- .../apache/iotdb/tsfile/DefaultSource.scala | 13 +- .../iotdb/tsfile/TsFileOutputWriter.scala | 13 +- .../iotdb/tsfile/TsFileWriterFactory.scala | 13 +- .../org/apache/iotdb/tsfile/package.scala | 13 +- .../edu/tsinghua/tsfile/ConverterTest.scala | 13 +- .../cn/edu/tsinghua/tsfile/TSFileSuit.scala | 13 +- tsfile/README.md | 21 ++ tsfile/example/readme.md | 21 ++ .../cn/edu/tsinghua/tsfile/TsFileRead.java | 13 +- .../tsinghua/tsfile/TsFileSequenceRead.java | 15 +- .../cn/edu/tsinghua/tsfile/TsFileWrite.java | 13 +- tsfile/package.sh | 13 +- tsfile/pom.xml | 65 ++++- .../iotdb/tsfile/common/cache/Cache.java | 13 +- .../iotdb/tsfile/common/cache/LRUCache.java | 13 +- .../tsfile/common/conf/TSFileConfig.java | 13 +- .../tsfile/common/conf/TSFileDescriptor.java | 29 +-- .../common/constant/JsonFormatConstant.java | 20 +- .../tsfile/common/constant/QueryConstant.java | 15 +- .../common/constant/StatisticConstant.java | 15 +- .../common/constant/SystemConstant.java | 15 +- .../iotdb/tsfile/compress/Compressor.java | 17 +- .../iotdb/tsfile/compress/UnCompressor.java | 13 +- .../tsfile/encoding/bitpacking/IntPacker.java | 13 +- .../encoding/bitpacking/LongPacker.java | 13 +- .../encoding/common/EncodingConfig.java | 13 +- .../tsfile/encoding/common/EndianType.java | 13 +- .../encoding/decoder/BitmapDecoder.java | 13 +- .../tsfile/encoding/decoder/Decoder.java | 13 +- .../encoding/decoder/DeltaBinaryDecoder.java | 13 +- .../decoder/DoublePrecisionDecoder.java | 13 +- .../tsfile/encoding/decoder/FloatDecoder.java | 13 +- .../encoding/decoder/GorillaDecoder.java | 13 +- .../encoding/decoder/IntRleDecoder.java | 13 +- .../encoding/decoder/LongRleDecoder.java | 13 +- .../tsfile/encoding/decoder/PlainDecoder.java | 13 +- .../tsfile/encoding/decoder/RleDecoder.java | 13 +- .../decoder/SinglePrecisionDecoder.java | 13 +- .../encoding/encoder/BitmapEncoder.java | 13 +- .../encoding/encoder/DeltaBinaryEncoder.java | 13 +- .../encoder/DoublePrecisionEncoder.java | 13 +- .../tsfile/encoding/encoder/Encoder.java | 13 +- .../tsfile/encoding/encoder/FloatEncoder.java | 13 +- .../encoding/encoder/GorillaEncoder.java | 13 +- .../encoding/encoder/IntRleEncoder.java | 13 +- .../encoding/encoder/LongRleEncoder.java | 13 +- .../tsfile/encoding/encoder/PlainEncoder.java | 13 +- .../tsfile/encoding/encoder/RleEncoder.java | 13 +- .../encoder/SinglePrecisionEncoder.java | 13 +- .../encoding/encoder/TSEncodingBuilder.java | 13 +- .../exception/TsFileRuntimeException.java | 13 +- .../exception/cache/CacheException.java | 13 +- .../CompressionTypeNotSupportedException.java | 13 +- .../encoding/TsFileDecodingException.java | 13 +- .../encoding/TsFileEncodingException.java | 13 +- .../filter/FilterDataTypeException.java | 13 +- .../filter/FilterInvokeException.java | 13 +- .../QueryFilterOptimizationException.java | 13 +- .../UnSupportFilterDataTypeException.java | 13 +- .../metadata/MetadataArgsErrorException.java | 13 +- .../write/InvalidJsonSchemaException.java | 13 +- .../write/NoMeasurementException.java | 13 +- .../tsfile/exception/write/PageException.java | 13 +- .../write/UnSupportedDataTypeException.java | 13 +- .../write/UnknownColumnTypeException.java | 15 +- .../write/WriteProcessException.java | 15 +- .../apache/iotdb/tsfile/file/MetaMarker.java | 21 +- .../tsfile/file/footer/ChunkGroupFooter.java | 28 +- .../iotdb/tsfile/file/header/ChunkHeader.java | 33 +-- .../iotdb/tsfile/file/header/PageHeader.java | 72 +++-- .../tsfile/file/header/package-info.java | 15 +- .../file/metadata/ChunkGroupMetaData.java | 24 +- .../tsfile/file/metadata/ChunkMetaData.java | 17 +- .../file/metadata/TsDeviceMetadata.java | 16 +- .../file/metadata/TsDeviceMetadataIndex.java | 17 +- .../iotdb/tsfile/file/metadata/TsDigest.java | 14 +- .../tsfile/file/metadata/TsFileMetaData.java | 13 +- .../file/metadata/enums/CompressionType.java | 13 +- .../file/metadata/enums/TSDataType.java | 17 +- .../file/metadata/enums/TSEncoding.java | 13 +- .../file/metadata/enums/TSFreqType.java | 13 +- .../metadata/statistics/BinaryStatistics.java | 13 +- .../statistics/BooleanStatistics.java | 17 +- .../metadata/statistics/DoubleStatistics.java | 13 +- .../metadata/statistics/FloatStatistics.java | 13 +- .../statistics/IntegerStatistics.java | 13 +- .../metadata/statistics/LongStatistics.java | 13 +- .../metadata/statistics/NoStatistics.java | 27 +- .../file/metadata/statistics/Statistics.java | 63 ++--- .../statistics/StatisticsClassException.java | 13 +- .../statistics/StatisticsDeserializer.java | 24 -- .../apache/iotdb/tsfile/read/IDataReader.java | 13 +- .../iotdb/tsfile/read/ReadOnlyTsFile.java | 13 +- .../tsfile/read/TsFileSequenceReader.java | 25 +- .../tsfile/read/UnClosedTsFileReader.java | 13 +- .../iotdb/tsfile/read/common/BatchData.java | 197 +++++++------- .../iotdb/tsfile/read/common/Chunk.java | 13 +- .../iotdb/tsfile/read/common/Field.java | 13 +- .../apache/iotdb/tsfile/read/common/Path.java | 30 ++- .../iotdb/tsfile/read/common/RowRecord.java | 17 +- .../tsfile/read/controller/ChunkLoader.java | 13 +- .../read/controller/ChunkLoaderImpl.java | 13 +- .../read/controller/MetadataQuerier.java | 13 +- .../controller/MetadataQuerierByFileImpl.java | 13 +- .../read/expression/ExpressionType.java | 13 +- .../read/expression/IBinaryExpression.java | 13 +- .../tsfile/read/expression/IExpression.java | 13 +- .../read/expression/IUnaryExpression.java | 13 +- .../read/expression/QueryExpression.java | 13 +- .../expression/impl/BinaryExpression.java | 13 +- .../expression/impl/GlobalTimeExpression.java | 13 +- .../impl/SingleSeriesExpression.java | 13 +- .../expression/util/ExpressionOptimizer.java | 13 +- .../expression/util/ExpressionPrinter.java | 13 +- .../tsfile/read/filter/DigestForFilter.java | 13 +- .../iotdb/tsfile/read/filter/TimeFilter.java | 13 +- .../iotdb/tsfile/read/filter/ValueFilter.java | 13 +- .../read/filter/basic/BinaryFilter.java | 13 +- .../tsfile/read/filter/basic/Filter.java | 13 +- .../tsfile/read/filter/basic/UnaryFilter.java | 13 +- .../read/filter/factory/FilterFactory.java | 13 +- .../read/filter/factory/FilterType.java | 13 +- .../read/filter/operator/AndFilter.java | 13 +- .../iotdb/tsfile/read/filter/operator/Eq.java | 13 +- .../iotdb/tsfile/read/filter/operator/Gt.java | 13 +- .../tsfile/read/filter/operator/GtEq.java | 13 +- .../iotdb/tsfile/read/filter/operator/Lt.java | 13 +- .../tsfile/read/filter/operator/LtEq.java | 13 +- .../tsfile/read/filter/operator/NotEq.java | 13 +- .../read/filter/operator/NotFilter.java | 13 +- .../tsfile/read/filter/operator/OrFilter.java | 13 +- .../dataset/DataSetWithTimeGenerator.java | 13 +- .../dataset/DataSetWithoutTimeGenerator.java | 16 +- .../read/query/dataset/QueryDataSet.java | 13 +- .../executor/ExecutorWithTimeGenerator.java | 13 +- .../read/query/executor/QueryExecutor.java | 13 +- .../read/query/executor/TsFileExecutor.java | 13 +- .../query/timegenerator/TimeGenerator.java | 13 +- .../timegenerator/TimeGeneratorImpl.java | 13 +- .../query/timegenerator/node/AndNode.java | 13 +- .../query/timegenerator/node/LeafNode.java | 13 +- .../read/query/timegenerator/node/Node.java | 13 +- .../query/timegenerator/node/NodeType.java | 13 +- .../read/query/timegenerator/node/OrNode.java | 13 +- .../read/reader/DefaultTsFileInput.java | 13 +- .../iotdb/tsfile/read/reader/TsFileInput.java | 13 +- .../tsfile/read/reader/chunk/ChunkReader.java | 13 +- .../reader/chunk/ChunkReaderByTimestamp.java | 15 +- .../reader/chunk/ChunkReaderWithFilter.java | 19 +- .../chunk/ChunkReaderWithoutFilter.java | 15 +- .../tsfile/read/reader/page/PageReader.java | 111 ++++---- .../read/reader/series/FileSeriesReader.java | 13 +- .../series/FileSeriesReaderWithFilter.java | 13 +- .../series/FileSeriesReaderWithoutFilter.java | 13 +- .../series/SeriesReaderByTimestamp.java | 15 +- .../org/apache/iotdb/tsfile/utils/Binary.java | 18 +- .../apache/iotdb/tsfile/utils/BytesUtils.java | 96 ++++--- .../org/apache/iotdb/tsfile/utils/Loader.java | 15 +- .../org/apache/iotdb/tsfile/utils/Pair.java | 13 +- .../apache/iotdb/tsfile/utils/PublicBAOS.java | 13 +- .../utils/ReadWriteForEncodingUtils.java | 30 +-- .../iotdb/tsfile/utils/ReadWriteIOUtils.java | 30 +-- .../iotdb/tsfile/utils/StringContainer.java | 30 ++- .../iotdb/tsfile/write/TsFileWriter.java | 37 ++- .../iotdb/tsfile/write/chunk/ChunkBuffer.java | 32 +-- .../write/chunk/ChunkGroupWriterImpl.java | 15 +- .../tsfile/write/chunk/ChunkWriterImpl.java | 13 +- .../tsfile/write/chunk/IChunkGroupWriter.java | 13 +- .../tsfile/write/chunk/IChunkWriter.java | 13 +- .../iotdb/tsfile/write/page/PageWriter.java | 15 +- .../iotdb/tsfile/write/record/TSRecord.java | 13 +- .../record/datapoint/BooleanDataPoint.java | 13 +- .../write/record/datapoint/DataPoint.java | 13 +- .../record/datapoint/DoubleDataPoint.java | 13 +- .../record/datapoint/FloatDataPoint.java | 13 +- .../write/record/datapoint/IntDataPoint.java | 13 +- .../write/record/datapoint/LongDataPoint.java | 13 +- .../record/datapoint/StringDataPoint.java | 13 +- .../iotdb/tsfile/write/schema/FileSchema.java | 24 +- .../tsfile/write/schema/JsonConverter.java | 17 +- .../write/schema/MeasurementSchema.java | 21 +- .../tsfile/write/schema/SchemaBuilder.java | 13 +- .../write/writer/DefaultTsFileOutput.java | 18 +- .../tsfile/write/writer/IDataWriter.java | 13 +- .../tsfile/write/writer/TsFileIOWriter.java | 19 +- .../tsfile/write/writer/TsFileOutput.java | 13 +- .../tsfile-format.properties.template | 21 ++ .../iotdb/tsfile/common/LRUCacheTest.java | 13 +- .../iotdb/tsfile/compress/CompressTest.java | 13 +- .../iotdb/tsfile/compress/SnappyTest.java | 13 +- .../constant/TimeseriesTestConstant.java | 13 +- .../encoding/bitpacking/IntPackerTest.java | 13 +- .../encoding/bitpacking/LongPackerTest.java | 13 +- .../encoding/decoder/BitmapDecoderTest.java | 13 +- .../encoding/decoder/FloatDecoderTest.java | 13 +- .../encoding/decoder/GorillaDecoderTest.java | 13 +- .../encoding/decoder/IntRleDecoderTest.java | 13 +- .../encoding/decoder/LongRleDecoderTest.java | 13 +- .../delta/DeltaBinaryEncoderIntegerTest.java | 13 +- .../delta/DeltaBinaryEncoderLongTest.java | 13 +- .../file/metadata/ChunkGroupMetaDataTest.java | 13 +- .../file/metadata/ChunkMetaDataTest.java | 13 +- .../file/metadata/TimeSeriesMetadataTest.java | 13 +- .../metadata/TsDeviceMetadataIndexTest.java | 13 +- .../file/metadata/TsDeviceMetadataTest.java | 13 +- .../file/metadata/TsFileMetaDataTest.java | 13 +- .../statistics/BooleanStatisticsTest.java | 13 +- .../statistics/DoubleStatisticsTest.java | 13 +- .../statistics/FloatStatisticsTest.java | 13 +- .../statistics/IntegerStatisticsTest.java | 13 +- .../statistics/LongStatisticsTest.java | 13 +- .../statistics/StringStatisticsTest.java | 13 +- .../file/metadata/utils/TestHelper.java | 13 +- .../tsfile/file/metadata/utils/Utils.java | 13 +- .../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 13 +- .../apache/iotdb/tsfile/read/ReadTest.java | 77 +++--- .../tsfile/read/TimePlainEncodeReadTest.java | 81 +++--- .../iotdb/tsfile/read/common/PathTest.java | 13 +- .../read/controller/ChunkLoaderTest.java | 13 +- .../MetadataQuerierByFileImplTest.java | 15 +- .../tsfile/read/filter/DigestFilterTest.java | 13 +- .../read/filter/IExpressionOptimizerTest.java | 13 +- .../read/filter/MinTimeMaxTimeFilterTest.java | 13 +- .../tsfile/read/filter/OperatorTest.java | 13 +- .../query/executor/QueryExecutorTest.java | 13 +- .../read/query/timegenerator/NodeTest.java | 13 +- .../timegenerator/ReaderByTimestampTest.java | 13 +- .../timegenerator/TimeGeneratorTest.java | 13 +- ...leGeneratorForSeriesReaderByTimestamp.java | 13 +- .../tsfile/read/reader/PageReaderTest.java | 13 +- .../iotdb/tsfile/read/reader/ReaderTest.java | 13 +- .../iotdb/tsfile/utils/BytesUtilsTest.java | 13 +- .../tsfile/utils/CommonTestConstant.java | 13 +- .../iotdb/tsfile/utils/FileGenerator.java | 13 +- .../apache/iotdb/tsfile/utils/FileUtils.java | 13 +- .../iotdb/tsfile/utils/FileUtilsTest.java | 13 +- .../apache/iotdb/tsfile/utils/PairTest.java | 13 +- .../utils/ReadWriteStreamUtilsTest.java | 13 +- .../utils/ReadWriteToBytesUtilsTest.java | 13 +- .../iotdb/tsfile/utils/RecordUtils.java | 13 +- .../iotdb/tsfile/utils/RecordUtilsTest.java | 13 +- .../tsfile/utils/StringContainerTest.java | 13 +- .../tsfile/utils/TsFileGeneratorForTest.java | 13 +- .../apache/iotdb/tsfile/write/PerfTest.java | 13 +- .../iotdb/tsfile/write/ReadPageInMemTest.java | 13 +- .../tsfile/write/TsFileIOWriterTest.java | 19 +- .../tsfile/write/TsFileReadWriteTest.java | 13 +- .../apache/iotdb/tsfile/write/WriteTest.java | 13 +- .../schema/converter/JsonConverterTest.java | 13 +- .../schema/converter/SchemaBuilderTest.java | 13 +- .../tsfile/write/series/PageWriterTest.java | 13 +- tsfile/src/test/resources/logback.xml | 20 ++ 793 files changed, 6711 insertions(+), 8461 deletions(-) create mode 100644 Jenkinsfile rename iotdb-cli/src/test/java/org/apache/iotdb/cli/client/{AbstractClientTest.java => AbstractClientIT.java} (63%) rename iotdb-cli/src/test/java/org/apache/iotdb/cli/client/{StartClientScriptTest.java => StartClientScriptIT.java} (84%) 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/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 rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBAuthorizationTest.java => IoTDBAuthorizationIT.java} (98%) rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBCompleteTest.java => IoTDBCompleteIT.java} (97%) rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBDaemonTest.java => IoTDBDaemonIT.java} (97%) rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBEngineTimeGeneratorTest.java => IoTDBEngineTimeGeneratorIT.java} (95%) rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBLargeDataTest.java => IoTDBLargeDataIT.java} (94%) rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBLimitSlimitTest.java => IoTDBLimitSlimitIT.java} (95%) rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBMetadataFetchTest.java => IoTDBMetadataFetchIT.java} (96%) rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBMultiSeriesTest.java => IoTDBMultiSeriesIT.java} (94%) rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBSequenceDataQueryTest.java => IoTDBSequenceDataQueryIT.java} (95%) rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBSeriesReaderTest.java => IoTDBSeriesReaderIT.java} (96%) rename iotdb/src/test/java/org/apache/iotdb/db/integration/{IoTDBTimeZoneTest.java => IoTDBTimeZoneIT.java} (93%) delete mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/control/OpenedFilePathsManagerTest.java create mode 100644 iotdb/src/test/resources/logback.xml create mode 100644 jenkins.pom delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsDeserializer.java diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..10f36876b --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,183 @@ +#!groovy + +/** + * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +pipeline { + + agent { + node { + label 'ubuntu' + } + } + + environment { + // Testfails will be handled by the jenkins junit steps and mark the build as unstable. + MVN_TEST_FAIL_IGNORE = '-Dmaven.test.failure.ignore=true' + } + + tools { + maven 'Maven 3 (latest)' + jdk 'JDK 1.8 (latest)' + } + + options { + timeout(time: 1, unit: 'HOURS') + // When we have test-fails e.g. we don't need to run the remaining steps + skipStagesAfterUnstable() + } + + stages { + stage('Initialization') { + steps { + echo 'Building Branch: ' + env.BRANCH_NAME + echo 'Using PATH = ' + env.PATH + } + } + + stage('Checkout') { + steps { + echo 'Checking out branch ' + env.BRANCH_NAME + checkout scm + } + } + + stage('Build (not master)') { + when { + expression { + env.BRANCH_NAME != 'master' + } + } + steps { + echo 'Building' + sh 'mvn ${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install' + } + post { + always { + junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true) + junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true) + } + } + } + + stage('Build') { + when { + branch 'master' + } + steps { + echo 'Building' + // We'll deploy to a relative directory so we can + // deploy new versions only if the entrie build succeeds + sh 'mvn ${MVN_TEST_FAIL_IGNORE} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy' + } + post { + always { + junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true) + junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true) + } + } + } + + stage('Code Quality') { + when { + branch 'master' + } + steps { + echo 'Checking Code Quality' + withSonarQubeEnv('ASF Sonar Analysis') { + sh 'mvn sonar:sonar' + } + } + } + + stage('Deploy') { + when { + branch 'master' + } + steps { + echo 'Deploying' + // Deploy the artifacts using the wagon-maven-plugin. + sh 'mvn -f jenkins.pom -X -P deploy-snapshots wagon:upload' + } + } + + stage('Cleanup') { + steps { + echo 'Cleaning up the workspace' + deleteDir() + } + } + } + + // Send out notifications on unsuccessful builds. + post { + // If this build failed, send an email to the list. + failure { + script { + if(env.BRANCH_NAME == "master") { + emailext( + subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", + body: """ +BUILD-FAILURE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]': + +Check console output at "${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]" +""", + to: "dev@iotdb.apache.org" + ) + } + } + } + + // If this build didn't fail, but there were failing tests, send an email to the list. + unstable { + script { + if(env.BRANCH_NAME == "master") { + emailext( + subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", + body: """ +BUILD-UNSTABLE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]': + +Check console output at "${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]" +""", + to: "dev@iotdb.apache.org" + ) + } + } + } + + // Send an email, if the last build was not successful and this one is. + success { + script { + if ((env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { + emailext ( + subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", + body: """ +BUILD-STABLE: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]': + +Is back to normal. +""", + to: "dev@iotdb.apache.org" + ) + } + } + } + } + +} \ No newline at end of file diff --git a/Readme.md b/Readme.md index 573d92b70..d3ef29473 100644 --- a/Readme.md +++ b/Readme.md @@ -1,10 +1,31 @@ + + # IoTDB -[![Build Status](https://travis-ci.org/thulab/iotdb.svg?branch=master)](https://travis-ci.org/thulab/iotdb) +[![Build Status](https://www.travis-ci.org/apache/incubator-iotdb.svg?branch=master)](https://www.travis-ci.org/apache/incubator-iotdb) [![codecov](https://codecov.io/gh/thulab/iotdb/branch/master/graph/badge.svg?token=tBhPhPC9EQ)](https://codecov.io/gh/thulab/iotdb) -[![GitHub release](https://img.shields.io/github/release/thulab/iotdb.svg)](https://github.com/thulab/iotdbc/releases) +[![GitHub release](https://img.shields.io/github/release/apache/incubator-iotdb.svg)](https://github.com/apache/incubator-iotdb/releases) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) -![](https://github-size-badge.herokuapp.com/thulab/iotdb.svg) -![](https://img.shields.io/github/downloads/thulab/iotdb/total.svg) +![](https://github-size-badge.herokuapp.com/apache/incubator-iotdb.svg) +![](https://img.shields.io/github/downloads/apache/incubator-iotdb/total.svg) ![](https://img.shields.io/badge/platform-win10%20%7C%20macox%20%7C%20linux-yellow.svg) ![](https://img.shields.io/badge/java--language-1.8-blue.svg) [![IoTDB Website](https://img.shields.io/website-up-down-green-red/https/shields.io.svg?label=iotdb-website)](http://iotdb.apache.org/) diff --git a/asf.header b/asf.header index d587bc965..7f7950e90 100644 --- a/asf.header +++ b/asf.header @@ -1,5 +1,3 @@ -Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information @@ -10,8 +8,9 @@ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. diff --git a/checkstyle.xml b/checkstyle.xml index 649478b8c..07ad0ba08 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -2,8 +2,6 @@ @@ -42,6 +41,9 @@ org.apache.iotdb.web.grafana.TsfileWebDemoApplication 1.5.4.RELEASE 4.3.9.RELEASE + false + ${grafana.test.skip} + ${grafana.test.skip} @@ -166,6 +168,33 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + + ${grafana.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + + + ${grafana.test.skip} + ${grafana.it.skip} + + @@ -187,4 +216,20 @@ + + + skipTsfileTests + + + skipTests + true + + + + true + true + true + + + diff --git a/grafana/readme.md b/grafana/readme.md index bc651797f..353b7ea9a 100644 --- a/grafana/readme.md +++ b/grafana/readme.md @@ -1,3 +1,24 @@ + + # IoTDB-Grafana * [中文](https://github.com/thulab/iotdb/blob/master/grafana/readme_zh.md) diff --git a/grafana/readme_zh.md b/grafana/readme_zh.md index d9b538a38..60a1278c2 100644 --- a/grafana/readme_zh.md +++ b/grafana/readme_zh.md @@ -1,3 +1,24 @@ + + # Grafana安装 Grafana下载地址:https://grafana.com/grafana/download diff --git a/grafana/src/main/java/org/apache/iotdb/web/grafana/TsfileWebDemoApplication.java b/grafana/src/main/java/org/apache/iotdb/web/grafana/TsfileWebDemoApplication.java index 2c91d9548..817413a54 100644 --- a/grafana/src/main/java/org/apache/iotdb/web/grafana/TsfileWebDemoApplication.java +++ b/grafana/src/main/java/org/apache/iotdb/web/grafana/TsfileWebDemoApplication.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.web.grafana; diff --git a/grafana/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java b/grafana/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java index fd7ab3cee..2877cbe74 100644 --- a/grafana/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java +++ b/grafana/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.web.grafana.bean; diff --git a/grafana/src/main/java/org/apache/iotdb/web/grafana/conf/MyConfiguration.java b/grafana/src/main/java/org/apache/iotdb/web/grafana/conf/MyConfiguration.java index 4e16a892b..529354df9 100644 --- a/grafana/src/main/java/org/apache/iotdb/web/grafana/conf/MyConfiguration.java +++ b/grafana/src/main/java/org/apache/iotdb/web/grafana/conf/MyConfiguration.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.web.grafana.conf; diff --git a/grafana/src/main/java/org/apache/iotdb/web/grafana/controller/DatabaseConnectController.java b/grafana/src/main/java/org/apache/iotdb/web/grafana/controller/DatabaseConnectController.java index 05a4c56f6..9a0cfaea2 100644 --- a/grafana/src/main/java/org/apache/iotdb/web/grafana/controller/DatabaseConnectController.java +++ b/grafana/src/main/java/org/apache/iotdb/web/grafana/controller/DatabaseConnectController.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.web.grafana.controller; diff --git a/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/BasicDao.java b/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/BasicDao.java index dd8dae17a..488cac653 100644 --- a/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/BasicDao.java +++ b/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/BasicDao.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.web.grafana.dao; diff --git a/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java b/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java index d54fd525e..5ee77363e 100644 --- a/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java +++ b/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.web.grafana.dao.impl; diff --git a/grafana/src/main/java/org/apache/iotdb/web/grafana/service/DatabaseConnectService.java b/grafana/src/main/java/org/apache/iotdb/web/grafana/service/DatabaseConnectService.java index 796c34873..551013687 100644 --- a/grafana/src/main/java/org/apache/iotdb/web/grafana/service/DatabaseConnectService.java +++ b/grafana/src/main/java/org/apache/iotdb/web/grafana/service/DatabaseConnectService.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.web.grafana.service; diff --git a/grafana/src/main/java/org/apache/iotdb/web/grafana/service/impl/DatabaseConnectServiceImpl.java b/grafana/src/main/java/org/apache/iotdb/web/grafana/service/impl/DatabaseConnectServiceImpl.java index aa262bf6b..846140f02 100644 --- a/grafana/src/main/java/org/apache/iotdb/web/grafana/service/impl/DatabaseConnectServiceImpl.java +++ b/grafana/src/main/java/org/apache/iotdb/web/grafana/service/impl/DatabaseConnectServiceImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.web.grafana.service.impl; diff --git a/hadoop/README.md b/hadoop/README.md index 70ce85d4c..dccc0ce42 100644 --- a/hadoop/README.md +++ b/hadoop/README.md @@ -1 +1,22 @@ + + # tsfile-hadoop-connector diff --git a/hadoop/pom.xml b/hadoop/pom.xml index 462546374..4b87cadd1 100644 --- a/hadoop/pom.xml +++ b/hadoop/pom.xml @@ -1,8 +1,6 @@ diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java index a5c262628..1e5f23383 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java index c9891f8b6..45298b357 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java index ab7d11cc4..208025a0b 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java index f9f578687..86b4dbfe8 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java index 2a102eb5c..560d7645b 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java index df850292c..f13004f88 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSRow.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSRow.java index bb702e226..73baf3bb9 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSRow.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSRow.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TSFMRReadExample.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TSFMRReadExample.java index 9ed30ec42..5470a5baa 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TSFMRReadExample.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TSFMRReadExample.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop.example; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TsFileHelper.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TsFileHelper.java index c0d63fabb..bff859fa6 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TsFileHelper.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TsFileHelper.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop.example; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSInputStream.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSInputStream.java index d8a38ea52..bb437e404 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSInputStream.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSInputStream.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop.io; diff --git a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSOutputStream.java b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSOutputStream.java index 0d396f6eb..56d80e7b8 100644 --- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSOutputStream.java +++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSOutputStream.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop.io; diff --git a/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/InputOutputStreamTest.java b/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/InputOutputStreamTest.java index 7bbcb8a82..ac88ad8af 100644 --- a/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/InputOutputStreamTest.java +++ b/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/InputOutputStreamTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TSFHadoopTest.java b/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TSFHadoopTest.java index c7fb4c3c0..5f9669ab6 100644 --- a/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TSFHadoopTest.java +++ b/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TSFHadoopTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TSFInputSplitTest.java b/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TSFInputSplitTest.java index a58cd5dc1..667ce6a62 100644 --- a/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TSFInputSplitTest.java +++ b/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TSFInputSplitTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java b/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java index fda4ebf53..77d0eda23 100644 --- a/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java +++ b/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.hadoop; diff --git a/iotdb-cli/cli/bin/export-csv.bat b/iotdb-cli/cli/bin/export-csv.bat index 64a72e963..3d6c1faba 100644 --- a/iotdb-cli/cli/bin/export-csv.bat +++ b/iotdb-cli/cli/bin/export-csv.bat @@ -1,6 +1,4 @@ @REM -@REM Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -@REM @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @REM distributed with this work for additional information @@ -11,11 +9,12 @@ @REM @REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. @REM @echo off diff --git a/iotdb-cli/cli/bin/export-csv.sh b/iotdb-cli/cli/bin/export-csv.sh index 8d187072a..5914ba752 100755 --- a/iotdb-cli/cli/bin/export-csv.sh +++ b/iotdb-cli/cli/bin/export-csv.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -12,11 +10,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # diff --git a/iotdb-cli/cli/bin/import-csv.bat b/iotdb-cli/cli/bin/import-csv.bat index 88ea9ded0..c29b43494 100644 --- a/iotdb-cli/cli/bin/import-csv.bat +++ b/iotdb-cli/cli/bin/import-csv.bat @@ -1,6 +1,4 @@ @REM -@REM Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -@REM @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @REM distributed with this work for additional information @@ -11,11 +9,12 @@ @REM @REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. @REM @echo off diff --git a/iotdb-cli/cli/bin/import-csv.sh b/iotdb-cli/cli/bin/import-csv.sh index 8b307a103..6bcd5958e 100755 --- a/iotdb-cli/cli/bin/import-csv.sh +++ b/iotdb-cli/cli/bin/import-csv.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -12,11 +10,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # diff --git a/iotdb-cli/cli/bin/run-client.bat b/iotdb-cli/cli/bin/run-client.bat index 59b5c68c6..af74edcb9 100755 --- a/iotdb-cli/cli/bin/run-client.bat +++ b/iotdb-cli/cli/bin/run-client.bat @@ -1,6 +1,4 @@ @REM -@REM Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -@REM @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @REM distributed with this work for additional information @@ -11,11 +9,12 @@ @REM @REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. @REM .\start-client.bat -h localhost -p 6667 -u root -pw root \ No newline at end of file diff --git a/iotdb-cli/cli/bin/start-client.bat b/iotdb-cli/cli/bin/start-client.bat index ec96ac399..d6912357f 100755 --- a/iotdb-cli/cli/bin/start-client.bat +++ b/iotdb-cli/cli/bin/start-client.bat @@ -1,6 +1,4 @@ @REM -@REM Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -@REM @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @REM distributed with this work for additional information @@ -11,11 +9,12 @@ @REM @REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. @REM @echo off diff --git a/iotdb-cli/cli/bin/start-client.sh b/iotdb-cli/cli/bin/start-client.sh index 5e5b587d6..7105b15dc 100755 --- a/iotdb-cli/cli/bin/start-client.sh +++ b/iotdb-cli/cli/bin/start-client.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -12,11 +10,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # diff --git a/iotdb-cli/pom.xml b/iotdb-cli/pom.xml index 6a159bb55..e79805816 100644 --- a/iotdb-cli/pom.xml +++ b/iotdb-cli/pom.xml @@ -1,8 +1,6 @@ @@ -32,9 +31,11 @@ IoTDB Cli A Client tool. - false 1.3.1 2.14.5 + false + ${cli.test.skip} + ${cli.test.skip} @@ -97,13 +98,49 @@ ${project.basedir}/cli/lib + org.apache.maven.plugins maven-surefire-plugin + + ${cli.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + ${cli.test.skip} + ${cli.it.skip} + + + skipCliTests + + + skipTests + true + + + + true + true + true + + + diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/AbstractClient.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/AbstractClient.java index b481da131..d19a8c4b2 100644 --- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/AbstractClient.java +++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/AbstractClient.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.cli.client; @@ -62,7 +61,6 @@ public abstract class AbstractClient { protected static final String USERNAME_NAME = "username"; protected static final String ISO8601_ARGS = "disableISO8601"; - // protected static final String TIME_KEY_WORD = "time"; protected static final List AGGREGRATE_TIME_LIST = new ArrayList<>(); protected static final String MAX_PRINT_ROW_COUNT_ARGS = "maxPRC"; protected static final String MAX_PRINT_ROW_COUNT_NAME = "maxPrintRowCount"; @@ -85,7 +83,8 @@ public abstract class AbstractClient { protected static final String IMPORT_CMD = "import"; protected static final String EXPORT_CMD = "export"; private static final String NEED_NOT_TO_PRINT_TIMESTAMP = "AGGREGATION"; - protected static String timeFormat = "default"; + private static final String DEFAULT_TIME_FORMAT = "default"; + protected static String timeFormat = DEFAULT_TIME_FORMAT; protected static int maxPrintRowCount = 1000; protected static int fetchSize = 10000; protected static int maxTimeLength = ISO_DATETIME_LEN; @@ -133,7 +132,7 @@ public abstract class AbstractClient { protected static int[] maxValueLengthForShow = new int[]{75, 45, 8, 8}; protected static String formatTime = "%" + maxTimeLength + "s|"; protected static String formatValue = "%" + maxValueLength + "s|"; - protected static int DIVIDING_LINE_LEN = 40; + protected static int dividinglinelen = 40; protected static String host = "127.0.0.1"; protected static String port = "6667"; protected static String username; @@ -160,11 +159,10 @@ protected static void init() { * * @param res result set * @param printToConsole print to console - * @param statement statement in string format * @param zoneId time-zone ID * @throws SQLException SQLException */ - public static void output(ResultSet res, boolean printToConsole, String statement, ZoneId zoneId) + public static void output(ResultSet res, boolean printToConsole, ZoneId zoneId) throws SQLException { int cnt = 0; int displayCnt = 0; @@ -176,8 +174,7 @@ public static void output(ResultSet res, boolean printToConsole, String statemen boolean isShow = res instanceof IoTDBMetadataResultSet; if (!isShow && resultSetMetaData.getColumnTypeName(0) != null) { - printTimestamp = !res.getMetaData().getColumnTypeName(0).toUpperCase() - .equals(NEED_NOT_TO_PRINT_TIMESTAMP); + printTimestamp = !res.getMetaData().getColumnTypeName(0).equalsIgnoreCase(NEED_NOT_TO_PRINT_TIMESTAMP); } // Output values @@ -249,7 +246,7 @@ public static void output(ResultSet res, boolean printToConsole, String statemen } } - System.out.println(StringUtils.repeat('-', DIVIDING_LINE_LEN)); + System.out.println(StringUtils.repeat('-', dividinglinelen)); if (isShow) { int type = res.getType(); if (type == IoTDBMetadataResultSet.MetadataType.STORAGE_GROUP.ordinal()) { // storage group @@ -305,7 +302,7 @@ private static String formatDatetime(long timestamp, ZoneId zoneId) { case "long": case "number": return timestamp + ""; - case "default": + case DEFAULT_TIME_FORMAT: case "iso8601": dateTime = ZonedDateTime.ofInstant(Instant.ofEpochMilli(timestamp), zoneId); return dateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); @@ -344,7 +341,7 @@ protected static void setTimeFormat(String newTimeFormat) { maxTimeLength = maxValueLength; timeFormat = newTimeFormat.trim().toLowerCase(); break; - case "default": + case DEFAULT_TIME_FORMAT: case "iso8601": maxTimeLength = ISO_DATETIME_LEN; timeFormat = newTimeFormat.trim().toLowerCase(); @@ -425,7 +422,7 @@ protected static void printName(boolean printTimestamp, int colCount, System.out.printf(formatValue, resultSetMetaData.getColumnLabel(i)); } } - System.out.printf("\n"); + System.out.printf("%n"); } protected static String[] removePasswordArgs(String[] args) { @@ -436,11 +433,9 @@ protected static String[] removePasswordArgs(String[] args) { break; } } - if (index >= 0) { - if ((index + 1 >= args.length) || (index + 1 < args.length && keywordSet - .contains(args[index + 1]))) { - return ArrayUtils.remove(args, index); - } + if (index >= 0 && ((index + 1 >= args.length) || (index + 1 < args.length && keywordSet + .contains(args[index + 1])))) { + return ArrayUtils.remove(args, index); } return args; } @@ -455,7 +450,7 @@ protected static void displayLogo(String version) { + " \n"); } - protected static OperationResult handleInputInputCmd(String cmd, IoTDBConnection connection) { + protected static OperationResult handleInputCmd(String cmd, IoTDBConnection connection) { String specialCmd = cmd.toLowerCase().trim(); if (specialCmd.equals(QUIT_COMMAND) || specialCmd.equals(EXIT_COMMAND)) { @@ -463,7 +458,7 @@ protected static OperationResult handleInputInputCmd(String cmd, IoTDBConnection return OperationResult.RETURN_OPER; } if (specialCmd.equals(HELP)) { - System.out.println(String.format(" \t\t\t execute your sql statment")); + System.out.println(" \t\t\t execute your sql statment"); System.out .println(String .format(" %s\t\t show how many timeseries are in iotdb", SHOW_METADATA_COMMAND)); @@ -609,7 +604,7 @@ protected static OperationResult handleInputInputCmd(String cmd, IoTDBConnection boolean hasResultSet = statement.execute(cmd.trim()); if (hasResultSet) { ResultSet resultSet = statement.getResultSet(); - output(resultSet, printToConsole, cmd.trim(), zoneId); + output(resultSet, printToConsole, zoneId); } System.out.println("Execute successfully. Type `help` to get more information."); } catch (Exception e) { diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/Client.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/Client.java index 83dbff22b..e4f12b2c2 100644 --- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/Client.java +++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/Client.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.cli.client; @@ -78,7 +77,6 @@ public class Client extends AbstractClient { */ public static void main(String[] args) throws ClassNotFoundException { Class.forName(Config.JDBC_DRIVER_NAME); - IoTDBConnection connection = null; Options options = createOptions(); HelpFormatter hf = new HelpFormatter(); hf.setWidth(MAX_HELP_CONSOLE_WIDTH); @@ -122,82 +120,54 @@ public static void main(String[] args) throws ClassNotFoundException { return; } - ConsoleReader reader = null; - try { - reader = new ConsoleReader(); + try(ConsoleReader reader = new ConsoleReader()) { reader.setExpandEvents(false); - // for (Completer completer : getCommandCompleter()) { - // reader.addCompleter(completer); - // } - // ((CandidateListCompletionHandler) reader.getCompletionHandler()) - // .setPrintSpaceAfterFullCompletion(false); String s; - try { - host = checkRequiredArg(HOST_ARGS, HOST_NAME, commandLine, false, host); - port = checkRequiredArg(PORT_ARGS, PORT_NAME, commandLine, false, port); - username = checkRequiredArg(USERNAME_ARGS, USERNAME_NAME, commandLine, true, null); - password = commandLine.getOptionValue(PASSWORD_ARGS); - if (password == null) { - password = reader.readLine("please input your password:", '\0'); - } - try { - connection = (IoTDBConnection) DriverManager - .getConnection(Config.IOTDB_URL_PREFIX + host + ":" + port + "/", username, password); - properties = connection.getServerProperties(); - AGGREGRATE_TIME_LIST.addAll(properties.getSupportedTimeAggregationOperations()); - } catch (SQLException e) { - System.out.println(String.format("%s> %s. Host is %s, port is %s.", IOTDB_CLI_PREFIX, - e.getMessage(), host, port)); - return; - } + host = checkRequiredArg(HOST_ARGS, HOST_NAME, commandLine, false, host); + port = checkRequiredArg(PORT_ARGS, PORT_NAME, commandLine, false, port); + username = checkRequiredArg(USERNAME_ARGS, USERNAME_NAME, commandLine, true, null); - } catch (ArgsErrorException e) { - // System.out.println(TSFILEDB_CLI_PREFIX + ": " + e.getMessage()); - return; + password = commandLine.getOptionValue(PASSWORD_ARGS); + if (password == null) { + password = reader.readLine("please input your password:", '\0'); } - - displayLogo(properties.getVersion()); - System.out.println(IOTDB_CLI_PREFIX + "> login successfully"); - - while (true) { - s = reader.readLine(IOTDB_CLI_PREFIX + "> ", null); - if (s == null) { - continue; - } else { - String[] cmds = s.trim().split(";"); - for (int i = 0; i < cmds.length; i++) { - String cmd = cmds[i]; - if (cmd != null && !cmd.trim().equals("")) { - OperationResult result = handleInputInputCmd(cmd, connection); - switch (result) { - case RETURN_OPER: - return; - case CONTINUE_OPER: - continue; - default: - break; + try (IoTDBConnection connection = (IoTDBConnection) DriverManager.getConnection(Config.IOTDB_URL_PREFIX + host + ":" + port + "/", username, password)){ + properties = connection.getServerProperties(); + AGGREGRATE_TIME_LIST.addAll(properties.getSupportedTimeAggregationOperations()); + displayLogo(properties.getVersion()); + System.out.println(IOTDB_CLI_PREFIX + "> login successfully"); + while (true) { + s = reader.readLine(IOTDB_CLI_PREFIX + "> ", null); + if (s != null) { + String[] cmds = s.trim().split(";"); + for (int i = 0; i < cmds.length; i++) { + String cmd = cmds[i]; + if (cmd != null && !cmd.trim().equals("")) { + OperationResult result = handleInputCmd(cmd, connection); + switch (result) { + case RETURN_OPER: + return; + case CONTINUE_OPER: + continue; + default: + break; + } } } } } + } catch (SQLException e) { + System.out.println(String.format("%s> %s Host is %s, port is %s.", IOTDB_CLI_PREFIX, e.getMessage(), host, port)); } - } catch (Exception e) { + } catch(ArgsErrorException e){ + System.out.println(IOTDB_CLI_PREFIX + "> input params error because" + e.getMessage()); + }catch (Exception e) { System.out.println(IOTDB_CLI_PREFIX + "> exit client with error " + e.getMessage()); - } finally { - if (reader != null) { - reader.close(); - } - if (connection != null) { - try { - connection.close(); - } catch (SQLException e) { - e.printStackTrace(); - } - } } } + @Deprecated private static Completer[] getCommandCompleter() { List candidateStrings = new ArrayList<>(); for (String s : FUNCTION_NAME_LIST) { @@ -297,7 +267,7 @@ public int complete(final String buffer, final int cursor, final List candidates) { int result = super.complete(buffer, cursor, candidates); if (candidates.isEmpty() && cursor > 1) { - int equalsIdx = buffer.indexOf("="); + int equalsIdx = buffer.indexOf('='); if (equalsIdx != -1) { String confName = buffer.substring(0, equalsIdx); String value = buffer.substring(equalsIdx + 1).toUpperCase(); diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/WinClient.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/WinClient.java index 8fc4f438d..cf3473fee 100644 --- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/WinClient.java +++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/WinClient.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.cli.client; @@ -42,7 +41,6 @@ public class WinClient extends AbstractClient { */ public static void main(String[] args) throws ClassNotFoundException, SQLException { Class.forName(Config.JDBC_DRIVER_NAME); - IoTDBConnection connection = null; Options options = createOptions(); HelpFormatter hf = new HelpFormatter(); hf.setWidth(MAX_HELP_CONSOLE_WIDTH); @@ -85,70 +83,50 @@ public static void main(String[] args) throws ClassNotFoundException, SQLExcepti hf.printHelp(IOTDB_CLI_PREFIX, options, true); return; } - Scanner scanner = null; - try { - String s; - try { - host = checkRequiredArg(HOST_ARGS, HOST_NAME, commandLine, false, host); - port = checkRequiredArg(PORT_ARGS, PORT_NAME, commandLine, false, port); - username = checkRequiredArg(USERNAME_ARGS, USERNAME_NAME, commandLine, true, null); - - password = commandLine.getOptionValue(PASSWORD_ARGS); - if (password == null) { - password = readPassword(); - } - try { - connection = (IoTDBConnection) DriverManager - .getConnection(Config.IOTDB_URL_PREFIX + host + ":" + port + "/", username, password); - properties = connection.getServerProperties(); - AGGREGRATE_TIME_LIST.addAll(properties.getSupportedTimeAggregationOperations()); - } catch (SQLException e) { - System.out.println(IOTDB_CLI_PREFIX + "> " + e.getMessage()); - return; - } - } catch (ArgsErrorException e) { - // System.out.println(TSFILEDB_CLI_PREFIX + ": " + e.getMessage()); - return; + try (Scanner scanner = new Scanner(System.in)){ + host = checkRequiredArg(HOST_ARGS, HOST_NAME, commandLine, false, host); + port = checkRequiredArg(PORT_ARGS, PORT_NAME, commandLine, false, port); + username = checkRequiredArg(USERNAME_ARGS, USERNAME_NAME, commandLine, true, null); + password = commandLine.getOptionValue(PASSWORD_ARGS); + if (password == null) { + password = readPassword(); } - - displayLogo(properties.getVersion()); - - System.out.println(IOTDB_CLI_PREFIX + "> login successfully"); - scanner = new Scanner(System.in); - while (true) { - System.out.print(IOTDB_CLI_PREFIX + "> "); - s = scanner.nextLine(); - if (s == null) { - continue; - } else { - String[] cmds = s.trim().split(";"); - for (int i = 0; i < cmds.length; i++) { - String cmd = cmds[i]; - if (cmd != null && !cmd.trim().equals("")) { - OperationResult result = handleInputInputCmd(cmd, connection); - switch (result) { - case RETURN_OPER: - return; - case CONTINUE_OPER: - continue; - default: - break; + try(IoTDBConnection connection = (IoTDBConnection) DriverManager + .getConnection(Config.IOTDB_URL_PREFIX + host + ":" + port + "/", username, password)){ + properties = connection.getServerProperties(); + AGGREGRATE_TIME_LIST.addAll(properties.getSupportedTimeAggregationOperations()); + displayLogo(properties.getVersion()); + System.out.println(IOTDB_CLI_PREFIX + "> login successfully"); + while (true) { + System.out.print(IOTDB_CLI_PREFIX + "> "); + String s = scanner.nextLine(); + if(s != null){ + String[] cmds = s.trim().split(";"); + for (int i = 0; i < cmds.length; i++) { + String cmd = cmds[i]; + if (cmd != null && !cmd.trim().equals("")) { + OperationResult result = handleInputCmd(cmd, connection); + switch (result) { + case RETURN_OPER: + return; + case CONTINUE_OPER: + continue; + default: + break; + } } } } } + } catch (SQLException e) { + System.out.println(String.format("%s> %s Host is %s, port is %s.", IOTDB_CLI_PREFIX, e.getMessage(), host, port)); } - } catch (Exception e) { - System.out.println(IOTDB_CLI_PREFIX + "> exit client with error " + e.getMessage()); - } finally { - if (scanner != null) { - scanner.close(); - } - if (connection != null) { - connection.close(); - } - } + } catch (ArgsErrorException e) { + System.out.println(IOTDB_CLI_PREFIX + "> input params error because" + e.getMessage()); + }catch (Exception e) { + System.out.println(IOTDB_CLI_PREFIX + "> exit client with error " + e.getMessage()); + } } private static String readPassword() { diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/exception/ArgsErrorException.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/exception/ArgsErrorException.java index 7d17a1e58..66f35f1e2 100644 --- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/exception/ArgsErrorException.java +++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/exception/ArgsErrorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.cli.exception; diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java index 3a1152979..badb8be5c 100644 --- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java +++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.cli.tool; @@ -69,11 +68,12 @@ public abstract class AbstractCsvTool { protected static String password; protected static ZoneId zoneId; - // protected static final String JDBC_DRIVER = "case hu.tsfiledb.jdbc.IoTDBDriver"; protected static String timeZoneID; protected static String timeFormat; protected static IoTDBConnection connection; + AbstractCsvTool() {} + protected static String checkRequiredArg(String arg, String name, CommandLine commandLine) throws ArgsErrorException { String str = commandLine.getOptionValue(arg); diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/CsvTestDataGen.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/CsvTestDataGen.java index 84e455ff7..24b288d3d 100644 --- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/CsvTestDataGen.java +++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/CsvTestDataGen.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.cli.tool; @@ -63,7 +62,6 @@ public static String isoDataGen() { } catch (FileNotFoundException e) { e.printStackTrace(); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } finally { try { diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java index 1468e0a24..51ea6b088 100644 --- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java +++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.cli.tool; @@ -150,7 +149,7 @@ public static void main(String[] args) throws IOException, SQLException { } private static void parseSpecialParams(CommandLine commandLine, ConsoleReader reader) - throws IOException, ArgsErrorException { + throws ArgsErrorException { targetDirectory = checkRequiredArg(TARGET_FILE_ARGS, TARGET_FILE_NAME, commandLine); timeFormat = commandLine.getOptionValue(TIME_FORMAT_ARGS); if (timeFormat == null) { @@ -217,21 +216,19 @@ private static Options createOptions() { return options; } - private static void dumpFromSqlFile(String filePath) throws ClassNotFoundException, IOException { - BufferedReader reader = new BufferedReader(new FileReader(filePath)); - String sql = null; - int index = 0; - while ((sql = reader.readLine()) != null) { - try { - dumpResult(sql, index); - } catch (SQLException e) { - System.out.println( - String.format("[ERROR] Cannot dump data for statment %s, because %s", sql, - e.getMessage())); + private static void dumpFromSqlFile(String filePath) throws IOException { + try (BufferedReader reader = new BufferedReader(new FileReader(filePath));){ + String sql = null; + int index = 0; + while ((sql = reader.readLine()) != null) { + try { + dumpResult(sql, index); + } catch (SQLException e) { + System.out.println(String.format("[ERROR] Cannot dump data for statment %s, because %s", sql, e.getMessage())); + } + index++; } - index++; } - reader.close(); } /** @@ -239,11 +236,10 @@ private static void dumpFromSqlFile(String filePath) throws ClassNotFoundExcepti * * @param sql export the result of executing the sql * @param index use to create dump file name - * @throws ClassNotFoundException if cannot find driver * @throws SQLException if SQL is not valid */ private static void dumpResult(String sql, int index) - throws ClassNotFoundException, SQLException { + throws SQLException { BufferedWriter writer = null; final String path = targetDirectory + DUMP_FILE_NAME + index + ".csv"; try { diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java index 2c604a539..813ebb974 100644 --- a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java +++ b/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.cli.tool; @@ -171,14 +170,14 @@ private static void loadDataFromCSV(File file, int index) { return; } headInfo.add(strHeadInfo[i]); - String deviceInfo = strHeadInfo[i].substring(0, strHeadInfo[i].lastIndexOf(".")); + String deviceInfo = strHeadInfo[i].substring(0, strHeadInfo[i].lastIndexOf('.')); if (!deviceToColumn.containsKey(deviceInfo)) { deviceToColumn.put(deviceInfo, new ArrayList<>()); } // storage every device's sensor index info deviceToColumn.get(deviceInfo).add(i - 1); - colInfo.add(strHeadInfo[i].substring(strHeadInfo[i].lastIndexOf(".") + 1)); + colInfo.add(strHeadInfo[i].substring(strHeadInfo[i].lastIndexOf('.') + 1)); } String line; @@ -302,10 +301,6 @@ private static List createInsertSQL(String line, Map tim String timestampsStr = data[0]; sbd.append(") values(").append(timestampsStr.trim().equals("") ? "NO TIMESTAMP" : timestampsStr); - // if (timestampsStr.trim().equals("")) { - // continue; - // } - // sbd.append(") values(").append(timestampsStr); for (int j = 0; j < colIndex.size(); ++j) { if (data[entry.getValue().get(j) + 1].equals("")) { @@ -357,7 +352,7 @@ public static void main(String[] args) throws IOException, SQLException { hf.printHelp(TSFILEDB_CLI_PREFIX, options, true); return; } - parseSpecialParams(commandLine, reader); + parseSpecialParams(commandLine); importCsvFromFile(host, port, username, password, filename, timeZoneID); } catch (ArgsErrorException e) { // ignored @@ -368,8 +363,7 @@ public static void main(String[] args) throws IOException, SQLException { } } - private static void parseSpecialParams(CommandLine commandLine, ConsoleReader reader) - throws IOException, ArgsErrorException { + private static void parseSpecialParams(CommandLine commandLine) { timeZoneID = commandLine.getOptionValue(TIME_ZONE_ARGS); } diff --git a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientTest.java b/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java similarity index 63% rename from iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientTest.java rename to iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java index c459c43ef..275bb9b13 100644 --- a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientTest.java +++ b/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.cli.client; @@ -38,7 +37,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -public class AbstractClientTest { +public class AbstractClientIT { @Mock private IoTDBConnection connection; @@ -82,27 +81,27 @@ public void testCheckRequiredArg() throws ParseException, ArgsErrorException { String str = AbstractClient .checkRequiredArg(AbstractClient.USERNAME_ARGS, AbstractClient.USERNAME_NAME, commandLine, true, "root"); - assertEquals(str, "user1"); + assertEquals("user1", str); args = new String[]{"-u", "root",}; commandLine = parser.parse(options, args); str = AbstractClient .checkRequiredArg(AbstractClient.HOST_ARGS, AbstractClient.HOST_NAME, commandLine, false, "127.0.0.1"); - assertEquals(str, "127.0.0.1"); + assertEquals("127.0.0.1", str); try { str = AbstractClient .checkRequiredArg(AbstractClient.HOST_ARGS, AbstractClient.HOST_NAME, commandLine, true, "127.0.0.1"); } catch (ArgsErrorException e) { - assertEquals(e.getMessage(), "IoTDB: Required values for option 'host' not provided"); + assertEquals("IoTDB: Required values for option 'host' not provided", e.getMessage()); } try { str = AbstractClient .checkRequiredArg(AbstractClient.HOST_ARGS, AbstractClient.HOST_NAME, commandLine, false, null); } catch (ArgsErrorException e) { - assertEquals(e.getMessage(), "IoTDB: Required values for option 'host' is null."); + assertEquals("IoTDB: Required values for option 'host' is null.", e.getMessage()); } } @@ -142,61 +141,30 @@ private void isTwoStringArrayEqual(String[] expected, String[] actual) { @Test public void testHandleInputInputCmd() { - assertEquals(AbstractClient.handleInputInputCmd(AbstractClient.EXIT_COMMAND, connection), - OperationResult.RETURN_OPER); - assertEquals(AbstractClient.handleInputInputCmd(AbstractClient.QUIT_COMMAND, connection), - OperationResult.RETURN_OPER); - - assertEquals( - AbstractClient.handleInputInputCmd(AbstractClient.SHOW_METADATA_COMMAND, connection), - OperationResult.CONTINUE_OPER); - - assertEquals(AbstractClient - .handleInputInputCmd(String.format("%s=", AbstractClient.SET_TIMESTAMP_DISPLAY), - connection), OperationResult.CONTINUE_OPER); - assertEquals(AbstractClient - .handleInputInputCmd(String.format("%s=xxx", AbstractClient.SET_TIMESTAMP_DISPLAY), - connection), OperationResult.CONTINUE_OPER); - assertEquals(AbstractClient - .handleInputInputCmd(String.format("%s=default", AbstractClient.SET_TIMESTAMP_DISPLAY), - connection), - OperationResult.CONTINUE_OPER); + assertEquals(OperationResult.RETURN_OPER, AbstractClient.handleInputCmd(AbstractClient.EXIT_COMMAND, connection)); + assertEquals(OperationResult.RETURN_OPER, AbstractClient.handleInputCmd(AbstractClient.QUIT_COMMAND, connection)); + + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(AbstractClient.SHOW_METADATA_COMMAND, connection)); + + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(String.format("%s=", AbstractClient.SET_TIMESTAMP_DISPLAY), connection)); + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(String.format("%s=xxx", AbstractClient.SET_TIMESTAMP_DISPLAY), connection)); + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(String.format("%s=default", AbstractClient.SET_TIMESTAMP_DISPLAY), connection)); testSetTimeFormat(); - assertEquals( - AbstractClient.handleInputInputCmd(String.format("%s=", AbstractClient.SET_MAX_DISPLAY_NUM), - connection), OperationResult.CONTINUE_OPER); - assertEquals(AbstractClient - .handleInputInputCmd(String.format("%s=xxx", AbstractClient.SET_MAX_DISPLAY_NUM), - connection), OperationResult.CONTINUE_OPER); - assertEquals(AbstractClient - .handleInputInputCmd(String.format("%s=1", AbstractClient.SET_MAX_DISPLAY_NUM), - connection), OperationResult.CONTINUE_OPER); + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(String.format("%s=", AbstractClient.SET_MAX_DISPLAY_NUM), connection)); + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(String.format("%s=xxx", AbstractClient.SET_MAX_DISPLAY_NUM),connection)); + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(String.format("%s=1", AbstractClient.SET_MAX_DISPLAY_NUM), connection)); testSetMaxDisplayNumber(); - assertEquals(AbstractClient.handleInputInputCmd(AbstractClient.SHOW_TIMEZONE, connection), - OperationResult.CONTINUE_OPER); - assertEquals( - AbstractClient.handleInputInputCmd(AbstractClient.SHOW_TIMESTAMP_DISPLAY, connection), - OperationResult.CONTINUE_OPER); - assertEquals(AbstractClient.handleInputInputCmd(AbstractClient.SHOW_FETCH_SIZE, connection), - OperationResult.CONTINUE_OPER); - - assertEquals(AbstractClient - .handleInputInputCmd(String.format("%s=", AbstractClient.SET_TIME_ZONE), connection), - OperationResult.CONTINUE_OPER); - assertEquals( - AbstractClient.handleInputInputCmd(String.format("%s=+08:00", AbstractClient.SET_TIME_ZONE), - connection), OperationResult.CONTINUE_OPER); - - assertEquals( - AbstractClient - .handleInputInputCmd(String.format("%s=", AbstractClient.SET_FETCH_SIZE), connection), - OperationResult.CONTINUE_OPER); - assertEquals( - AbstractClient.handleInputInputCmd(String.format("%s=111", AbstractClient.SET_FETCH_SIZE), - connection), - OperationResult.CONTINUE_OPER); + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(AbstractClient.SHOW_TIMEZONE, connection)); + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(AbstractClient.SHOW_TIMESTAMP_DISPLAY, connection)); + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(AbstractClient.SHOW_FETCH_SIZE, connection)); + + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(String.format("%s=", AbstractClient.SET_TIME_ZONE), connection)); + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(String.format("%s=+08:00", AbstractClient.SET_TIME_ZONE), connection)); + + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(String.format("%s=", AbstractClient.SET_FETCH_SIZE), connection)); + assertEquals(OperationResult.CONTINUE_OPER, AbstractClient.handleInputCmd(String.format("%s=111", AbstractClient.SET_FETCH_SIZE), connection)); } private void testSetTimeFormat() { @@ -209,11 +177,11 @@ private void testSetTimeFormat() { assertEquals(AbstractClient.formatTime, "%" + AbstractClient.maxTimeLength + "s|"); AbstractClient.setTimeFormat("default"); - assertEquals(AbstractClient.maxTimeLength, AbstractClient.ISO_DATETIME_LEN); + assertEquals(AbstractClient.ISO_DATETIME_LEN, AbstractClient.maxTimeLength); assertEquals(AbstractClient.formatTime, "%" + AbstractClient.maxTimeLength + "s|"); AbstractClient.setTimeFormat("iso8601"); - assertEquals(AbstractClient.maxTimeLength, AbstractClient.ISO_DATETIME_LEN); + assertEquals(AbstractClient.ISO_DATETIME_LEN, AbstractClient.maxTimeLength); assertEquals(AbstractClient.formatTime, "%" + AbstractClient.maxTimeLength + "s|"); AbstractClient.setTimeFormat("yyyy-MM-dd HH:mm:ssZZ"); @@ -228,10 +196,10 @@ private void testSetTimeFormat() { private void testSetMaxDisplayNumber() { AbstractClient.setMaxDisplayNumber("10"); - assertEquals(AbstractClient.maxPrintRowCount, 10); + assertEquals(10, AbstractClient.maxPrintRowCount); AbstractClient.setMaxDisplayNumber("111111111111111"); - assertEquals(AbstractClient.maxPrintRowCount, Integer.MAX_VALUE); + assertEquals(Integer.MAX_VALUE, AbstractClient.maxPrintRowCount); AbstractClient.setMaxDisplayNumber("-10"); - assertEquals(AbstractClient.maxPrintRowCount, Integer.MAX_VALUE); + assertEquals(Integer.MAX_VALUE, AbstractClient.maxPrintRowCount); } } diff --git a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptTest.java b/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java similarity index 84% rename from iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptTest.java rename to iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java index 200a05999..bf717ace6 100644 --- a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptTest.java +++ b/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.cli.client; @@ -31,7 +30,7 @@ import org.junit.Before; import org.junit.Test; -public class StartClientScriptTest { +public class StartClientScriptIT { @Before public void setUp() throws Exception { @@ -43,6 +42,7 @@ public void tearDown() throws Exception { @Test public void test() throws IOException, InterruptedException { + String os = System.getProperty("os.name").toLowerCase(); if (os.startsWith("windows")) { testStartClientOnWindows(); @@ -54,7 +54,7 @@ public void test() throws IOException, InterruptedException { private void testStartClientOnWindows() throws IOException { final String[] output = {"````````````````````````", "Starting IoTDB Client", "````````````````````````", - "IoTDB> Connection Error, please check whether the network is available or the server has started.. Host is 127.0.0.1, port is 6668."}; + "IoTDB> Connection Error, please check whether the network is available or the server has started. Host is 127.0.0.1, port is 6668."}; String dir = getCurrentPath("cmd.exe", "/c", "echo %cd%"); ProcessBuilder builder = new ProcessBuilder("cmd.exe", "/c", dir + File.separator + "cli" + File.separator + "bin" + File.separator + "start-client.bat", @@ -66,7 +66,7 @@ private void testStartClientOnWindows() throws IOException { private void testStartClientOnUnix() throws IOException { final String[] output = {"---------------------", "Starting IoTDB Client", "---------------------", - "IoTDB> Connection Error, please check whether the network is available or the server has started.. Host is 127.0.0.1, port is 6668."}; + "IoTDB> Connection Error, please check whether the network is available or the server has started. Host is 127.0.0.1, port is 6668."}; String dir = getCurrentPath("pwd"); System.out.println(dir); ProcessBuilder builder = new ProcessBuilder("sh", diff --git a/iotdb-cli/src/test/resources/logback.xml b/iotdb-cli/src/test/resources/logback.xml index 74b6b131a..543c069d9 100644 --- a/iotdb-cli/src/test/resources/logback.xml +++ b/iotdb-cli/src/test/resources/logback.xml @@ -1,4 +1,24 @@ + diff --git a/iotdb/iotdb/bin/start-postBackClient.bat b/iotdb/iotdb/bin/start-postBackClient.bat index a79935768..e8b0e8569 100755 --- a/iotdb/iotdb/bin/start-postBackClient.bat +++ b/iotdb/iotdb/bin/start-postBackClient.bat @@ -1,6 +1,4 @@ @REM -@REM Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -@REM @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @REM distributed with this work for additional information @@ -11,11 +9,12 @@ @REM @REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. @REM @echo off diff --git a/iotdb/iotdb/bin/start-postBackClient.sh b/iotdb/iotdb/bin/start-postBackClient.sh index 13b09b174..eb3e5a402 100755 --- a/iotdb/iotdb/bin/start-postBackClient.sh +++ b/iotdb/iotdb/bin/start-postBackClient.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -12,11 +10,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # diff --git a/iotdb/iotdb/bin/start-server.bat b/iotdb/iotdb/bin/start-server.bat index 86c4b21ba..abf9ebc00 100755 --- a/iotdb/iotdb/bin/start-server.bat +++ b/iotdb/iotdb/bin/start-server.bat @@ -1,6 +1,4 @@ @REM -@REM Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -@REM @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @REM distributed with this work for additional information @@ -11,11 +9,12 @@ @REM @REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. @REM @echo off diff --git a/iotdb/iotdb/bin/start-server.sh b/iotdb/iotdb/bin/start-server.sh index 1f6acb754..b24855ab3 100755 --- a/iotdb/iotdb/bin/start-server.sh +++ b/iotdb/iotdb/bin/start-server.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -12,11 +10,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # diff --git a/iotdb/iotdb/bin/stop-postBackClient.bat b/iotdb/iotdb/bin/stop-postBackClient.bat index f36e708c3..d7908ec56 100755 --- a/iotdb/iotdb/bin/stop-postBackClient.bat +++ b/iotdb/iotdb/bin/stop-postBackClient.bat @@ -1,6 +1,4 @@ @REM -@REM Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -@REM @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @REM distributed with this work for additional information @@ -11,11 +9,12 @@ @REM @REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. @REM @echo off diff --git a/iotdb/iotdb/bin/stop-postBackClient.sh b/iotdb/iotdb/bin/stop-postBackClient.sh index faf366530..9ff0ab787 100755 --- a/iotdb/iotdb/bin/stop-postBackClient.sh +++ b/iotdb/iotdb/bin/stop-postBackClient.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -12,11 +10,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # diff --git a/iotdb/iotdb/bin/stop-server.bat b/iotdb/iotdb/bin/stop-server.bat index a538acf0c..0cfdbdc0c 100755 --- a/iotdb/iotdb/bin/stop-server.bat +++ b/iotdb/iotdb/bin/stop-server.bat @@ -1,6 +1,4 @@ @REM -@REM Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -@REM @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @REM distributed with this work for additional information @@ -11,11 +9,12 @@ @REM @REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. @REM @echo off diff --git a/iotdb/iotdb/bin/stop-server.sh b/iotdb/iotdb/bin/stop-server.sh index 8750b6bc4..cc9463992 100755 --- a/iotdb/iotdb/bin/stop-server.sh +++ b/iotdb/iotdb/bin/stop-server.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -12,11 +10,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # diff --git a/iotdb/iotdb/conf/error_info_cn.properties b/iotdb/iotdb/conf/error_info_cn.properties index e8e39959b..7a115cd04 100644 --- a/iotdb/iotdb/conf/error_info_cn.properties +++ b/iotdb/iotdb/conf/error_info_cn.properties @@ -1,6 +1,4 @@ # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -11,11 +9,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # 20000=未知错误 diff --git a/iotdb/iotdb/conf/error_info_en.properties b/iotdb/iotdb/conf/error_info_en.properties index 11828fbe6..62bc9372b 100644 --- a/iotdb/iotdb/conf/error_info_en.properties +++ b/iotdb/iotdb/conf/error_info_en.properties @@ -1,6 +1,4 @@ # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -11,11 +9,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # 20000=Unknown error diff --git a/iotdb/iotdb/conf/iotdb-engine.properties b/iotdb/iotdb/conf/iotdb-engine.properties index bf96f17ed..1bb1c7e9a 100644 --- a/iotdb/iotdb/conf/iotdb-engine.properties +++ b/iotdb/iotdb/conf/iotdb-engine.properties @@ -1,6 +1,4 @@ # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -11,26 +9,33 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # rpc_port=6667 + # Write ahead log configuration # Is write ahead log enable enable_wal=true -# When the total number of write ahead log in the file and memory reaches the specified size, all the logs are compressed and the unused logs are removed -# Increase this value, it will lead to short write pause. Decrease this value, it will increase IO and CPU consumption -wal_cleanup_threshold=500000 + # When a certain amount ofwrite ahead log is reached, it will be flushed to disk # It is possible to lose at most flush_wal_threshold operations flush_wal_threshold=10000 + # The cycle when write ahead log is periodically refreshed to disk(in milliseconds) # It is possible to lose at most flush_wal_period_in_ms ms operations flush_wal_period_in_ms=10 + +# The cycle when write ahead log is periodically forced to be written to disk(in milliseconds) +# If force_wal_period_in_ms = 0 it means force write ahead log to be written to disk after each refreshment +# Set this parameter to 0 may slow down the ingestion on slow disk. +force_wal_period_in_ms=10 + # database features configuration # data dir # If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data/data). @@ -43,6 +48,7 @@ flush_wal_period_in_ms=10 # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. # data_dir=/path/iotdb/data/data + # tsfile dir # For this property, multiple directories should be set, and all directories should be separated by ",". All TsFiles will be allocated separately in all these directories. Moreover, setting absolute directories is suggested. # If this property is unset, system will save the TsFiles in the default relative path directory under the data_dir folder(i.e., %IOTDB_HOME%/data/data/settled). @@ -55,6 +61,7 @@ flush_wal_period_in_ms=10 # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. # tsfile_dir=/path/iotdb/data/data,data/data + # mult_dir_strategy # The strategy is used to choose a directory from tsfile_dir for the system to store a new tsfile. # System provides three strategies to choose from, or user can create his own strategy by extending org.apache.iotdb.db.conf.directories.strategy.DirectoryStrategy. @@ -66,6 +73,7 @@ flush_wal_period_in_ms=10 # If this property is unset, system will use MaxDiskUsableSpaceFirstStrategy as default strategy. # For this property, fully-qualified class name (include package name) and simple class name are both acceptable. # mult_dir_strategy=MaxDiskUsableSpaceFirstStrategy + # system dir # If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data/system). # If it is absolute, system will save the data in exact location it points to. @@ -77,6 +85,7 @@ flush_wal_period_in_ms=10 # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. # sys_dir=/path/iotdb/data/system + # wal dir # If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data). # If it is absolute, system will save the data in the exact location it points to. @@ -88,53 +97,70 @@ flush_wal_period_in_ms=10 # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. # wal_dir=/path/iotdb/data + # The maximum concurrent thread number for merging overflow # Increase this value, it will increase IO and CPU consumption # Decrease this value, when there is much overflow data, it will increase disk usage, which will reduce read speed # When the value<=0 or > CPU core number, use the CPU core number. merge_concurrent_threads=0 + # Maximum number of folders open at the same time # Increase this value, it will use more memory, random I/O becomes smaller, file fragmentation (i.e., group) is more neat. # Decrease this value, it will use less memory, random I/O becomes greater, file fragmentation is less neat. # group_size_in_byte * max_opened_folder = theoretical value of maximum memory occupancy # For an application, the total amount of folder is equal to the number of storage_group settings in SQL max_opened_folder=100 + # The amount of data that is read every time when IoTDB merge data. fetch_size=10000 + # The period time of flushing data from memory to file. # The unit is second. period_time_for_flush_in_second=3600 + # The period time for merge overflow data with tsfile data. # The unit is second. period_time_for_merge_in_second=7200 + #When set to true, start timing flush and merge service. False, stop timing flush and merge service. #Default is true. enable_timing_close_and_Merge=true + # time zone of server side # default value is +08:00 # eg. +08:00, -01:00 time_zone=+08:00 + # if memory used by write reaches this threshold, auto flush will be triggered, percentile of Java heap memory mem_threshold_warning=0.5 + # if memory used by write reaches this threshold, write will be blocked, percentile of Java heap memory mem_threshold_dangerous=0.6 + # every such interval, a thread will check if memory exceeds mem_threshold_warning # if do exceed, auto flush will be triggered, in ms, 1s by default mem_monitor_interval=1000 + # Decide how to control memory used by inserting data. # 0 is RecordMemController, which count the size of every record (tuple). # 1 is JVMMemController, which use JVM heap memory as threshold. mem_controller_type=0 + # When a bufferwrite's metadata size (in byte) exceed this, the bufferwrite is forced closed. bufferwrite_meta_size_threshold=209715200 + # When a bufferwrite's file size (in byte) exceeds this, the bufferwrite is forced closed. bufferwrite_file_size_threshold=2147483648 + # When a overflow's metadata size (in byte) exceeds this, the overflow is forced closed. overflow_meta_size_threshold=20971520 + # When a overflow's file size (in byte) exceeds this, the overflow is forced closed. overflow_file_size_threshold=209715200 + # How many thread can concurrently flush. When <= 0, use CPU core number. concurrent_flush_thread=0 + # Statistics Monitor configuration # Set enable_stat_monitor true(or false) to enable(or disable) the StatMonitor that stores statistics info periodically. # back_loop_period_sec decides the period when StatMonitor writes statistics info into IoTDB. @@ -143,36 +169,49 @@ concurrent_flush_thread=0 # Note: IoTDB requires stat_monitor_detect_freq_sec >= 600s and stat_monitor_retain_interval_sec >= 600s. # The monitor, which writes statistics info to IoTDB periodically, is disabled by default. enable_stat_monitor=false + # The period that StatMonitor stores statistics info back_loop_period_sec=5 + # The interval at which StatMonitor starts to check whether statistics info can be deleted due to exceeding the retention volume stat_monitor_detect_freq_sec=600 + # The minimum age of statistics storage information to be eligible for deletion due to age stat_monitor_retain_interval_sec=600 + # When set false, MemMonitorThread and MemStatisticThread will not be created. enable_mem_monitor=true + # When set to true, small flush will be triggered periodically even if memory threshold is not exceeded. enable_small_flush=true + # The interval of small flush in ms. small_flush_interval=60000 + # The threshold of lines of external sort external_sort_threshold=50 + # cache size for MManager. # This cache is used to improve write speed where all path check and TSDataType will be cached in MManager with corresponding Path. schema_manager_cache_size=300000 + # If the size in byte of a WAL log exceeds this, it won't be written. # Generally the default value 4MB is enough. max_log_entry_size=4194304 + # IoTDB postBack server properties # Whether to allow to post back, the default allowed is_postback_enable=true + # PostBack server port address postback_server_port=5555 + # White IP list of Postback client. # Please use the form of network segment to present the range of IP, for example: 192.168.0.0/16 # If there are more than one IP segment, please separate them by commas # The default is to allow all IP to postback IP_white_list=0.0.0.0/0 + # Choose a postBack strategy of merging historical data: #1. It's more likely to update historical data, please choose "true". #2. It's more likely not to update historical data or you don't know exactly, please choose "false". diff --git a/iotdb/iotdb/conf/iotdb-env.bat b/iotdb/iotdb/conf/iotdb-env.bat index ca8ed8809..0821f08a3 100644 --- a/iotdb/iotdb/conf/iotdb-env.bat +++ b/iotdb/iotdb/conf/iotdb-env.bat @@ -1,6 +1,4 @@ @REM -@REM Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -@REM @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @REM distributed with this work for additional information @@ -11,11 +9,12 @@ @REM @REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. @REM @echo off diff --git a/iotdb/iotdb/conf/iotdb-env.sh b/iotdb/iotdb/conf/iotdb-env.sh index 4cf6fa65c..0a6c7b595 100755 --- a/iotdb/iotdb/conf/iotdb-env.sh +++ b/iotdb/iotdb/conf/iotdb-env.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -12,11 +10,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # diff --git a/iotdb/iotdb/conf/iotdb-postbackClient.properties b/iotdb/iotdb/conf/iotdb-postbackClient.properties index 24f8fdadb..bb70b2f5b 100644 --- a/iotdb/iotdb/conf/iotdb-postbackClient.properties +++ b/iotdb/iotdb/conf/iotdb-postbackClient.properties @@ -1,6 +1,4 @@ # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -11,11 +9,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # server_ip=127.0.0.1 diff --git a/iotdb/iotdb/conf/logback.xml b/iotdb/iotdb/conf/logback.xml index 123f7fb73..93cb7423f 100644 --- a/iotdb/iotdb/conf/logback.xml +++ b/iotdb/iotdb/conf/logback.xml @@ -1,8 +1,6 @@ diff --git a/iotdb/iotdb/conf/tsfile-format.properties b/iotdb/iotdb/conf/tsfile-format.properties index a462f86fb..714800633 100644 --- a/iotdb/iotdb/conf/tsfile-format.properties +++ b/iotdb/iotdb/conf/tsfile-format.properties @@ -1,6 +1,4 @@ # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -11,11 +9,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # group_size_in_byte=134217728 diff --git a/iotdb/pom.xml b/iotdb/pom.xml index 914c540a5..17ff37ff5 100644 --- a/iotdb/pom.xml +++ b/iotdb/pom.xml @@ -1,8 +1,6 @@ @@ -34,8 +33,8 @@ 3.5.2 3.8.1 false - **/*Test.java - **/NoTest.java + ${iotdb.test.skip} + ${iotdb.test.skip} @@ -164,18 +163,31 @@ ${project.basedir}/iotdb/lib + org.apache.maven.plugins maven-surefire-plugin - alphabetical + ${iotdb.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + + ${iotdb.test.skip} - - ${it.test.excludes} - - - ${it.test.includes} - + ${iotdb.it.skip} @@ -199,4 +211,20 @@ + + + skipTsfileTests + + + skipTests + true + + + + true + true + true + + + diff --git a/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g b/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g index 85d8a8a3f..df7a7bcb7 100644 --- a/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g +++ b/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g @@ -1,6 +1,4 @@ // -// Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -// // Licensed to the Apache Software Foundation (ASF) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -11,11 +9,12 @@ // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. // lexer grammar TSLexer; diff --git a/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g b/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g index 5175238fb..84be5d0d2 100644 --- a/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g +++ b/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g @@ -1,6 +1,4 @@ // -// Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -// // Licensed to the Apache Software Foundation (ASF) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -11,11 +9,12 @@ // // http://www.apache.org/licenses/LICENSE-2.0 // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. // parser grammar TSParser; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthException.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthException.java index 0a5a4523e..f8c581e82 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java index 07f9aba2e..5c3124d04 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java index b460582a0..4e718724b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.authorizer; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java index bb5efe6ea..27d123d53 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.authorizer; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java index 93d587935..652d379c0 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.authorizer; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java index e0e0d736a..7f95e9e82 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.entity; @@ -31,13 +30,39 @@ */ public class PathPrivilege { + private Set privileges; + private String path; + /** * Sort PathPrivilege by referenceCnt in descent order. */ - public static Comparator referenceDescentSorter = (o1, - o2) -> -Integer.compare(o1.referenceCnt.get(), o2.referenceCnt.get()); - public Set privileges; - public String path; + public static final Comparator referenceDescentSorter = (o1, o2) -> -Integer. + compare(o1.referenceCnt.get(), o2.referenceCnt.get()); + + public Set getPrivileges() { + return privileges; + } + + public void setPrivileges(Set privileges) { + this.privileges = privileges; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public AtomicInteger getReferenceCnt() { + return referenceCnt; + } + + public void setReferenceCnt(AtomicInteger referenceCnt) { + this.referenceCnt = referenceCnt; + } + /** * This field records how many times this privilege is referenced during a life cycle (from being * loaded to being discarded). When serialized to a file, this determines the order of @@ -45,7 +70,7 @@ public class PathPrivilege { * result, the hot privileges will be in the first place so that the hit time will decrease when * being queried. */ - public AtomicInteger referenceCnt = new AtomicInteger(0); + private AtomicInteger referenceCnt = new AtomicInteger(0); public PathPrivilege(String path) { this.path = path; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java index 5c2024d53..e657a9bad 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.entity; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/Role.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/Role.java index 93655921b..d034ee0d4 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/Role.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/Role.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.entity; @@ -30,8 +29,24 @@ */ public class Role { - public String name; - public List privilegeList; + private String name; + private List privilegeList; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List getPrivilegeList() { + return privilegeList; + } + + public void setPrivilegeList(List privilegeList) { + this.privilegeList = privilegeList; + } public Role() { } @@ -58,8 +73,8 @@ public void removePrivilege(String path, int privilgeId) { */ public void setPrivileges(String path, Set privileges) { for (PathPrivilege pathPrivilege : privilegeList) { - if (pathPrivilege.path.equals(path)) { - pathPrivilege.privileges = privileges; + if (pathPrivilege.getPath().equals(path)) { + pathPrivilege.setPrivileges(privileges); } } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java index 260f2bcbb..34f85b9e6 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.entity; @@ -76,8 +75,8 @@ public void removePrivilege(String path, int privilgeId) { */ public void setPrivileges(String path, Set privileges) { for (PathPrivilege pathPrivilege : privilegeList) { - if (pathPrivilege.path.equals(path)) { - pathPrivilege.privileges = privileges; + if (pathPrivilege.getPath().equals(path)) { + pathPrivilege.setPrivileges(privileges); } } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java index f15d57f66..b43524400 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.role; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java index af74d90b2..ce7c7fbd3 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.role; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java index 830bcd6ab..f34c73185 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.role; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java index 5d3607a35..52b250955 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.role; @@ -81,7 +80,7 @@ public Role loadRole(String rolename) throws IOException { try (DataInputStream dataInputStream = new DataInputStream( new BufferedInputStream(inputStream))) { Role role = new Role(); - role.name = IOUtils.readString(dataInputStream, STRING_ENCODING, strBufferLocal); + role.setName(IOUtils.readString(dataInputStream, STRING_ENCODING, strBufferLocal)); int privilegeNum = dataInputStream.readInt(); List pathPrivilegeList = new ArrayList<>(); @@ -89,7 +88,7 @@ public Role loadRole(String rolename) throws IOException { pathPrivilegeList .add(IOUtils.readPathPrivilege(dataInputStream, STRING_ENCODING, strBufferLocal)); } - role.privilegeList = pathPrivilegeList; + role.setPrivilegeList(pathPrivilegeList); return role; } catch (Exception e) { @@ -100,16 +99,16 @@ public Role loadRole(String rolename) throws IOException { @Override public void saveRole(Role role) throws IOException { File roleProfile = new File( - roleDirPath + File.separator + role.name + IoTDBConstant.PROFILE_SUFFIX + TEMP_SUFFIX); + roleDirPath + File.separator + role.getName() + IoTDBConstant.PROFILE_SUFFIX + TEMP_SUFFIX); BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(roleProfile)); try { - IOUtils.writeString(outputStream, role.name, STRING_ENCODING, encodingBufferLocal); + IOUtils.writeString(outputStream, role.getName(), STRING_ENCODING, encodingBufferLocal); - role.privilegeList.sort(PathPrivilege.referenceDescentSorter); - int privilegeNum = role.privilegeList.size(); + role.getPrivilegeList().sort(PathPrivilege.referenceDescentSorter); + int privilegeNum = role.getPrivilegeList().size(); IOUtils.writeInt(outputStream, privilegeNum, encodingBufferLocal); for (int i = 0; i < privilegeNum; i++) { - PathPrivilege pathPrivilege = role.privilegeList.get(i); + PathPrivilege pathPrivilege = role.getPrivilegeList().get(i); IOUtils .writePathPrivilege(outputStream, pathPrivilege, STRING_ENCODING, encodingBufferLocal); } @@ -122,7 +121,7 @@ public void saveRole(Role role) throws IOException { } File oldFile = new File( - roleDirPath + File.separator + role.name + IoTDBConstant.PROFILE_SUFFIX); + roleDirPath + File.separator + role.getName() + IoTDBConstant.PROFILE_SUFFIX); IOUtils.replaceFile(roleProfile, oldFile); } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java index db552b6b4..832fd4349 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.role; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java index f07f1c227..d573e100a 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.user; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java index b61fff08f..b7fdc3aed 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.user; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java index b19f2c740..f254c47ca 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.user; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java index 9cb1dd02e..b84342232 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.user; @@ -35,6 +34,8 @@ import org.apache.iotdb.db.auth.entity.User; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.utils.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class loads a user's information from the corresponding file.The user file is a sequential @@ -52,6 +53,7 @@ public class LocalFileUserAccessor implements IUserAccessor { private static final String TEMP_SUFFIX = ".temp"; private static final String STRING_ENCODING = "utf-8"; + private static final Logger LOGGER = LoggerFactory.getLogger(LocalFileUserAccessor.class); private String userDirPath; /** @@ -79,7 +81,9 @@ public User loadUser(String username) throws IOException { File newProfile = new File( userDirPath + File.separator + username + IoTDBConstant.PROFILE_SUFFIX + TEMP_SUFFIX); if (newProfile.exists() && newProfile.isFile()) { - newProfile.renameTo(userProfile); + if(!newProfile.renameTo(userProfile)) { + LOGGER.error("New profile renaming not succeed."); + } userProfile = newProfile; } else { return null; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java index f525e52fa..6d33b5a35 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth.user; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java index 4ca133bb7..7e8c783ad 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.concurrent; @@ -54,19 +53,19 @@ private void init() { } public void readLock(Object obj) { - this.locks[Math.abs(obj.hashCode()) % lockSize].readLock().lock(); + this.locks[Math.abs(obj.hashCode() % lockSize)].readLock().lock(); } public void readUnlock(Object obj) { - this.locks[Math.abs(obj.hashCode()) % lockSize].readLock().unlock(); + this.locks[Math.abs(obj.hashCode() % lockSize)].readLock().unlock(); } public void writeLock(Object obj) { - this.locks[Math.abs(obj.hashCode()) % lockSize].writeLock().lock(); + this.locks[Math.abs(obj.hashCode() % lockSize)].writeLock().lock(); } public void writeUnlock(Object obj) { - this.locks[Math.abs(obj.hashCode()) % lockSize].writeLock().unlock(); + this.locks[Math.abs(obj.hashCode() % lockSize)].writeLock().unlock(); } /** diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java index a001fb50a..628f75ac5 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.concurrent; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java index c5df043fe..d1384104e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.concurrent; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java index eca1d3553..9c69147f0 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.concurrent; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java index 69c018196..04ca847ea 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,27 +9,32 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.concurrent; public enum ThreadName { - JDBC_SERVICE("JDBC-ServerServiceImpl"), JDBC_CLIENT("JDBC-Client"), MERGE_SERVICE( - "Merge-ServerServiceImpl"), CLOSE_MERGE_SERVICE( - "Close-Merge-ServerServiceImpl"), CLOSE_MERGE_DAEMON( - "Close-Merge-Daemon-Thread"), CLOSE_DAEMON("Close-Daemon-Thread"), MERGE_DAEMON( - "Merge-Daemon-Thread"), MEMORY_MONITOR("IoTDB-MemMonitor-Thread"), MEMORY_STATISTICS( - "IoTDB-MemStatistic-Thread"), FLUSH_PARTIAL_POLICY( - "IoTDB-FlushPartialPolicy-Thread"), FORCE_FLUSH_ALL_POLICY( - "IoTDB-ForceFlushAllPolicy-Thread"), STAT_MONITOR( - "StatMonitor-ServerServiceImpl"), FLUSH_SERVICE( - "Flush-ServerServiceImpl"), WAL_DAEMON( - "IoTDB-MultiFileLogNodeManager-Sync-Thread"), INDEX_SERVICE( - "Index-ServerServiceImpl"); + JDBC_SERVICE("JDBC-ServerServiceImpl"), + JDBC_CLIENT("JDBC-Client"), + MERGE_SERVICE("Merge-ServerServiceImpl"), + CLOSE_MERGE_SERVICE("Close-Merge-ServerServiceImpl"), + CLOSE_MERGE_DAEMON("Close-Merge-Daemon-Thread"), + CLOSE_DAEMON("Close-Daemon-Thread"), + MERGE_DAEMON("Merge-Daemon-Thread"), + MEMORY_MONITOR("IoTDB-MemMonitor-Thread"), + MEMORY_STATISTICS("IoTDB-MemStatistic-Thread"), + FLUSH_PARTIAL_POLICY("IoTDB-FlushPartialPolicy-Thread"), + FORCE_FLUSH_ALL_POLICY("IoTDB-ForceFlushAllPolicy-Thread"), + STAT_MONITOR("StatMonitor-ServerServiceImpl"), + FLUSH_SERVICE("Flush-ServerServiceImpl"), + WAL_DAEMON("IoTDB-MultiFileLogNodeManager-Sync-Thread"), + WAL_FORCE_DAEMON("IoTDB-MultiFileLogNodeManager-Force-Thread"), + INDEX_SERVICE("Index-ServerServiceImpl"); private String name; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index 290efb076..49ebc861d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.conf; @@ -52,22 +51,32 @@ public class IoTDBConfig { public int flushWalThreshold = 10000; /** - * The cycle when write ahead logs are periodically refreshed to disk(in milliseconds). - * It is possible to lose at most flush_wal_period_in_ms ms operations. + * The cycle when write ahead logs are periodically refreshed to disk(in milliseconds). It is + * possible to lose at most flush_wal_period_in_ms ms operations. */ public long flushWalPeriodInMs = 10000; + + /** + * The cycle when write ahead log is periodically forced to be written to disk(in milliseconds) If + * set this parameter to 0 it means call outputStream.force(true) after every each write + */ + public long forceWalPeriodInMs = 10; + /** * Data directory. */ public String dataDir = null; + /** * System directory. */ public String sysDir = null; + /** * Wal directory. */ public String walDir = null; + /** * Data directory of Overflow data. */ @@ -110,14 +119,13 @@ public class IoTDBConfig { public String indexFileDir = "index"; /** - * Temporary directory for temporary files of read (External Sort). - * TODO: unused field + * Temporary directory for temporary files of read (External Sort). TODO: unused field */ public String readTmpFileDir = "readTmp"; /** - * The maximum concurrent thread number for merging overflow. - * When the value <=0 or > CPU core number, use the CPU core number. + * The maximum concurrent thread number for merging overflow. When the value <=0 or > CPU core + * number, use the CPU core number. */ public int mergeConcurrentThreads = Runtime.getRuntime().availableProcessors(); @@ -149,8 +157,7 @@ public class IoTDBConfig { /** * When set true, start timed flush and merge service. Else, stop timed flush and merge service. - * The default value is true. - * TODO: 'timed' better explains this than 'timing'. + * The default value is true. TODO: 'timed' better explains this than 'timing'. */ public boolean enableTimingCloseAndMerge = true; @@ -161,7 +168,8 @@ public class IoTDBConfig { public ZoneId zoneID = ZoneId.systemDefault(); /** - * BufferWriteProcessor and OverflowProcessor will immediately flush if this threshold is reached. + * BufferWriteProcessor and OverflowProcessor will immediately flush if this threshold is + * reached. */ public long memThresholdWarning = (long) (0.5 * Runtime.getRuntime().maxMemory()); /** @@ -175,8 +183,8 @@ public class IoTDBConfig { public long memMonitorInterval = 1000; /** * Decide how to control memory usage of inserting data. 0 is RecordMemController, which sums the - * size of each record (tuple). 1 is JVMMemController, which uses the JVM heap memory as - * the memory usage indicator. + * size of each record (tuple). 1 is JVMMemController, which uses the JVM heap memory as the + * memory usage indicator. */ public int memControllerType = 1; /** @@ -200,8 +208,8 @@ public class IoTDBConfig { */ public boolean enableMemMonitor = false; /** - * When set to true, small flushes will be triggered periodically even if the memory threshold - * is not exceeded. + * When set to true, small flushes will be triggered periodically even if the memory threshold is + * not exceeded. */ public boolean enableSmallFlush = false; /** @@ -209,8 +217,8 @@ public class IoTDBConfig { */ public long smallFlushInterval = 60 * 1000; /** - * The statMonitor writes statistics info into IoTDB every backLoopPeriodSec secs. - * The default value is 5s. + * The statMonitor writes statistics info into IoTDB every backLoopPeriodSec secs. The default + * value is 5s. */ public int backLoopPeriodSec = 5; /** @@ -222,8 +230,8 @@ public class IoTDBConfig { */ public int statMonitorDetectFreqSec = 60 * 10; /** - * Set the maximum time to keep monitor statistics information in IoTDB. - * The default value is 600s. + * Set the maximum time to keep monitor statistics information in IoTDB. The default value is + * 600s. */ public int statMonitorRetainIntervalSec = 60 * 10; /** @@ -236,8 +244,8 @@ public class IoTDBConfig { */ public int mManagerCacheSize = 400000; /** - * The maximum size of a single log in byte. If a log exceeds this size, - * it cannot be written to the WAL file and an exception is thrown. + * The maximum size of a single log in byte. If a log exceeds this size, it cannot be written to + * the WAL file and an exception is thrown. */ public int maxLogEntrySize = 4 * 1024 * 1024; /** @@ -253,9 +261,9 @@ public class IoTDBConfig { */ public String languageVersion = "EN"; /** - * Choose a postBack strategy of merging historical data: - * 1. It's more likely to update historical data, choose "true". - * 2. It's more likely not to update historical data or you don't know exactly, choose "false". + * Choose a postBack strategy of merging historical data: 1. It's more likely to update historical + * data, choose "true". 2. It's more likely not to update historical data or you don't know + * exactly, choose "false". */ public boolean update_historical_data_possibility = false; public String ipWhiteList = "0.0.0.0/0"; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java index 3b568720c..b25b7c16d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.conf; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index d5c8c1fd3..e919cdbaa 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.conf; @@ -40,7 +39,7 @@ private IoTDBDescriptor() { } public static final IoTDBDescriptor getInstance() { - return TsfileDBDescriptorHolder.INSTANCE; + return IoTDBDescriptorHolder.INSTANCE; } public IoTDBConfig getConfig() { @@ -49,7 +48,6 @@ public IoTDBConfig getConfig() { /** * load an property file and set TsfileDBConfig variables. - * */ private void loadProps() { InputStream inputStream = null; @@ -123,6 +121,9 @@ private void loadProps() { conf.flushWalPeriodInMs = Integer .parseInt(properties.getProperty("flush_wal_period_in_ms", conf.flushWalPeriodInMs + "")); + conf.forceWalPeriodInMs = Integer + .parseInt(properties.getProperty("force_wal_period_in_ms", + conf.forceWalPeriodInMs + "")); conf.dataDir = properties.getProperty("data_dir", conf.dataDir); conf.bufferWriteDirs = properties.getProperty("tsfile_dir", conf.default_tsfile_dir) @@ -265,7 +266,7 @@ private void loadProps() { } } - private static class TsfileDBDescriptorHolder { + private static class IoTDBDescriptorHolder { private static final IoTDBDescriptor INSTANCE = new IoTDBDescriptor(); } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/Directories.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/Directories.java index 0404281ea..668b9ecff 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/Directories.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/Directories.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.conf.directories; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java index 4266aadca..52b550b2e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.conf.directories.strategy; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java index 3667c6b80..bda3d6e39 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.conf.directories.strategy; @@ -27,7 +26,7 @@ public class MaxDiskUsableSpaceFirstStrategy extends DirectoryStrategy { // disk space is measured by MB - private final long dataSizeShift = 1024 * 1024; + private static final double DATA_SIZE_SHIFT = 1024D * 1024; @Override public int nextFolderIndex() { @@ -61,7 +60,7 @@ public int getMaxSpaceFolder() { } private long getUsableSpace(String path) { - double freespace = new File(path).getUsableSpace() / dataSizeShift; + double freespace = new File(path).getUsableSpace() / DATA_SIZE_SHIFT; return (long) freespace; } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinDirOccupiedSpaceFirstStrategy.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinDirOccupiedSpaceFirstStrategy.java index a082c2d46..11f40beea 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinDirOccupiedSpaceFirstStrategy.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinDirOccupiedSpaceFirstStrategy.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.conf.directories.strategy; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java index a2a98e0a6..b4f1b26b1 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.conf.directories.strategy; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java index 3d65a2802..d2a28bd5b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.conf.directories.strategy; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/Processor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/Processor.java index 030503f0a..5cdbad14a 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/Processor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/Processor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/Action.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/Action.java index 60a5efb43..e62d715f6 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/Action.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/Action.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.bufferwrite; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java index 5f841be3a..24f5d947d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.bufferwrite; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/FileNodeConstants.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/FileNodeConstants.java index e1d4b940e..6f7240197 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/FileNodeConstants.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/FileNodeConstants.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.bufferwrite; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/RestorableTsFileIOWriter.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/RestorableTsFileIOWriter.java index 553db9a8e..f382440df 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/RestorableTsFileIOWriter.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/RestorableTsFileIOWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.bufferwrite; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/RowGroupBlockMetaDataCache.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/RowGroupBlockMetaDataCache.java index 7fc0d30c5..a1ed3cb08 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/RowGroupBlockMetaDataCache.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/RowGroupBlockMetaDataCache.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.cache; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java index e98497eda..c6f4d2490 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.cache; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java index c513bc8e6..477a20968 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.cache; @@ -35,8 +34,6 @@ */ public class TsFileMetadataUtils { - private static final Logger LOGGER = LoggerFactory.getLogger(TsFileMetadataUtils.class); - /** * get tsfile meta data. * diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeManager.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeManager.java index 1c6c1c1fe..1a0fe00c5 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.filenode; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java index b802e6e62..0b47a0039 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.filenode; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessorStatus.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessorStatus.java index 3af89bf1e..067d3a590 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessorStatus.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessorStatus.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.filenode; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessorStore.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessorStore.java index 498966096..349ab24b2 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessorStore.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessorStore.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.filenode; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/IntervalFileNode.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/IntervalFileNode.java index 8575ee5c5..7b2377764 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/IntervalFileNode.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/IntervalFileNode.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.filenode; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/Main.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/Main.java deleted file mode 100644 index d76e8ecf4..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/Main.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.engine.filenode; - -/** - * Created by liukun on 2019/1/9. - */ -public class Main { - -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/OverflowChangeType.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/OverflowChangeType.java index ddc43de5c..03b9f41c7 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/OverflowChangeType.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/OverflowChangeType.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.filenode; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/SerializeUtil.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/SerializeUtil.java index 077c718c7..bcefb6876 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/SerializeUtil.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/SerializeUtil.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.filenode; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenodev2/TimeIntervalTsFile.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenodev2/TimeIntervalTsFile.java index e0446f525..de0360493 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenodev2/TimeIntervalTsFile.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenodev2/TimeIntervalTsFile.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.filenodev2; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/BasicMemController.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/BasicMemController.java index b41273e3a..ed1a36b6b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/BasicMemController.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/BasicMemController.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/FlushPartialPolicy.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/FlushPartialPolicy.java index c73a0ac37..ae4e299f7 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/FlushPartialPolicy.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/FlushPartialPolicy.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/ForceFLushAllPolicy.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/ForceFLushAllPolicy.java index f535abfd4..fdea69f4b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/ForceFLushAllPolicy.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/ForceFLushAllPolicy.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/JVMMemController.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/JVMMemController.java index b9eb158ac..a1d00da08 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/JVMMemController.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/JVMMemController.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/MemMonitorThread.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/MemMonitorThread.java index afd03e5f9..c324a2aba 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/MemMonitorThread.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/MemMonitorThread.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/MemStatisticThread.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/MemStatisticThread.java index 1e615d28c..676fb5d35 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/MemStatisticThread.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/MemStatisticThread.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/NoActPolicy.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/NoActPolicy.java index 1cd9c1a96..0f4ecb120 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/NoActPolicy.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/NoActPolicy.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/Policy.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/Policy.java index e90de41bb..0140ac529 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/Policy.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/Policy.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/RecordMemController.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/RecordMemController.java index 310bdcffb..ea3f01ebe 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/RecordMemController.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/RecordMemController.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java index 48abbb68d..0596e6152 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java index e5e5bad00..f1e75e3a5 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java index e20bc5e9f..aba946bc4 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java index 4cf5d677d..c513caa71 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushUtil.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushUtil.java index 180329e9a..a8f33021f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushUtil.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushUtil.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java index 6961ee69e..123e4d2d8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java index d5c618b1e..77d0d3615 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java index dd9c3bb29..212acd3c9 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java index d3fcbb9c0..4d2122d39 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowIO.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowIO.java index 604abd1b9..d115a7e2e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowIO.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowIO.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessor.java index fa1ab00ed..5512f22a2 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowResource.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowResource.java index f2b71603a..133906879 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowResource.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowResource.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSeriesImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSeriesImpl.java index a69687090..2902e7733 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSeriesImpl.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSeriesImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSupport.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSupport.java index 90563a665..200c5aabd 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSupport.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSupport.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFFileMetadata.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFFileMetadata.java index eef4df17b..f8dbac7bc 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFFileMetadata.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFFileMetadata.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFRowGroupListMetadata.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFRowGroupListMetadata.java index 392199f97..7cd157973 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFRowGroupListMetadata.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFRowGroupListMetadata.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFSeriesListMetadata.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFSeriesListMetadata.java index fcbbd9603..ebffbb895 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFSeriesListMetadata.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFSeriesListMetadata.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/MergeStatus.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/MergeStatus.java index 91e909983..9b9aa85bf 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/MergeStatus.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/MergeStatus.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/OverflowOpType.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/OverflowOpType.java index 7ca4d45dc..ba4c4f9e6 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/OverflowOpType.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/OverflowOpType.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/OverflowReadWriteThriftFormatUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/OverflowReadWriteThriftFormatUtils.java index 62d8518ca..372e4a249 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/OverflowReadWriteThriftFormatUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/OverflowReadWriteThriftFormatUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/TimePair.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/TimePair.java index 19d8acd63..71b64d7d2 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/TimePair.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/TimePair.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushManager.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushManager.java index 81061e3e2..8f1b5faf3 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.pool; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/MergeManager.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/MergeManager.java index 87bb3a7de..7d135c514 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/MergeManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/MergeManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.pool; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/GlobalSortedSeriesDataSource.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/GlobalSortedSeriesDataSource.java index a8b128db4..e06ad194e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/GlobalSortedSeriesDataSource.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/GlobalSortedSeriesDataSource.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.querycontext; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/MergeSeriesDataSource.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/MergeSeriesDataSource.java index 257f44b6a..2e42bac67 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/MergeSeriesDataSource.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/MergeSeriesDataSource.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.querycontext; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowInsertFile.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowInsertFile.java index e6c9756ec..44f18c3df 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowInsertFile.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowInsertFile.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.querycontext; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowSeriesDataSource.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowSeriesDataSource.java index 019e998cc..3a655f3eb 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowSeriesDataSource.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowSeriesDataSource.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.querycontext; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowUpdateDeleteFile.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowUpdateDeleteFile.java index de01245d2..875c98fcc 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowUpdateDeleteFile.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowUpdateDeleteFile.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.querycontext; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java index b0962beab..f63915e76 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.querycontext; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java index d854bf97a..90a58e4d8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.querycontext; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/UnsealedTsFile.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/UnsealedTsFile.java index 6519c32c4..6d140aa43 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/UnsealedTsFile.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/UnsealedTsFile.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.querycontext; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/utils/FlushStatus.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/utils/FlushStatus.java index f32400b4f..bd26620d8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/utils/FlushStatus.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/utils/FlushStatus.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java index a6f5b9540..f4815446e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/BufferWriteProcessorException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/BufferWriteProcessorException.java index cb0ebf8ca..bf6a34910 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/BufferWriteProcessorException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/BufferWriteProcessorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java index ab0ca337e..acae81c28 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/ErrorDebugException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/ErrorDebugException.java index c0405003c..9dff25f1c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/ErrorDebugException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/ErrorDebugException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeManagerException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeManagerException.java index 2912cd026..1e5e11d59 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeManagerException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeManagerException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeNotExistException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeNotExistException.java index 7581b8f2d..6463f47ed 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeNotExistException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeNotExistException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeProcessorException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeProcessorException.java index bc6c50189..213d3c053 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeProcessorException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeProcessorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/MetadataArgsErrorException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/MetadataArgsErrorException.java index 707865ccd..5649ae9f6 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/MetadataArgsErrorException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/MetadataArgsErrorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/NotConsistentException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/NotConsistentException.java index bbff3d44b..c570a0b3f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/NotConsistentException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/NotConsistentException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/OverflowProcessorException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/OverflowProcessorException.java index 7693c911a..21ac26154 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/OverflowProcessorException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/OverflowProcessorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/OverflowWrongParameterException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/OverflowWrongParameterException.java index b0cc646ed..e0bd2a545 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/OverflowWrongParameterException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/OverflowWrongParameterException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java index 06d243155..6e1aa8e59 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java index cb7ce4478..8747205ad 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorRuntimException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorRuntimException.java index a8d752c47..6f4fe9177 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorRuntimException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorRuntimException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/RecoverException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/RecoverException.java index 4d7e1c935..da9ded37d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/RecoverException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/RecoverException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/StartupException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/StartupException.java index 726e7fbbb..d52ad9518 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/StartupException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/StartupException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java index 60dac6476..cf78eba6c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedOverflowOpTypeException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedOverflowOpTypeException.java index 96cbf225c..3253a9a14 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedOverflowOpTypeException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedOverflowOpTypeException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/WALOverSizedException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/WALOverSizedException.java index 313cf7f67..44482d401 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/WALOverSizedException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/WALOverSizedException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/builder/ExceptionBuilder.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/builder/ExceptionBuilder.java index 2fbc038cd..fc584f97f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/builder/ExceptionBuilder.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/builder/ExceptionBuilder.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.builder; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/AuthPluginException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/AuthPluginException.java index a2784dabb..86c635606 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/AuthPluginException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/AuthPluginException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.codebased; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/ConnectionFailedException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/ConnectionFailedException.java index 25e5844b3..9a6a1a8db 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/ConnectionFailedException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/ConnectionFailedException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.codebased; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/ConnectionHostException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/ConnectionHostException.java index ed7eaa08f..0421cab91 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/ConnectionHostException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/ConnectionHostException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.codebased; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/InsecureAPIException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/InsecureAPIException.java index 79b719767..03934fe25 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/InsecureAPIException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/InsecureAPIException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.codebased; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/InvalidParameterException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/InvalidParameterException.java index abd81175b..f3f7c83ea 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/InvalidParameterException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/InvalidParameterException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.codebased; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/IoTDBException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/IoTDBException.java index d4a27bc94..864dd5b25 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/IoTDBException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/IoTDBException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.codebased; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/NoParameterException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/NoParameterException.java index 73bd537c5..fce1e425c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/NoParameterException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/NoParameterException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.codebased; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/NoPreparedStatementException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/NoPreparedStatementException.java index 202ad7528..b55193d0f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/NoPreparedStatementException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/NoPreparedStatementException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.codebased; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/OutOfMemoryException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/OutOfMemoryException.java index c7eb943f5..6f03526b7 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/OutOfMemoryException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/OutOfMemoryException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.codebased; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/UnknownException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/UnknownException.java index 84b733904..2d2ba0438 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/UnknownException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/codebased/UnknownException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.codebased; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/GeneratePhysicalPlanException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/GeneratePhysicalPlanException.java index 9e995b4ff..ccabdd214 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/GeneratePhysicalPlanException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/GeneratePhysicalPlanException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.qp; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java index 7cd86ecb6..bb7c3596f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.qp; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java index a98235fa6..91d9424a8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.qp; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java index 6d3899163..df32ce263 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.qp; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java index f631e000e..358227bd4 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception.qp; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java index 9129b608d..1f28e79ff 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MGraph.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MGraph.java index cfd92332a..26abfebaf 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MGraph.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MGraph.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MManager.java index 12900c55c..7012c2efc 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MNode.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MNode.java index 96dd2bf94..485ea0986 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MNode.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MNode.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java index 7f038adaf..84c892cf6 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/Metadata.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/Metadata.java index 2826c98c1..33fac5720 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/Metadata.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/Metadata.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java index 95f87911f..ed200a175 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java index 3ec820978..0fd5c04e0 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/PNode.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/PNode.java index 99811ed63..4986ee2e2 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/PNode.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/PNode.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/PTree.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/PTree.java index 6db9ae8b4..5252bd2fe 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/PTree.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/PTree.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java b/iotdb/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java index 8c4338de0..37198b298 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.monitor; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java b/iotdb/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java index 891c68b98..f3db6472c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.monitor; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java b/iotdb/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java index a3497e79c..b00d18c33 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.monitor; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderConfig.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderConfig.java index ffb91a711..28c9f868c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderConfig.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderConfig.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.conf; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderDescriptor.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderDescriptor.java index 5c6f65f52..bed3b74ab 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderDescriptor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderDescriptor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.conf; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerManager.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerManager.java index 13b60b175..a8aaab9cc 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.receiver; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerService.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerService.java index 6a54b576e..ec0a78974 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerService.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerService.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * Autogenerated by Thrift Compiler (0.9.1) diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerServiceImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerServiceImpl.java index ad4ec4cd8..8b1f513c8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerServiceImpl.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/receiver/ServerServiceImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.receiver; @@ -96,7 +95,11 @@ public boolean getUUID(String uuid, String IPaddress) throws TException { schemaFromSenderPath.set(postbackPath + this.uuid.get() + File.separator + "mlog.txt"); if (new File(postbackPath + this.uuid.get()).exists() && new File(postbackPath + this.uuid.get()).list().length != 0) { - PostbackUtils.deleteFile(new File(postbackPath + this.uuid.get())); + try { + PostbackUtils.deleteFile(new File(postbackPath + this.uuid.get())); + } catch (IOException e) { + throw new TException(e); + } } for (String bufferWritePath : bufferWritePaths) { String backupPath = bufferWritePath + "postback" + File.separator; @@ -104,7 +107,11 @@ && new File(postbackPath + this.uuid.get()).list().length != 0) { && new File(backupPath + this.uuid.get()).list().length != 0) { // if does not exist, it means that the last time postback failed, clear uuid // data and receive the data again - PostbackUtils.deleteFile(new File(backupPath + this.uuid.get())); + try { + PostbackUtils.deleteFile(new File(backupPath + this.uuid.get())); + } catch (IOException e) { + throw new TException(e); + } } } boolean legalOrNOt = PostbackUtils.verifyIPSegment(tsfileDBConfig.ipWhiteList, IPaddress); @@ -273,14 +280,22 @@ public void getSchema(ByteBuffer schema, int status) throws TException { public boolean merge() throws TException { getFileNodeInfo(); mergeData(); - PostbackUtils.deleteFile(new File(postbackPath + this.uuid.get())); + try { + PostbackUtils.deleteFile(new File(postbackPath + this.uuid.get())); + } catch (IOException e) { + throw new TException(e); + } for (String bufferWritePath : bufferWritePaths) { String backupPath = bufferWritePath + "postback" + File.separator; if (new File(backupPath + this.uuid.get()).exists() && new File(backupPath + this.uuid.get()).list().length != 0) { // if does not exist, it means that the last time postback process failed, clear // uuid data and receive the data again - PostbackUtils.deleteFile(new File(backupPath + this.uuid.get())); + try { + PostbackUtils.deleteFile(new File(backupPath + this.uuid.get())); + } catch (IOException e) { + throw new TException(e); + } } } return true; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileManager.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileManager.java index 55dedd0b7..bd1bd80e8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.sender; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSender.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSender.java index a3da536ba..9d6e24c1b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSender.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSender.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.sender; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSenderImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSenderImpl.java index c41fd466b..8f750e410 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSenderImpl.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSenderImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.sender; @@ -492,7 +491,11 @@ public void postback() { if (new File(snapshotPath).exists() && new File(snapshotPath).list().length != 0) { // it means that the last task of postback does not succeed! Clear the files and // start to postback again - PostbackUtils.deleteFile(new File(snapshotPath)); + try { + PostbackUtils.deleteFile(new File(snapshotPath)); + } catch (IOException e) { + e.printStackTrace(); + } } } @@ -573,7 +576,11 @@ public void postback() { } } for (String snapshotPath : config.snapshotPaths) { - PostbackUtils.deleteFile(new File(snapshotPath)); + try { + PostbackUtils.deleteFile(new File(snapshotPath)); + } catch (IOException e) { + e.printStackTrace(); + } } try { clientOfServer.afterReceiving(); diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender1.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender1.java index 34fe4b169..9fc409a6c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender1.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender1.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender2.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender2.java index a5a6cf53d..b5d9835ab 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender2.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender2.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender3.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender3.java index 378b03a31..a56b45bcd 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender3.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender3.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/RandomNum.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/RandomNum.java index 1f3b7c41f..90996727e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/RandomNum.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/RandomNum.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/Utils.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/Utils.java index 081b7f3f1..33a1de5c1 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/Utils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/Utils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java index 65164537a..1ec75a75d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java index 56c757894..5011071c4 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.constant; @@ -178,16 +177,23 @@ public class DatetimeUtils { public static long convertDatetimeStrToMillisecond(String str, ZoneId zoneId) throws LogicalOperatorException { - return convertDatetimeStrToMillisecond(str, toZoneOffset(zoneId)); + return convertDatetimeStrToMillisecond(str, toZoneOffset(zoneId), 0); } /** * convert date time string to millisecond. */ - public static long convertDatetimeStrToMillisecond(String str, ZoneOffset offset) + public static long convertDatetimeStrToMillisecond(String str, ZoneOffset offset, int depth) throws LogicalOperatorException { - if (str.length() - str.lastIndexOf('+') != 6 && str.length() - str.lastIndexOf('-') != 6) { - return convertDatetimeStrToMillisecond(str + offset, offset); + if (depth >= 2){ + throw new DateTimeException( + String.format("Failed to convert %s to millisecond, zone offset is %s, " + + "please input like 2011-12-03T10:15:30 or 2011-12-03T10:15:30+01:00", str, offset)); + } + if (str.indexOf('Z') > 0){ + return convertDatetimeStrToMillisecond(str.substring(0, str.indexOf('Z')) + "+00:00", offset, depth); + } else if (str.length() - str.lastIndexOf('+') != 6 && str.length() - str.lastIndexOf('-') != 6) { + return convertDatetimeStrToMillisecond(str + offset, offset, depth + 1); } else if (str.indexOf('[') > 0 || str.indexOf(']') > 0) { throw new DateTimeException( String.format("%s with [time-region] at end is not supported now, " diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java index cc1ba9ab7..19640edf5 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.constant; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java index e37a331a3..3b1ee4f25 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.constant; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java index 574797e4b..9de2f1878 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.exception; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/OverflowQPExecutor.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/OverflowQPExecutor.java index 967e05703..3b37fac57 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/OverflowQPExecutor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/OverflowQPExecutor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.executor; @@ -436,9 +435,9 @@ private boolean operateAuthor(AuthorPlan author) throws ProcessorException { msg = new StringBuilder("Privileges are : [ \n"); role = authorizer.getRole(roleName); if (role != null) { - for (PathPrivilege pathPrivilege : role.privilegeList) { + for (PathPrivilege pathPrivilege : role.getPrivilegeList()) { if (nodeName == null || AuthUtils - .pathBelongsTo(nodeName.getFullPath(), pathPrivilege.path)) { + .pathBelongsTo(nodeName.getFullPath(), pathPrivilege.getPath())) { msg.append(pathPrivilege.toString()); } } @@ -456,7 +455,7 @@ private boolean operateAuthor(AuthorPlan author) throws ProcessorException { msg.append("From itself : {\n"); for (PathPrivilege pathPrivilege : user.privilegeList) { if (nodeName == null || AuthUtils - .pathBelongsTo(nodeName.getFullPath(), pathPrivilege.path)) { + .pathBelongsTo(nodeName.getFullPath(), pathPrivilege.getPath())) { msg.append(pathPrivilege.toString()); } } @@ -465,9 +464,9 @@ private boolean operateAuthor(AuthorPlan author) throws ProcessorException { role = authorizer.getRole(roleN); if (role != null) { msg.append("From role ").append(roleN).append(" : {\n"); - for (PathPrivilege pathPrivilege : role.privilegeList) { + for (PathPrivilege pathPrivilege : role.getPrivilegeList()) { if (nodeName == null - || AuthUtils.pathBelongsTo(nodeName.getFullPath(), pathPrivilege.path)) { + || AuthUtils.pathBelongsTo(nodeName.getFullPath(), pathPrivilege.getPath())) { msg.append(pathPrivilege.toString()); } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java index 488bf94aa..b735617d9 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.executor; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java index 6060caf8b..b346cdb9f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java index d00334045..d9b6f5652 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java index 6a0c4e9f1..1472e544f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java index 40012cb4c..cfc164b14 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java index 2ab2fb1d5..4a1217e76 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java index 6c3a57c87..a6c032ba3 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java index 1b5c4f8af..cd3f7f074 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java index df4c904b2..60e82cf3a 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java index bca7bba8e..e0c60975c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java index a750c9d02..4838d7427 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java index f78c58b78..ec3ef2717 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java index 4b66edfc5..e0d725c00 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java index 0e6f7c927..94b84f8e6 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java index 3a1883039..b237239b7 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.sys; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java index f6a3560c3..e8d467977 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.sys; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java index 6ab4c14be..c755b47d6 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.sys; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java index 447529184..d10cb7041 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.logical.sys; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java index dcfe56d21..77dd6e4a5 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java index b093ce258..43a5e28f1 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java index 4be29c282..b89717b6a 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java index fff4f90ac..7f0399ff8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java index 4fbae1635..f4087eb48 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java index e531998a2..499181103 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java index 56e61e95a..4e60c5be2 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java index 9e033219b..5da9c2a66 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.crud; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java index 6eda697ac..4641ad93e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.sys; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java index d8125792c..f2421bf9e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.sys; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java index ecf15ba6e..f21264ad9 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.sys; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java index a48cb3fcc..f708e85a6 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.physical.sys; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java index 19dd2d34e..f0adb66db 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.strategy; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java index b201989c0..e5a7ade14 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.strategy; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java index 07aaa96aa..28cb7f62d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.strategy.optimizer; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java index 03ee97dc5..fe3e7cde1 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.strategy.optimizer; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java index ae0762078..6d9f3cb6c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.strategy.optimizer; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java index 12c1b440f..c3a7d0620 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.strategy.optimizer; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java index 7879d6062..e62f4179e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.strategy.optimizer; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java index 578a2215a..f6b7dbd21 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.strategy.optimizer; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/executor/QueryJobExecutor.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/executor/QueryJobExecutor.java deleted file mode 100644 index 9e26b8f6e..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/executor/QueryJobExecutor.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.executor; - -import org.apache.iotdb.db.query.component.job.QueryEngine; -import org.apache.iotdb.db.query.component.job.QueryEngineImpl; -import org.apache.iotdb.db.query.component.job.QueryJob; -import org.apache.iotdb.db.query.component.job.QueryJobExecutionMessage; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; - -public abstract class QueryJobExecutor implements Runnable { - - private QueryJob queryJob; - private QueryEngine queryEngine; - - protected QueryJobExecutor(QueryJob queryJob) { - this.queryJob = queryJob; - this.queryEngine = QueryEngineImpl.getInstance(); - } - - public abstract QueryDataSet execute() throws InterruptedException; - - @Override - public void run() { - try { - QueryDataSet queryDataSet = execute(); - queryEngine.finishJob(queryJob, queryDataSet); - } catch (InterruptedException e) { - queryJob.setMessage(new QueryJobExecutionMessage(e.getMessage())); - queryEngine.terminateJob(queryJob); - } catch (Exception e) { - queryJob.setMessage(new QueryJobExecutionMessage("Unexpected Error:" + e.getMessage())); - queryEngine.terminateJob(queryJob); - } - } -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryEngine.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryEngine.java deleted file mode 100644 index db7a6e884..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryEngine.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.job; - -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; - -public interface QueryEngine { - - /** - * Submit a QueryJob to EngineQueryRouter - * - * @param job - * @return QueryJobFuture for submitted QueryJob - */ - QueryJobFuture submit(QueryJob job) throws InterruptedException; - - void finishJob(QueryJob queryJob, QueryDataSet queryDataSet); - - void terminateJob(QueryJob queryJob); - - /** - * - * @param queryJob - * @return null if there is NOT corresponding OnePassQueryDataSet for given queryJob - */ - QueryDataSet retrieveQueryDataSet(QueryJob queryJob); -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryEngineImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryEngineImpl.java deleted file mode 100644 index 73d67dde9..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryEngineImpl.java +++ /dev/null @@ -1,156 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.job; - -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import org.apache.iotdb.db.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.query.component.executor.QueryJobExecutor; -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class QueryEngineImpl implements QueryEngine, Runnable { - - private static final Logger logger = LoggerFactory.getLogger(QueryEngineImpl.class); - private static final int PENDING_QUEUE_SIZE = 100000; - private static final int THREAD_POOL_SIZE = 50; - private static final String THREAD_POOL_NAME = "EngineQueryRouter"; - private BlockingQueue queryJobPendingQueue; - private QueryJobDispatcher queryJobDispatcher; - private ConcurrentHashMap queryJobResultSet; - private ExecutorService queryJobExecutorService; - - private QueryEngineImpl() { - queryJobPendingQueue = new ArrayBlockingQueue<>(PENDING_QUEUE_SIZE); - queryJobExecutorService = IoTDBThreadPoolFactory - .newFixedThreadPool(THREAD_POOL_SIZE, THREAD_POOL_NAME); - queryJobResultSet = new ConcurrentHashMap<>(); - } - - public static QueryEngineImpl getInstance() { - return QueryEngineImplHelper.INSTANCE; - } - - @Override - public QueryJobFuture submit(QueryJob job) throws InterruptedException { - job.setStatus(QueryJobStatus.PENDING); - QueryJobFuture queryJobFuture = new QueryJobFutureImpl(job); - putJobToQueue(job); - return queryJobFuture; - } - - @Override - public void run() { - while (true) { - QueryJob queryJob = null; - try { - queryJob = queryJobPendingQueue.take(); - checkoutJobStatus(queryJob); - prepareJob(queryJob); - executeJob(queryJob); - } catch (InterruptedException e) { - logger.info("QueryJob[{}] was terminated", queryJob); - synchronized (queryJob) { - queryJob.setStatus(QueryJobStatus.TERMINATED); - queryJob.notify(); - } - } catch (Exception e) { - logger.error(String.format("Execute QueryJob[%s] error: ", queryJob), e); - synchronized (queryJob) { - queryJob.setMessage(new QueryJobExecutionMessage(e.getMessage())); - queryJob.setStatus(QueryJobStatus.TERMINATED); - queryJob.notify(); - } - } - } - } - - private void putJobToQueue(QueryJob queryJob) throws InterruptedException { - queryJob.setSubmitTimestamp(System.currentTimeMillis()); - queryJobPendingQueue.put(queryJob); - } - - private void checkoutJobStatus(QueryJob queryJob) throws InterruptedException { - if (queryJob.getStatus() == QueryJobStatus.WAITING_TO_BE_TERMINATED) { - throw new InterruptedException("QueryJob[" + queryJob + "] receive Terminating command"); - } - } - - private void prepareJob(QueryJob queryJob) { - queryJob.setStatus(QueryJobStatus.READY); - } - - private void executeJob(QueryJob queryJob) { - queryJob.setStartTimestamp(System.currentTimeMillis()); - QueryJobExecutor queryJobExecutor = queryJobDispatcher.dispatch(queryJob); - queryJobExecutorService.submit(queryJobExecutor); - } - - @Override - public void finishJob(QueryJob queryJob, QueryDataSet queryDataSet) { - synchronized (queryJob) { - try { - setQueryDataSet(queryJob, queryDataSet); - queryJob.setStatus(QueryJobStatus.FINISHED); - queryJob.setEndTimestamp(System.currentTimeMillis()); - queryJob.notify(); - } catch (Exception e) { - logger.error(String.format("finish QueryJob[%s] error: ", queryJob), e); - queryJob.setMessage(new QueryJobExecutionMessage(e.getMessage())); - queryJob.notify(); - } - } - } - - @Override - public void terminateJob(QueryJob queryJob) { - synchronized (queryJob) { - try { - queryJob.setStatus(QueryJobStatus.TERMINATED); - queryJob.notify(); - } catch (Exception e) { - logger.error(String.format("terminate QueryJob[%s] error: ", queryJob), e); - queryJob.setMessage(new QueryJobExecutionMessage(e.getMessage())); - queryJob.notify(); - } - } - } - - @Override - public QueryDataSet retrieveQueryDataSet(QueryJob queryJob) { - return queryJobResultSet.get(queryJob); - } - - private void setQueryDataSet(QueryJob job, QueryDataSet queryDataSet) { - this.queryJobResultSet.put(job, queryDataSet); - } - - public void setQueryJobDispatcher(QueryJobDispatcher queryJobDispatcher) { - this.queryJobDispatcher = queryJobDispatcher; - } - - private static class QueryEngineImplHelper { - - private static final QueryEngineImpl INSTANCE = new QueryEngineImpl(); - } -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJob.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJob.java deleted file mode 100644 index 9fc49ec78..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJob.java +++ /dev/null @@ -1,143 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.job; - -import org.apache.iotdb.tsfile.read.expression.QueryExpression; - -public abstract class QueryJob { - - protected QueryJobType type; - private long jobId; - private long submitTimestamp; - private long startTimestamp; - private long endTimestamp; - private QueryJobStatus status; - private QueryJobExecutionMessage message; - private String clientId; - - public QueryJob(long jobId) { - this.jobId = jobId; - } - - public QueryJobStatus getStatus() { - return status; - } - - public void setStatus(QueryJobStatus status) { - this.status = status; - } - - @Override - public int hashCode() { - return Long.hashCode(jobId); - } - - @Override - public boolean equals(Object o) { - if (o instanceof QueryJob && ((QueryJob) o).getJobId() == jobId) { - return true; - } - return false; - } - - public long getJobId() { - return jobId; - } - - public void setJobId(long jobId) { - this.jobId = jobId; - } - - public long getSubmitTimestamp() { - return submitTimestamp; - } - - public void setSubmitTimestamp(long submitTimestamp) { - this.submitTimestamp = submitTimestamp; - } - - public long getStartTimestamp() { - return startTimestamp; - } - - public void setStartTimestamp(long startTimestamp) { - this.startTimestamp = startTimestamp; - } - - public long getEndTimestamp() { - return endTimestamp; - } - - public void setEndTimestamp(long endTimestamp) { - this.endTimestamp = endTimestamp; - } - - public String getClientId() { - return clientId; - } - - public void setClientId(String clientId) { - this.clientId = clientId; - } - - public QueryJobExecutionMessage getMessage() { - return message; - } - - public void setMessage(QueryJobExecutionMessage message) { - this.message = message; - } - - @Override - public String toString() { - return String.valueOf(jobId); - } - - public QueryJobType getType() { - return type; - } - - public static class SelectQueryJob extends QueryJob { - - private QueryExpression queryExpression; - private int fetchSize; - - public SelectQueryJob(long jobId) { - super(jobId); - this.type = QueryJobType.SELECT; - } - - public QueryExpression getQueryExpression() { - return queryExpression; - } - - public void setQueryExpression(QueryExpression queryExpression) { - this.queryExpression = queryExpression; - } - - public int getFetchSize() { - return fetchSize; - } - - public void setFetchSize(int fetchSize) { - this.fetchSize = fetchSize; - } - } -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobContext.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobContext.java deleted file mode 100644 index efd07f42a..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobContext.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.job; - -public class QueryJobContext { - -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobDispatcher.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobDispatcher.java deleted file mode 100644 index 6b5a3fb0a..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobDispatcher.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.job; - -import org.apache.iotdb.db.query.component.executor.QueryJobExecutor; - -public interface QueryJobDispatcher { - - QueryJobExecutor dispatch(QueryJob queryJob); - -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobExecutionMessage.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobExecutionMessage.java deleted file mode 100644 index 48b82f929..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobExecutionMessage.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.job; - -public class QueryJobExecutionMessage { - - private String message; - - public QueryJobExecutionMessage(String message) { - this.message = message; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobFuture.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobFuture.java deleted file mode 100644 index 75c16ed37..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobFuture.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.job; - -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; - -public interface QueryJobFuture { - - /** - * Wait until corresponding QueryJob is finished. This method is synchronized and invoking this - * method will block current thread. An InterruptedException will be thrown if current thread is - * interrupted. - */ - void waitToFinished() throws InterruptedException; - - /** - * Terminate corresponding QueryJob. This method is synchronized and invoking will be blocked - * until corresponding QueryJob is terminated. This method is synchronized and invoking this - * method will block current thread. An InterruptedException will be thrown if current thread is - * interrupted. - */ - void terminateCurrentJob() throws InterruptedException; - - /** - * Get current status of corresponding QueryJob. - * - * @return status - */ - QueryJobStatus getCurrentStatus(); - - /** - * Retrieve OnePassQueryDataSet from EngineQueryRouter result pool. - * - * @return null if the queryJob is not finished. - */ - QueryDataSet retrieveQueryDataSet(); -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobFutureImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobFutureImpl.java deleted file mode 100644 index 5ced71779..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobFutureImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.job; - -import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class QueryJobFutureImpl implements QueryJobFuture { - - private static final Logger logger = LoggerFactory.getLogger(QueryJobFutureImpl.class); - private QueryJob queryJob; - - // private QueryEngine queryEngine; - - public QueryJobFutureImpl(QueryJob queryJob) { - this.queryJob = queryJob; - // this.queryEngine = QueryEngineImpl.getInstance(); - } - - @Override - public void waitToFinished() throws InterruptedException { - synchronized (queryJob) { - if (queryJobIsDone(queryJob)) { - return; - } else { - queryJob.wait(); - } - } - } - - @Override - public void terminateCurrentJob() throws InterruptedException { - synchronized (queryJob) { - if (!queryJobIsDone(queryJob)) { - queryJob.setStatus(QueryJobStatus.WAITING_TO_BE_TERMINATED); - queryJob.wait(); - } - } - } - - @Override - public QueryJobStatus getCurrentStatus() { - return queryJob.getStatus(); - } - - @Override - public QueryDataSet retrieveQueryDataSet() { - return null; - // return queryEngine.retrieveQueryDataSet(queryJob); - } - - private boolean queryJobIsDone(QueryJob queryJob) { - if (queryJob.getStatus() == QueryJobStatus.FINISHED - || queryJob.getStatus() == QueryJobStatus.TERMINATED) { - return true; - } - return false; - } -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobStatus.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobStatus.java deleted file mode 100644 index 12ccc965f..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobStatus.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.job; - -public enum QueryJobStatus { - PENDING, READY, RUNNING, FINISHED, WAITING_TO_BE_TERMINATED, TERMINATED -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobType.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobType.java deleted file mode 100644 index 7deaab14b..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/job/QueryJobType.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.job; - -public enum QueryJobType { - SELECT, AGGREGATION, GROUP_BY -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/component/resource/QueryResource.java b/iotdb/src/main/java/org/apache/iotdb/db/query/component/resource/QueryResource.java deleted file mode 100644 index e7eb33e27..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/component/resource/QueryResource.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.component.resource; - -public interface QueryResource { - - /** - * Release represents the operations for current resource such as return, close, destroy. - */ - void release(); -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java b/iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java index 20a2c2091..890508664 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.control; @@ -27,7 +26,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.iotdb.db.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.StartupException; import org.apache.iotdb.db.service.IService; import org.apache.iotdb.db.service.ServiceType; import org.apache.iotdb.tsfile.read.TsFileSequenceReader; @@ -146,7 +144,6 @@ public synchronized void decreaseFileReaderReference(String filePath) { * This method is used when the given file path is deleted. */ public synchronized void closeFileAndRemoveReader(String filePath) throws IOException { - System.out.println(fileReaderMap.containsKey(filePath)); if (fileReaderMap.containsKey(filePath)) { referenceMap.remove(filePath); fileReaderMap.get(filePath).close(); @@ -174,7 +171,8 @@ public synchronized boolean contains(String filePath) { } @Override - public void start() throws StartupException { + public void start() { + // Do nothing } @Override @@ -197,7 +195,6 @@ public ServiceType getID() { } private static class FileReaderManagerHelper { - - public static FileReaderManager INSTANCE = new FileReaderManager(); + private static final FileReaderManager INSTANCE = new FileReaderManager(); } } \ No newline at end of file diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/OpenedFilePathsManager.java b/iotdb/src/main/java/org/apache/iotdb/db/query/control/OpenedFilePathsManager.java index 80e70131e..7bd48ba87 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/control/OpenedFilePathsManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/control/OpenedFilePathsManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.control; @@ -110,7 +109,6 @@ public void addFilePathToMap(long jobId, String filePath) { } private static class OpenedFilePathsManagerHelper { - - public static OpenedFilePathsManager INSTANCE = new OpenedFilePathsManager(); + private static final OpenedFilePathsManager INSTANCE = new OpenedFilePathsManager(); } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryDataSourceManager.java b/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryDataSourceManager.java index fa4e10095..2824a9f86 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryDataSourceManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryDataSourceManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.control; @@ -33,6 +32,9 @@ public class QueryDataSourceManager { private static FileNodeManager fileNodeManager = FileNodeManager.getInstance(); + private QueryDataSourceManager() { + } + public static QueryDataSource getQueryDataSource(long jobId, Path selectedPath) throws FileNodeManagerException { diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryTokenManager.java b/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryTokenManager.java index 33af768a1..df3ee24ea 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryTokenManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryTokenManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.control; @@ -111,7 +110,7 @@ public void setJobIdForCurrentRequestThread(long jobId) { public void beginQueryOfGivenQueryPaths(long jobId, List queryPaths) throws FileNodeManagerException { Set deviceIdSet = new HashSet<>(); - queryPaths.forEach((path) -> deviceIdSet.add(path.getDevice())); + queryPaths.forEach(path -> deviceIdSet.add(path.getDevice())); for (String deviceId : deviceIdSet) { putQueryTokenForCurrentRequestThread(jobId, deviceId, @@ -169,7 +168,6 @@ private void putQueryTokenForCurrentRequestThread(long jobId, String deviceId, i } private static class QueryTokenManagerHelper { - - public static QueryTokenManager INSTANCE = new QueryTokenManager(); + private static final QueryTokenManager INSTANCE = new QueryTokenManager(); } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithTimeGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithTimeGenerator.java index f92febd04..20d93e89a 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithTimeGenerator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithTimeGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.dataset; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutTimeGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutTimeGenerator.java index 7cc36232c..4c0ccb7f2 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutTimeGenerator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutTimeGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.dataset; @@ -29,22 +28,20 @@ import org.apache.iotdb.db.utils.TsPrimitiveType; import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.common.BatchData; import org.apache.iotdb.tsfile.read.common.Field; import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.read.common.RowRecord; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; +/** + * TODO implement this class as TsFile DataSetWithoutTimeGenerator + */ public class EngineDataSetWithoutTimeGenerator extends QueryDataSet { private List readers; private TimeValuePair[] cacheTimeValueList; - private List batchDataList; - - private List hasDataRemaining; - private PriorityQueue timeHeap; private Set timeSet; @@ -81,8 +78,8 @@ private void initHeap() throws IOException { } @Override - public boolean hasNext() throws IOException { - return timeHeap.size() > 0; + public boolean hasNext() { + return !timeHeap.isEmpty(); } @Override diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithTimeGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithTimeGenerator.java index 185e05d04..53d73d1d8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithTimeGenerator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithTimeGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.executor; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithoutTimeGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithoutTimeGenerator.java index e79626726..231cd8667 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithoutTimeGenerator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutorWithoutTimeGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.executor; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java index 54141029b..c6feee1d3 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.executor; @@ -32,8 +31,6 @@ import org.apache.iotdb.tsfile.read.expression.QueryExpression; import org.apache.iotdb.tsfile.read.expression.util.ExpressionOptimizer; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Query entrance class of IoTDB query process. All query clause will be transformed to physical @@ -41,14 +38,12 @@ */ public class EngineQueryRouter { - private static final Logger LOGGER = LoggerFactory.getLogger(EngineQueryRouter.class); - /** * Each unique jdbc request(query, aggregation or others job) has an unique job id. This job id * will always be maintained until the request is closed. In each job, the unique file will be * only opened once to avoid too many opened files error. */ - private AtomicLong jobId = new AtomicLong(); + private AtomicLong jobIdGenerator = new AtomicLong(); /** * execute physical plan. @@ -56,9 +51,9 @@ public class EngineQueryRouter { public QueryDataSet query(QueryExpression queryExpression) throws IOException, FileNodeManagerException { - long jobId = getNextJobId(); - QueryTokenManager.getInstance().setJobIdForCurrentRequestThread(jobId); - OpenedFilePathsManager.getInstance().setJobIdForCurrentRequestThread(jobId); + long nextJobId = getNextJobId(); + QueryTokenManager.getInstance().setJobIdForCurrentRequestThread(nextJobId); + OpenedFilePathsManager.getInstance().setJobIdForCurrentRequestThread(nextJobId); if (queryExpression.hasQueryFilter()) { try { @@ -69,11 +64,11 @@ public QueryDataSet query(QueryExpression queryExpression) if (optimizedExpression.getType() == GLOBAL_TIME) { EngineExecutorWithoutTimeGenerator engineExecutor = new EngineExecutorWithoutTimeGenerator( - jobId, queryExpression); + nextJobId, queryExpression); return engineExecutor.executeWithGlobalTimeFilter(); } else { EngineExecutorWithTimeGenerator engineExecutor = new EngineExecutorWithTimeGenerator( - jobId, + nextJobId, queryExpression); return engineExecutor.execute(); } @@ -84,7 +79,7 @@ public QueryDataSet query(QueryExpression queryExpression) } else { try { EngineExecutorWithoutTimeGenerator engineExecutor = new EngineExecutorWithoutTimeGenerator( - jobId, + nextJobId, queryExpression); return engineExecutor.executeWithoutFilter(); } catch (PathErrorException e) { @@ -94,6 +89,6 @@ public QueryDataSet query(QueryExpression queryExpression) } private synchronized long getNextJobId() { - return jobId.incrementAndGet(); + return jobIdGenerator.incrementAndGet(); } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJob.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJob.java deleted file mode 100644 index f92e25f69..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJob.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// package org.apache.iotdb.db.query.externalsort; -// -// -// import java.io.IOException; -// import java.util.ArrayList; -// import java.util.List; -// -/// ** -// * This class represents an external sort job. Every job will use a separated directory. -// */ -// public class ExternalSortJob { -// private long jobId; -// private List partList; -// -// public ExternalSortJob(long jobId, List partList) { -// this.jobId = jobId; -// this.partList = partList; -// } -// -// public List executeWithGlobalTimeFilter() throws IOException { -// List readers = new ArrayList<>(); -// for (ExternalSortJobPart part : partList) { -// readers.add(part.executeWithGlobalTimeFilter()); -// } -// return readers; -// } -// } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobEngine.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobEngine.java deleted file mode 100644 index bda92720a..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobEngine.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// package org.apache.iotdb.db.query.externalsort; -// -// import org.apache.iotdb.db.query.reader.merge.PrioritySeriesReader; -// -// import java.io.IOException; -// import java.util.List; -// -// -// public interface ExternalSortJobEngine { -// -// /** -// * Receive a list of TimeValuePairReaders and judge whether it should be processed -// using external sort. -// * If needed, do the merge sort for all TimeValuePairReaders using specific strategy. -// * @param timeValuePairReaderList A list include a set of TimeValuePairReaders -// * @return -// */ -// List executeWithGlobalTimeFilter(List -// timeValuePairReaderList) throws -// IOException; -// -// /** -// * Create an external sort job which contains many parts. -// * @param timeValuePairReaderList -// * @return -// */ -// ExternalSortJob createJob(List timeValuePairReaderList); -// -// } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobPart.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobPart.java deleted file mode 100644 index 0c02bd873..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobPart.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// package org.apache.iotdb.db.query.externalsort; -// -// import org.apache.iotdb.db.query.reader.merge.PrioritySeriesReader; -// -// import java.io.IOException; -// -// -// public abstract class ExternalSortJobPart { -// -// private ExternalSortJobPartType type; -// -// public ExternalSortJobPart (ExternalSortJobPartType type) { -// this.type = type; -// } -// -// public abstract PrioritySeriesReader executeWithGlobalTimeFilter() throws IOException; -// -// public ExternalSortJobPartType getType() { -// return type; -// } -// -// public enum ExternalSortJobPartType { -// SINGLE_SOURCE, MULTIPLE_SOURCE -// } -// -// } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobScheduler.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobScheduler.java deleted file mode 100644 index 4fd335fb5..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobScheduler.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// package org.apache.iotdb.db.query.externalsort; -// -// -// public class ExternalSortJobScheduler { -// -// private long jobId = 0; -// -// private ExternalSortJobScheduler() { -// -// } -// -// public synchronized long genJobId() { -// jobId++; -// return jobId; -// } -// -// private static class ExternalSortJobSchedulerHelper { -// private static ExternalSortJobScheduler INSTANCE = new ExternalSortJobScheduler(); -// } -// -// public static ExternalSortJobScheduler getInstance() { -// return ExternalSortJobSchedulerHelper.INSTANCE; -// } -// } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/LineMerger.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/LineMerger.java deleted file mode 100644 index 980f84f98..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/LineMerger.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// package org.apache.iotdb.db.query.externalsort; -// -// import org.apache.iotdb.db.query.externalsort.serialize.TimeValuePairDeserializer; -// import org.apache.iotdb.db.query.externalsort.serialize.TimeValuePairSerializer; -// import org.apache.iotdb.db.query.externalsort.serialize.impl.FixLengthTimeValuePairDeserializer; -// import org.apache.iotdb.db.query.externalsort.serialize.impl.FixLengthTimeValuePairSerializer; -// import org.apache.iotdb.db.query.reader.merge.PriorityMergeReader; -// import org.apache.iotdb.db.query.reader.merge.PrioritySeriesReader; -// -// import java.io.IOException; -// import java.util.List; -// -// -// public class LineMerger { -// -// private String tmpFilePath; -// -// public LineMerger(String tmpFilePath) { -// this.tmpFilePath = tmpFilePath; -// } -// -// public PrioritySeriesReader merge(List prioritySeriesReaders) throws IOException { -// TimeValuePairSerializer serializer = new FixLengthTimeValuePairSerializer(tmpFilePath); -// PriorityMergeReader reader = new PriorityMergeReader(prioritySeriesReaders); -// while (reader.hasNext()) { -// serializer.write(reader.next()); -// } -// reader.close(); -// serializer.close(); -// TimeValuePairDeserializer deserializer = new FixLengthTimeValuePairDeserializer(tmpFilePath); -// return new PrioritySeriesReader(deserializer, prioritySeriesReaders.get(0).getPriority()); -// } -// } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/MultiSourceExternalSortJobPart.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/MultiSourceExternalSortJobPart.java deleted file mode 100644 index 2c6db5464..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/MultiSourceExternalSortJobPart.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// package org.apache.iotdb.db.query.externalsort; -// -// import org.apache.iotdb.db.query.reader.merge.PrioritySeriesReader; -// -// import java.io.IOException; -// import java.util.ArrayList; -// import java.util.List; -// -// -// public class MultiSourceExternalSortJobPart extends ExternalSortJobPart { -// private String tmpFilePath; -// private List source; -// -// public MultiSourceExternalSortJobPart(String tmpFilePath, List source) { -// super(ExternalSortJobPartType.MULTIPLE_SOURCE); -// this.source = source; -// this.tmpFilePath = tmpFilePath; -// } -// -//// public MultiSourceExternalSortJobPart(String tmpFilePath, ExternalSortJobPart... externalSortJobParts) { -//// super(ExternalSortJobPartType.MULTIPLE_SOURCE); -//// source = new ArrayList<>(); -//// for (ExternalSortJobPart externalSortJobPart : externalSortJobParts) { -//// source.add(externalSortJobPart); -//// } -//// this.tmpFilePath = tmpFilePath; -//// } -// -// @Override -// public PrioritySeriesReader executeWithGlobalTimeFilter() throws IOException { -// List prioritySeriesReaders = new ArrayList<>(); -// for (ExternalSortJobPart part : source) { -// prioritySeriesReaders.add(part.executeWithGlobalTimeFilter()); -// } -// LineMerger merger = new LineMerger(tmpFilePath); -// return merger.merge(prioritySeriesReaders); -// } -// } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/SimpleExternalSortEngine.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/SimpleExternalSortEngine.java deleted file mode 100644 index 7b7ccfe9b..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/SimpleExternalSortEngine.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// package org.apache.iotdb.db.query.externalsort; -// -// import org.apache.iotdb.db.conf.TsfileDBDescriptor; -// import org.apache.iotdb.db.query.reader.merge.PrioritySeriesReader; -// -// import java.io.File; -// import java.io.IOException; -// import java.util.ArrayList; -// import java.util.List; -// -// -// public class SimpleExternalSortEngine implements ExternalSortJobEngine { -// -// private ExternalSortJobScheduler scheduler; -// //TODO: using config -// private String baseDir; -// private int minExternalSortSourceCount; -// -// private SimpleExternalSortEngine() { -// baseDir = TsfileDBDescriptor.getInstance().getConfig().readTmpFileDir + File.separatorChar; -// minExternalSortSourceCount = TsfileDBDescriptor.getInstance().getConfig().externalSortThreshold; -// scheduler = ExternalSortJobScheduler.getInstance(); -// } -// -// public SimpleExternalSortEngine(String baseDir, int minExternalSortSourceCount) { -// this.baseDir = baseDir; -// this.minExternalSortSourceCount = minExternalSortSourceCount; -// scheduler = ExternalSortJobScheduler.getInstance(); -// } -// -// @Override -// public List executeWithGlobalTimeFilter(List readers) -// throws IOException -// { -// if (readers.size() < minExternalSortSourceCount) { -// return readers; -// } -// ExternalSortJob job = createJob(readers); -// return job.executeWithGlobalTimeFilter(); -// } -// -// //TODO: this method could be optimized to have a better performance -// @Override -// public ExternalSortJob createJob(List readers) { -// long jodId = scheduler.genJobId(); -// List ret = new ArrayList<>(); -// List tmpPartList = new ArrayList<>(); -// for (PrioritySeriesReader reader : readers) { -// ret.add(new SingleSourceExternalSortJobPart(reader)); -// } -// -// int partId = 0; -// while (ret.size() >= minExternalSortSourceCount) { -// for (int i = 0; i < ret.size(); ) { -// List partGroup = new ArrayList<>(); -// for (int j = 0; j < minExternalSortSourceCount && i < ret.size(); j++) { -// partGroup.add(ret.get(i)); -// i++; -// } -// StringBuilder tmpFilePath = new StringBuilder(baseDir).append(jodId).append("_").append(partId); -// MultiSourceExternalSortJobPart part = new MultiSourceExternalSortJobPart(tmpFilePath.toString(), -// partGroup); -// tmpPartList.add(part); -// partId++; -// } -// ret = tmpPartList; -// tmpPartList = new ArrayList<>(); -// } -// return new ExternalSortJob(jodId, ret); -// } -// -// private static class SimpleExternalSortJobEngineHelper { -// private static SimpleExternalSortEngine INSTANCE = new SimpleExternalSortEngine(); -// } -// -// public static SimpleExternalSortEngine getInstance() { -// return SimpleExternalSortJobEngineHelper.INSTANCE; -// } -// } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/SingleSourceExternalSortJobPart.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/SingleSourceExternalSortJobPart.java deleted file mode 100644 index 9dfecf7c6..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/SingleSourceExternalSortJobPart.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// package org.apache.iotdb.db.query.externalsort; -// -// import org.apache.iotdb.db.query.reader.merge.PrioritySeriesReader; -// -// -// public class SingleSourceExternalSortJobPart extends ExternalSortJobPart { -// -// private PrioritySeriesReader timeValuePairReader; -// -// public SingleSourceExternalSortJobPart(PrioritySeriesReader timeValuePairReader) { -// super(ExternalSortJobPartType.SINGLE_SOURCE); -// this.timeValuePairReader = timeValuePairReader; -// } -// -// @Override -// public PrioritySeriesReader executeWithGlobalTimeFilter() { -// return this.timeValuePairReader; -// } -// } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/TimeValuePairDeserializer.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/TimeValuePairDeserializer.java deleted file mode 100644 index 20f114bd7..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/TimeValuePairDeserializer.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.externalsort.serialize; - -import java.io.IOException; -import org.apache.iotdb.db.utils.TimeValuePair; - -public interface TimeValuePairDeserializer { - - boolean hasNext() throws IOException; - - TimeValuePair next() throws IOException; - - /** - * Close current deserializer. - */ - void close() throws IOException; -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/TimeValuePairSerializer.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/TimeValuePairSerializer.java deleted file mode 100644 index f9dd8888e..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/TimeValuePairSerializer.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.externalsort.serialize; - -import java.io.IOException; -import org.apache.iotdb.db.utils.TimeValuePair; - -public interface TimeValuePairSerializer { - - void write(TimeValuePair timeValuePair) throws IOException; - - void close() throws IOException; -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairDeserializer.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairDeserializer.java deleted file mode 100644 index d5c49ca88..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairDeserializer.java +++ /dev/null @@ -1,201 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.externalsort.serialize.impl; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import org.apache.iotdb.db.query.externalsort.serialize.TimeValuePairDeserializer; -import org.apache.iotdb.db.utils.TimeValuePair; -import org.apache.iotdb.db.utils.TsPrimitiveType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.Binary; -import org.apache.iotdb.tsfile.utils.BytesUtils; - -/** - * FileFormat: [Header][Body] [Header] = [DataTypeLength] + - * [DataTypeInStringBytes] [DataTypeLength] = 4 bytes. - */ -public class FixLengthTimeValuePairDeserializer implements TimeValuePairDeserializer { - - private TimeValuePairReader reader; - private InputStream inputStream; - private String tmpFilePath; - - public FixLengthTimeValuePairDeserializer(String tmpFilePath) throws IOException { - this.tmpFilePath = tmpFilePath; - inputStream = new BufferedInputStream(new FileInputStream(tmpFilePath)); - TSDataType dataType = readHeader(); - setReader(dataType); - } - - @Override - public boolean hasNext() throws IOException { - return inputStream.available() > 0; - } - - @Override - public TimeValuePair next() throws IOException { - return reader.read(inputStream); - } - - @Override - public void close() throws IOException { - inputStream.close(); - File file = new File(tmpFilePath); - if (!file.delete()) { - throw new IOException("Delete external sort tmp file error. FilePath:" + tmpFilePath); - } - } - - private TSDataType readHeader() throws IOException { - byte[] lengthInBytes = new byte[4]; - inputStream.read(lengthInBytes); - int length = BytesUtils.bytesToInt(lengthInBytes); - byte[] typeInBytes = new byte[length]; - inputStream.read(typeInBytes); - return TSDataType.valueOf(BytesUtils.bytesToString(typeInBytes)); - } - - private void setReader(TSDataType type) { - switch (type) { - case BOOLEAN: - this.reader = new TimeValuePairReader.BooleanReader(); - break; - case INT32: - this.reader = new TimeValuePairReader.IntReader(); - break; - case INT64: - this.reader = new TimeValuePairReader.LongReader(); - break; - case FLOAT: - this.reader = new TimeValuePairReader.FloatReader(); - break; - case DOUBLE: - this.reader = new TimeValuePairReader.DoubleReader(); - break; - case TEXT: - this.reader = new TimeValuePairReader.BinaryReader(); - break; - default: - throw new RuntimeException("Unknown TSDataType in FixLengthTimeValuePairSerializer:" - + type); - } - } - - private abstract static class TimeValuePairReader { - - public abstract TimeValuePair read(InputStream inputStream) throws IOException; - - private static class BooleanReader - extends FixLengthTimeValuePairDeserializer.TimeValuePairReader { - - byte[] timestampBytes = new byte[8]; - byte[] valueBytes = new byte[1]; - - @Override - public TimeValuePair read(InputStream inputStream) throws IOException { - inputStream.read(timestampBytes); - inputStream.read(valueBytes); - return new TimeValuePair(BytesUtils.bytesToLong(timestampBytes), - new TsPrimitiveType.TsBoolean(BytesUtils.bytesToBool(valueBytes))); - } - } - - private static class IntReader extends FixLengthTimeValuePairDeserializer.TimeValuePairReader { - - byte[] timestampBytes = new byte[8]; - byte[] valueBytes = new byte[4]; - - @Override - public TimeValuePair read(InputStream inputStream) throws IOException { - inputStream.read(timestampBytes); - inputStream.read(valueBytes); - return new TimeValuePair(BytesUtils.bytesToLong(timestampBytes), - new TsPrimitiveType.TsInt(BytesUtils.bytesToInt(valueBytes))); - } - } - - private static class LongReader extends FixLengthTimeValuePairDeserializer.TimeValuePairReader { - - byte[] timestampBytes = new byte[8]; - byte[] valueBytes = new byte[8]; - - @Override - public TimeValuePair read(InputStream inputStream) throws IOException { - inputStream.read(timestampBytes); - inputStream.read(valueBytes); - return new TimeValuePair(BytesUtils.bytesToLong(timestampBytes), - new TsPrimitiveType.TsLong(BytesUtils.bytesToLong(valueBytes))); - } - } - - private static class FloatReader - extends FixLengthTimeValuePairDeserializer.TimeValuePairReader { - - byte[] timestampBytes = new byte[8]; - byte[] valueBytes = new byte[4]; - - @Override - public TimeValuePair read(InputStream inputStream) throws IOException { - inputStream.read(timestampBytes); - inputStream.read(valueBytes); - return new TimeValuePair(BytesUtils.bytesToLong(timestampBytes), - new TsPrimitiveType.TsFloat(BytesUtils.bytesToFloat(valueBytes))); - } - } - - private static class DoubleReader - extends FixLengthTimeValuePairDeserializer.TimeValuePairReader { - - byte[] timestampBytes = new byte[8]; - byte[] valueBytes = new byte[8]; - - @Override - public TimeValuePair read(InputStream inputStream) throws IOException { - inputStream.read(timestampBytes); - inputStream.read(valueBytes); - return new TimeValuePair(BytesUtils.bytesToLong(timestampBytes), - new TsPrimitiveType.TsDouble(BytesUtils.bytesToDouble(valueBytes))); - } - } - - private static class BinaryReader - extends FixLengthTimeValuePairDeserializer.TimeValuePairReader { - - byte[] timestampBytes = new byte[8]; - byte[] valueLength = new byte[4]; - byte[] valueBytes; - - @Override - public TimeValuePair read(InputStream inputStream) throws IOException { - inputStream.read(timestampBytes); - inputStream.read(valueLength); - int length = BytesUtils.bytesToInt(valueLength); - valueBytes = new byte[length]; - inputStream.read(valueBytes); - return new TimeValuePair(BytesUtils.bytesToLong(timestampBytes), - new TsPrimitiveType.TsBinary(new Binary(BytesUtils.bytesToString(valueBytes)))); - } - } - } -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairSerializer.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairSerializer.java deleted file mode 100644 index 7d2e00f74..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairSerializer.java +++ /dev/null @@ -1,166 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.externalsort.serialize.impl; - -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import org.apache.iotdb.db.query.externalsort.serialize.TimeValuePairSerializer; -import org.apache.iotdb.db.utils.TimeValuePair; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.utils.BytesUtils; - -/** - * IMPORTANT: One instance of this class should used with same type of TimeValuePair. - * FileFormat: [Header][Body][Header] = [DataTypeLength] + [DataTypeInStringBytes] - * [DataTypeLength] = 4 bytes - */ -public class FixLengthTimeValuePairSerializer implements TimeValuePairSerializer { - - private TimeValuePairWriter writer; - private OutputStream outputStream; - private boolean dataTypeDefined; - - public FixLengthTimeValuePairSerializer(String tmpFilePath) throws IOException { - checkPath(tmpFilePath); - outputStream = new BufferedOutputStream(new FileOutputStream(tmpFilePath)); - } - - @Override - public void write(TimeValuePair timeValuePair) throws IOException { - if (!dataTypeDefined) { - setWriter(timeValuePair.getValue().getDataType()); - writeHeader(timeValuePair.getValue().getDataType()); - dataTypeDefined = true; - } - writer.write(timeValuePair, outputStream); - } - - @Override - public void close() throws IOException { - outputStream.close(); - } - - private void writeHeader(TSDataType dataType) throws IOException { - String typeInString = dataType.toString(); - outputStream.write(BytesUtils.intToBytes(typeInString.length())); - outputStream.write(BytesUtils.stringToBytes(typeInString)); - } - - private void checkPath(String tmpFilePath) throws IOException { - File file = new File(tmpFilePath); - if (file.exists()) { - file.delete(); - } - if (file.getParentFile() != null) { - file.getParentFile().mkdirs(); - } - file.createNewFile(); - } - - private void setWriter(TSDataType type) { - switch (type) { - case BOOLEAN: - this.writer = new TimeValuePairWriter.BooleanWriter(); - break; - case INT32: - this.writer = new TimeValuePairWriter.IntWriter(); - break; - case INT64: - this.writer = new TimeValuePairWriter.LongWriter(); - break; - case FLOAT: - this.writer = new TimeValuePairWriter.FloatWriter(); - break; - case DOUBLE: - this.writer = new TimeValuePairWriter.DoubleWriter(); - break; - case TEXT: - this.writer = new TimeValuePairWriter.BinaryWriter(); - break; - default: - throw new RuntimeException("Unknown TSDataType in FixLengthTimeValuePairSerializer:" - + type); - } - } - - private abstract static class TimeValuePairWriter { - - public abstract void write(TimeValuePair tvPair, OutputStream outputStream) throws IOException; - - private static class BooleanWriter extends TimeValuePairWriter { - - @Override - public void write(TimeValuePair tvPair, OutputStream outputStream) throws IOException { - outputStream.write(BytesUtils.longToBytes(tvPair.getTimestamp())); - outputStream.write(BytesUtils.boolToBytes(tvPair.getValue().getBoolean())); - } - } - - private static class IntWriter extends TimeValuePairWriter { - - @Override - public void write(TimeValuePair tvPair, OutputStream outputStream) throws IOException { - outputStream.write(BytesUtils.longToBytes(tvPair.getTimestamp())); - outputStream.write(BytesUtils.intToBytes(tvPair.getValue().getInt())); - } - } - - private static class LongWriter extends TimeValuePairWriter { - - @Override - public void write(TimeValuePair tvPair, OutputStream outputStream) throws IOException { - outputStream.write(BytesUtils.longToBytes(tvPair.getTimestamp())); - outputStream.write(BytesUtils.longToBytes(tvPair.getValue().getLong())); - } - } - - private static class FloatWriter extends TimeValuePairWriter { - - @Override - public void write(TimeValuePair tvPair, OutputStream outputStream) throws IOException { - outputStream.write(BytesUtils.longToBytes(tvPair.getTimestamp())); - outputStream.write(BytesUtils.floatToBytes(tvPair.getValue().getFloat())); - } - } - - private static class DoubleWriter extends TimeValuePairWriter { - - @Override - public void write(TimeValuePair tvPair, OutputStream outputStream) throws IOException { - outputStream.write(BytesUtils.longToBytes(tvPair.getTimestamp())); - outputStream.write(BytesUtils.doubleToBytes(tvPair.getValue().getDouble())); - } - } - - private static class BinaryWriter extends TimeValuePairWriter { - - @Override - public void write(TimeValuePair tvPair, OutputStream outputStream) throws IOException { - outputStream.write(BytesUtils.longToBytes(tvPair.getTimestamp())); - outputStream.write(BytesUtils.intToBytes(tvPair.getValue().getBinary().getLength())); - outputStream.write(BytesUtils.stringToBytes(tvPair.getValue() - .getBinary().getStringValue())); - } - } - } -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/SimpleTimeValuePairDeserializer.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/SimpleTimeValuePairDeserializer.java deleted file mode 100644 index 498232a30..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/SimpleTimeValuePairDeserializer.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.externalsort.serialize.impl; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import org.apache.iotdb.db.query.externalsort.serialize.TimeValuePairDeserializer; -import org.apache.iotdb.db.utils.TimeValuePair; - -/** - * Deserializer TimeValuePair. - */ -public class SimpleTimeValuePairDeserializer implements TimeValuePairDeserializer { - - private InputStream inputStream; - private ObjectInputStream objectInputStream; - private String tmpFilePath; - - /** - * init with file path. - */ - public SimpleTimeValuePairDeserializer(String tmpFilePath) throws IOException { - inputStream = new BufferedInputStream(new FileInputStream(tmpFilePath)); - objectInputStream = new ObjectInputStream(inputStream); - this.tmpFilePath = tmpFilePath; - } - - @Override - public boolean hasNext() throws IOException { - return inputStream.available() > 0; - } - - @Override - public TimeValuePair next() throws IOException { - try { - return (TimeValuePair) objectInputStream.readUnshared(); - } catch (ClassNotFoundException e) { - throw new IOException(e); - } - } - - // @Override - // public void skipCurrentTimeValuePair() throws IOException { - // next(); - // } - - /** - * This method will delete. - * - * @throws IOException -Delete external sort tmp file error. - */ - @Override - public void close() throws IOException { - objectInputStream.close(); - File file = new File(tmpFilePath); - if (!file.delete()) { - throw new IOException("Delete external sort tmp file error. FilePath:" + tmpFilePath); - } - } -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/SimpleTimeValuePairSerializer.java b/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/SimpleTimeValuePairSerializer.java deleted file mode 100644 index 42fc5c995..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/SimpleTimeValuePairSerializer.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.externalsort.serialize.impl; - -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectOutputStream; -import org.apache.iotdb.db.query.externalsort.serialize.TimeValuePairSerializer; -import org.apache.iotdb.db.utils.TimeValuePair; - -/** - * Serializer timeValuePair. - */ -public class SimpleTimeValuePairSerializer implements TimeValuePairSerializer { - - private ObjectOutputStream objectOutputStream; - - /** - * init with file path. - */ - public SimpleTimeValuePairSerializer(String tmpFilePath) throws IOException { - checkPath(tmpFilePath); - objectOutputStream = new ObjectOutputStream(new BufferedOutputStream( - new FileOutputStream(tmpFilePath))); - } - - private void checkPath(String tmpFilePath) throws IOException { - File file = new File(tmpFilePath); - if (file.exists()) { - file.delete(); - } - if (file.getParentFile() != null) { - file.getParentFile().mkdirs(); - } - file.createNewFile(); - } - - @Override - public void write(TimeValuePair timeValuePair) throws IOException { - objectOutputStream.writeUnshared(timeValuePair); - } - - @Override - public void close() throws IOException { - objectOutputStream.close(); - } -} diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java b/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java index d2d74f95e..674e744c0 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.factory; @@ -118,18 +117,11 @@ public PriorityMergeReader createUnSeqMergeReader( } } - // TODO add External Sort when needed - // timeValuePairReaders = externalSortJobEngine. - // executeWithGlobalTimeFilter(timeValuePairReaders); - + // TODO add external sort when needed return unSeqMergeReader; } - public PriorityMergeReader createUnSeqMergeReaderByTime( - OverflowSeriesDataSource overflowSeriesDataSource, - Filter filter) { - return null; - } + // TODO createUnSeqMergeReaderByTime a method with filter /** * This method is used to construct reader for merge process in IoTDB. To merge only one TsFile @@ -176,7 +168,6 @@ private IReader createSealedTsFileReaderForMerge(String filePath, } private static class SeriesReaderFactoryHelper { - - private static SeriesReaderFactory INSTANCE = new SeriesReaderFactory(); + private static final SeriesReaderFactory INSTANCE = new SeriesReaderFactory(); } } \ No newline at end of file diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java b/iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java index 8999766f8..de5067a60 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.fill; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java b/iotdb/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java index 585320884..8095b131a 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.fill; @@ -30,9 +29,6 @@ public class LinearFill extends IFill { private long beforeRange; private long afterRange; - - private Path path; - private BatchData result; public LinearFill(long beforeRange, long afterRange) { @@ -43,10 +39,9 @@ public LinearFill(long beforeRange, long afterRange) { /** * Constructor of LinearFill. */ - public LinearFill(Path path, TSDataType dataType, long queryTime, long beforeRange, + public LinearFill(TSDataType dataType, long queryTime, long beforeRange, long afterRange) { super(dataType, queryTime); - this.path = path; this.beforeRange = beforeRange; this.afterRange = afterRange; result = new BatchData(dataType, true, true); @@ -70,24 +65,11 @@ public void setAfterRange(long afterRange) { @Override public IFill copy(Path path) { - return new LinearFill(path, dataType, queryTime, beforeRange, afterRange); + return new LinearFill(dataType, queryTime, beforeRange, afterRange); } @Override public BatchData getFillResult() throws ProcessorException, IOException, PathErrorException { - long beforeTime; - if (beforeRange == -1) { - beforeTime = 0; - } else { - beforeTime = queryTime - beforeRange; - } - long afterTime; - if (afterRange == -1) { - afterTime = Long.MAX_VALUE; - } else { - afterTime = queryTime + afterRange; - } - return result; } } \ No newline at end of file diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java b/iotdb/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java index 6178d457b..2c66c7437 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,17 +9,15 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.fill; -import java.io.IOException; -import org.apache.iotdb.db.exception.PathErrorException; -import org.apache.iotdb.db.exception.ProcessorException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.BatchData; import org.apache.iotdb.tsfile.read.common.Path; @@ -30,13 +26,10 @@ public class PreviousFill extends IFill { private long beforeRange; - private Path path; - private BatchData result; - public PreviousFill(Path path, TSDataType dataType, long queryTime, long beforeRange) { + public PreviousFill(TSDataType dataType, long queryTime, long beforeRange) { super(dataType, queryTime); - this.path = path; this.beforeRange = beforeRange; result = new BatchData(dataType, true, true); } @@ -47,7 +40,7 @@ public PreviousFill(long beforeRange) { @Override public IFill copy(Path path) { - return new PreviousFill(path, dataType, queryTime, beforeRange); + return new PreviousFill(dataType, queryTime, beforeRange); } public long getBeforeRange() { @@ -55,13 +48,7 @@ public long getBeforeRange() { } @Override - public BatchData getFillResult() throws ProcessorException, IOException, PathErrorException { - long beforeTime; - if (beforeRange == -1) { - beforeTime = 0; - } else { - beforeTime = queryTime - beforeRange; - } + public BatchData getFillResult() { return result; } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IReader.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IReader.java index 092c50a31..6a574d6a5 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IReader.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderByTimestamp.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderByTimestamp.java index 3b79498c0..dbd6beb7d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderByTimestamp.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderByTimestamp.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.mem; @@ -61,8 +60,8 @@ public void skipCurrentTimeValuePair() throws IOException { } @Override - public void close() throws IOException { - + public void close() { + // Do nothing because mem chunk reader will not open files } // TODO consider change timeValuePairIterator to List structure, and use binary search instead of diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderWithFilter.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderWithFilter.java index de9031645..65785e769 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderWithFilter.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderWithFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,15 +9,15 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.mem; -import java.io.IOException; import java.util.Iterator; import org.apache.iotdb.db.engine.memtable.TimeValuePairSorter; import org.apache.iotdb.db.query.reader.IReader; @@ -71,7 +69,8 @@ public void skipCurrentTimeValuePair() { } @Override - public void close() throws IOException { + public void close() { + // Do nothing because mem chunk reader will not open files } @Override diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderWithoutFilter.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderWithoutFilter.java index 25c1142a6..bae74968d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderWithoutFilter.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/mem/MemChunkReaderWithoutFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,15 +9,15 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.mem; -import java.io.IOException; import java.util.Iterator; import org.apache.iotdb.db.engine.memtable.TimeValuePairSorter; import org.apache.iotdb.db.query.reader.IReader; @@ -51,8 +49,8 @@ public void skipCurrentTimeValuePair() { } @Override - public void close() throws IOException { - + public void close() { + // Do nothing because mem chunk reader will not open files } @Override diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/EngineReaderByTimeStamp.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/EngineReaderByTimeStamp.java index 6034abc3a..8ddf0add0 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/EngineReaderByTimeStamp.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/EngineReaderByTimeStamp.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.merge; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReader.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReader.java index c82e3f7a5..c2e8b41d6 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReader.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.merge; @@ -51,7 +50,7 @@ public void addReaderWithPriority(IReader reader, int priority) throws IOExcepti @Override public boolean hasNext() { - return heap.size() > 0; + return !heap.isEmpty(); } @Override @@ -62,7 +61,7 @@ public TimeValuePair next() throws IOException { } private void updateHeap(Element top) throws IOException { - while (heap.size() > 0 && heap.peek().timeValuePair.getTimestamp() == top.timeValuePair + while (!heap.isEmpty() && heap.peek().timeValuePair.getTimestamp() == top.timeValuePair .getTimestamp()) { Element e = heap.poll(); IReader reader = readerList.get(e.index); @@ -116,9 +115,16 @@ public Element(int index, TimeValuePair timeValuePair, int priority) { @Override public int compareTo(Element o) { - return this.timeValuePair.getTimestamp() > o.timeValuePair.getTimestamp() ? 1 - : this.timeValuePair.getTimestamp() < o.timeValuePair.getTimestamp() ? -1 - : o.priority.compareTo(this.priority); + + if (this.timeValuePair.getTimestamp() > o.timeValuePair.getTimestamp()) { + return 1; + } + + if (this.timeValuePair.getTimestamp() < o.timeValuePair.getTimestamp()) { + return -1; + } + + return o.priority.compareTo(this.priority); } } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderByTimestamp.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderByTimestamp.java index 1f7a420e7..244291a11 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderByTimestamp.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderByTimestamp.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.merge; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SealedTsFilesReader.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SealedTsFilesReader.java index 4778d6182..4a330bb8a 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SealedTsFilesReader.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SealedTsFilesReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.sequence; @@ -153,11 +152,7 @@ private boolean singleTsFileSatisfied(IntervalFileNode fileNode) { long startTime = fileNode.getStartTime(seriesPath.getDevice()); long endTime = fileNode.getEndTime(seriesPath.getDevice()); - if (!filter.satisfyStartEndTime(startTime, endTime)) { - return false; - } - - return true; + return filter.satisfyStartEndTime(startTime, endTime); } private void initSingleTsFileReader(IntervalFileNode fileNode) throws IOException { diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceDataReader.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceDataReader.java index 4146f048c..d4cbbe44f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceDataReader.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceDataReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.sequence; @@ -88,8 +87,6 @@ public boolean hasNext() throws IOException { if (currentSeriesReader.hasNext()) { curReaderInitialized = true; return true; - } else { - curReaderInitialized = false; } } return false; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceInsertDataByTimeStampReader.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceInsertDataByTimeStampReader.java deleted file mode 100644 index b9b526ec7..000000000 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceInsertDataByTimeStampReader.java +++ /dev/null @@ -1,245 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// -// package org.apache.iotdb.read.reader; -// -// import org.apache.iotdb.db.engine.filenode.IntervalFileNode; -// import org.apache.iotdb.db.engine.querycontext.GlobalSortedSeriesDataSource; -// import org.apache.iotdb.db.engine.querycontext.UnsealedTsFile; -// import org.apache.iotdb.db.query.control.FileReaderManager; -// import org.apache.iotdb.db.query.reader.merge.PriorityMergeReaderByTimestamp; -// import org.apache.iotdb.db.query.reader.merge.PrioritySeriesReader; -// import org.apache.iotdb.db.query.reader.merge.PrioritySeriesReaderByTimestamp; -// import org.apache.iotdb.db.query.reader.merge.EngineReaderByTimeStamp; -// import org.apache.iotdb.db.query.reader.mem.MemChunkReaderByTimestamp; -// import org.apache.iotdb.db.utils.TimeValuePair; -// import org.apache.iotdb.db.utils.TsPrimitiveType; -// -// import java.io.IOException; -// import java.io.RandomAccessFile; -// import java.util.ArrayList; -// import java.util.List; -// -/// ** -// * A reader for sequence insert data which can get the corresponding value of the specified time -// point. -// */ -// public class SequenceInsertDataByTimeStampReader extends SequenceDataReader implements -// EngineReaderByTimeStamp { -// -// private long currentTimestamp; -// private PriorityMergeReaderByTimestamp priorityMergeSortTimeValuePairReader; -// -// public SequenceInsertDataByTimeStampReader(GlobalSortedSeriesDataSource sortedSeriesDataSource) -// throws IOException { -// super(sortedSeriesDataSource); -// -// List priorityTimeValuePairReaderByTimestamps = -// new ArrayList<>(); -// int priority = 1; -// -// //data in sealedTsFiles and unSealedTsFile -// if (sortedSeriesDataSource.getSealedTsFiles() != null) { -// SealedTsFileWithTimeStampReader sealedTsFileWithTimeStampReader = new -// SealedTsFileWithTimeStampReader(sortedSeriesDataSource.getSealedTsFiles()); -// priorityTimeValuePairReaderByTimestamps.add(new PrioritySeriesReaderByTimestamp( -// sealedTsFileWithTimeStampReader, new PrioritySeriesReader.Priority(priority++))); -// } -// if (sortedSeriesDataSource.getUnsealedTsFile() != null) { -// UnSealedTsFileWithTimeStampReader unSealedTsFileWithTimeStampReader = new -// UnSealedTsFileWithTimeStampReader(sortedSeriesDataSource.getUnsealedTsFile()); -// priorityTimeValuePairReaderByTimestamps.add(new PrioritySeriesReaderByTimestamp( -// unSealedTsFileWithTimeStampReader, new PrioritySeriesReader.Priority(priority++))); -// } -// //data in memTable -// if (sortedSeriesDataSource.hasRawChunk()) { -// MemChunkReaderByTimestamp rawSeriesChunkReaderByTimestamp = new -// MemChunkReaderByTimestamp(sortedSeriesDataSource.getReadableMemChunk()); -// priorityTimeValuePairReaderByTimestamps.add(new PrioritySeriesReaderByTimestamp( -// rawSeriesChunkReaderByTimestamp, new PrioritySeriesReader.Priority(priority++))); -// } -// -// priorityMergeSortTimeValuePairReader = new PriorityMergeReaderByTimestamp( -// priorityTimeValuePairReaderByTimestamps); -// currentTimestamp = Long.MIN_VALUE; -// } -// -// @Override -// public boolean hasNext() throws IOException { -// return priorityMergeSortTimeValuePairReader.hasNext(); -// } -// -// @Override -// public TimeValuePair next() throws IOException { -// return priorityMergeSortTimeValuePairReader.next(); -// } -// -// /** -// * @param timestamp -// * @return If there is no TimeValuePair whose timestamp equals to given timestamp, -// * then return null. -// * @throws IOException -// */ -// @Override -// public TsPrimitiveType getValueInTimestamp(long timestamp) throws IOException { -// setCurrentTimestamp(timestamp); -// return priorityMergeSortTimeValuePairReader.getValueInTimestamp(timestamp); -// } -// -// -// public void setCurrentTimestamp(long currentTimestamp) { -// this.currentTimestamp = currentTimestamp; -// } -// -// private class SealedTsFileWithTimeStampReader extends SequenceDataReader.SealedTsFilesReader -// implements -// EngineReaderByTimeStamp { -// -// private boolean hasCacheLastTimeValuePair; -// private TimeValuePair cachedTimeValuePair; -// -// private SealedTsFileWithTimeStampReader(List sealedTsFiles) { -// super(sealedTsFiles); -// hasCacheLastTimeValuePair = false; -// } -// -// @Override -// public boolean hasNext() throws IOException { -// //hasCached -// if (hasCacheLastTimeValuePair && cachedTimeValuePair.getTimestamp() >= currentTimestamp) { -// return true; -// } -// //tsFileReader has initialized -// if (singleTsFileReaderInitialized) { -// TsPrimitiveType value = ((SeriesReaderFromSingleFileByTimestampImpl) -// tsFileReader).getValueInTimestamp(currentTimestamp); -// if (value != null) { -// hasCacheLastTimeValuePair = true; -// cachedTimeValuePair = new TimeValuePair(currentTimestamp, value); -// return true; -// } else { -// if (tsFileReader.hasNext()) { -// return true; -// } else { -// singleTsFileReaderInitialized = false; -// } -// } -// } -// -// while ((usedIntervalFileIndex + 1) < sealedTsFiles.size()) { -// if (!singleTsFileReaderInitialized) { -// IntervalFileNode fileNode = sealedTsFiles.get(++usedIntervalFileIndex); -// //currentTimestamp<=maxTimestamp -// if (singleTsFileSatisfied(fileNode)) { -// initSingleTsFileReader(fileNode); -// singleTsFileReaderInitialized = true; -// } else { -// continue; -// } -// } -// //tsFileReader has already initialized -// TsPrimitiveType value = ((SeriesReaderFromSingleFileByTimestampImpl) -// tsFileReader).getValueInTimestamp(currentTimestamp); -// if (value != null) { -// hasCacheLastTimeValuePair = true; -// cachedTimeValuePair = new TimeValuePair(currentTimestamp, value); -// return true; -// } else { -// if (tsFileReader.hasNext()) { -// return true; -// } else { -// singleTsFileReaderInitialized = false; -// } -// } -// } -// return false; -// } -// -// @Override -// public TimeValuePair next() throws IOException { -// if (hasCacheLastTimeValuePair) { -// hasCacheLastTimeValuePair = false; -// return cachedTimeValuePair; -// } else { -// return tsFileReader.next(); -// } -// } -// -// protected boolean singleTsFileSatisfied(IntervalFileNode fileNode) { -// -// if (fileNode.getStartTime(seriesPath.getDevice()) == -1) { -// return false; -// } -// long maxTime = fileNode.getEndTime(seriesPath.getDevice()); -// return currentTimestamp <= maxTime; -// } -// -// protected void initSingleTsFileReader(IntervalFileNode fileNode) throws IOException { -// RandomAccessFile raf = FileReaderManager.getInstance().get(jobId, fileNode.getFilePath()); -// ITsRandomAccessFileReader randomAccessFileReader = new TsRandomAccessLocalFileReader(raf); -// tsFileReader = new SeriesReaderFromSingleFileByTimestampImpl(randomAccessFileReader, seriesPath); -// } -// -// @Override -// public TsPrimitiveType getValueInTimestamp(long timestamp) throws IOException { -// if (hasNext()) { -// cachedTimeValuePair = next(); -// if (cachedTimeValuePair.getTimestamp() == timestamp) { -// return cachedTimeValuePair.getValue(); -// } else { -// hasCacheLastTimeValuePair = true; -// } -// } -// return null; -// } -// } -// -// protected class UnSealedTsFileWithTimeStampReader extends SequenceDataReader. -// UnSealedTsFileReader implements EngineReaderByTimeStamp { -// -// public UnSealedTsFileWithTimeStampReader(UnsealedTsFile unsealedTsFile) throws IOException { -// super(unsealedTsFile); -// } -// -// @Override -// public boolean hasNext() throws IOException { -// return tsFileReader.hasNext(); -// } -// -// @Override -// public TimeValuePair next() throws IOException { -// return tsFileReader.next(); -// } -// -// protected void initSingleTsFileReader(ITsRandomAccessFileReader randomAccessFileReader, -// SeriesChunkLoader seriesChunkLoader, -// List encodedSeriesChunkDescriptorList) { -// tsFileReader = new SeriesReaderFromSingleFileByTimestampImpl(randomAccessFileReader, -// seriesChunkLoader, -// encodedSeriesChunkDescriptorList); -// } -// -// @Override -// public TsPrimitiveType getValueInTimestamp(long timestamp) throws IOException { -// return ((EngineReaderByTimeStamp) tsFileReader).getValueInTimestamp(timestamp); -// } -// } -// -// } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/UnSealedTsFileReader.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/UnSealedTsFileReader.java index 597eb340f..0dda8c5a6 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/UnSealedTsFileReader.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/UnSealedTsFileReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.sequence; @@ -38,7 +37,7 @@ public class UnSealedTsFileReader implements IReader { protected Path seriesPath; - private FileSeriesReader unSealedTsFileReader; + private FileSeriesReader unSealedReader; private BatchData data; /** @@ -55,10 +54,10 @@ public UnSealedTsFileReader(UnsealedTsFile unsealedTsFile, Filter filter) throws ChunkLoader chunkLoader = new ChunkLoaderImpl(unClosedTsFileReader); if (filter == null) { - unSealedTsFileReader = new FileSeriesReaderWithoutFilter(chunkLoader, + unSealedReader = new FileSeriesReaderWithoutFilter(chunkLoader, unsealedTsFile.getChunkMetaDataList()); } else { - unSealedTsFileReader = new FileSeriesReaderWithFilter(chunkLoader, + unSealedReader = new FileSeriesReaderWithFilter(chunkLoader, unsealedTsFile.getChunkMetaDataList(), filter); } @@ -68,10 +67,10 @@ public UnSealedTsFileReader(UnsealedTsFile unsealedTsFile, Filter filter) throws @Override public boolean hasNext() throws IOException { if (data == null || !data.hasNext()) { - if (!unSealedTsFileReader.hasNextBatch()) { + if (!unSealedReader.hasNextBatch()) { return false; } - data = unSealedTsFileReader.nextBatch(); + data = unSealedReader.nextBatch(); } return data.hasNext(); @@ -91,8 +90,8 @@ public void skipCurrentTimeValuePair() { @Override public void close() throws IOException { - if (unSealedTsFileReader != null) { - unSealedTsFileReader.close(); + if (unSealedReader != null) { + unSealedReader.close(); } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/unsequence/EngineChunkReader.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/unsequence/EngineChunkReader.java index 8cf8164ed..e49e968f5 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/unsequence/EngineChunkReader.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/unsequence/EngineChunkReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.unsequence; @@ -74,19 +73,16 @@ public void close() throws IOException { this.unClosedTsFileReader.close(); } - // TODO @Override public boolean hasNextBatch() { return false; } - // TODO @Override public BatchData nextBatch() { return null; } - // TODO @Override public BatchData currentBatch() { return null; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java b/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java index fd3e87e4e..292ca0e21 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.timegenerator; @@ -31,39 +30,18 @@ public class EngineLeafNode implements Node { private BatchData data = null; - private boolean gotData = false; - public EngineLeafNode(IReader reader) { this.reader = reader; } @Override public boolean hasNext() throws IOException { - return reader.hasNext(); - - // if (gotData) { - // data.next(); - // gotData = false; - // } - // - // if (data == null || !data.hasNext()) { - // if (reader.hasNextBatch()) - // data = reader.nextBatch(); - // else - // return false; - // } - // - // return data.hasNext(); } @Override public long next() throws IOException { return reader.next().getTimestamp(); - - // long time = data.currentTime(); - // gotData = true; - // return time; } /** diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java b/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java index 0089b37a9..7e17ac2fc 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.timegenerator; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java index e1b0b6ce2..fda9e109b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.timegenerator; @@ -61,9 +60,9 @@ public long next() throws IOException { return operatorNode.next(); } - // TODO implement the optimization @Override public Object getValue(Path path, long time) { + // TODO implement the optimization return null; } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/CloseMergeService.java b/iotdb/src/main/java/org/apache/iotdb/db/service/CloseMergeService.java index 276cdbebc..379b9c239 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/CloseMergeService.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/CloseMergeService.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; @@ -41,10 +40,10 @@ public class CloseMergeService implements IService { private static final Logger LOGGER = LoggerFactory.getLogger(CloseMergeService.class); private static IoTDBConfig dbConfig = IoTDBDescriptor.getInstance().getConfig(); - private static final long mergeDelay = dbConfig.periodTimeForMerge; - private static final long closeDelay = dbConfig.periodTimeForFlush; - private static final long mergePeriod = dbConfig.periodTimeForMerge; - private static final long closePeriod = dbConfig.periodTimeForFlush; + private static final long MERGE_DELAY = dbConfig.periodTimeForMerge; + private static final long CLOSE_DELAY = dbConfig.periodTimeForFlush; + private static final long MERGE_PERIOD = dbConfig.periodTimeForMerge; + private static final long CLOSE_PERIOD = dbConfig.periodTimeForFlush; private static CloseMergeService CLOSE_MERGE_SERVICE = new CloseMergeService(); private MergeServiceThread mergeService = new MergeServiceThread(); private CloseServiceThread closeService = new CloseServiceThread(); @@ -100,7 +99,7 @@ public void closeService() { isStart = false; synchronized (service) { service.shutdown(); - service.notify(); + service.notifyAll(); } CLOSE_MERGE_SERVICE = null; LOGGER.info("Shutdown close and merge service successfully."); @@ -140,14 +139,15 @@ public CloseAndMergeDaemon() { @Override public void run() { - service.scheduleWithFixedDelay(mergeService, mergeDelay, mergePeriod, TimeUnit.SECONDS); - service.scheduleWithFixedDelay(closeService, closeDelay, closePeriod, TimeUnit.SECONDS); + service.scheduleWithFixedDelay(mergeService, MERGE_DELAY, MERGE_PERIOD, TimeUnit.SECONDS); + service.scheduleWithFixedDelay(closeService, CLOSE_DELAY, CLOSE_PERIOD, TimeUnit.SECONDS); while (!service.isShutdown()) { synchronized (service) { try { service.wait(); } catch (InterruptedException e) { - e.printStackTrace(); + LOGGER.error("CLose and merge error.", e); + Thread.currentThread().interrupt(); } } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IService.java b/iotdb/src/main/java/org/apache/iotdb/db/service/IService.java index 285423eca..c73ec07fa 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/IService.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/IService.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java index 02d1900ca..841027d43 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; @@ -142,7 +141,7 @@ private void initErrorInformation() { */ private void systemDataRecovery() throws RecoverException { LOGGER.info("{}: start checking write log...", IoTDBConstant.GLOBAL_DB_NAME); - // QueryProcessor processor = new QueryProcessor(new OverflowQPExecutor()); + WriteLogNodeManager writeLogManager = MultiFileLogNodeManager.getInstance(); List filenodeNames = null; try { diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java index a085cacc0..0892127db 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java b/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java index b243fac25..cb7dd49e8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java b/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java index 62243d6ba..10c46f262 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java b/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java index 35a610482..bc3d0a6b9 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JMXService.java b/iotdb/src/main/java/org/apache/iotdb/db/service/JMXService.java index eb203b8eb..f20302c3a 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/JMXService.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/JMXService.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/Monitor.java b/iotdb/src/main/java/org/apache/iotdb/db/service/Monitor.java index 68bc6cfb4..2d1af93f0 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/Monitor.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/Monitor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java b/iotdb/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java index d6ee60bed..0e92c756b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/RegisterManager.java b/iotdb/src/main/java/org/apache/iotdb/db/service/RegisterManager.java index 0f8b854f3..5a9f327ea 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/RegisterManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/RegisterManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/ServiceType.java b/iotdb/src/main/java/org/apache/iotdb/db/service/ServiceType.java index 7473b8dbc..61ae722b1 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/ServiceType.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/ServiceType.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/StartupCheck.java b/iotdb/src/main/java/org/apache/iotdb/db/service/StartupCheck.java index c6eaa66c0..79901953c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/StartupCheck.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/StartupCheck.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java b/iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java index f854670af..f4bdb7961 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java index a85567949..2423a2296 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java b/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java index f6297c041..0e8566cff 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.service; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java index 4ea6a460e..46d5cc596 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java index aa589daaf..6a69a754b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql.parse; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java index 2dcebf990..f91de9df8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql.parse; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java index bddf4d19a..7cf5bc245 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql.parse; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/Node.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/Node.java index 66c5ee00f..9d4afb234 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/Node.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/Node.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql.parse; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java index 5890e7f19..349a2e911 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql.parse; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java index 0f8bd4611..585946898 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql.parse; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java index ab85cc461..711c2b61d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql.parse; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java index 17b2d8493..9a1c50a8f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql.parse; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java index 3f7de77a1..28c52002c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; @@ -186,14 +185,14 @@ public static boolean checkPrivilege(String path, int privilegeId, } for (PathPrivilege pathPrivilege : privilegeList) { if (path != null) { - if (pathPrivilege.path != null && AuthUtils.pathBelongsTo(path, pathPrivilege.path)) { - if (pathPrivilege.privileges.contains(privilegeId)) { + if (pathPrivilege.getPath() != null && AuthUtils.pathBelongsTo(path, pathPrivilege.getPath())) { + if (pathPrivilege.getPrivileges().contains(privilegeId)) { return true; } } } else { - if (pathPrivilege.path == null) { - if (pathPrivilege.privileges.contains(privilegeId)) { + if (pathPrivilege.getPath() == null) { + if (pathPrivilege.getPrivileges().contains(privilegeId)) { return true; } } @@ -216,12 +215,12 @@ public static Set getPrivileges(String path, List privil Set privileges = new HashSet<>(); for (PathPrivilege pathPrivilege : privilegeList) { if (path != null) { - if (pathPrivilege.path != null && AuthUtils.pathBelongsTo(path, pathPrivilege.path)) { - privileges.addAll(pathPrivilege.privileges); + if (pathPrivilege.getPath() != null && AuthUtils.pathBelongsTo(path, pathPrivilege.getPath())) { + privileges.addAll(pathPrivilege.getPrivileges()); } } else { - if (pathPrivilege.path == null) { - privileges.addAll(pathPrivilege.privileges); + if (pathPrivilege.getPath() == null) { + privileges.addAll(pathPrivilege.getPrivileges()); } } } @@ -239,8 +238,8 @@ public static Set getPrivileges(String path, List privil public static boolean hasPrivilege(String path, int privilegeId, List privilegeList) { for (PathPrivilege pathPrivilege : privilegeList) { - if (pathPrivilege.path.equals(path) && pathPrivilege.privileges.contains(privilegeId)) { - pathPrivilege.referenceCnt.incrementAndGet(); + if (pathPrivilege.getPath().equals(path) && pathPrivilege.getPrivileges().contains(privilegeId)) { + pathPrivilege.getReferenceCnt().incrementAndGet(); return true; } } @@ -256,12 +255,12 @@ public static boolean hasPrivilege(String path, int privilegeId, */ public static void addPrivilege(String path, int privilgeId, List privilegeList) { for (PathPrivilege pathPrivilege : privilegeList) { - if (pathPrivilege.path.equals(path)) { + if (pathPrivilege.getPath().equals(path)) { if (privilgeId != PrivilegeType.ALL.ordinal()) { - pathPrivilege.privileges.add(privilgeId); + pathPrivilege.getPrivileges().add(privilgeId); } else { for (PrivilegeType privilegeType : PrivilegeType.values()) { - pathPrivilege.privileges.add(privilegeType.ordinal()); + pathPrivilege.getPrivileges().add(privilegeType.ordinal()); } } return; @@ -269,10 +268,10 @@ public static void addPrivilege(String path, int privilgeId, List } PathPrivilege pathPrivilege = new PathPrivilege(path); if (privilgeId != PrivilegeType.ALL.ordinal()) { - pathPrivilege.privileges.add(privilgeId); + pathPrivilege.getPrivileges().add(privilgeId); } else { for (PrivilegeType privilegeType : PrivilegeType.values()) { - pathPrivilege.privileges.add(privilegeType.ordinal()); + pathPrivilege.getPrivileges().add(privilegeType.ordinal()); } } privilegeList.add(pathPrivilege); @@ -289,14 +288,14 @@ public static void removePrivilege(String path, int privilgeId, List privilegeList) { PathPrivilege emptyPrivilege = null; for (PathPrivilege pathPrivilege : privilegeList) { - if (pathPrivilege.path.equals(path)) { + if (pathPrivilege.getPath().equals(path)) { if (privilgeId != PrivilegeType.ALL.ordinal()) { - pathPrivilege.privileges.remove(privilgeId); + pathPrivilege.getPrivileges().remove(privilgeId); } else { privilegeList.remove(pathPrivilege); return; } - if (pathPrivilege.privileges.size() == 0) { + if (pathPrivilege.getPrivileges().size() == 0) { emptyPrivilege = pathPrivilege; } break; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java index 9f6d135e8..308c15a7d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; @@ -27,7 +26,7 @@ public class CommonUtils { - public static int javaVersion = CommonUtils.getJdkVersion(); + public static final int javaVersion = CommonUtils.getJdkVersion(); /** * get JDK version. diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java index f0cb2d64b..6db7deed9 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/FileUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/FileUtils.java index 78cef9a92..114110b5a 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/FileUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/FileUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/IOUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/IOUtils.java index 8120813e5..8da60e2ef 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/IOUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/IOUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; @@ -130,7 +129,7 @@ public static PathPrivilege readPathPrivilege(DataInputStream inputStream, Strin int privilegeNum = inputStream.readInt(); PathPrivilege pathPrivilege = new PathPrivilege(path); for (int i = 0; i < privilegeNum; i++) { - pathPrivilege.privileges.add(inputStream.readInt()); + pathPrivilege.getPrivileges().add(inputStream.readInt()); } return pathPrivilege; } @@ -149,9 +148,9 @@ public static void writePathPrivilege(OutputStream outputStream, PathPrivilege p String encoding, ThreadLocal encodingBufferLocal) throws IOException { - writeString(outputStream, pathPrivilege.path, encoding, encodingBufferLocal); - writeInt(outputStream, pathPrivilege.privileges.size(), encodingBufferLocal); - for (Integer i : pathPrivilege.privileges) { + writeString(outputStream, pathPrivilege.getPath(), encoding, encodingBufferLocal); + writeInt(outputStream, pathPrivilege.getPrivileges().size(), encodingBufferLocal); + for (Integer i : pathPrivilege.getPrivileges()) { writeInt(outputStream, i, encodingBufferLocal); } } @@ -166,7 +165,10 @@ public static void writePathPrivilege(OutputStream outputStream, PathPrivilege p public static void replaceFile(File newFile, File oldFile) throws IOException { if (!newFile.renameTo(oldFile)) { // some OSs need to delete the old file before renaming to it - oldFile.delete(); + if(!oldFile.delete()){ + throw new IOException( + String.format("Cannot delete old user file : %s", oldFile.getPath())); + } if (!newFile.renameTo(oldFile)) { throw new IOException( String.format("Cannot replace old user file with new one : %s", newFile.getPath())); diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java index 500de42e4..c1720ad25 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; @@ -84,8 +83,7 @@ private String loadLocalDataOnePass(String inputCsvDataPath) { try { this.extraDataFileWriter = new BufferedWriter(new FileWriter(extraDataFile)); } catch (IOException e) { - LOG.error("create"); - e.printStackTrace(); + LOG.error("create", e); close(); return null; } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/MemUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/MemUtils.java index 8887cbd36..f1ac22b4c 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/MemUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/MemUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; @@ -51,19 +50,19 @@ public static long getRecordSize(TSRecord record) { private static long getPointSize(DataPoint dataPoint) { switch (dataPoint.getType()) { case INT32: - return 8 + 4; + return 8 + 4L; case INT64: - return 8 + 8; + return 8 + 8L; case FLOAT: - return 8 + 4; + return 8 + 4L; case DOUBLE: - return 8 + 8; + return 8 + 8L; case BOOLEAN: - return 8 + 1; + return 8 + 1L; case TEXT: return 8 + dataPoint.getValue().toString().length() * 2; default: - return 8 + 8; + return 8 + 8L; } } @@ -95,7 +94,7 @@ public static long getTsRecordMemOverflow(TSRecord record) { */ public static long getStringMem(String str) { // wide char (2 bytes each) and 64B String overhead - return str.length() * 2 + 64; + return str.length() * 2 + 64L; } /** diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java index 6cf57706b..5e956384d 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,17 +9,25 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; +import com.sun.management.UnixOperatingSystemMXBean; import java.io.BufferedReader; +import java.io.File; +import java.io.FileDescriptor; import java.io.IOException; import java.io.InputStreamReader; +import java.lang.management.ManagementFactory; +import java.lang.management.OperatingSystemMXBean; +import java.nio.channels.FileChannel; +import java.nio.file.StandardOpenOption; import java.util.Collections; import java.util.EnumMap; import java.util.List; @@ -32,8 +38,9 @@ import org.slf4j.LoggerFactory; // Notice : statistics in this class may not be accurate because of limited user authority. +// TODO: now only TOTAL_OPEN_FILE_NUM is general avaiable on multiple Linux-like OSs. public class OpenFileNumUtil { - + private static final Logger log = LoggerFactory.getLogger(OpenFileNumUtil.class); private static final int PID_ERROR_CODE = -1; private static final int UNSUPPORTED_OS_ERROR_CODE = -2; private static final int UNKNOWN_STATISTICS_ERROR_CODE = -3; @@ -42,14 +49,17 @@ public class OpenFileNumUtil { private static final String MAC_OS_NAME = "mac"; private static final String SEARCH_PID_LINUX = "ps -aux | grep -i %s | grep -v grep"; private static final String SEARCH_PID_MAC = "ps aux | grep -i %s | grep -v grep"; + //TODO lsof command is only avaiable on some OSs. private static final String SEARCH_OPEN_DATA_FILE_BY_PID = "lsof -p %d"; - private static Logger log = LoggerFactory.getLogger(OpenFileNumUtil.class); + private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); private static Directories directories = Directories.getInstance(); private final String[] cmds = {"/bin/bash", "-c", ""}; private int pid; private String processName; + OperatingSystemMXBean os = ManagementFactory.getOperatingSystemMXBean(); + /** * constructor, process key word is defined by IOTDB_PROCESS_KEY_WORD. */ @@ -184,12 +194,20 @@ private EnumMap getOpenFile(int pid) { } in.close(); pro.destroy(); - } catch (IOException e) { + } catch (Exception e) { log.error("Cannot get open file number of IoTDB process because of {}", e.getMessage()); } return resultMap; } + private long getCurrentOpenedFiles() { + if(os instanceof UnixOperatingSystemMXBean){ + return ((UnixOperatingSystemMXBean) os).getOpenFileDescriptorCount(); + }else { + return UNSUPPORTED_OS_ERROR_CODE; + } + } + /** * Check if runtime OS is supported then return the result list. If pid is abnormal then all * statistics returns -1, if OS is not supported then all statistics returns -2 @@ -226,19 +244,22 @@ private EnumMap getStatisticMap() { * @return open file number */ public int get(OpenFileNumStatistics statistics) { + if(statistics.equals(OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM)){ + return (int) getCurrentOpenedFiles(); + } EnumMap statisticsMap = getStatisticMap(); return statisticsMap.getOrDefault(statistics, UNKNOWN_STATISTICS_ERROR_CODE); } public enum OpenFileNumStatistics { - TOTAL_OPEN_FILE_NUM(null), DATA_OPEN_FILE_NUM( - Collections.singletonList(config.dataDir)), DELTA_OPEN_FILE_NUM( - directories.getAllTsFileFolders()), OVERFLOW_OPEN_FILE_NUM( - Collections.singletonList(config.overflowDataDir)), WAL_OPEN_FILE_NUM( - Collections.singletonList(config.walFolder)), METADATA_OPEN_FILE_NUM( - Collections.singletonList(config.metadataDir)), DIGEST_OPEN_FILE_NUM( - Collections.singletonList(config.fileNodeDir)), SOCKET_OPEN_FILE_NUM( - null); + TOTAL_OPEN_FILE_NUM(null), + DATA_OPEN_FILE_NUM(Collections.singletonList(config.dataDir)), + DELTA_OPEN_FILE_NUM(directories.getAllTsFileFolders()), + OVERFLOW_OPEN_FILE_NUM(Collections.singletonList(config.overflowDataDir)), + WAL_OPEN_FILE_NUM(Collections.singletonList(config.walFolder)), + METADATA_OPEN_FILE_NUM(Collections.singletonList(config.metadataDir)), + DIGEST_OPEN_FILE_NUM(Collections.singletonList(config.fileNodeDir)), + SOCKET_OPEN_FILE_NUM(null); // path is a list of directory corresponding to the OpenFileNumStatistics enum element, // e.g. data/data/ for DATA_OPEN_FILE_NUM diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/PostbackUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/PostbackUtils.java index ce16554ac..c7ca0b5fb 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/PostbackUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/PostbackUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,15 +9,17 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; import java.io.File; +import java.io.IOException; import java.text.DecimalFormat; import java.util.Map; import java.util.Map.Entry; @@ -136,17 +136,23 @@ private static boolean verifyIP(String IPsegment, String IPaddress, int subnetMa } } - public static void deleteFile(File file) { + public static void deleteFile(File file) throws IOException { if (!file.exists()) { return; } if (file.isFile() || file.list().length == 0) { - file.delete(); + if (!file.delete()){ + throw new IOException( + String.format("Cannot delete file : %s", file.getPath())); + } } else { File[] files = file.listFiles(); for (File f : files) { deleteFile(f); - f.delete(); + if(!f.delete()){ + throw new IOException( + String.format("Cannot delete file : %s", f.getPath())); + } } } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/PrimitiveArrayList.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/PrimitiveArrayList.java index dbb777aa0..0ab7d3b64 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/PrimitiveArrayList.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/PrimitiveArrayList.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/PrimitiveArrayListFactory.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/PrimitiveArrayListFactory.java index 695a5eed1..ba7f43ac4 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/PrimitiveArrayListFactory.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/PrimitiveArrayListFactory.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java index 51a7a2ac0..b07f8941b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/RecordUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/RecordUtils.java index 5d57a3e3c..954fa9621 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/RecordUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/RecordUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java index 9f5eac998..900d5928b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; @@ -64,6 +63,11 @@ public boolean equals(Object object) { return false; } + @Override + public int hashCode(){ + return ((Long)timestamp).hashCode() + value.hashCode(); + } + public int getSize() { return 8 + 8 + value.getSize(); } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java index 6f3f41a5a..a9a0e526b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java index e5777b0fc..b3333b0c8 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; @@ -99,9 +98,14 @@ public boolean equals(Object object) { .equals(getValue())); } + @Override + public int hashCode(){ + return getValue().hashCode(); + } + public static class TsBoolean extends TsPrimitiveType { - public boolean value; + private boolean value; public TsBoolean(boolean value) { this.value = value; @@ -135,7 +139,7 @@ public TSDataType getDataType() { public static class TsInt extends TsPrimitiveType { - public int value; + private int value; public TsInt(int value) { this.value = value; @@ -169,7 +173,7 @@ public TSDataType getDataType() { public static class TsLong extends TsPrimitiveType { - public long value; + private long value; public TsLong(long value) { this.value = value; @@ -203,7 +207,7 @@ public Object getValue() { public static class TsFloat extends TsPrimitiveType { - public float value; + private float value; public TsFloat(float value) { this.value = value; @@ -237,7 +241,7 @@ public TSDataType getDataType() { public static class TsDouble extends TsPrimitiveType { - public double value; + private double value; public TsDouble(double value) { this.value = value; @@ -271,7 +275,7 @@ public TSDataType getDataType() { public static class TsBinary extends TsPrimitiveType { - public Binary value; + private Binary value; public TsBinary(Binary value) { this.value = value; @@ -302,4 +306,15 @@ public TSDataType getDataType() { return TSDataType.TEXT; } } + + public static void main(String[] args){ + TsPrimitiveType type1 = new TsBoolean(false); + TsPrimitiveType type2 = new TsBoolean(true); + TsPrimitiveType type3 = new TsBoolean(false); + TsPrimitiveType type4 = new TsDouble(1); + + System.out.println(type1.equals(type2)); + System.out.println(type1.equals(type3)); + System.out.println(type1.equals(type4)); + } } \ No newline at end of file diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/LogPosition.java b/iotdb/src/main/java/org/apache/iotdb/db/writelog/LogPosition.java index eb5c862ad..d32c934a9 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/writelog/LogPosition.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/writelog/LogPosition.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,17 +9,18 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog; public class LogPosition { - public String logPath; - public long startPos; - public long endPos; + private String logPath; + private long startPos; + private long endPos; } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/RecoverStage.java b/iotdb/src/main/java/org/apache/iotdb/db/writelog/RecoverStage.java index e8723ed63..1b3d7057b 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/writelog/RecoverStage.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/writelog/RecoverStage.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java b/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java index 10724f143..e0d52758e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog.io; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java b/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java index 485c95d2c..080b41ffe 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog.io; @@ -26,5 +25,7 @@ public interface ILogWriter { void write(List logCache) throws IOException; + void force() throws IOException; + void close() throws IOException; } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java b/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java index af3e0e11e..ee28b8ed0 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog.io; @@ -26,12 +25,16 @@ import java.nio.channels.FileChannel; import java.util.List; import java.util.zip.CRC32; +import org.apache.iotdb.db.conf.IoTDBConfig; +import org.apache.iotdb.db.conf.IoTDBDescriptor; public class LogWriter implements ILogWriter { private File logFile; + private FileOutputStream fileOutputStream; private FileChannel outputStream; private CRC32 checkSummer = new CRC32(); + private IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); public LogWriter(String logFilePath) { logFile = new File(logFilePath); @@ -40,7 +43,8 @@ public LogWriter(String logFilePath) { @Override public void write(List logCache) throws IOException { if (outputStream == null) { - outputStream = new FileOutputStream(logFile, true).getChannel(); + fileOutputStream = new FileOutputStream(logFile, true); + outputStream = fileOutputStream.getChannel(); } int totalSize = 0; for (byte[] bytes : logCache) { @@ -56,12 +60,23 @@ public void write(List logCache) throws IOException { } buffer.flip(); outputStream.write(buffer); - outputStream.force(true); + if (config.forceWalPeriodInMs == 0) { + outputStream.force(true); + } + } + + @Override + public void force() throws IOException { + if (outputStream != null) { + outputStream.force(true); + } } @Override public void close() throws IOException { if (outputStream != null) { + fileOutputStream.close(); + fileOutputStream = null; outputStream.close(); outputStream = null; } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/RAFLogReader.java b/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/RAFLogReader.java index 9f50d7ddd..ba3bd9fad 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/RAFLogReader.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/RAFLogReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog.io; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java b/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java index a675baf1c..1a1bd684f 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog.manager; @@ -44,7 +43,9 @@ public class MultiFileLogNodeManager implements WriteLogNodeManager, IService { private Map nodeMap; private Thread syncThread; + private Thread forceThread; private IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); + private final Runnable syncTask = new Runnable() { @Override public void run() { @@ -66,6 +67,35 @@ public void run() { Thread.sleep(config.flushWalPeriodInMs); } catch (InterruptedException e) { logger.info("WAL sync thread exits."); + Thread.currentThread().interrupt(); + break; + } + } + } + }; + + private final Runnable forceTask = new Runnable() { + @Override + public void run() { + while (true) { + if (Thread.interrupted()) { + logger.info("WAL force thread exits."); + break; + } + logger.debug("Timed force starts, {} nodes to be flushed", nodeMap.size()); + for (WriteLogNode node : nodeMap.values()) { + try { + node.force(); + } catch (IOException e) { + logger.error("Cannot force {}, because {}", node.toString(), e.toString()); + } + } + logger.debug("Timed force finished"); + try { + Thread.sleep(config.forceWalPeriodInMs); + } catch (InterruptedException e) { + logger.info("WAL force thread exits."); + Thread.currentThread().interrupt(); break; } } @@ -123,16 +153,24 @@ public void recover() throws RecoverException { @Override public void close() { - if (syncThread == null || !syncThread.isAlive()) { + if (!isActivated(syncThread) && !isActivated(forceThread)) { logger.error("MultiFileLogNodeManager has not yet started"); return; } - logger.info("LogNodeManager starts closing.."); - syncThread.interrupt(); - logger.info("Waiting for sync thread to stop"); - while (syncThread.isAlive()) { - // wait + if (isActivated(syncThread)) { + syncThread.interrupt(); + logger.info("Waiting for sync thread to stop"); + while (syncThread.isAlive()) { + // wait for syncThread + } + } + if (isActivated(forceThread)) { + forceThread.interrupt(); + logger.info("Waiting for force thread to stop"); + while (forceThread.isAlive()) { + // wait for forceThread + } } logger.info("{} nodes to be closed", nodeMap.size()); for (WriteLogNode node : nodeMap.values()) { @@ -179,10 +217,15 @@ public void start() throws StartupException { if (!config.enableWal) { return; } - if (syncThread == null || !syncThread.isAlive()) { + if (!isActivated(syncThread)) { InstanceHolder.instance.syncThread = new Thread(InstanceHolder.instance.syncTask, ThreadName.WAL_DAEMON.getName()); InstanceHolder.instance.syncThread.start(); + if (config.forceWalPeriodInMs > 0 && !isActivated(forceThread)) { + InstanceHolder.instance.forceThread = new Thread(InstanceHolder.instance.forceTask, + ThreadName.WAL_FORCE_DAEMON.getName()); + InstanceHolder.instance.forceThread.start(); + } } else { logger.warn("MultiFileLogNodeManager has already started"); } @@ -207,6 +250,10 @@ public ServiceType getID() { return ServiceType.WAL_SERVICE; } + private boolean isActivated(Thread thread) { + return thread != null && thread.isAlive(); + } + private static class InstanceHolder { private static MultiFileLogNodeManager instance = new MultiFileLogNodeManager(); diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java b/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java index 8d61686a7..cf0339bc3 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog.manager; diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java b/iotdb/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java index cc8c65f5d..3ebbfc998 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog.node; @@ -65,6 +64,8 @@ public class ExclusiveWriteLogNode implements WriteLogNode, Comparable roleNames = accessor.listAllRoles(); roleNames.sort(null); for (int i = 0; i < roleNames.size(); i++) { - assertEquals(roles[i].name, roleNames.get(i)); + assertEquals(roles[i].getName(), roleNames.get(i)); } } } diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java index 8e6330360..421709073 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java index 09fe66649..1027fddaa 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth; @@ -58,23 +57,23 @@ public void test() throws AuthException { roles[i] = new Role("role" + i); for (int j = 0; j <= i; j++) { PathPrivilege pathPrivilege = new PathPrivilege("root.a.b.c" + j); - pathPrivilege.privileges.add(j); - roles[i].privilegeList.add(pathPrivilege); + pathPrivilege.getPrivileges().add(j); + roles[i].getPrivilegeList().add(pathPrivilege); } } // create - Role role = manager.getRole(roles[0].name); + Role role = manager.getRole(roles[0].getName()); assertEquals(null, role); for (Role role1 : roles) { - assertEquals(true, manager.createRole(role1.name)); + assertEquals(true, manager.createRole(role1.getName())); } for (Role role1 : roles) { - role = manager.getRole(role1.name); - assertEquals(role1.name, role.name); + role = manager.getRole(role1.getName()); + assertEquals(role1.getName(), role.getName()); } - assertEquals(false, manager.createRole(roles[0].name)); + assertEquals(false, manager.createRole(roles[0].getName())); boolean caught = false; try { manager.createRole("too"); @@ -85,19 +84,19 @@ public void test() throws AuthException { // delete assertEquals(false, manager.deleteRole("not a role")); - assertEquals(true, manager.deleteRole(roles[roles.length - 1].name)); - assertEquals(null, manager.getRole(roles[roles.length - 1].name)); - assertEquals(false, manager.deleteRole(roles[roles.length - 1].name)); + assertEquals(true, manager.deleteRole(roles[roles.length - 1].getName())); + assertEquals(null, manager.getRole(roles[roles.length - 1].getName())); + assertEquals(false, manager.deleteRole(roles[roles.length - 1].getName())); // grant privilege - role = manager.getRole(roles[0].name); + role = manager.getRole(roles[0].getName()); String path = "root.a.b.c"; int privilegeId = 0; assertEquals(false, role.hasPrivilege(path, privilegeId)); - assertEquals(true, manager.grantPrivilegeToRole(role.name, path, privilegeId)); - assertEquals(true, manager.grantPrivilegeToRole(role.name, path, privilegeId + 1)); - assertEquals(false, manager.grantPrivilegeToRole(role.name, path, privilegeId)); - role = manager.getRole(roles[0].name); + assertEquals(true, manager.grantPrivilegeToRole(role.getName(), path, privilegeId)); + assertEquals(true, manager.grantPrivilegeToRole(role.getName(), path, privilegeId + 1)); + assertEquals(false, manager.grantPrivilegeToRole(role.getName(), path, privilegeId)); + role = manager.getRole(roles[0].getName()); assertEquals(true, role.hasPrivilege(path, privilegeId)); caught = false; try { @@ -108,16 +107,16 @@ public void test() throws AuthException { assertEquals(true, caught); caught = false; try { - manager.grantPrivilegeToRole(role.name, path, -1); + manager.grantPrivilegeToRole(role.getName(), path, -1); } catch (AuthException e) { caught = true; } assertEquals(true, caught); // revoke privilege - role = manager.getRole(roles[0].name); - assertEquals(true, manager.revokePrivilegeFromRole(role.name, path, privilegeId)); - assertEquals(false, manager.revokePrivilegeFromRole(role.name, path, privilegeId)); + role = manager.getRole(roles[0].getName()); + assertEquals(true, manager.revokePrivilegeFromRole(role.getName(), path, privilegeId)); + assertEquals(false, manager.revokePrivilegeFromRole(role.getName(), path, privilegeId)); caught = false; try { manager.revokePrivilegeFromRole("not a role", path, privilegeId); @@ -127,7 +126,7 @@ public void test() throws AuthException { assertEquals(true, caught); caught = false; try { - manager.revokePrivilegeFromRole(role.name, path, -1); + manager.revokePrivilegeFromRole(role.getName(), path, -1); } catch (AuthException e) { caught = true; } @@ -137,7 +136,7 @@ public void test() throws AuthException { List rolenames = manager.listAllRoles(); rolenames.sort(null); for (int i = 0; i < roles.length - 1; i++) { - assertEquals(roles[i].name, rolenames.get(i)); + assertEquals(roles[i].getName(), rolenames.get(i)); } } } diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java index b37757331..4a05ded25 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth; @@ -60,7 +59,7 @@ public void test() throws IOException { users[i] = new User("user" + i, "password" + i); for (int j = 0; j <= i; j++) { PathPrivilege pathPrivilege = new PathPrivilege("root.a.b.c" + j); - pathPrivilege.privileges.add(j); + pathPrivilege.getPrivileges().add(j); users[i].privilegeList.add(pathPrivilege); users[i].roleList.add("role" + j); } diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java index 0370d1f1b..3bb022a81 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.auth; @@ -60,7 +59,7 @@ public void test() throws AuthException { users[i] = new User("user" + i, "password" + i); for (int j = 0; j <= i; j++) { PathPrivilege pathPrivilege = new PathPrivilege("root.a.b.c" + j); - pathPrivilege.privileges.add(j); + pathPrivilege.getPrivileges().add(j); users[i].privilegeList.add(pathPrivilege); users[i].roleList.add("role" + j); } diff --git a/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java index 3cf55c950..a90d33113 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.concurrent; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java b/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java index 5a8cf9f64..40c81791f 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.concurrent; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java index bdbbe38a3..59b26858f 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/PathUtils.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/PathUtils.java index 5c49bded6..2909258c4 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/PathUtils.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/PathUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/ProcessorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/ProcessorTest.java index b8bdfa43f..22cc44a1a 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/ProcessorTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/ProcessorTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteBenchmark.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteBenchmark.java index d5d983e30..8fb564db4 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteBenchmark.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteBenchmark.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.bufferwrite; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorNewTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorNewTest.java index 49283851d..490f408b4 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorNewTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorNewTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.bufferwrite; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorTest.java index 6c7f53db3..5fc74634c 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.bufferwrite; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/RestorableTsFileIOWriterTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/RestorableTsFileIOWriterTest.java index a267a4108..5762a4518 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/RestorableTsFileIOWriterTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/RestorableTsFileIOWriterTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.bufferwrite; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/filenode/SerializeUtilTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/filenode/SerializeUtilTest.java index 18aa7ced5..5411b46b7 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/filenode/SerializeUtilTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/filenode/SerializeUtilTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.filenode; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/filenodev2/FileNodeManagerBenchmark.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/filenodev2/FileNodeManagerBenchmark.java index ec1ad5a4e..97f2383e0 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/filenodev2/FileNodeManagerBenchmark.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/filenodev2/FileNodeManagerBenchmark.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.filenodev2; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java index be9bdaaa5..49fa52a20 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java index c9bef10c9..b86ca4710 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/IoTDBMemControlTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/IoTDBMemControlTest.java index 5fa5cbd6e..8e2b8d154 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/IoTDBMemControlTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/IoTDBMemControlTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/MemControllerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/MemControllerTest.java index 643bfd985..f9ac4cec3 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/MemControllerTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/MemControllerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowFileSizeControlTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowFileSizeControlTest.java index f18dd12f9..c5417e264 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowFileSizeControlTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowFileSizeControlTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowMetaSizeControlTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowMetaSizeControlTest.java index 6feeb94f8..1fcacb372 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowMetaSizeControlTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowMetaSizeControlTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memcontrol; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java index c979597cc..ea5d174ad 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java index b453ce62d..cf5dfa37f 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java index fafa6e2f7..e7f4ce7fe 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.memtable; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowIOTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowIOTest.java index 4eb3d449b..9fd7e7a12 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowIOTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowIOTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessorBenchmark.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessorBenchmark.java index 4b05859d9..ac623331e 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessorBenchmark.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessorBenchmark.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessorTest.java index fe7e2caf7..ae352dadb 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessorTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowProcessorTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowResourceTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowResourceTest.java index a4e21b504..eb5de0fde 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowResourceTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowResourceTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSupportTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSupportTest.java index b24bab37d..616696fd0 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSupportTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowSupportTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowTestUtils.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowTestUtils.java index 9486e5374..80751eead 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowTestUtils.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowTestUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.ioV2; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFFileMetadataTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFFileMetadataTest.java index 7d37e6b3f..715fe3642 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFFileMetadataTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFFileMetadataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.metadata; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFRowGroupListMetadataTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFRowGroupListMetadataTest.java index 2333a7cd0..138a29e6e 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFRowGroupListMetadataTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFRowGroupListMetadataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.metadata; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFSeriesListMetadataTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFSeriesListMetadataTest.java index 437798911..7216731f9 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFSeriesListMetadataTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OFSeriesListMetadataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.metadata; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OverflowTestHelper.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OverflowTestHelper.java index 63fcbf4e2..9b6688674 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OverflowTestHelper.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OverflowTestHelper.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.metadata; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OverflowUtils.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OverflowUtils.java index 94eff7794..a60f9e102 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OverflowUtils.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/metadata/OverflowUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.engine.overflow.metadata; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/exception/ExceptionBuilderTest.java b/iotdb/src/test/java/org/apache/iotdb/db/exception/ExceptionBuilderTest.java index 16a172456..59b9a4f78 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/exception/ExceptionBuilderTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/exception/ExceptionBuilderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.exception; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/Constant.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/Constant.java index eb1987d0a..256b8f2a5 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/Constant.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/Constant.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java similarity index 98% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java index dce857fd7..abf32e9d4 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -38,13 +37,13 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBAuthorizationTest { +public class IoTDBAuthorizationIT { private IoTDB deamon; public static void main(String[] args) throws Exception { for (int i = 0; i < 10; i++) { - IoTDBAuthorizationTest test = new IoTDBAuthorizationTest(); + IoTDBAuthorizationIT test = new IoTDBAuthorizationIT(); test.setUp(); test.authPerformanceTest(); test.tearDown(); diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java similarity index 97% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java index 0e1983736..c50b76d2d 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -38,7 +37,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBCompleteTest { +public class IoTDBCompleteIT { private IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java similarity index 97% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java index fc5022874..ab65f6b81 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -46,7 +45,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBDaemonTest { +public class IoTDBDaemonIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java similarity index 95% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java index 1cefcec37..c7ca5233b 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -51,7 +50,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBEngineTimeGeneratorTest { +public class IoTDBEngineTimeGeneratorIT { private static IoTDB daemon; private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig(); diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java similarity index 94% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java index 981b43625..ffc429a30 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -42,7 +41,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBLargeDataTest { +public class IoTDBLargeDataIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java similarity index 95% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java index e5d64d18c..659cd1efd 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -41,7 +40,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBLimitSlimitTest { +public class IoTDBLimitSlimitIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java similarity index 96% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java index 3eee80e6b..37f2bd728 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -42,7 +41,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBMetadataFetchTest { +public class IoTDBMetadataFetchIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java similarity index 94% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java index 586327b84..018c325a0 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -42,7 +41,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBMultiSeriesTest { +public class IoTDBMultiSeriesIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java similarity index 95% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java index 3bab09fa6..821e162fe 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -51,7 +50,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. In this test case, no unseq insert data. */ -public class IoTDBSequenceDataQueryTest { +public class IoTDBSequenceDataQueryIT { private static IoTDB daemon; private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig(); diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java similarity index 96% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java index 7f4a9c2c7..86b6812a1 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -50,7 +49,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBSeriesReaderTest { +public class IoTDBSeriesReaderIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java similarity index 93% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java index a4f32b14c..6e954d01c 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.integration; @@ -36,7 +35,7 @@ import org.junit.Before; import org.junit.Test; -public class IoTDBTimeZoneTest { +public class IoTDBTimeZoneIT { private static String[] insertSqls = new String[]{"SET STORAGE GROUP TO root.timezone", "CREATE TIMESERIES root.timezone.tz1 WITH DATATYPE = INT32, ENCODING = PLAIN",}; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java b/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java index 020572c5b..4a92d97f2 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java b/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java index 8a15cd5b7..e82e5bd9a 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerEfficiencyTest.java b/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerEfficiencyTest.java index cec0167a6..7cb52efce 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerEfficiencyTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerEfficiencyTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java b/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java index 7fdccab71..721c1ce10 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java b/iotdb/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java index 30da878e8..1888cd498 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.metadata; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/monitor/MonitorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/monitor/MonitorTest.java index ffbbbb94a..ef9a1a806 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/monitor/MonitorTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/monitor/MonitorTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.monitor; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/FileManagerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/FileManagerTest.java index 934dd515d..bae604311 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/FileManagerTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/FileManagerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.sender; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/IoTDBSingleClientPostBackTest.java b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/IoTDBSingleClientPostBackTest.java index 76ba70f12..8fde0cd1e 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/IoTDBSingleClientPostBackTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/IoTDBSingleClientPostBackTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.sender; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/MultipleClientPostBackTest.java b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/MultipleClientPostBackTest.java index 4010346a4..77c102cf5 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/MultipleClientPostBackTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/MultipleClientPostBackTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.postback.sender; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java index a24afcbec..dd3105e63 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.bench; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java index 6b8fc6bec..30d369ecf 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.other; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java index f513ed519..3db5957ca 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.other; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java index dc9ba25c8..f8786a977 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.plan; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java index c3baf92b3..d8ebfa9be 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.plan; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java index ebfbb20ff..83d4906b1 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.plan; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java index dd5c0b1e7..e737d8c7e 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.plan; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java index 59bcc54f1..093fd9301 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.strategy; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java index 36e6aa11a..c80bfcfd9 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.qp.utils; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java b/iotdb/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java index 1f9f8e6ea..da4a4fa0f 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.component; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java index 89c178146..5675fc660 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.control; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/control/OpenedFilePathsManagerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/query/control/OpenedFilePathsManagerTest.java deleted file mode 100644 index 000fdafa1..000000000 --- a/iotdb/src/test/java/org/apache/iotdb/db/query/control/OpenedFilePathsManagerTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.db.query.control; - -public class OpenedFilePathsManagerTest { - -} diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryTokenManagerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryTokenManagerTest.java index da59bff40..3ac15405a 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryTokenManagerTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryTokenManagerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.control; @@ -25,6 +24,6 @@ public class QueryTokenManagerTest { @Test public void test() { - + //TODO } } diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderByTimestampTest.java b/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderByTimestampTest.java index 8355330fe..03771e80f 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderByTimestampTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderByTimestampTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.merge; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderTest.java b/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderTest.java index 634147ece..66ecf06be 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/PriorityMergeReaderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.merge; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/SeriesMergeSortReaderTest.java b/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/SeriesMergeSortReaderTest.java index 0833736d9..f27948e7d 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/SeriesMergeSortReaderTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/query/reader/merge/SeriesMergeSortReaderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.query.reader.merge; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/script/IoTDBStartServerScriptTest.java b/iotdb/src/test/java/org/apache/iotdb/db/script/IoTDBStartServerScriptTest.java index 9aad044ad..f79826766 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/script/IoTDBStartServerScriptTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/script/IoTDBStartServerScriptTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.script; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeUtilsTest.java b/iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeUtilsTest.java index 85914ed93..ace139ba6 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeUtilsTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeUtilsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql; @@ -35,33 +34,13 @@ public class DatetimeUtilsTest { private ZoneOffset zoneOffset; private ZoneId zoneId; - - public static void main(String[] args) throws LogicalOperatorException { - // ZoneId id = ZoneId.of("+08:00"); - // Instant instant = Instant.now(); - // ZoneOffset zoneOffset = id.getRules().getOffset(instant); - // System.out.println(currentOffsetForMyZone); - - // DatetimeUtils.convertDatetimeStrToMillisecond("2019.01.02T15:13:27.689[Asia/Shanghai]", zoneOffset); - // for(String string : ZoneId.getAvailableZoneIds()) { - // ZoneId id = ZoneId.of(string); - // Instant instant = Instant.now(); - // ZoneOffset currentOffsetForMyZone = id.getRules().getOffset(instant); - // System.out.println(string+"--"+currentOffsetForMyZone); - // } - // long timestamp = System.currentTimeMillis(); - // System.out.println(timestamp); - // LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(1546499858912L), - // ZoneId.systemDefault()); - // System.out.println(dateTime); - System.out.println( - DatetimeUtils.convertDatetimeStrToMillisecond("2018-1-1T13:00:07", ZoneId.systemDefault())); - } + // 1546413207689 + // 2019-01-02T15:13:27.689+08:00 + private final long timestamp = 1546413207689L; + private long delta; @Before public void setUp() throws Exception { - zoneOffset = ZonedDateTime.now().getOffset(); - zoneId = ZoneId.systemDefault(); } @After @@ -69,18 +48,35 @@ public void tearDown() throws Exception { } @Test - public void testConvertDatetimeStrToLongWithoutMS() throws LogicalOperatorException { - // 1546413207689 - // 2019-01-02T15:13:27.689+08:00 + public void test1() throws LogicalOperatorException{ + zoneOffset = ZonedDateTime.now().getOffset(); + zoneId = ZoneId.systemDefault(); + if(zoneOffset.toString().equals("Z")){ + delta = 8 * 3600000; + } else { + delta = (8 - Long.parseLong(zoneOffset.toString().split(":")[0])) * 3600000; + } + testConvertDatetimeStrToLongWithoutMS(zoneOffset, zoneId, timestamp - 689 + delta); + testConvertDatetimeStrToLongWithMS(zoneOffset, zoneId, timestamp + delta); + } + + @Test + public void test2() throws LogicalOperatorException{ + zoneOffset = ZoneOffset.UTC; + zoneId = ZoneId.of("Etc/UTC"); + delta = 8 * 3600000; + testConvertDatetimeStrToLongWithoutMS(zoneOffset, zoneId, timestamp - 689 + delta); + testConvertDatetimeStrToLongWithMS(zoneOffset, zoneId, timestamp + delta); + } + + public void testConvertDatetimeStrToLongWithoutMS(ZoneOffset zoneOffset, ZoneId zoneId, long res) throws LogicalOperatorException { String[] timeFormatWithoutMs = new String[]{"2019-01-02 15:13:27", "2019/01/02 15:13:27", "2019.01.02 15:13:27", "2019-01-02T15:13:27", "2019/01/02T15:13:27", "2019.01.02T15:13:27", "2019-01-02 15:13:27" + zoneOffset, "2019/01/02 15:13:27" + zoneOffset, "2019.01.02 15:13:27" + zoneOffset, "2019-01-02T15:13:27" + zoneOffset, "2019/01/02T15:13:27" + zoneOffset, "2019.01.02T15:13:27" + zoneOffset,}; - - long res = 1546413207000L; for (String str : timeFormatWithoutMs) { - Assert.assertEquals(res, DatetimeUtils.convertDatetimeStrToMillisecond(str, zoneOffset)); + Assert.assertEquals(res, DatetimeUtils.convertDatetimeStrToMillisecond(str, zoneOffset, 0)); } for (String str : timeFormatWithoutMs) { @@ -89,10 +85,7 @@ public void testConvertDatetimeStrToLongWithoutMS() throws LogicalOperatorExcept } - @Test - public void testConvertDatetimeStrToLongWithMS() throws LogicalOperatorException { - // 1546413207689 - // 2019-01-02T15:13:27.689+08:00 + public void testConvertDatetimeStrToLongWithMS(ZoneOffset zoneOffset, ZoneId zoneId, long res) throws LogicalOperatorException { String[] timeFormatWithoutMs = new String[]{"2019-01-02 15:13:27.689", "2019/01/02 15:13:27.689", "2019.01.02 15:13:27.689", "2019-01-02T15:13:27.689", "2019/01/02T15:13:27.689", @@ -100,10 +93,8 @@ public void testConvertDatetimeStrToLongWithMS() throws LogicalOperatorException "2019/01/02 15:13:27.689" + zoneOffset, "2019.01.02 15:13:27.689" + zoneOffset, "2019-01-02T15:13:27.689" + zoneOffset, "2019/01/02T15:13:27.689" + zoneOffset, "2019.01.02T15:13:27.689" + zoneOffset,}; - - long res = 1546413207689L; for (String str : timeFormatWithoutMs) { - assertEquals(res, DatetimeUtils.convertDatetimeStrToMillisecond(str, zoneOffset)); + assertEquals(res, DatetimeUtils.convertDatetimeStrToMillisecond(str, zoneOffset, 0)); } for (String str : timeFormatWithoutMs) { @@ -117,4 +108,12 @@ public void createTest() { // ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.of("+08:00")); // System.out.println(zonedDateTime); } + + public static void main(String[] args){ +// System.out.println(DatetimeUtils.toZoneOffset(ZoneId.of("Etc/UTC"))); + for(String zoneId : ZoneId.getAvailableZoneIds()){ + System.out.println(zoneId + ": " + DatetimeUtils.toZoneOffset(ZoneId.of(zoneId))); + } +// System.out.println(ZoneOffset.of("+00:00")); + } } diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java b/iotdb/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java index 819aeb311..03a09dbc1 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.sql; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java index f1a26ddc2..3b0c5996f 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java b/iotdb/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java index 69d2640bc..efab19350 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,24 +9,28 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; import static org.junit.Assert.assertEquals; +import com.sun.management.UnixOperatingSystemMXBean; import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.lang.management.ManagementFactory; +import java.lang.management.OperatingSystemMXBean; import java.lang.management.RuntimeMXBean; import java.nio.file.Files; import java.util.ArrayList; import org.apache.commons.io.FileUtils; +import org.apache.iotdb.db.utils.OpenFileNumUtil.OpenFileNumStatistics; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -55,7 +57,9 @@ public class OpenFileNumUtilTest { private static int getProcessID() { RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean(); - return Integer.parseInt(runtimeMXBean.getName().split("@")[0]); + int pid = Integer.parseInt(runtimeMXBean.getName().split("@")[0]); + System.out.println("Test process ID of OpenFileNumUtilTest is " + pid); + return pid; } @Before @@ -64,14 +68,13 @@ public void setUp() { openFileNumUtil.setPid(testProcessID); String dataFilePath = OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM.getPath().get(0); String userDir = System.getProperty("user.dir"); - currDir = userDir + File.separator + testProcessID + File.separator + dataFilePath; + currDir = userDir + File.separator + testProcessID; + testDataDirRoot = new File(currDir); + currDir = currDir + File.separator + dataFilePath; File testDataDir = new File(currDir); - testDataDirRoot = new File(userDir + File.separator + testProcessID); - if (!testDataDir.exists()) { - if (!testDataDir.isDirectory()) { - if (!testDataDir.mkdirs()) { - LOGGER.error("Create test file dir {} failed.", testDataDir.getPath()); - } + if(!testDataDir.isDirectory()){ + if (!testDataDir.mkdirs()) { + LOGGER.error("Create test file dir {} failed.", testDataDir.getPath()); } } testFileName = TEST_FILE_PREFIX + testProcessID; @@ -108,34 +111,34 @@ public void tearDown() { } @Test - public void testDataOpenFileNumWhenCreateFile() { + public void testTotalOpenFileNumWhenCreateFile() { if (os.startsWith(MAC_OS_NAME) || os.startsWith(LINUX_OS_NAME)) { // get total open file number statistics of original state totalOpenFileNumBefore = openFileNumUtil - .get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM); + .get(OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM); for (int i = 0; i < testFileNum; i++) { fileList.add(new File(currDir + testFileName + i)); } // create testFileNum File, then get total open file number statistics totalOpenFileNumAfter = openFileNumUtil - .get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM); + .get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM); totalOpenFileNumChange = totalOpenFileNumAfter - totalOpenFileNumBefore; // create test file shall not affect total open file number statistics assertEquals(0, totalOpenFileNumChange); } else { assertEquals(-2, - openFileNumUtil.get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM)); + openFileNumUtil.get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM)); } } @Test - public void testDataOpenFileNumWhenCreateFileWriter() { + public void testTotalOpenFileNumWhenCreateFileWriter() { if (os.startsWith(MAC_OS_NAME) || os.startsWith(LINUX_OS_NAME)) { for (int i = 0; i < testFileNum; i++) { - fileList.add(new File(currDir + testFileName + i)); + fileList.add(new File(currDir + File.separator + testFileName + i)); } totalOpenFileNumBefore = openFileNumUtil - .get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM); + .get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM); for (File file : fileList) { if (file.exists()) { try { @@ -146,7 +149,10 @@ public void testDataOpenFileNumWhenCreateFileWriter() { } else { try { boolean flag = file.createNewFile(); - if (!flag) { + if(flag) { + LOGGER.debug("Create a file {} successfully", file); + fileWriterList.add(new FileWriter(file)); + }else{ LOGGER.error( "create test file {} failed when execute testTotalOpenFileNumWhenCreateFileWriter().", file.getPath()); @@ -154,26 +160,22 @@ public void testDataOpenFileNumWhenCreateFileWriter() { } catch (IOException e) { LOGGER.error(e.getMessage()); } - try { - fileWriterList.add(new FileWriter(file)); - } catch (IOException e) { - LOGGER.error(e.getMessage()); - } } } totalOpenFileNumAfter = openFileNumUtil - .get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM); + .get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM); totalOpenFileNumChange = totalOpenFileNumAfter - totalOpenFileNumBefore; // create FileWriter shall cause total open file number increase by testFileNum assertEquals(testFileNum, totalOpenFileNumChange); } else { assertEquals(-2, - openFileNumUtil.get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM)); + openFileNumUtil.get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM)); } } @Test - public void testDataOpenFileNumWhenFileWriterWriting() { + public void testTotalOpenFileNumWhenFileWriterWriting() { + LOGGER.debug("testDataOpenFileNumWhenFileWriterWriting..."); if (os.startsWith(MAC_OS_NAME) || os.startsWith(LINUX_OS_NAME)) { for (int i = 0; i < testFileNum; i++) { fileList.add(new File(currDir + testFileName + i)); @@ -201,7 +203,7 @@ public void testDataOpenFileNumWhenFileWriterWriting() { } } totalOpenFileNumBefore = openFileNumUtil - .get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM); + .get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM); for (FileWriter fw : fileWriterList) { try { fw.write("this is a test file for open file number counting."); @@ -210,18 +212,19 @@ public void testDataOpenFileNumWhenFileWriterWriting() { } } totalOpenFileNumAfter = openFileNumUtil - .get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM); + .get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM); totalOpenFileNumChange = totalOpenFileNumAfter - totalOpenFileNumBefore; // writing test file shall not affect total open file number statistics assertEquals(0, totalOpenFileNumChange); } else { assertEquals(-2, - openFileNumUtil.get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM)); + openFileNumUtil.get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM)); } } @Test - public void testDataOpenFileNumWhenFileWriterClose() { + public void testTotalOpenFileNumWhenFileWriterClose() { + LOGGER.debug("testDataOpenFileNumWhenFileWriterClose..."); if (os.startsWith(MAC_OS_NAME) || os.startsWith(LINUX_OS_NAME)) { for (int i = 0; i < testFileNum; i++) { fileList.add(new File(currDir + testFileName + i)); @@ -258,7 +261,7 @@ public void testDataOpenFileNumWhenFileWriterClose() { } } totalOpenFileNumBefore = openFileNumUtil - .get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM); + .get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM); for (FileWriter fw : fileWriterList) { try { fw.close(); @@ -267,13 +270,13 @@ public void testDataOpenFileNumWhenFileWriterClose() { } } totalOpenFileNumAfter = openFileNumUtil - .get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM); + .get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM); totalOpenFileNumChange = totalOpenFileNumAfter - totalOpenFileNumBefore; // close FileWriter shall cause total open file number decrease by testFileNum assertEquals(-testFileNum, totalOpenFileNumChange); } else { assertEquals(-2, - openFileNumUtil.get(OpenFileNumUtil.OpenFileNumStatistics.DATA_OPEN_FILE_NUM)); + openFileNumUtil.get(OpenFileNumUtil.OpenFileNumStatistics.TOTAL_OPEN_FILE_NUM)); } } diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/PrimitiveArrayListTest.java b/iotdb/src/test/java/org/apache/iotdb/db/utils/PrimitiveArrayListTest.java index 288d2317c..44c47515d 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/utils/PrimitiveArrayListTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/utils/PrimitiveArrayListTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.utils; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java b/iotdb/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java index fdf8f8dd9..20d74cab4 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java b/iotdb/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java index 2cc5479b0..c21bed24c 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog; @@ -75,41 +74,51 @@ public void writeLogTest() throws IOException { return; } int[] batchSizes = new int[]{100, 500, 1000, 5000, 10000}; + long[] forceCycle = new long[]{10, 0}; int oldBatchSize = config.flushWalThreshold; + long oldForceCycle = config.forceWalPeriodInMs; for (int j = 0; j < batchSizes.length; j++) { - config.flushWalThreshold = batchSizes[j]; - File tempRestore = new File("testtemp", "restore"); - File tempProcessorStore = new File("testtemp", "processorStore"); - tempRestore.getParentFile().mkdirs(); - tempRestore.createNewFile(); - tempProcessorStore.createNewFile(); - - WriteLogNode logNode = new ExclusiveWriteLogNode("root.testLogNode", tempRestore.getPath(), - tempProcessorStore.getPath()); - - long time = System.currentTimeMillis(); - for (int i = 0; i < 1000000; i++) { - InsertPlan bwInsertPlan = new InsertPlan(1, "logTestDevice", 100, - Arrays.asList("s1", "s2", "s3", "s4"), - Arrays.asList("1.0", "15", "str", "false")); - UpdatePlan updatePlan = new UpdatePlan(0, 100, "2.0", new Path("root.logTestDevice.s1")); - DeletePlan deletePlan = new DeletePlan(50, new Path("root.logTestDevice.s1")); - - logNode.write(bwInsertPlan); - logNode.write(updatePlan); - logNode.write(deletePlan); + for (int k = 0; k < forceCycle.length; k++) { + config.flushWalThreshold = batchSizes[j]; + config.forceWalPeriodInMs = forceCycle[k]; + File tempRestore = new File("testtemp", "restore"); + File tempProcessorStore = new File("testtemp", "processorStore"); + tempRestore.getParentFile().mkdirs(); + tempRestore.createNewFile(); + tempProcessorStore.createNewFile(); + + WriteLogNode logNode = new ExclusiveWriteLogNode("root.testLogNode", + tempRestore.getPath(), + tempProcessorStore.getPath()); + + long time = System.currentTimeMillis(); + for (int i = 0; i < 1000000; i++) { + InsertPlan bwInsertPlan = new InsertPlan(1, "logTestDevice", 100, + Arrays.asList("s1", "s2", "s3", "s4"), + Arrays.asList("1.0", "15", "str", "false")); + UpdatePlan updatePlan = new UpdatePlan(0, 100, "2.0", + new Path("root.logTestDevice.s1")); + DeletePlan deletePlan = new DeletePlan(50, + new Path("root.logTestDevice.s1")); + + logNode.write(bwInsertPlan); + logNode.write(updatePlan); + logNode.write(deletePlan); + } + logNode.forceSync(); + System.out.println("forceWalPeriodInMs = " + config.forceWalPeriodInMs); + System.out.println( + 3000000 + " logs use " + (System.currentTimeMillis() - time) + " ms at batch size " + + config.flushWalThreshold); + + logNode.delete(); + tempRestore.delete(); + tempProcessorStore.delete(); + tempRestore.getParentFile().delete(); } - logNode.forceSync(); - System.out.println( - 3000000 + " logs use " + (System.currentTimeMillis() - time) + " ms at batch size " - + batchSizes[j]); - - logNode.delete(); - tempRestore.delete(); - tempProcessorStore.delete(); - tempRestore.getParentFile().delete(); } config.flushWalThreshold = oldBatchSize; + config.forceWalPeriodInMs = oldForceCycle; } @Test @@ -130,23 +139,28 @@ public void recoverTest() MManager.getInstance().setStorageLevelToMTree("root.logTestDevice"); } catch (PathErrorException ignored) { } - MManager.getInstance().addPathToMTree("root.logTestDevice.s1", TSDataType.DOUBLE.name(), + MManager.getInstance().addPathToMTree("root.logTestDevice.s1", + TSDataType.DOUBLE.name(), TSEncoding.PLAIN.name(), new String[]{}); MManager.getInstance() - .addPathToMTree("root.logTestDevice.s2", TSDataType.INT32.name(), TSEncoding.PLAIN.name(), + .addPathToMTree("root.logTestDevice.s2", TSDataType.INT32.name(), + TSEncoding.PLAIN.name(), new String[]{}); MManager.getInstance() - .addPathToMTree("root.logTestDevice.s3", TSDataType.TEXT.name(), TSEncoding.PLAIN.name(), + .addPathToMTree("root.logTestDevice.s3", TSDataType.TEXT.name(), + TSEncoding.PLAIN.name(), new String[]{}); MManager.getInstance().addPathToMTree("root.logTestDevice.s4", TSDataType.BOOLEAN.name(), TSEncoding.PLAIN.name(), new String[]{}); - WriteLogNode logNode = new ExclusiveWriteLogNode("root.logTestDevice", tempRestore.getPath(), + WriteLogNode logNode = new ExclusiveWriteLogNode("root.logTestDevice", + tempRestore.getPath(), tempProcessorStore.getPath()); for (int i = 0; i < 1000000; i++) { InsertPlan bwInsertPlan = new InsertPlan(1, "root.logTestDevice", 100, Arrays.asList("s1", "s2", "s3", "s4"), Arrays.asList("1.0", "15", "str", "false")); - UpdatePlan updatePlan = new UpdatePlan(0, 100, "2.0", new Path("root.logTestDevice.s1")); + UpdatePlan updatePlan = new UpdatePlan(0, 100, "2.0", + new Path("root.logTestDevice.s1")); DeletePlan deletePlan = new DeletePlan(50, new Path("root.logTestDevice.s1")); logNode.write(bwInsertPlan); @@ -180,7 +194,8 @@ public void encodeDecodeTest() throws IOException { InsertPlan bwInsertPlan = new InsertPlan(1, "root.logTestDevice", 100, Arrays.asList("s1", "s2", "s3", "s4"), Arrays.asList("1.0", "15", "str", "false")); - UpdatePlan updatePlan = new UpdatePlan(0, 100, "2.0", new Path("root.logTestDevice.s1")); + UpdatePlan updatePlan = new UpdatePlan(0, 100, "2.0", + new Path("root.logTestDevice.s1")); for (int i = 0; i < 20; i++) { updatePlan.addInterval(new Pair(200l, 300l)); } @@ -204,7 +219,8 @@ public void encodeDecodeTest() throws IOException { @Test public void SQLEncodingComparisonTest() throws WALOverSizedException { - String sql = "INSERT INTO root.logTestDevice(time,s1,s2,s3,s4) VALUES (100,1.0,15,\"str\",false)"; + String sql = "INSERT INTO root.logTestDevice(time,s1,s2,s3,s4) " + + "VALUES (100,1.0,15,\"str\",false)"; InsertPlan bwInsertPlan = new InsertPlan(1, "root.logTestDevice", 100, Arrays.asList("s1", "s2", "s3", "s4"), Arrays.asList("1.0", "15", "str", "false")); diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/RecoverTest.java b/iotdb/src/test/java/org/apache/iotdb/db/writelog/RecoverTest.java index 637986dcf..08bbe382c 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/writelog/RecoverTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/writelog/RecoverTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java index e1ba74fe4..448ef2c6a 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java b/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java index ac7874dd1..26caf61a7 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java b/iotdb/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java index 2027466e5..4ba32ef3b 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.db.writelog.io; diff --git a/iotdb/src/test/resources/logback.xml b/iotdb/src/test/resources/logback.xml new file mode 100644 index 000000000..58cdf7763 --- /dev/null +++ b/iotdb/src/test/resources/logback.xml @@ -0,0 +1,41 @@ + + + + + + + + System.out + + %-5p [%d] [%thread] %C:%L - %m %n + utf-8 + + + DEBUG + + + + + + + + diff --git a/iotdb/src/test/resources/start-postBackTest.sh b/iotdb/src/test/resources/start-postBackTest.sh index 2acac542b..7ad92269c 100644 --- a/iotdb/src/test/resources/start-postBackTest.sh +++ b/iotdb/src/test/resources/start-postBackTest.sh @@ -1,4 +1,22 @@ #!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# if [ -z "${IOTDB_HOME}" ]; then export IOTDB_HOME="$(cd "`dirname "$0"`"/..;cd ".."; cd ".."; cd "iotdb" ;pwd)" diff --git a/iotdb/src/test/resources/stop-postBackTest.sh b/iotdb/src/test/resources/stop-postBackTest.sh index 3cb608dd0..cdddbf5b5 100644 --- a/iotdb/src/test/resources/stop-postBackTest.sh +++ b/iotdb/src/test/resources/stop-postBackTest.sh @@ -1,4 +1,22 @@ #!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# PIDS=$(ps ax | grep -i 'postBackTest' | grep java | grep -v grep | awk '{print $1}') diff --git a/java-google-style.xml b/java-google-style.xml index 83ee2685a..0daaf7254 100644 --- a/java-google-style.xml +++ b/java-google-style.xml @@ -1,8 +1,6 @@ diff --git a/jdbc/README.md b/jdbc/README.md index 4b85d2ec2..0921cd5f7 100644 --- a/jdbc/README.md +++ b/jdbc/README.md @@ -1,3 +1,24 @@ + + # Usage ## Dependencies diff --git a/jdbc/example/readme.md b/jdbc/example/readme.md index 5e8dc2be9..4823c79b7 100644 --- a/jdbc/example/readme.md +++ b/jdbc/example/readme.md @@ -1,3 +1,24 @@ + + # Function ``` The example is to show how to send data from localhost to IoTDB through Kafka. diff --git a/jdbc/example/src/main/java/org/apache/iotdb/jdbc/jdbcDemo/SendDataToIotdb.java b/jdbc/example/src/main/java/org/apache/iotdb/jdbc/jdbcDemo/SendDataToIotdb.java index 966627d9b..794fa568d 100644 --- a/jdbc/example/src/main/java/org/apache/iotdb/jdbc/jdbcDemo/SendDataToIotdb.java +++ b/jdbc/example/src/main/java/org/apache/iotdb/jdbc/jdbcDemo/SendDataToIotdb.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * The class is to show how to write and read date from IoTDB through JDBC diff --git a/jdbc/example/src/main/java/org/apache/iotdb/jdbc/kafka_iotdbDemo/KafkaConsumer.java b/jdbc/example/src/main/java/org/apache/iotdb/jdbc/kafka_iotdbDemo/KafkaConsumer.java index 9ebd32b2a..0595b11a9 100644 --- a/jdbc/example/src/main/java/org/apache/iotdb/jdbc/kafka_iotdbDemo/KafkaConsumer.java +++ b/jdbc/example/src/main/java/org/apache/iotdb/jdbc/kafka_iotdbDemo/KafkaConsumer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * The class is to show how to get data from kafka through multi-threads. diff --git a/jdbc/example/src/main/java/org/apache/iotdb/jdbc/kafka_iotdbDemo/KafkaProducer.java b/jdbc/example/src/main/java/org/apache/iotdb/jdbc/kafka_iotdbDemo/KafkaProducer.java index 84ab985d0..07390d997 100644 --- a/jdbc/example/src/main/java/org/apache/iotdb/jdbc/kafka_iotdbDemo/KafkaProducer.java +++ b/jdbc/example/src/main/java/org/apache/iotdb/jdbc/kafka_iotdbDemo/KafkaProducer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * The class is to show how to send data to kafka diff --git a/jdbc/package.sh b/jdbc/package.sh index 60754953b..72c379b3f 100755 --- a/jdbc/package.sh +++ b/jdbc/package.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -12,11 +10,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # echo "Package iotdb-jdbc..." diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 1c9f2e7a8..40c412417 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -1,8 +1,6 @@ @@ -33,6 +32,8 @@ A jdbc driver for a time series database, IoTDB, which uses TsFile as its storage format on disk. false + ${jdbc.test.skip} + ${jdbc.test.skip} @@ -68,11 +69,40 @@ + org.apache.maven.plugins maven-surefire-plugin + + ${jdbc.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + ${jdbc.test.skip} + ${jdbc.it.skip} + + + + org.apache.rat + apache-rat-plugin + + + example/data/kafka_data.csv + @@ -116,5 +146,19 @@ + + skipTsfileTests + + + skipTests + true + + + + true + true + true + + diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java index a47fcfa13..a1ee68fa9 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java index ff5c13de6..d6d72854b 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java index d5b9b3e95..1618a6235 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnectionParams.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnectionParams.java index 5f8452d8b..07878121a 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnectionParams.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnectionParams.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java index 82d1eb001..a708904bc 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDriver.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDriver.java index a0965bfdd..aae8fb7f0 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDriver.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDriver.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBMetadataResultMetadata.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBMetadataResultMetadata.java index 56bef3214..40090829b 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBMetadataResultMetadata.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBMetadataResultMetadata.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBMetadataResultSet.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBMetadataResultSet.java index 20ac4d2ac..3d56da4ae 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBMetadataResultSet.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBMetadataResultSet.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPrepareStatement.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPrepareStatement.java index cdb8f2320..45df785b5 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPrepareStatement.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPrepareStatement.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java index c4b8f6480..83159dd7f 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBResultMetadata.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBResultMetadata.java index 0878d5650..466809564 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBResultMetadata.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBResultMetadata.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBSQLException.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBSQLException.java index e70aca838..4c543df73 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBSQLException.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBSQLException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java index ea5d5eceb..084a6ca13 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBURLException.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBURLException.java index 69bd774f8..ba3873919 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBURLException.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBURLException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/Utils.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/Utils.java index a9e65eecc..847555083 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/Utils.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/Utils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java index ef46846bb..912019d3c 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java index 67b8ddb1b..bc511b0dd 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java index 8cf9341fd..92b5cf7db 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBMetadataResultMetadataTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBMetadataResultMetadataTest.java index 709b1b482..5caf6ee0d 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBMetadataResultMetadataTest.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBMetadataResultMetadataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPrepareStatementTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPrepareStatementTest.java index de0f789b7..1b60ec81a 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPrepareStatementTest.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPrepareStatementTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBQueryResultSetTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBQueryResultSetTest.java index 1d866c20e..7cd3ded8b 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBQueryResultSetTest.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBQueryResultSetTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBResultMetadataTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBResultMetadataTest.java index f1b929eaa..2796ea579 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBResultMetadataTest.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBResultMetadataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java index 1e6005ec9..d8632fc92 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java index 475155ce4..ff6650dce 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/MetadataDemo.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/MetadataDemo.java index 5bd9eae23..41c22d380 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/MetadataDemo.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/MetadataDemo.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc.demo; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/PrepareStatementDemo.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/PrepareStatementDemo.java index c7a4c3585..3f0e3a0d5 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/PrepareStatementDemo.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/PrepareStatementDemo.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc.demo; diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/StatementDemo.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/StatementDemo.java index 33cc02905..a122e8a00 100644 --- a/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/StatementDemo.java +++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/demo/StatementDemo.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.jdbc.demo; diff --git a/jenkins.pom b/jenkins.pom new file mode 100644 index 000000000..dab9a4b82 --- /dev/null +++ b/jenkins.pom @@ -0,0 +1,67 @@ + + + + + 4.0.0 + + + org.apache + apache + 21 + + + org.apache.iotdb + iotdb-jenkins-tools + 0.2.0-SNAPSHOT + pom + + IoTDB: Jenkins Tools + Set of helpers to do individual tasks only needed on our Jenkins build. + + + + + deploy-snapshots + + + + org.codehaus.mojo + wagon-maven-plugin + 2.0.0 + + ${project.basedir}/local-snapshots-dir + ** + apache.snapshots.https + ${distMgmtSnapshotsUrl} + + + + + + + + \ No newline at end of file diff --git a/mvnw.cmd b/mvnw.cmd index 822735351..fbe6a9f41 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -1,6 +1,4 @@ @REM -@REM Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -@REM @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @REM distributed with this work for additional information @@ -11,11 +9,12 @@ @REM @REM http://www.apache.org/licenses/LICENSE-2.0 @REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. @REM @REM ---------------------------------------------------------------------------- diff --git a/mvnw.sh b/mvnw.sh index 735e74e12..f448a403b 100755 --- a/mvnw.sh +++ b/mvnw.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -12,11 +10,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # diff --git a/pom.xml b/pom.xml index 3a658aeb2..c6d2bf132 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,6 @@ @@ -61,14 +60,22 @@ 2.5 4.0 0.9.3 + + https://builds.apache.org/analysis + + **/generated-sources - + - + ch.qos.logback logback-classic @@ -139,33 +146,71 @@ *thrift* + This will suppress the generation of a hidden timestamp at the top of each generated html page + and hopefully let the site generation nod to too big updates every time. + --> true false + We need to increase the memory available to tests as we were + getting out-of-memory errors when building on windows machines. + --> org.apache.maven.plugins maven-surefire-plugin - -Xmx512m + -Xmx1024m + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.6.0.1398 + + + org.apache.rat + apache-rat-plugin + + + + **/.git/** + **/.gitignore + + **/target/** + + **/.project + **/.settings/** + **/.classpath + + **/.idea/** + **/*.iml + + **/*.log + + licenses-binary/* + + .github/** + + .checkstyle + + local-snapshots-dir/** + + Strange xthings usually happen if you run with a too low Java version. + This plugin not only checks the minimum java version of 1.8, but also + checks all dependencies (and transitive dependencies) for reported CVEs. + --> org.apache.maven.plugins maven-enforcer-plugin @@ -202,14 +247,14 @@ + Even if Maven transitively pulls in dependencies, relying on these can + quite often cause hard to find problems. So it's a good practice to make + sure everything directly required is also directly added as a dependency. + On the other side adding unused dependency only over-complicates the + the dependency graph, so the maven-dependency-plugin checks we depend on + what we need and only that and that runtime dependencies are correctly + imported with runtime scope. + --> org.apache.maven.plugins maven-dependency-plugin @@ -259,7 +304,10 @@ checkstyle.xml - + + + - + Check if all files contain Apache headers in them. + Ignore this plugin, we use license-maven-plugin to check apache header. + --> + + org.apache.rat + apache-rat-plugin + + + license-check + verify + + check + + + + org.codehaus.mojo @@ -380,8 +407,8 @@ + Generate the legally required text files in the jars + --> org.apache.maven.plugins maven-remote-resources-plugin @@ -408,9 +435,9 @@ + A set of profiles defining the different properties needed to download and run thrift + They are automatically activated depending on the OS you are using. + --> windows @@ -458,14 +485,14 @@ + Note to the Download: The download-maven-plugin checks if a resource is previously downloaded + and only downloads each file once. It caches downloaded files in: + {maven local repo}/.cache/download-maven-plugin + --> thrift-generation diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml index 132e00fb5..c5097ec21 100644 --- a/service-rpc/pom.xml +++ b/service-rpc/pom.xml @@ -1,8 +1,6 @@ @@ -31,12 +30,48 @@ service-rpc Service-rpc RPC framework for client and server. + + false + ${rpc.test.skip} + ${rpc.test.skip} + org.apache.thrift libthrift + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${rpc.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + + + ${rpc.test.skip} + ${rpc.it.skip} + + + + only-eclipse @@ -91,5 +126,19 @@ + + skipTsfileTests + + + skipTests + true + + + + true + true + true + + diff --git a/service-rpc/src/main/thrift/rpc.thrift b/service-rpc/src/main/thrift/rpc.thrift index 3a4545212..c603ae0fd 100644 --- a/service-rpc/src/main/thrift/rpc.thrift +++ b/service-rpc/src/main/thrift/rpc.thrift @@ -1,6 +1,4 @@ /* - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ namespace java org.apache.iotdb.service.rpc.thrift diff --git a/spark/README.md b/spark/README.md index 8ed84603f..2a82c379c 100644 --- a/spark/README.md +++ b/spark/README.md @@ -1,3 +1,24 @@ + + # tsfile-spark-connector Used to read and write(developing) tsfile in spark. diff --git a/spark/pom.xml b/spark/pom.xml index c24870a0d..f064753ea 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -1,8 +1,6 @@ diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/io/CreateTSFile.java b/spark/src/main/java/org/apache/iotdb/tsfile/io/CreateTSFile.java index 5fd225e27..8fce7d111 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/io/CreateTSFile.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/io/CreateTSFile.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.io; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSInputStream.java b/spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSInputStream.java index d0c93cc9c..8d67fe663 100644 --- a/spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSInputStream.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSInputStream.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.io; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSOutputStream.java b/spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSOutputStream.java index e6afe2d40..9057432c9 100644 --- a/spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSOutputStream.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSOutputStream.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.io; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileOutputFormat.java b/spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileOutputFormat.java index 35f6dce42..57faa129a 100644 --- a/spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileOutputFormat.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileOutputFormat.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.io; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileRecordWriter.java b/spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileRecordWriter.java index 27794bf48..1fce40c96 100644 --- a/spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileRecordWriter.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileRecordWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.io; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/Executor.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/Executor.java index e57192fef..bfcbbae48 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/Executor.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/Executor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/QueryProcessor.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/QueryProcessor.java index 5720bb3e6..62dabe80b 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/QueryProcessor.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/QueryProcessor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/BasicOperator.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/BasicOperator.java index afdefc965..c3a893c99 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/BasicOperator.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/BasicOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.common; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/FilterOperator.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/FilterOperator.java index bb07d09b3..96b4d8985 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/FilterOperator.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/FilterOperator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.common; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/Operator.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/Operator.java index 7b86ddcf5..684e0e507 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/Operator.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/Operator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.common; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/SQLConstant.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/SQLConstant.java index 5b337e62a..76234e46a 100644 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/SQLConstant.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/SQLConstant.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.common; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/SingleQuery.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/SingleQuery.java index 3ceb0ea01..2b0365201 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/SingleQuery.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/SingleQuery.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.common; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/TSQueryPlan.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/TSQueryPlan.java index 2cf476f89..e412f9631 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/TSQueryPlan.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/common/TSQueryPlan.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.common; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/BasicOperatorException.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/BasicOperatorException.java index 73fdc0bcd..be36f3520 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/BasicOperatorException.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/BasicOperatorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.exception; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/DNFOptimizeException.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/DNFOptimizeException.java index b9db4f363..c27ef5506 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/DNFOptimizeException.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/DNFOptimizeException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.exception; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/LogicalOptimizeException.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/LogicalOptimizeException.java index 8d1b21e2d..4606824b8 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/LogicalOptimizeException.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/LogicalOptimizeException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.exception; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/MergeFilterException.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/MergeFilterException.java index 7ac5163b5..114d5b666 100644 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/MergeFilterException.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/MergeFilterException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.exception; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryOperatorException.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryOperatorException.java index 63990b0a7..fc9f177b1 100644 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryOperatorException.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryOperatorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.exception; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryProcessorException.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryProcessorException.java index 3b467f16d..9aba40f16 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryProcessorException.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryProcessorException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.exception; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/RemoveNotException.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/RemoveNotException.java index 94438018d..df4f6e483 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/RemoveNotException.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/RemoveNotException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.exception; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/DNFFilterOptimizer.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/DNFFilterOptimizer.java index 685e24f42..6b9b4fe43 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/DNFFilterOptimizer.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/DNFFilterOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.optimizer; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/IFilterOptimizer.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/IFilterOptimizer.java index 61793d4ca..44d00fc35 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/IFilterOptimizer.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/IFilterOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.optimizer; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/MergeSingleFilterOptimizer.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/MergeSingleFilterOptimizer.java index 5f1bce4a8..1bc627309 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/MergeSingleFilterOptimizer.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/MergeSingleFilterOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.optimizer; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/PhysicalOptimizer.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/PhysicalOptimizer.java index 127059c34..57753ab4f 100644 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/PhysicalOptimizer.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/PhysicalOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.optimizer; diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/RemoveNotOptimizer.java b/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/RemoveNotOptimizer.java index 9cd71cf11..33396eab7 100755 --- a/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/RemoveNotOptimizer.java +++ b/spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/RemoveNotOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.qp.optimizer; diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/Converter.scala b/spark/src/main/scala/org/apache/iotdb/tsfile/Converter.scala index 0c2eb63c7..0ca5aeb52 100755 --- a/spark/src/main/scala/org/apache/iotdb/tsfile/Converter.scala +++ b/spark/src/main/scala/org/apache/iotdb/tsfile/Converter.scala @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala b/spark/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala index 498fea6a1..1b2a80050 100755 --- a/spark/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala +++ b/spark/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala b/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala index f8041af02..3a17f6d27 100644 --- a/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala +++ b/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala b/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala index 8cf3a1e56..1b9e2ef4c 100644 --- a/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala +++ b/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/package.scala b/spark/src/main/scala/org/apache/iotdb/tsfile/package.scala index 6450bb8be..c8e17b4d0 100755 --- a/spark/src/main/scala/org/apache/iotdb/tsfile/package.scala +++ b/spark/src/main/scala/org/apache/iotdb/tsfile/package.scala @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) diff --git a/spark/src/test/scala/cn/edu/tsinghua/tsfile/ConverterTest.scala b/spark/src/test/scala/cn/edu/tsinghua/tsfile/ConverterTest.scala index 9218a2e6a..55713be9d 100644 --- a/spark/src/test/scala/cn/edu/tsinghua/tsfile/ConverterTest.scala +++ b/spark/src/test/scala/cn/edu/tsinghua/tsfile/ConverterTest.scala @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) diff --git a/spark/src/test/scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala b/spark/src/test/scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala index 03dd4912c..93bf84844 100644 --- a/spark/src/test/scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala +++ b/spark/src/test/scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) diff --git a/tsfile/README.md b/tsfile/README.md index 19d4ad67a..b8977fdcc 100644 --- a/tsfile/README.md +++ b/tsfile/README.md @@ -1,3 +1,24 @@ + + # TsFile Document
 ___________    ___________.__.__          
diff --git a/tsfile/example/readme.md b/tsfile/example/readme.md
index aa1ea70c7..1a324f5b9 100644
--- a/tsfile/example/readme.md
+++ b/tsfile/example/readme.md
@@ -1,3 +1,24 @@
+
+
 # Function
 ```
 The example is to show how to write and read a TsFile File.
diff --git a/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileRead.java b/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileRead.java
index d8fd0e328..ce341db0c 100644
--- a/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileRead.java
+++ b/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileRead.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile;
 
diff --git a/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileSequenceRead.java b/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileSequenceRead.java
index 5c71cb87b..faecbddf5 100644
--- a/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileSequenceRead.java
+++ b/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileSequenceRead.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile;
 
@@ -52,7 +51,7 @@ public static void main(String[] args) throws IOException {
     System.out.println("Level 1 metadata size: " + reader.getFileMetadataPos());
     TsFileMetaData metaData = reader.readFileMetadata();
     // Sequential reading of one ChunkGroup now follows this order:
-    // first SeriesChunks (headers and data) in one ChunkGroup, then the ChunkGroupFooter
+    // first SeriesChunks (headers and data) in one ChunkGroup, then the CHUNK_GROUP_FOOTER
     // Because we do not know how many chunks a ChunkGroup may have, we should read one byte (the marker) ahead and
     // judge accordingly.
     System.out.println("[Chunk Group]");
diff --git a/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileWrite.java b/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileWrite.java
index 604860eb9..37b69be1e 100644
--- a/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileWrite.java
+++ b/tsfile/example/src/main/java/cn/edu/tsinghua/tsfile/TsFileWrite.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 /**
  * There are two ways to construct a TsFile instance,they generate the same TsFile file.
diff --git a/tsfile/package.sh b/tsfile/package.sh
index 12579d757..9ae2a8454 100755
--- a/tsfile/package.sh
+++ b/tsfile/package.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -12,11 +10,12 @@
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 echo "Package tsfile..."
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index ba1c9393b..28de2fc5c 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -1,8 +1,6 @@
 
 
 
@@ -34,6 +33,8 @@
     https://github.com/thulab/iotdb/tree/master/tsfile
     
         false
+        ${tsfile.test.skip}
+        ${tsfile.test.skip}
     
     
         
@@ -65,12 +66,31 @@
     
     
         
+            
             
                 org.apache.maven.plugins
                 maven-surefire-plugin
                 
-                    -Xmx1024m
+                    ${tsfile.ut.skip}
+                
+            
+            
+                org.apache.maven.plugins
+                maven-failsafe-plugin
+                
+                    
+                        run-integration-tests
+                        integration-test
+                        
+                            integration-test
+                            verify
+                        
+                    
+                
+                
                     ${tsfile.test.skip}
+                    ${tsfile.it.skip}
                 
             
             
@@ -93,6 +113,35 @@
                     
                 
             
+            
+                org.apache.rat
+                apache-rat-plugin
+                
+                    
+                        src/test/resources/*.json
+                        
+                        src/test/resources/perTestInputData
+                        
+                        **/*.log
+                    
+                
+            
         
     
+    
+        
+            skipTsfileTests
+            
+                
+                    skipTests
+                    true
+                
+            
+            
+                true
+                true
+                true
+            
+        
+    
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Cache.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Cache.java
index 453dde83a..7acdf74d6 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Cache.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Cache.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.common.cache;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/LRUCache.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/LRUCache.java
index 3598f6a56..1c044b984 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/LRUCache.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/LRUCache.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.common.cache;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
index 840a5d0e1..fdd333e68 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.common.conf;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
index 214d90237..52285cd77 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.common.conf;
 
@@ -60,7 +59,7 @@ private void multiplicityWarning(String resource, ClassLoader classLoader) {
       if (urlSet != null && urlSet.size() > 1) {
         LOGGER.warn("Resource [{}] occurs multiple times on the classpath", resource);
         for (URL url : urlSet) {
-          LOGGER.warn("Resource [{}] occurs at [{}]", resource, url.toString());
+          LOGGER.warn("Resource [{}] occurs at [{}]", resource, url);
         }
       }
     } catch (IOException e) {
@@ -76,7 +75,7 @@ private URL getResource(String filename, ClassLoader classLoader) {
    * load an .properties file and set TSFileConfig variables
    */
   private void loadProps() {
-    InputStream inputStream = null;
+    InputStream inputStream;
     String url = System.getProperty(SystemConstant.TSFILE_CONF, null);
     if (url == null) {
       url = System.getProperty(SystemConstant.TSFILE_HOME, null);
@@ -128,14 +127,12 @@ private void loadProps() {
     } catch (Exception e) {
       LOGGER.error("Loading settings {} failed because {}", url, e.getMessage());
     } finally {
-      if (inputStream != null) {
-        try {
-          inputStream.close();
-          inputStream = null;
-        } catch (IOException e) {
-          LOGGER.error("Failed to close stream for loading config because {}", e.getMessage());
-        }
+      try {
+        inputStream.close();
+      } catch (IOException e) {
+        LOGGER.error("Failed to close stream for loading config because {}", e.getMessage());
       }
+
     }
   }
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/JsonFormatConstant.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/JsonFormatConstant.java
index 0d12299d1..4e2c93fd4 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/JsonFormatConstant.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/JsonFormatConstant.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.common.constant;
 
@@ -23,7 +22,6 @@
  * This class define several constant string variables used in tsfile schema's keys.
  */
 public class JsonFormatConstant {
-
   public static final String JSON_SCHEMA = "schema";
   public static final String DELTA_TYPE = "delta_type";
   public static final String MEASUREMENT_UID = "measurement_id";
@@ -33,13 +31,15 @@ public class JsonFormatConstant {
   public static final String ENUM_VALUES_SEPARATOR = ",";
   public static final String MAX_POINT_NUMBER = "max_point_number";
   public static final String COMPRESS_TYPE = "compressor";
-  public static final String FreqType = "freq_type";
+  public static final String FREQ_TYPE = "freq_type";
   public static final String TSRECORD_SEPARATOR = ",";
   public static final String MAX_STRING_LENGTH = "max_string_length";
 
   public static final String ROW_GROUP_SIZE = "row_group_size";
   public static final String PAGE_SIZE = "page_size";
 
-  public static final String defaultDeltaType = "default_delta_type";
+  public static final String DEFAULT_DELTA_TYPE = "default_delta_type";
   public static final String PROPERTIES = "properties";
+
+  private JsonFormatConstant(){}
 }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/QueryConstant.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/QueryConstant.java
index 0e47b3152..bf3622a07 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/QueryConstant.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/QueryConstant.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.common.constant;
 
@@ -25,4 +24,6 @@ public class QueryConstant {
   public static final String PARTITION_START_OFFSET = "partition_start_offset";
   // The end offset for the partition
   public static final String PARTITION_END_OFFSET = "partition_end_offset";
+
+  private QueryConstant(){}
 }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/StatisticConstant.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/StatisticConstant.java
index 0e115489f..67215ffdc 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/StatisticConstant.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/StatisticConstant.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.common.constant;
 
@@ -37,4 +36,6 @@ public class StatisticConstant {
   public static final String SUM = "sum";
 
   public static final String LAST = "last";
+
+  private StatisticConstant(){}
 }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/SystemConstant.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/SystemConstant.java
index 02d424f96..d3a6f5658 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/SystemConstant.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/SystemConstant.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.common.constant;
 
@@ -26,4 +25,6 @@ public class SystemConstant {
   public static final String PATH_SEPARATOR = ".";
   public static final String PATH_SEPARATER_NO_REGEX = "\\.";
   public static final String DEFAULT_DELTA_TYPE = "default_delta_type";
+
+  private SystemConstant(){}
 }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/Compressor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/Compressor.java
index 6dee0ec47..28d161467 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/Compressor.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/Compressor.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.compress;
 
@@ -23,8 +22,6 @@
 import java.nio.ByteBuffer;
 import org.apache.iotdb.tsfile.exception.compress.CompressionTypeNotSupportedException;
 import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.xerial.snappy.Snappy;
 
 /**
@@ -112,8 +109,6 @@ public CompressionType getType() {
 
   public static class SnappyCompressor extends Compressor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SnappyCompressor.class);
-
     @Override
     public byte[] compress(byte[] data) throws IOException {
       if (data == null) {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/UnCompressor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/UnCompressor.java
index 13aea5bf8..5fe14203f 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/UnCompressor.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/compress/UnCompressor.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.compress;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPacker.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPacker.java
index 8586b15f3..1b80da272 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPacker.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPacker.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.bitpacking;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPacker.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPacker.java
index 93642e4e1..cb0ab04e1 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPacker.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPacker.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.bitpacking;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/common/EncodingConfig.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/common/EncodingConfig.java
index 109a01827..f7551d5a5 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/common/EncodingConfig.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/common/EncodingConfig.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.common;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/common/EndianType.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/common/EndianType.java
index 1010aa0da..eadb5d385 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/common/EndianType.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/common/EndianType.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.common;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoder.java
index 609284ca1..5ff3abba1 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/Decoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/Decoder.java
index b2173b30d..bb516bb29 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/Decoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/Decoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DeltaBinaryDecoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DeltaBinaryDecoder.java
index a1276a353..db508d823 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DeltaBinaryDecoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DeltaBinaryDecoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoder.java
index 08e8935a9..d608a3e86 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoder.java
index 18580e96d..f65a81030 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoder.java
index 773f192cb..af0d9bb9a 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoder.java
index 3a4f9f981..1eca225ed 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoder.java
index 4c7f47f00..b9185385c 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/PlainDecoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/PlainDecoder.java
index bfcf58faa..96785554c 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/PlainDecoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/PlainDecoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/RleDecoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/RleDecoder.java
index 65f765410..c22b6c3b0 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/RleDecoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/RleDecoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoder.java
index 1b86eafdd..8dac0bae2 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.decoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/BitmapEncoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/BitmapEncoder.java
index efdd8aadb..379428f1d 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/BitmapEncoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/BitmapEncoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DeltaBinaryEncoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DeltaBinaryEncoder.java
index bd5afffba..9c9d8f8c0 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DeltaBinaryEncoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DeltaBinaryEncoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoder.java
index d4b939790..176dcfb8c 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/Encoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/Encoder.java
index ed61bc1ce..ecb2c87b0 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/Encoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/Encoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatEncoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatEncoder.java
index 955059c13..d9b128ada 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatEncoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/FloatEncoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoder.java
index bca395201..def51f66c 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntRleEncoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntRleEncoder.java
index 23779dc3d..d0be2f1df 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntRleEncoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntRleEncoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongRleEncoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongRleEncoder.java
index 8f309751b..95ff64883 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongRleEncoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongRleEncoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/PlainEncoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/PlainEncoder.java
index 2cc316b2e..d1580996e 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/PlainEncoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/PlainEncoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RleEncoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RleEncoder.java
index b9add65bb..2a01c2f5e 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RleEncoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RleEncoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoder.java
index 7c12bb730..a78db35ac 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/TSEncodingBuilder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/TSEncodingBuilder.java
index 667f867c6..840517ddb 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/TSEncodingBuilder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/TSEncodingBuilder.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.encoding.encoder;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileRuntimeException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileRuntimeException.java
index adf2df95e..1097b6540 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileRuntimeException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/TsFileRuntimeException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/cache/CacheException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/cache/CacheException.java
index a30a74c23..910af37a9 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/cache/CacheException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/cache/CacheException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.cache;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/compress/CompressionTypeNotSupportedException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/compress/CompressionTypeNotSupportedException.java
index f412341bc..aadebc718 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/compress/CompressionTypeNotSupportedException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/compress/CompressionTypeNotSupportedException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.compress;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileDecodingException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileDecodingException.java
index 163bdeaf5..06de4d73c 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileDecodingException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileDecodingException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.encoding;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileEncodingException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileEncodingException.java
index a6fc00418..8941aa789 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileEncodingException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/encoding/TsFileEncodingException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.encoding;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterDataTypeException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterDataTypeException.java
index e2ac6cddc..b634e9f54 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterDataTypeException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterDataTypeException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.filter;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterInvokeException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterInvokeException.java
index dc7f762f7..137f0ba1b 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterInvokeException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterInvokeException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.filter;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/QueryFilterOptimizationException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/QueryFilterOptimizationException.java
index 704934ca3..b317fde65 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/QueryFilterOptimizationException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/QueryFilterOptimizationException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.filter;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/UnSupportFilterDataTypeException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/UnSupportFilterDataTypeException.java
index 651e530d1..d4d5089be 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/UnSupportFilterDataTypeException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/UnSupportFilterDataTypeException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.filter;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/metadata/MetadataArgsErrorException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/metadata/MetadataArgsErrorException.java
index 16f6162fa..cb037d83d 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/metadata/MetadataArgsErrorException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/metadata/MetadataArgsErrorException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.metadata;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/InvalidJsonSchemaException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/InvalidJsonSchemaException.java
index 6333caa7f..9c96fbf5f 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/InvalidJsonSchemaException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/InvalidJsonSchemaException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.write;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/NoMeasurementException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/NoMeasurementException.java
index 360eb9fdd..7d81be05a 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/NoMeasurementException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/NoMeasurementException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.write;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/PageException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/PageException.java
index 1c9899ab3..c38a25bd5 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/PageException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/PageException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.write;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnSupportedDataTypeException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnSupportedDataTypeException.java
index 6448aa328..28ee000b5 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnSupportedDataTypeException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnSupportedDataTypeException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.write;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnknownColumnTypeException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnknownColumnTypeException.java
index 50c0fbcb5..96e9d465d 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnknownColumnTypeException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/UnknownColumnTypeException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.write;
 
@@ -30,10 +29,8 @@
 public class UnknownColumnTypeException extends TsFileRuntimeException {
 
   private static final long serialVersionUID = -4003170165687174659L;
-  public String type;
 
   public UnknownColumnTypeException(String type) {
     super("Column type not found: " + type);
-    this.type = type;
   }
 }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/WriteProcessException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/WriteProcessException.java
index b4a5ce052..8b5003851 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/WriteProcessException.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/WriteProcessException.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.exception.write;
 
@@ -27,7 +26,7 @@
 public class WriteProcessException extends Exception {
 
   private static final long serialVersionUID = -2664638061585302767L;
-  protected String errMsg;
+  private final String errMsg;
 
   public WriteProcessException(String msg) {
     super(msg);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java
index 172b55255..e93cd94a7 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file;
 
@@ -26,11 +25,13 @@
  */
 public class MetaMarker {
 
-  public static final byte ChunkGroupFooter = 0;
-  public static final byte ChunkHeader = 1;
-  public static final byte Separator = 2;
+  public static final byte CHUNK_GROUP_FOOTER = 0;
+  public static final byte CHUNK_HEADER = 1;
+  public static final byte SEPARATOR = 2;
 
   public static void handleUnexpectedMarker(byte marker) throws IOException {
     throw new IOException("Unexpected marker " + marker);
   }
+
+  private MetaMarker(){}
 }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/footer/ChunkGroupFooter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/footer/ChunkGroupFooter.java
index 6b62eb009..25b8aba23 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/footer/ChunkGroupFooter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/footer/ChunkGroupFooter.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.footer;
 
@@ -29,7 +28,7 @@
 
 public class ChunkGroupFooter {
 
-  private static final byte MARKER = MetaMarker.ChunkGroupFooter;
+  private static final byte MARKER = MetaMarker.CHUNK_GROUP_FOOTER;
 
   private String deviceID;
 
@@ -37,16 +36,11 @@ public class ChunkGroupFooter {
 
   private int numberOfChunks;
 
-  /**
-   * The time when endRowgroup() is called.
-   */
-  private long writtenTime;
-
   // this field does not need to be serialized.
   private int serializedSize;
 
   /**
-   * constructor of ChunkGroupFooter.
+   * constructor of CHUNK_GROUP_FOOTER.
    *
    * @param deviceID device ID
    * @param dataSize data size
@@ -71,7 +65,7 @@ private static int getSerializedSize(int deviceIdLength) {
   /**
    * deserialize from inputStream.
    *
-   * @param markerRead Whether the marker of the ChunkGroupFooter is read ahead.
+   * @param markerRead Whether the marker of the CHUNK_GROUP_FOOTER is read ahead.
    */
   public static ChunkGroupFooter deserializeFrom(InputStream inputStream, boolean markerRead)
       throws IOException {
@@ -91,7 +85,7 @@ public static ChunkGroupFooter deserializeFrom(InputStream inputStream, boolean
   /**
    * deserialize from FileChannel.
    *
-   * @param markerRead Whether the marker of the ChunkGroupFooter is read ahead.
+   * @param markerRead Whether the marker of the CHUNK_GROUP_FOOTER is read ahead.
    */
   public static ChunkGroupFooter deserializeFrom(FileChannel channel, long offset,
       boolean markerRead)
@@ -152,7 +146,7 @@ public int serializeTo(OutputStream outputStream) throws IOException {
 
   @Override
   public String toString() {
-    return "ChunkGroupFooter{" + "deviceID='" + deviceID + '\'' + ", dataSize=" + dataSize
+    return "CHUNK_GROUP_FOOTER{" + "deviceID='" + deviceID + '\'' + ", dataSize=" + dataSize
         + ", numberOfChunks="
         + numberOfChunks + ", serializedSize=" + serializedSize + '}';
   }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java
index eaeb2a040..9aefed429 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.header;
 
@@ -32,7 +31,7 @@
 
 public class ChunkHeader {
 
-  public static final byte MARKER = MetaMarker.ChunkHeader;
+  public static final byte MARKER = MetaMarker.CHUNK_HEADER;
 
   private String measurementID;
   private int dataSize;
@@ -46,12 +45,6 @@ public class ChunkHeader {
    */
   private long maxTombstoneTime;
 
-  /**
-   * The time when the ChunkGroup of this chunk is closed. This will not be written out and will
-   * only be set when read together with its ChunkGroup during querying.
-   */
-  private long writtenTime;// not serialized now.
-
   // this field does not need to be serialized.
   private int serializedSize;
 
@@ -86,7 +79,7 @@ private static int getSerializedSize(int measurementIdLength) {
   /**
    * deserialize from inputStream.
    *
-   * @param markerRead Whether the marker of the ChunkHeader has been read
+   * @param markerRead Whether the marker of the CHUNK_HEADER has been read
    */
   public static ChunkHeader deserializeFrom(InputStream inputStream, boolean markerRead)
       throws IOException {
@@ -113,7 +106,7 @@ public static ChunkHeader deserializeFrom(InputStream inputStream, boolean marke
    *
    * @param byteBuffer ByteBuffer
    * @param markerRead read marker (boolean type)
-   * @return ChunkHeader object
+   * @return CHUNK_HEADER object
    * @throws IOException IOException
    */
   public static ChunkHeader deserializeFrom(ByteBuffer byteBuffer, boolean markerRead)
@@ -135,7 +128,7 @@ public static ChunkHeader deserializeFrom(ByteBuffer byteBuffer, boolean markerR
    * @param channel FileChannel
    * @param offset offset
    * @param markerRead read marker (boolean type)
-   * @return ChunkHeader object
+   * @return CHUNK_HEADER object
    * @throws IOException IOException
    */
   public static ChunkHeader deserializeFrom(FileChannel channel, long offset, boolean markerRead)
@@ -191,7 +184,7 @@ public TSDataType getDataType() {
    */
   public int serializeTo(OutputStream outputStream) throws IOException {
     int length = 0;
-    length += ReadWriteIOUtils.write(MetaMarker.ChunkHeader, outputStream);
+    length += ReadWriteIOUtils.write(MetaMarker.CHUNK_HEADER, outputStream);
     length += ReadWriteIOUtils.write(measurementID, outputStream);
     length += ReadWriteIOUtils.write(dataSize, outputStream);
     length += ReadWriteIOUtils.write(dataType, outputStream);
@@ -211,7 +204,7 @@ public int serializeTo(OutputStream outputStream) throws IOException {
    */
   public int serializeTo(ByteBuffer buffer) {
     int length = 0;
-    length += ReadWriteIOUtils.write(MetaMarker.ChunkHeader, buffer);
+    length += ReadWriteIOUtils.write(MetaMarker.CHUNK_HEADER, buffer);
     length += ReadWriteIOUtils.write(measurementID, buffer);
     length += ReadWriteIOUtils.write(dataSize, buffer);
     length += ReadWriteIOUtils.write(dataType, buffer);
@@ -245,7 +238,7 @@ public void setMaxTombstoneTime(long maxTombstoneTime) {
 
   @Override
   public String toString() {
-    return "ChunkHeader{" + "measurementID='" + measurementID + '\'' + ", dataSize=" + dataSize
+    return "CHUNK_HEADER{" + "measurementID='" + measurementID + '\'' + ", dataSize=" + dataSize
         + ", dataType="
         + dataType + ", compressionType=" + compressionType + ", encodingType=" + encodingType
         + ", numOfPages="
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java
index 5f5113315..9c9eca6b3 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.header;
 
@@ -34,15 +33,15 @@ public class PageHeader {
   private int compressedSize;
   private int numOfValues;
   private Statistics statistics;
-  private long max_timestamp;
-  private long min_timestamp;
+  private long maxTimestamp;
+  private long minTimestamp;
 
   // this field does not need to be serialized.
   private int serializedSize;
 
   public PageHeader(int uncompressedSize, int compressedSize, int numOfValues,
-      Statistics statistics,
-      long max_timestamp, long min_timestamp) {
+                    Statistics statistics,
+                    long maxTimestamp, long minTimestamp) {
     this.uncompressedSize = uncompressedSize;
     this.compressedSize = compressedSize;
     this.numOfValues = numOfValues;
@@ -50,8 +49,8 @@ public PageHeader(int uncompressedSize, int compressedSize, int numOfValues,
       statistics = new NoStatistics();
     }
     this.statistics = statistics;
-    this.max_timestamp = max_timestamp;
-    this.min_timestamp = min_timestamp;
+    this.maxTimestamp = maxTimestamp;
+    this.minTimestamp = minTimestamp;
     serializedSize = calculatePageHeaderSize();
   }
 
@@ -64,11 +63,11 @@ public static PageHeader deserializeFrom(InputStream inputStream, TSDataType dat
     int uncompressedSize = ReadWriteIOUtils.readInt(inputStream);
     int compressedSize = ReadWriteIOUtils.readInt(inputStream);
     int numOfValues = ReadWriteIOUtils.readInt(inputStream);
-    long max_timestamp = ReadWriteIOUtils.readLong(inputStream);
-    long min_timestamp = ReadWriteIOUtils.readLong(inputStream);
+    long maxTimestamp = ReadWriteIOUtils.readLong(inputStream);
+    long minTimestamp = ReadWriteIOUtils.readLong(inputStream);
     Statistics statistics = Statistics.deserialize(inputStream, dataType);
-    return new PageHeader(uncompressedSize, compressedSize, numOfValues, statistics, max_timestamp,
-        min_timestamp);
+    return new PageHeader(uncompressedSize, compressedSize, numOfValues, statistics, maxTimestamp,
+        minTimestamp);
   }
 
   public static PageHeader deserializeFrom(ByteBuffer buffer, TSDataType dataType)
@@ -76,11 +75,11 @@ public static PageHeader deserializeFrom(ByteBuffer buffer, TSDataType dataType)
     int uncompressedSize = ReadWriteIOUtils.readInt(buffer);
     int compressedSize = ReadWriteIOUtils.readInt(buffer);
     int numOfValues = ReadWriteIOUtils.readInt(buffer);
-    long max_timestamp = ReadWriteIOUtils.readLong(buffer);
-    long min_timestamp = ReadWriteIOUtils.readLong(buffer);
+    long maxTimestamp = ReadWriteIOUtils.readLong(buffer);
+    long minTimestamp = ReadWriteIOUtils.readLong(buffer);
     Statistics statistics = Statistics.deserialize(buffer, dataType);
-    return new PageHeader(uncompressedSize, compressedSize, numOfValues, statistics, max_timestamp,
-        min_timestamp);
+    return new PageHeader(uncompressedSize, compressedSize, numOfValues, statistics, maxTimestamp,
+        minTimestamp);
   }
 
   public int calculatePageHeaderSize() {
@@ -111,11 +110,6 @@ public int getNumOfValues() {
     return numOfValues;
   }
 
-  /*
-   * public void setStatistics(Statistics statistics) { this.statistics = statistics; if(statistics != null)
-   * serializedSize = calculatePageHeaderSize(); }
-   */
-
   public void setNumOfValues(int numOfValues) {
     this.numOfValues = numOfValues;
   }
@@ -124,20 +118,20 @@ public Statistics getStatistics() {
     return statistics;
   }
 
-  public long getMax_timestamp() {
-    return max_timestamp;
+  public long getMaxTimestamp() {
+    return maxTimestamp;
   }
 
-  public void setMax_timestamp(long max_timestamp) {
-    this.max_timestamp = max_timestamp;
+  public void setMaxTimestamp(long maxTimestamp) {
+    this.maxTimestamp = maxTimestamp;
   }
 
-  public long getMin_timestamp() {
-    return min_timestamp;
+  public long getMinTimestamp() {
+    return minTimestamp;
   }
 
-  public void setMin_timestamp(long min_timestamp) {
-    this.min_timestamp = min_timestamp;
+  public void setMinTimestamp(long minTimestamp) {
+    this.minTimestamp = minTimestamp;
   }
 
   public int serializeTo(OutputStream outputStream) throws IOException {
@@ -145,8 +139,8 @@ public int serializeTo(OutputStream outputStream) throws IOException {
     length += ReadWriteIOUtils.write(uncompressedSize, outputStream);
     length += ReadWriteIOUtils.write(compressedSize, outputStream);
     length += ReadWriteIOUtils.write(numOfValues, outputStream);
-    length += ReadWriteIOUtils.write(max_timestamp, outputStream);
-    length += ReadWriteIOUtils.write(min_timestamp, outputStream);
+    length += ReadWriteIOUtils.write(maxTimestamp, outputStream);
+    length += ReadWriteIOUtils.write(minTimestamp, outputStream);
     length += statistics.serialize(outputStream);
     assert length == getSerializedSize();
     return length;
@@ -156,8 +150,8 @@ public int serializeTo(OutputStream outputStream) throws IOException {
   public String toString() {
     return "PageHeader{" + "uncompressedSize=" + uncompressedSize + ", compressedSize="
         + compressedSize
-        + ", numOfValues=" + numOfValues + ", statistics=" + statistics + ", max_timestamp="
-        + max_timestamp
-        + ", min_timestamp=" + min_timestamp + ", serializedSize=" + serializedSize + '}';
+        + ", numOfValues=" + numOfValues + ", statistics=" + statistics + ", maxTimestamp="
+        + maxTimestamp
+        + ", minTimestamp=" + minTimestamp + ", serializedSize=" + serializedSize + '}';
   }
 }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/package-info.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/package-info.java
index 99133df00..53d982846 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/package-info.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/package-info.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,16 +9,17 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.header;
 
 /**
- * ChunkGroupFooter and ChunkHeader are used for parsing file.
+ * CHUNK_GROUP_FOOTER and CHUNK_HEADER are used for parsing file.
  *
  * ChunkGroupMetadata and ChunkMetadata are used for locating the positions of ChunkGroup (footer)
  * and chunk (header),filtering data quickly, and thereby they have digest information.
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
index 452174457..ceac1b8c7 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata;
 
@@ -27,16 +26,12 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Metadata of ChunkGroup.
  */
 public class ChunkGroupMetaData {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ChunkGroupMetaData.class);
-
   /**
    * Name of device, this field is not serialized.
    */
@@ -66,7 +61,9 @@ private ChunkGroupMetaData() {
    * is correct.
    */
   public ChunkGroupMetaData(String deviceID, List chunkMetaDataList) {
-    assert chunkMetaDataList != null;
+    if (chunkMetaDataList == null) {
+      throw new IllegalArgumentException("Given chunkMetaDataList is null");
+    }
     this.deviceID = deviceID;
     this.chunkMetaDataList = chunkMetaDataList;
     reCalculateSerializedSize();
@@ -105,9 +102,8 @@ public static ChunkGroupMetaData deserializeFrom(InputStream inputStream) throws
    *
    * @param buffer ByteBuffer
    * @return ChunkGroupMetaData object
-   * @throws IOException IOException
    */
-  public static ChunkGroupMetaData deserializeFrom(ByteBuffer buffer) throws IOException {
+  public static ChunkGroupMetaData deserializeFrom(ByteBuffer buffer) {
     ChunkGroupMetaData chunkGroupMetaData = new ChunkGroupMetaData();
 
     chunkGroupMetaData.deviceID = (ReadWriteIOUtils.readString(buffer));
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaData.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaData.java
index c721129e4..dea423ce7 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaData.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaData.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata;
 
@@ -25,16 +24,12 @@
 import java.nio.ByteBuffer;
 import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
 import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * MetaData of one chunk.
  */
 public class ChunkMetaData {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ChunkMetaData.class);
-
   private String measurementUid;
 
   /**
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadata.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadata.java
index 015ff74c9..f2002624f 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadata.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadata.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata;
 
@@ -52,6 +51,7 @@ public class TsDeviceMetadata {
   private List chunkGroupMetadataList = new ArrayList<>();
 
   public TsDeviceMetadata() {
+    // allowed to clair an empty TsDeviceMetadata whose fields will be assigned later.
   }
 
   /**
@@ -85,7 +85,7 @@ public static TsDeviceMetadata deserializeFrom(InputStream inputStream) throws I
    * @param buffer -buffer to deserialize
    * @return -device meta data
    */
-  public static TsDeviceMetadata deserializeFrom(ByteBuffer buffer) throws IOException {
+  public static TsDeviceMetadata deserializeFrom(ByteBuffer buffer) {
     TsDeviceMetadata deviceMetadata = new TsDeviceMetadata();
 
     deviceMetadata.startTime = ReadWriteIOUtils.readLong(buffer);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataIndex.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataIndex.java
index 6e81bbf8b..0ba26ddd9 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataIndex.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataIndex.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata;
 
@@ -83,7 +82,7 @@ public static TsDeviceMetadataIndex deserializeFrom(InputStream inputStream) thr
    * @param buffer -determine the index's source
    * @return -a TsDeviceMetadataIndex
    */
-  public static TsDeviceMetadataIndex deserializeFrom(ByteBuffer buffer) throws IOException {
+  public static TsDeviceMetadataIndex deserializeFrom(ByteBuffer buffer) {
     TsDeviceMetadataIndex index = new TsDeviceMetadataIndex();
     index.offset = ReadWriteIOUtils.readLong(buffer);
     index.len = ReadWriteIOUtils.readInt(buffer);
@@ -145,7 +144,7 @@ public int serializeTo(OutputStream outputStream) throws IOException {
    * @param buffer -param to determine the byte length
    * @return -byte length
    */
-  public int serializeTo(ByteBuffer buffer) throws IOException {
+  public int serializeTo(ByteBuffer buffer) {
     int byteLen = 0;
     byteLen += ReadWriteIOUtils.write(offset, buffer);
     byteLen += ReadWriteIOUtils.write(len, buffer);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDigest.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDigest.java
index d2eb4cffe..bc1e84112 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDigest.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDigest.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata;
 
@@ -40,6 +39,7 @@ public class TsDigest {
   private int sizeOfList;
 
   public TsDigest() {
+    // allowed to clair an empty TsDigest whose fields will be assigned later.
   }
 
   public static int getNullDigestSize() {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetaData.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetaData.java
index 7bb4655be..574c63311 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetaData.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetaData.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java
index 6cb93ac0b..483c05e26 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.enums;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSDataType.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSDataType.java
index 6faea61f2..7c775cd8a 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSDataType.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSDataType.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.enums;
 
@@ -29,7 +28,9 @@ public enum TSDataType {
    * @return -enum type
    */
   public static TSDataType deserialize(short i) {
-    assert i < 6;
+    if(i >= 6){
+      throw new IllegalArgumentException("Invalid input: " + i);
+    }
     switch (i) {
       case 0:
         return BOOLEAN;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSEncoding.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSEncoding.java
index 3d8fdb94f..b70fd2d88 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSEncoding.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSEncoding.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.enums;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSFreqType.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSFreqType.java
index 4862d1931..d4075c62b 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSFreqType.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSFreqType.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.enums;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
index 4e1b6e47d..b4b20db34 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BinaryStatistics.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.statistics;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
index 4cb1d1f7a..ca2044e57 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatistics.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.statistics;
 
@@ -58,10 +57,10 @@ public void updateStats(boolean value) {
   private void updateStats(boolean minValue, boolean maxValue, boolean firstValue, double sumValue,
       boolean lastValue) {
     if (!minValue && min) {
-      min = minValue;
+      min = false;
     }
     if (maxValue && !max) {
-      max = maxValue;
+      max = true;
     }
     this.last = lastValue;
   }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java
index 7b665bc08..dacdb9c2a 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatistics.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.statistics;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java
index 64b1f1fb3..93feff640 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatistics.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.statistics;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java
index 5984a88b9..eb730482e 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatistics.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.statistics;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java
index 0060fdcee..2addb69ad 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatistics.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.statistics;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/NoStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/NoStatistics.java
index 68d38835b..6cc702b9b 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/NoStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/NoStatistics.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,15 +9,15 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.statistics;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import org.apache.iotdb.tsfile.utils.Binary;
@@ -35,6 +33,7 @@ public class NoStatistics extends Statistics {
 
   @Override
   public void setMinMaxFromBytes(byte[] minBytes, byte[] maxBytes) {
+    // NoStatistics does not make any statistics
   }
 
   @Override
@@ -49,18 +48,22 @@ public Long getMax() {
 
   @Override
   public void updateStats(boolean value) {
+    // NoStatistics does not make any statistics
   }
 
   @Override
   public void updateStats(int value) {
+    // NoStatistics does not make any statistics
   }
 
   @Override
   public void updateStats(long value) {
+    // NoStatistics does not make any statistics
   }
 
   @Override
   public void updateStats(Binary value) {
+    // NoStatistics does not make any statistics
   }
 
   @Override
@@ -70,6 +73,7 @@ public void updateStats(long min, long max) {
 
   @Override
   protected void mergeStatisticsValue(Statistics stats) {
+    // NoStatistics does not make any statistics
   }
 
   @Override
@@ -148,11 +152,12 @@ public ByteBuffer getLastBytebuffer() {
   }
 
   @Override
-  void fill(InputStream inputStream) throws IOException {
-    // nothing
+  void fill(InputStream inputStream) {
+    // NoStatistics does not make any statistics
   }
 
   @Override
-  void fill(ByteBuffer byteBuffer) throws IOException {
+  void fill(ByteBuffer byteBuffer) {
+    // NoStatistics does not make any statistics
   }
 }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java
index 644dbc436..052222f76 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/Statistics.java
@@ -1,6 +1,4 @@
 /**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,11 +9,12 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.iotdb.tsfile.file.metadata.statistics;
 
@@ -44,8 +43,9 @@
 public abstract class Statistics {
 
   private static final Logger LOG = LoggerFactory.getLogger(Statistics.class);
-  // isEmpty being false means this statistic has been initialized and the max
-  // and min is not null;
+  /**
+   * isEmpty being false means this statistic has been initialized and the max and min is not null;
+   */
   protected boolean isEmpty = true;
 
   /**
@@ -130,37 +130,37 @@ public static Statistics deserialize(ByteBuffer buffer, TSDataType dataType) thr
     return statistics;
   }
 
-  abstract public void setMinMaxFromBytes(byte[] minBytes, byte[] maxBytes);
+  public abstract void setMinMaxFromBytes(byte[] minBytes, byte[] maxBytes);
 
-  abstract public T getMin();
+  public abstract T getMin();
 
-  abstract public T getMax();
+  public abstract T getMax();
 
-  abstract public T getFirst();
+  public abstract T getFirst();
 
-  abstract public double getSum();
+  public abstract double getSum();
 
-  abstract public T getLast();
+  public abstract T getLast();
 
-  abstract public byte[] getMaxBytes();
+  public abstract byte[] getMaxBytes();
 
-  abstract public byte[] getMinBytes();
+  public abstract byte[] getMinBytes();
 
-  abstract public byte[] getFirstBytes();
+  public abstract byte[] getFirstBytes();
 
-  abstract public byte[] getSumBytes();
+  public abstract byte[] getSumBytes();
 
-  abstract public byte[] getLastBytes();
+  public abstract byte[] getLastBytes();
 
-  abstract public ByteBuffer getMaxBytebuffer();
+  public abstract ByteBuffer getMaxBytebuffer();
 
-  abstract public ByteBuffer getMinBytebuffer();
+  public abstract ByteBuffer getMinBytebuffer();
 
-  abstract public ByteBuffer getFirstBytebuffer();
+  public abstract ByteBuffer getFirstBytebuffer();
 
-  abstract public ByteBuffer getSumBytebuffer();
+  public abstract ByteBuffer getSumBytebuffer();
 
-  abstract public ByteBuffer getLastBytebuffer();
+  public abstract ByteBuffer getLastBytebuffer();
 
   /**
    * merge parameter to this statistic. Including
@@ -168,7 +168,7 @@ public static Statistics deserialize(ByteBuffer buffer, TSDataType dataType) thr
    * @param stats input statistics
    * @throws StatisticsClassException cannot merge statistics
    */
-  public void mergeStatistics(Statistics stats) throws StatisticsClassException {
+  public void mergeStatistics(Statistics stats) {
     if (stats == null) {
       LOG.warn("tsfile-file parameter stats is null");
       return;
@@ -179,15 +179,16 @@ public void mergeStatistics(Statistics stats) throws StatisticsClassException
         isEmpty = false;
       }
     } else {
-      LOG.warn("tsfile-file Statistics classes mismatched,no merge: " + this.getClass().toString()
-          + " vs. "
-          + stats.getClass().toString());
+      String thisClass = this.getClass().toString();
+      String statsClass = stats.getClass().toString();
+      LOG.warn("tsfile-file Statistics classes mismatched,no merge: {} v.s. {}",
+              thisClass, statsClass);
 
       throw new StatisticsClassException(this.getClass(), stats.getClass());
     }
   }
 
-  abstract protected void mergeStatisticsValue(Statistics stats);
+  protected abstract void mergeStatisticsValue(Statistics stats);
 
   public boolean isEmpty() {
     return isEmpty;
@@ -239,7 +240,7 @@ public void reset() {
    * @return the size of one field of this class.
int, float - 4
double, long, bigDecimal - * 8
boolean - 1
No - 0
binary - -1 which means uncertainty */ - abstract public int sizeOfDatum(); + public abstract int sizeOfDatum(); /** * read data from the inputStream. diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsClassException.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsClassException.java index ecd606bae..d1a271f2a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsClassException.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsClassException.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata.statistics; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsDeserializer.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsDeserializer.java deleted file mode 100644 index 2d48a1617..000000000 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/StatisticsDeserializer.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.iotdb.tsfile.file.metadata.statistics; - -public class StatisticsDeserializer { - -} diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/IDataReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/IDataReader.java index 2c7251849..f45e6449b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/IDataReader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/IDataReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFile.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFile.java index 7045d6858..e08715397 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFile.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFile.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java index af63e8270..23ad23868 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read; @@ -144,10 +143,10 @@ public TsDeviceMetadata readTsDeviceMetaData(TsDeviceMetadataIndex index) throws } /** - * read data from current position of the input, and deserialize it to a ChunkGroupFooter.
+ * read data from current position of the input, and deserialize it to a CHUNK_GROUP_FOOTER.
* This method is not threadsafe. * - * @return a ChunkGroupFooter + * @return a CHUNK_GROUP_FOOTER * @throws IOException io error */ public ChunkGroupFooter readChunkGroupFooter() throws IOException { @@ -155,11 +154,11 @@ public ChunkGroupFooter readChunkGroupFooter() throws IOException { } /** - * read data from current position of the input, and deserialize it to a ChunkGroupFooter. + * read data from current position of the input, and deserialize it to a CHUNK_GROUP_FOOTER. * * @param position the offset of the chunk group footer in the file * @param markerRead true if the offset does not contains the marker , otherwise false - * @return a ChunkGroupFooter + * @return a CHUNK_GROUP_FOOTER * @throws IOException io error */ public ChunkGroupFooter readChunkGroupFooter(long position, boolean markerRead) @@ -180,10 +179,10 @@ public void setPositionToAChunkGroup(ChunkGroupFooter footer) throws IOException } /** - * read data from current position of the input, and deserialize it to a ChunkHeader.
This + * read data from current position of the input, and deserialize it to a CHUNK_HEADER.
This * method is not threadsafe. * - * @return a ChunkHeader + * @return a CHUNK_HEADER * @throws IOException io error */ public ChunkHeader readChunkHeader() throws IOException { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/UnClosedTsFileReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/UnClosedTsFileReader.java index ce4771e04..99f010bca 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/UnClosedTsFileReader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/UnClosedTsFileReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchData.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchData.java index 8ad545a21..b0973bf87 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchData.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchData.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.common; @@ -31,21 +30,27 @@ */ public class BatchData { - private static int TIME_CAPACITY = 1; - private static int VALUE_CAPACITY = 1; - private static int EMPTY_TIME_CAPACITY = 1; - private static int CAPACITY_THRESHOLD = 1024; + private int timeCapacity = 1; + private int valueCapacity = 1; + private int emptyTimeCapacity = 1; + private int capacityThreshold = 1024; private TSDataType dataType; private int curIdx; - private int timeArrayIdx; // the number of ArrayList in timeRet - private int curTimeIdx; // the index of current ArrayList in timeRet - private int timeLength; // the insert timestamp number of timeRet + /** the number of ArrayList in timeRet **/ + private int timeArrayIdx; + /** the index of current ArrayList in timeRet **/ + private int curTimeIdx; + /** the insert timestamp number of timeRet **/ + private int timeLength; - private int valueArrayIdx;// the number of ArrayList in valueRet - private int curValueIdx; // the index of current ArrayList in valueRet - private int valueLength; // the insert value number of valueRet + /** the number of ArrayList in valueRet **/ + private int valueArrayIdx; + /** the index of current ArrayList in valueRet **/ + private int curValueIdx; + /** the insert value number of valueRet **/ + private int valueLength; private ArrayList timeRet; private ArrayList emptyTimeRet; @@ -88,7 +93,7 @@ public void next() { public long currentTime() { rangeCheckForTime(curIdx); - return this.timeRet.get(curIdx / TIME_CAPACITY)[curIdx % TIME_CAPACITY]; + return this.timeRet.get(curIdx / timeCapacity)[curIdx % timeCapacity]; } /** @@ -132,11 +137,11 @@ public void init(TSDataType type, boolean recordTime, boolean hasEmptyTime) { this.curValueIdx = 0; this.valueLength = 0; this.curIdx = 0; - CAPACITY_THRESHOLD = TSFileConfig.dynamicDataSize; + capacityThreshold = TSFileConfig.dynamicDataSize; if (recordTime) { timeRet = new ArrayList<>(); - timeRet.add(new long[TIME_CAPACITY]); + timeRet.add(new long[timeCapacity]); timeArrayIdx = 0; curTimeIdx = 0; timeLength = 0; @@ -144,33 +149,33 @@ public void init(TSDataType type, boolean recordTime, boolean hasEmptyTime) { if (hasEmptyTime) { emptyTimeRet = new ArrayList<>(); - emptyTimeRet.add(new long[EMPTY_TIME_CAPACITY]); + emptyTimeRet.add(new long[emptyTimeCapacity]); } switch (dataType) { case BOOLEAN: booleanRet = new ArrayList<>(); - booleanRet.add(new boolean[VALUE_CAPACITY]); + booleanRet.add(new boolean[valueCapacity]); break; case INT32: intRet = new ArrayList<>(); - intRet.add(new int[VALUE_CAPACITY]); + intRet.add(new int[valueCapacity]); break; case INT64: longRet = new ArrayList<>(); - longRet.add(new long[VALUE_CAPACITY]); + longRet.add(new long[valueCapacity]); break; case FLOAT: floatRet = new ArrayList<>(); - floatRet.add(new float[VALUE_CAPACITY]); + floatRet.add(new float[valueCapacity]); break; case DOUBLE: doubleRet = new ArrayList<>(); - doubleRet.add(new double[VALUE_CAPACITY]); + doubleRet.add(new double[valueCapacity]); break; case TEXT: binaryRet = new ArrayList<>(); - binaryRet.add(new Binary[VALUE_CAPACITY]); + binaryRet.add(new Binary[valueCapacity]); break; default: throw new UnSupportedDataTypeException(String.valueOf(dataType)); @@ -183,16 +188,16 @@ public void init(TSDataType type, boolean recordTime, boolean hasEmptyTime) { * @param v timestamp */ public void putTime(long v) { - if (curTimeIdx == TIME_CAPACITY) { - if (TIME_CAPACITY >= CAPACITY_THRESHOLD) { - this.timeRet.add(new long[TIME_CAPACITY]); + if (curTimeIdx == timeCapacity) { + if (timeCapacity >= capacityThreshold) { + this.timeRet.add(new long[timeCapacity]); timeArrayIdx++; curTimeIdx = 0; } else { - long[] newData = new long[TIME_CAPACITY * 2]; - System.arraycopy(timeRet.get(0), 0, newData, 0, TIME_CAPACITY); + long[] newData = new long[timeCapacity * 2]; + System.arraycopy(timeRet.get(0), 0, newData, 0, timeCapacity); this.timeRet.set(0, newData); - TIME_CAPACITY = TIME_CAPACITY * 2; + timeCapacity = timeCapacity * 2; } } (timeRet.get(timeArrayIdx))[curTimeIdx++] = v; @@ -205,18 +210,18 @@ public void putTime(long v) { * @param v boolean data */ public void putBoolean(boolean v) { - if (curValueIdx == VALUE_CAPACITY) { - if (VALUE_CAPACITY >= CAPACITY_THRESHOLD) { + if (curValueIdx == valueCapacity) { + if (valueCapacity >= capacityThreshold) { if (this.booleanRet.size() <= valueArrayIdx + 1) { - this.booleanRet.add(new boolean[VALUE_CAPACITY]); + this.booleanRet.add(new boolean[valueCapacity]); } valueArrayIdx++; curValueIdx = 0; } else { - boolean[] newData = new boolean[VALUE_CAPACITY * 2]; - System.arraycopy(booleanRet.get(0), 0, newData, 0, VALUE_CAPACITY); + boolean[] newData = new boolean[valueCapacity * 2]; + System.arraycopy(booleanRet.get(0), 0, newData, 0, valueCapacity); this.booleanRet.set(0, newData); - VALUE_CAPACITY = VALUE_CAPACITY * 2; + valueCapacity = valueCapacity * 2; } } (this.booleanRet.get(valueArrayIdx))[curValueIdx++] = v; @@ -229,18 +234,18 @@ public void putBoolean(boolean v) { * @param v int data */ public void putInt(int v) { - if (curValueIdx == VALUE_CAPACITY) { - if (VALUE_CAPACITY >= CAPACITY_THRESHOLD) { + if (curValueIdx == valueCapacity) { + if (valueCapacity >= capacityThreshold) { if (this.intRet.size() <= valueArrayIdx + 1) { - this.intRet.add(new int[VALUE_CAPACITY]); + this.intRet.add(new int[valueCapacity]); } valueArrayIdx++; curValueIdx = 0; } else { - int[] newData = new int[VALUE_CAPACITY * 2]; - System.arraycopy(intRet.get(0), 0, newData, 0, VALUE_CAPACITY); + int[] newData = new int[valueCapacity * 2]; + System.arraycopy(intRet.get(0), 0, newData, 0, valueCapacity); this.intRet.set(0, newData); - VALUE_CAPACITY = VALUE_CAPACITY * 2; + valueCapacity = valueCapacity * 2; } } (this.intRet.get(valueArrayIdx))[curValueIdx++] = v; @@ -253,18 +258,18 @@ public void putInt(int v) { * @param v long data */ public void putLong(long v) { - if (curValueIdx == VALUE_CAPACITY) { - if (VALUE_CAPACITY >= CAPACITY_THRESHOLD) { + if (curValueIdx == valueCapacity) { + if (valueCapacity >= capacityThreshold) { if (this.longRet.size() <= valueArrayIdx + 1) { - this.longRet.add(new long[VALUE_CAPACITY]); + this.longRet.add(new long[valueCapacity]); } valueArrayIdx++; curValueIdx = 0; } else { - long[] newData = new long[VALUE_CAPACITY * 2]; - System.arraycopy(longRet.get(0), 0, newData, 0, VALUE_CAPACITY); + long[] newData = new long[valueCapacity * 2]; + System.arraycopy(longRet.get(0), 0, newData, 0, valueCapacity); this.longRet.set(0, newData); - VALUE_CAPACITY = VALUE_CAPACITY * 2; + valueCapacity = valueCapacity * 2; } } (this.longRet.get(valueArrayIdx))[curValueIdx++] = v; @@ -277,18 +282,18 @@ public void putLong(long v) { * @param v float data */ public void putFloat(float v) { - if (curValueIdx == VALUE_CAPACITY) { - if (VALUE_CAPACITY >= CAPACITY_THRESHOLD) { + if (curValueIdx == valueCapacity) { + if (valueCapacity >= capacityThreshold) { if (this.floatRet.size() <= valueArrayIdx + 1) { - this.floatRet.add(new float[VALUE_CAPACITY]); + this.floatRet.add(new float[valueCapacity]); } valueArrayIdx++; curValueIdx = 0; } else { - float[] newData = new float[VALUE_CAPACITY * 2]; - System.arraycopy(floatRet.get(0), 0, newData, 0, VALUE_CAPACITY); + float[] newData = new float[valueCapacity * 2]; + System.arraycopy(floatRet.get(0), 0, newData, 0, valueCapacity); this.floatRet.set(0, newData); - VALUE_CAPACITY = VALUE_CAPACITY * 2; + valueCapacity = valueCapacity * 2; } } (this.floatRet.get(valueArrayIdx))[curValueIdx++] = v; @@ -301,18 +306,18 @@ public void putFloat(float v) { * @param v double data */ public void putDouble(double v) { - if (curValueIdx == VALUE_CAPACITY) { - if (VALUE_CAPACITY >= CAPACITY_THRESHOLD) { + if (curValueIdx == valueCapacity) { + if (valueCapacity >= capacityThreshold) { if (this.doubleRet.size() <= valueArrayIdx + 1) { - this.doubleRet.add(new double[VALUE_CAPACITY]); + this.doubleRet.add(new double[valueCapacity]); } valueArrayIdx++; curValueIdx = 0; } else { - double[] newData = new double[VALUE_CAPACITY * 2]; - System.arraycopy(doubleRet.get(0), 0, newData, 0, VALUE_CAPACITY); + double[] newData = new double[valueCapacity * 2]; + System.arraycopy(doubleRet.get(0), 0, newData, 0, valueCapacity); this.doubleRet.set(0, newData); - VALUE_CAPACITY = VALUE_CAPACITY * 2; + valueCapacity = valueCapacity * 2; } } (this.doubleRet.get(valueArrayIdx))[curValueIdx++] = v; @@ -325,18 +330,18 @@ public void putDouble(double v) { * @param v binary data. */ public void putBinary(Binary v) { - if (curValueIdx == VALUE_CAPACITY) { - if (VALUE_CAPACITY >= CAPACITY_THRESHOLD) { + if (curValueIdx == valueCapacity) { + if (valueCapacity >= capacityThreshold) { if (this.binaryRet.size() <= valueArrayIdx + 1) { - this.binaryRet.add(new Binary[VALUE_CAPACITY]); + this.binaryRet.add(new Binary[valueCapacity]); } valueArrayIdx++; curValueIdx = 0; } else { - Binary[] newData = new Binary[VALUE_CAPACITY * 2]; - System.arraycopy(binaryRet.get(0), 0, newData, 0, VALUE_CAPACITY); + Binary[] newData = new Binary[valueCapacity * 2]; + System.arraycopy(binaryRet.get(0), 0, newData, 0, valueCapacity); this.binaryRet.set(0, newData); - VALUE_CAPACITY = VALUE_CAPACITY * 2; + valueCapacity = valueCapacity * 2; } } (this.binaryRet.get(valueArrayIdx))[curValueIdx++] = v; @@ -378,71 +383,71 @@ private void rangeCheckForEmptyTime(int idx) { public boolean getBoolean() { rangeCheck(curIdx); - return this.booleanRet.get(curIdx / TIME_CAPACITY)[curIdx % TIME_CAPACITY]; + return this.booleanRet.get(curIdx / timeCapacity)[curIdx % timeCapacity]; } public void setBoolean(int idx, boolean v) { rangeCheck(idx); - this.booleanRet.get(idx / TIME_CAPACITY)[idx % TIME_CAPACITY] = v; + this.booleanRet.get(idx / timeCapacity)[idx % timeCapacity] = v; } public int getInt() { rangeCheck(curIdx); - return this.intRet.get(curIdx / TIME_CAPACITY)[curIdx % TIME_CAPACITY]; + return this.intRet.get(curIdx / timeCapacity)[curIdx % timeCapacity]; } public void setInt(int idx, int v) { rangeCheck(idx); - this.intRet.get(idx / TIME_CAPACITY)[idx % TIME_CAPACITY] = v; + this.intRet.get(idx / timeCapacity)[idx % timeCapacity] = v; } public long getLong() { rangeCheck(curIdx); - return this.longRet.get(curIdx / TIME_CAPACITY)[curIdx % TIME_CAPACITY]; + return this.longRet.get(curIdx / timeCapacity)[curIdx % timeCapacity]; } public void setLong(int idx, long v) { rangeCheck(idx); - this.longRet.get(idx / TIME_CAPACITY)[idx % TIME_CAPACITY] = v; + this.longRet.get(idx / timeCapacity)[idx % timeCapacity] = v; } public float getFloat() { rangeCheck(curIdx); - return this.floatRet.get(curIdx / TIME_CAPACITY)[curIdx % TIME_CAPACITY]; + return this.floatRet.get(curIdx / timeCapacity)[curIdx % timeCapacity]; } public void setFloat(int idx, float v) { rangeCheck(idx); - this.floatRet.get(idx / TIME_CAPACITY)[idx % TIME_CAPACITY] = v; + this.floatRet.get(idx / timeCapacity)[idx % timeCapacity] = v; } public double getDouble() { rangeCheck(curIdx); - return this.doubleRet.get(curIdx / TIME_CAPACITY)[curIdx % TIME_CAPACITY]; + return this.doubleRet.get(curIdx / timeCapacity)[curIdx % timeCapacity]; } public void setDouble(int idx, double v) { rangeCheck(idx); - this.doubleRet.get(idx / TIME_CAPACITY)[idx % TIME_CAPACITY] = v; + this.doubleRet.get(idx / timeCapacity)[idx % timeCapacity] = v; } public Binary getBinary() { rangeCheck(curIdx); - return this.binaryRet.get(curIdx / TIME_CAPACITY)[curIdx % TIME_CAPACITY]; + return this.binaryRet.get(curIdx / timeCapacity)[curIdx % timeCapacity]; } public void setBinary(int idx, Binary v) { - this.binaryRet.get(idx / TIME_CAPACITY)[idx % TIME_CAPACITY] = v; + this.binaryRet.get(idx / timeCapacity)[idx % timeCapacity] = v; } public void setTime(int idx, long v) { rangeCheckForTime(idx); - this.timeRet.get(idx / TIME_CAPACITY)[idx % TIME_CAPACITY] = v; + this.timeRet.get(idx / timeCapacity)[idx % timeCapacity] = v; } public long getEmptyTime(int idx) { rangeCheckForEmptyTime(idx); - return this.emptyTimeRet.get(idx / EMPTY_TIME_CAPACITY)[idx % EMPTY_TIME_CAPACITY]; + return this.emptyTimeRet.get(idx / emptyTimeCapacity)[idx % emptyTimeCapacity]; } /** @@ -453,7 +458,7 @@ public long getEmptyTime(int idx) { public long[] getTimeAsArray() { long[] res = new long[timeLength]; for (int i = 0; i < timeLength; i++) { - res[i] = timeRet.get(i / TIME_CAPACITY)[i % TIME_CAPACITY]; + res[i] = timeRet.get(i / timeCapacity)[i % timeCapacity]; } return res; } @@ -488,30 +493,6 @@ public void putAnObject(Object v) { } } - /** - * get and object. - * - * @return object - */ - public Comparable getAnObject() { - switch (dataType) { - case BOOLEAN: - return getBoolean(); - case DOUBLE: - return getDouble(); - case TEXT: - return getBinary(); - case FLOAT: - return getFloat(); - case INT32: - return getInt(); - case INT64: - return getLong(); - default: - throw new UnSupportedDataTypeException(String.valueOf(dataType)); - } - } - /** * set an object. * diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Chunk.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Chunk.java index 975121f68..7c63be6f3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Chunk.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Chunk.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.common; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Field.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Field.java index b8a8298ce..421e296e8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Field.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Field.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.common; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java index 0e0bc97a4..0b3533d21 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Path.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.common; @@ -33,28 +32,37 @@ public class Path { private String measurement = null; private String device = null; private String fullPath; + private String illegalPathArgument = "Path parameter is null"; public Path(StringContainer pathSc) { - assert pathSc != null; + if (pathSc == null) { + throw new IllegalArgumentException(""); + } String[] splits = pathSc.toString().split(SystemConstant.PATH_SEPARATER_NO_REGEX); init(splits); } public Path(String pathSc) { - assert pathSc != null; + if (pathSc == null) { + throw new IllegalArgumentException(illegalPathArgument); + } String[] splits = pathSc.split(SystemConstant.PATH_SEPARATER_NO_REGEX); init(splits); } public Path(String[] pathSc) { - assert pathSc != null; + if (pathSc == null) { + throw new IllegalArgumentException(illegalPathArgument); + } String[] splits = new StringContainer(pathSc, SystemConstant.PATH_SEPARATOR).toString() .split(SystemConstant.PATH_SEPARATER_NO_REGEX); init(splits); } public Path(String device, String measurement) { - assert device != null && measurement != null; + if (device == null || measurement == null) { + throw new IllegalArgumentException(illegalPathArgument); + } String[] splits = (device + SystemConstant.PATH_SEPARATOR + measurement) .split(SystemConstant.PATH_SEPARATER_NO_REGEX); init(splits); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/RowRecord.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/RowRecord.java index aca0ecd8b..fa7ab3825 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/RowRecord.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/RowRecord.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.common; @@ -32,10 +31,6 @@ public RowRecord(long timestamp) { this.fields = new ArrayList<>(); } - public long getTime() { - return timestamp; - } - public void addField(Field f) { this.fields.add(f); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/ChunkLoader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/ChunkLoader.java index 473af0ce0..78e561e86 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/ChunkLoader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/ChunkLoader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.controller; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderImpl.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderImpl.java index 42d017acb..2d7624cf4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderImpl.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.controller; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerier.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerier.java index 64cb4d50c..e288e5886 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerier.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerier.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.controller; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java index f1f41eb7f..4fda546b1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.controller; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/ExpressionType.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/ExpressionType.java index ec0b4cacc..4bffddb31 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/ExpressionType.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/ExpressionType.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.expression; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java index a953b9468..b97310aa6 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.expression; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IExpression.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IExpression.java index 167b12db0..a05b84250 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IExpression.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IExpression.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.expression; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IUnaryExpression.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IUnaryExpression.java index a3e20c8be..b4be3cff4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IUnaryExpression.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IUnaryExpression.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.expression; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/QueryExpression.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/QueryExpression.java index dd6d5512f..393448b6b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/QueryExpression.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/QueryExpression.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.expression; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/BinaryExpression.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/BinaryExpression.java index 2610b6c18..60e68e0a0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/BinaryExpression.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/BinaryExpression.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.expression.impl; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java index 4843939e8..d69a65ae4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.expression.impl; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/SingleSeriesExpression.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/SingleSeriesExpression.java index 721454287..b2c2b24a2 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/SingleSeriesExpression.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/SingleSeriesExpression.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.expression.impl; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionOptimizer.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionOptimizer.java index ecfcea041..147d2e56c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionOptimizer.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionOptimizer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.expression.util; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionPrinter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionPrinter.java index fdcb2cc04..c0e3f549f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionPrinter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/util/ExpressionPrinter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.expression.util; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/DigestForFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/DigestForFilter.java index 1c19f6da3..e3784afdc 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/DigestForFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/DigestForFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/TimeFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/TimeFilter.java index 3e0c8fd5a..7016e5fdc 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/TimeFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/TimeFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/ValueFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/ValueFilter.java index de09ccbce..07e35be18 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/ValueFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/ValueFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/BinaryFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/BinaryFilter.java index 03931633b..aeba875dd 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/BinaryFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/BinaryFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.basic; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/Filter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/Filter.java index eeee98642..9320b8fed 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/Filter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/Filter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.basic; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/UnaryFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/UnaryFilter.java index a542c06dc..ff66ef515 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/UnaryFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/UnaryFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.basic; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java index ef0195ec3..83e97ae57 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterFactory.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.factory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterType.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterType.java index ea94b4426..55628d11d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterType.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/FilterType.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.factory; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/AndFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/AndFilter.java index 55b7451a1..cf5db76ba 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/AndFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/AndFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.operator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Eq.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Eq.java index 02ce855aa..bd0d55b00 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Eq.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Eq.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.operator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Gt.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Gt.java index 4389713ec..ed569a7ec 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Gt.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Gt.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.operator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/GtEq.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/GtEq.java index edf1acdad..609194753 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/GtEq.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/GtEq.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.operator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Lt.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Lt.java index 8f7a9609e..f5b3beca5 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Lt.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Lt.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.operator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/LtEq.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/LtEq.java index 6104dee96..060b3ade3 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/LtEq.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/LtEq.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.operator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/NotEq.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/NotEq.java index e85b7188d..90266fc70 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/NotEq.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/NotEq.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.operator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/NotFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/NotFilter.java index 277b977c5..2385a82c2 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/NotFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/NotFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.operator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/OrFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/OrFilter.java index e8b0d3f3a..38d876254 100755 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/OrFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/OrFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter.operator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithTimeGenerator.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithTimeGenerator.java index 3a4265857..557cedcc9 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithTimeGenerator.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithTimeGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.dataset; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java index 1221ba078..80af768ce 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.dataset; @@ -99,9 +98,6 @@ public boolean hasNext() { @Override public RowRecord next() throws IOException { long minTime = timeHeapGet(); - if (minTime == 1480562618999L) { - System.out.println("debug"); - } RowRecord record = new RowRecord(minTime); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java index 84cebd1bd..4c00641bc 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.dataset; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/ExecutorWithTimeGenerator.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/ExecutorWithTimeGenerator.java index 72bb9ca9a..96c29add7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/ExecutorWithTimeGenerator.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/ExecutorWithTimeGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.executor; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutor.java index 217950f42..a59f34013 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutor.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.executor; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/TsFileExecutor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/TsFileExecutor.java index 41aab8f09..69d364f51 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/TsFileExecutor.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/TsFileExecutor.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.executor; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java index 5b585072f..21a1e9aba 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorImpl.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorImpl.java index 8577520f4..c17600110 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorImpl.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java index c8b80646c..e54d2b95e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator.node; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/LeafNode.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/LeafNode.java index a581721ec..b69c0477c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/LeafNode.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/LeafNode.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator.node; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java index 75f082f29..60d8802eb 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator.node; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/NodeType.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/NodeType.java index c2ea6a3e1..1e470edf0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/NodeType.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/NodeType.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator.node; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/OrNode.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/OrNode.java index ac54f0d3c..7d01630e5 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/OrNode.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/OrNode.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator.node; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/DefaultTsFileInput.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/DefaultTsFileInput.java index e57914c6b..904258d8b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/DefaultTsFileInput.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/DefaultTsFileInput.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/TsFileInput.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/TsFileInput.java index 02afea70e..260d436d8 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/TsFileInput.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/TsFileInput.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java index beeb161fc..b373a48fc 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader.chunk; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderByTimestamp.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderByTimestamp.java index c69cb4b4c..0c33e0a37 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderByTimestamp.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderByTimestamp.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader.chunk; @@ -32,7 +31,7 @@ public ChunkReaderByTimestamp(Chunk chunk) { @Override public boolean pageSatisfied(PageHeader pageHeader) { - long maxTimestamp = pageHeader.getMax_timestamp(); + long maxTimestamp = pageHeader.getMaxTimestamp(); // if maxTimestamp > currentTimestamp, this page should NOT be skipped return maxTimestamp >= currentTimestamp && maxTimestamp >= getMaxTombstoneTime(); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithFilter.java index f52d25d0c..70edb7570 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader.chunk; @@ -35,11 +34,11 @@ public ChunkReaderWithFilter(Chunk chunk, Filter filter) { @Override public boolean pageSatisfied(PageHeader pageHeader) { - if (pageHeader.getMax_timestamp() < getMaxTombstoneTime()) { + if (pageHeader.getMaxTimestamp() < getMaxTombstoneTime()) { return false; } - DigestForFilter digest = new DigestForFilter(pageHeader.getMin_timestamp(), - pageHeader.getMax_timestamp(), + DigestForFilter digest = new DigestForFilter(pageHeader.getMinTimestamp(), + pageHeader.getMaxTimestamp(), pageHeader.getStatistics().getMinBytebuffer(), pageHeader.getStatistics().getMaxBytebuffer(), chunkHeader.getDataType()); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithoutFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithoutFilter.java index d9e9a42bd..0f5a18d64 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithoutFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithoutFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader.chunk; @@ -30,7 +29,7 @@ public ChunkReaderWithoutFilter(Chunk chunk) { @Override public boolean pageSatisfied(PageHeader pageHeader) { - return pageHeader.getMax_timestamp() > getMaxTombstoneTime(); + return pageHeader.getMaxTimestamp() > getMaxTombstoneTime(); } } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java index 04d7054ae..16497d720 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader.page; @@ -33,16 +32,16 @@ public class PageReader { private TSDataType dataType; - // decoder for value column + /** decoder for value column */ private Decoder valueDecoder; - // decoder for time column + /** decoder for time column */ private Decoder timeDecoder; - // time column in memory + /** time column in memory */ private ByteBuffer timeBuffer; - // value column in memory + /** value column in memory */ private ByteBuffer valueBuffer; private BatchData data = null; @@ -69,8 +68,6 @@ public PageReader(ByteBuffer pageData, TSDataType dataType, Decoder valueDecoder * * @param pageData * uncompressed bytes size of time column, time column, value column - * @throws IOException - * exception in reading data from pageContent */ private void splitDataToTimeStampAndValue(ByteBuffer pageData) { int timeBufferLength = ReadWriteForEncodingUtils.readUnsignedVarInt(pageData); @@ -93,7 +90,7 @@ public BatchData nextBatch() throws IOException { if (filter == null) { data = getAllPageData(); } else { - data = getAllPageData(filter); + data = getAllPageDataWithFilter(); } return data; @@ -137,7 +134,7 @@ private BatchData getAllPageData() throws IOException { return pageData; } - private BatchData getAllPageData(Filter filter) throws IOException { + private BatchData getAllPageDataWithFilter() throws IOException { BatchData pageData = new BatchData(dataType, true); while (timeDecoder.hasNext(timeBuffer)) { @@ -145,46 +142,22 @@ private BatchData getAllPageData(Filter filter) throws IOException { switch (dataType) { case BOOLEAN: - boolean aBoolean = valueDecoder.readBoolean(valueBuffer); - if (filter.satisfy(timestamp, aBoolean)) { - pageData.putTime(timestamp); - pageData.putBoolean(aBoolean); - } + readBoolean(pageData, timestamp); break; case INT32: - int anInt = valueDecoder.readInt(valueBuffer); - if (filter.satisfy(timestamp, anInt)) { - pageData.putTime(timestamp); - pageData.putInt(anInt); - } + readInt(pageData, timestamp); break; case INT64: - long aLong = valueDecoder.readLong(valueBuffer); - if (filter.satisfy(timestamp, aLong)) { - pageData.putTime(timestamp); - pageData.putLong(aLong); - } + readLong(pageData, timestamp); break; case FLOAT: - float aFloat = valueDecoder.readFloat(valueBuffer); - if (filter.satisfy(timestamp, aFloat)) { - pageData.putTime(timestamp); - pageData.putFloat(aFloat); - } + readFloat(pageData, timestamp); break; case DOUBLE: - double aDouble = valueDecoder.readDouble(valueBuffer); - if (filter.satisfy(timestamp, aDouble)) { - pageData.putTime(timestamp); - pageData.putDouble(aDouble); - } + readDouble(pageData, timestamp); break; case TEXT: - Binary aBinary = valueDecoder.readBinary(valueBuffer); - if (filter.satisfy(timestamp, aBinary)) { - pageData.putTime(timestamp); - pageData.putBinary(aBinary); - } + readText(pageData, timestamp); break; default: throw new UnSupportedDataTypeException(String.valueOf(dataType)); @@ -194,6 +167,54 @@ private BatchData getAllPageData(Filter filter) throws IOException { return pageData; } + private void readBoolean(BatchData pageData, long timestamp) { + boolean aBoolean = valueDecoder.readBoolean(valueBuffer); + if (filter.satisfy(timestamp, aBoolean)) { + pageData.putTime(timestamp); + pageData.putBoolean(aBoolean); + } + } + + private void readInt(BatchData pageData, long timestamp) { + int anInt = valueDecoder.readInt(valueBuffer); + if (filter.satisfy(timestamp, anInt)) { + pageData.putTime(timestamp); + pageData.putInt(anInt); + } + } + + private void readLong(BatchData pageData, long timestamp) { + long aLong = valueDecoder.readLong(valueBuffer); + if (filter.satisfy(timestamp, aLong)) { + pageData.putTime(timestamp); + pageData.putLong(aLong); + } + } + + private void readFloat(BatchData pageData, long timestamp) { + float aFloat = valueDecoder.readFloat(valueBuffer); + if (filter.satisfy(timestamp, aFloat)) { + pageData.putTime(timestamp); + pageData.putFloat(aFloat); + } + } + + private void readDouble(BatchData pageData, long timestamp) { + double aDouble = valueDecoder.readDouble(valueBuffer); + if (filter.satisfy(timestamp, aDouble)) { + pageData.putTime(timestamp); + pageData.putDouble(aDouble); + } + } + + private void readText(BatchData pageData, long timestamp) { + Binary aBinary = valueDecoder.readBinary(valueBuffer); + if (filter.satisfy(timestamp, aBinary)) { + pageData.putTime(timestamp); + pageData.putBinary(aBinary); + } + } + public void close() { timeBuffer = null; valueBuffer = null; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java index b24658911..ceb46786f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader.series; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithFilter.java index 31baa5ac5..e811d2b3a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader.series; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithoutFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithoutFilter.java index e1095c3e6..1ec0c96b9 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithoutFilter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithoutFilter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader.series; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/SeriesReaderByTimestamp.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/SeriesReaderByTimestamp.java index 26503bfe0..2d2e11ca1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/SeriesReaderByTimestamp.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/SeriesReaderByTimestamp.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader.series; @@ -92,7 +91,7 @@ public Object getValueInTimestamp(long timestamp) throws IOException { } return null; } else { - if (chunkReader.hasNextBatch()) { // data does not has next + if (chunkReader.hasNextBatch()) { data = chunkReader.nextBatch(); } else if (!constructNextSatisfiedChunkReader()) { return null; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Binary.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Binary.java index 03c5dec05..410b74155 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Binary.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Binary.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; @@ -85,10 +84,7 @@ public boolean equals(Object other) { return false; } - if (compareTo((Binary) other) == 0) { - return true; - } - return false; + return compareTo((Binary) other) == 0; } @Override diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java index afda9a3a6..78c635001 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; @@ -37,6 +36,8 @@ */ public class BytesUtils { + private BytesUtils(){} + private static final Logger LOG = LoggerFactory.getLogger(BytesUtils.class); /** @@ -61,7 +62,9 @@ public static byte[] intToBytes(int i) { * @return byte array */ public static byte[] intToBytes(int i, byte[] desc, int offset) { - assert desc.length - offset >= 4; + if (desc.length - offset < 4) { + throw new IllegalArgumentException("Invalid input: desc.length - offset < 4"); + } desc[0 + offset] = (byte) ((i >> 24) & 0xFF); desc[1 + offset] = (byte) ((i >> 16) & 0xFF); desc[2 + offset] = (byte) ((i >> 8) & 0xFF); @@ -101,7 +104,9 @@ public static void intToBytes(int srcNum, byte[] result, int pos, int width) { * @return two bytes in byte[] structure */ public static byte[] intToTwoBytes(int i) { - assert i <= 0xFFFF; + if (i > 0xFFFF) { + throw new IllegalArgumentException("Invalid input: " + i + " > 0xFFFF"); + } byte[] ret = new byte[2]; ret[1] = (byte) (i & 0xFF); ret[0] = (byte) ((i >> 8) & 0xFF); @@ -115,7 +120,9 @@ public static byte[] intToTwoBytes(int i) { * @return int value */ public static int twoBytesToInt(byte[] ret) { - assert ret.length == 2; + if (ret.length != 2) { + throw new IllegalArgumentException("Invalid input: ret.length != 2"); + } int value = 0; value |= ret[0]; value = value << 8; @@ -142,7 +149,10 @@ public static int bytesToInt(byte[] bytes) { * @return integer */ public static int bytesToInt(byte[] bytes, int offset) { - assert bytes.length - offset >= 4; + if (bytes.length - offset < 4) { + throw new IllegalArgumentException("Invalid input: bytes.length - offset < 4"); + } + int value = 0; // high bit to low for (int i = 0; i < 4; i++) { @@ -182,7 +192,7 @@ public static byte[] floatToBytes(float x) { byte[] b = new byte[4]; int l = Float.floatToIntBits(x); for (int i = 3; i >= 0; i--) { - b[i] = new Integer(l).byteValue(); + b[i] = (byte)l; l = l >> 8; } return b; @@ -196,10 +206,12 @@ public static byte[] floatToBytes(float x) { * @param offset position in desc byte array that conversion result should start */ public static void floatToBytes(float x, byte[] desc, int offset) { - assert desc.length - offset >= 4; + if (desc.length - offset < 4) { + throw new IllegalArgumentException("Invalid input: desc.length - offset < 4"); + } int l = Float.floatToIntBits(x); for (int i = 3 + offset; i >= offset; i--) { - desc[i] = new Integer(l).byteValue(); + desc[i] = (byte)l; l = l >> 8; } } @@ -211,7 +223,10 @@ public static void floatToBytes(float x, byte[] desc, int offset) { * @return float */ public static float bytesToFloat(byte[] b) { - assert b.length == 4; + if (b.length != 4) { + throw new IllegalArgumentException("Invalid input: b.length != 4"); + } + int l; l = b[3]; l &= 0xff; @@ -231,7 +246,10 @@ public static float bytesToFloat(byte[] b) { * @return float */ public static float bytesToFloat(byte[] b, int offset) { - assert b.length - offset >= 4; + if (b.length - offset < 4) { + throw new IllegalArgumentException("Invalid input: b.length - offset < 4"); + } + int l; l = b[offset + 3]; l &= 0xff; @@ -253,7 +271,7 @@ public static byte[] doubleToBytes(double data) { byte[] bytes = new byte[8]; long value = Double.doubleToLongBits(data); for (int i = 7; i >= 0; i--) { - bytes[i] = new Long(value).byteValue(); + bytes[i] = (byte)value; value = value >> 8; } return bytes; @@ -267,10 +285,13 @@ public static byte[] doubleToBytes(double data) { * @param offset start pos */ public static void doubleToBytes(double d, byte[] bytes, int offset) { - assert bytes.length - offset >= 8; + if (bytes.length - offset < 8) { + throw new IllegalArgumentException("Invalid input: bytes.length - offset < 8"); + } + long value = Double.doubleToLongBits(d); for (int i = 7; i >= 0; i--) { - bytes[offset + i] = new Long(value).byteValue(); + bytes[offset + i] = (byte)value; value = value >> 8; } } @@ -308,7 +329,9 @@ public static double bytesToDouble(byte[] bytes) { * @return double */ public static double bytesToDouble(byte[] bytes, int offset) { - assert bytes.length - offset >= 8; + if (bytes.length - offset < 8) { + throw new IllegalArgumentException("Invalid input: bytes.length - offset < 8"); + } long value = bytes[offset + 7]; value &= 0xff; value |= ((long) bytes[offset + 6] << 8); @@ -368,12 +391,11 @@ public static byte[] boolToBytes(boolean x, byte[] desc, int offset) { * @return boolean */ public static boolean bytesToBool(byte[] b) { - assert b.length == 1; - if (b[0] == 0) { - return false; - } else { - return true; + if (b.length != 1) { + throw new IllegalArgumentException("Invalid input: b.length != 1"); } + + return b[0] != 0; } /** @@ -384,12 +406,10 @@ public static boolean bytesToBool(byte[] b) { * @return boolean */ public static boolean bytesToBool(byte[] b, int offset) { - assert b.length - offset >= 1; - if (b[offset] == 0) { - return false; - } else { - return true; + if (b.length - offset < 1) { + throw new IllegalArgumentException("Invalid input: b.length - offset < 1"); } + return b[offset] != 0; } /** @@ -468,7 +488,9 @@ public static void longToBytes(long srcNum, byte[] result, int pos, int width) { * @return long */ public static long bytesToLong(byte[] byteNum) { - assert byteNum.length == 8; + if (byteNum.length != 8) { + throw new IllegalArgumentException("Invalid input: byteNum.length != 8"); + } return bytesToLong(byteNum, 8); } @@ -517,7 +539,9 @@ public static long bytesToLong(byte[] result, int pos, int width) { * @return long */ public static long bytesToLongFromOffset(byte[] byteNum, int len, int offset) { - assert byteNum.length - offset >= len; + if (byteNum.length - offset < len) { + throw new IllegalArgumentException("Invalid input: byteNum.length - offset < len"); + } long num = 0; for (int ix = 0; ix < len; ix++) { num <<= 8; @@ -663,7 +687,7 @@ public static int setIntN(int data, int offset, int value) { */ public static int getByteN(byte data, int offset) { offset %= 8; - if ((data & (1 << (7 - offset))) != 0) { + if (((0xff & data) & (1 << (7 - offset))) != 0) { return 1; } else { return 0; @@ -683,9 +707,9 @@ public static int getByteN(byte data, int offset) { public static byte setByteN(byte data, int offset, int value) { offset %= 8; if (value == 1) { - return (byte) (data | (1 << (7 - offset))); + return (byte) ((0xff & data) | (1 << (7 - offset))); } else { - return (byte) (data & ~(1 << (7 - offset))); + return (byte) ((0xff & data) & ~(1 << (7 - offset))); } } @@ -809,7 +833,7 @@ public static byte[] shortToBytes(short number) { int temp = number; byte[] b = new byte[2]; for (int i = b.length - 1; i >= 0; i--) { - b[i] = new Integer(temp & 0xff).byteValue(); + b[i] = (byte)temp; temp = temp >> 8; } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Loader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Loader.java index 62321e4be..98997f4e3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Loader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Loader.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; @@ -26,7 +25,7 @@ import java.util.Set; public class Loader { - + private Loader(){} /** * function for getting resources. */ diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Pair.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Pair.java index 8e6f056f7..ef882725a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Pair.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Pair.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/PublicBAOS.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/PublicBAOS.java index 84f639854..81bf9c477 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/PublicBAOS.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/PublicBAOS.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java index a998a3d7c..92e708f94 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteForEncodingUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; @@ -29,7 +28,8 @@ * Utils to read/write stream. */ public class ReadWriteForEncodingUtils { - + private static final String TOO_LONG_BYTE_FORMAT = "tsfile-common BytesUtils: encountered value (%d) that requires more than 4 bytes"; + private ReadWriteForEncodingUtils(){} /** * check all number in a int list and find max bit width. * @@ -150,7 +150,7 @@ public static void writeUnsignedVarInt(int value, OutputStream out) throws IOExc * @return the number of bytes that the value consume. * @throws IOException exception in IO */ - public static int writeUnsignedVarInt(int value, ByteBuffer buffer) throws IOException { + public static int writeUnsignedVarInt(int value, ByteBuffer buffer) { int position = 1; while ((value & 0xFFFFFF80) != 0L) { buffer.put((byte) ((value & 0x7F) | 0x80)); @@ -174,8 +174,7 @@ public static void writeIntLittleEndianPaddedOnBitWidth(int value, OutputStream int paddedByteNum = (bitWidth + 7) / 8; if (paddedByteNum > 4) { throw new IOException(String.format( - "tsfile-common BytesUtils: encountered value (%d) that requires more than 4 bytes", - paddedByteNum)); + TOO_LONG_BYTE_FORMAT, paddedByteNum)); } int offset = 0; while (paddedByteNum > 0) { @@ -199,8 +198,7 @@ public static void writeLongLittleEndianPaddedOnBitWidth(long value, OutputStrea int paddedByteNum = (bitWidth + 7) / 8; if (paddedByteNum > 8) { throw new IOException(String.format( - "tsfile-common BytesUtils: encountered value (%d) that requires more than 4 bytes", - paddedByteNum)); + TOO_LONG_BYTE_FORMAT, paddedByteNum)); } out.write(BytesUtils.longToBytes(value, paddedByteNum)); } @@ -218,8 +216,7 @@ public static int readIntLittleEndianPaddedOnBitWidth(ByteBuffer buffer, int bit int paddedByteNum = (bitWidth + 7) / 8; if (paddedByteNum > 4) { throw new IOException(String.format( - "tsfile-common BytesUtils: encountered value (%d) that requires more than 4 bytes", - paddedByteNum)); + TOO_LONG_BYTE_FORMAT, paddedByteNum)); } int result = 0; int offset = 0; @@ -245,8 +242,7 @@ public static long readLongLittleEndianPaddedOnBitWidth(ByteBuffer buffer, int b int paddedByteNum = (bitWidth + 7) / 8; if (paddedByteNum > 8) { throw new IOException(String.format( - "tsfile-common BytesUtils: encountered value (%d) that requires more than 4 bytes", - paddedByteNum)); + TOO_LONG_BYTE_FORMAT, paddedByteNum)); } long result = 0; for (int i = 0; i < paddedByteNum; i++) { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java index c83522b77..b24b4cd3c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; @@ -44,8 +43,8 @@ public class ReadWriteIOUtils { private static int LONG_LEN = 8; private static int DOUBLE_LEN = 8; private static int FLOAT_LEN = 4; - private static int BOOLEAN_LEN = 1; + private ReadWriteIOUtils(){} /** * read a bool from inputStream. */ @@ -343,8 +342,7 @@ public static short readShort(InputStream inputStream) throws IOException { * read a short var from byteBuffer. */ public static short readShort(ByteBuffer buffer) { - short n = buffer.getShort(); - return n; + return buffer.getShort(); } /** @@ -396,8 +394,7 @@ public static int readInt(InputStream inputStream) throws IOException { * read a int var from byteBuffer. */ public static int readInt(ByteBuffer buffer) { - int n = buffer.getInt(); - return n; + return buffer.getInt(); } /** @@ -425,8 +422,7 @@ public static long readLong(InputStream inputStream) throws IOException { * read a long var from byteBuffer. */ public static long readLong(ByteBuffer buffer) { - long n = buffer.getLong(); - return n; + return buffer.getLong(); } /** @@ -550,7 +546,7 @@ public static int readAsPossible(FileChannel channel, long position, ByteBuffer while (buffer.hasRemaining() && (read = channel.read(buffer, position)) != -1) { length += read; position += read; - read = channel.read(buffer, position); + channel.read(buffer, position); } return length; } @@ -624,7 +620,7 @@ public static List readIntegerList(InputStream inputStream) throws IOEx /** * read integer list with self define length. */ - public static List readIntegerList(ByteBuffer buffer) throws IOException { + public static List readIntegerList(ByteBuffer buffer) { int size = readInt(buffer); if (size <= 0) { return null; @@ -654,7 +650,7 @@ public static List readStringList(InputStream inputStream) throws IOExce /** * read string list with self define length. */ - public static List readStringList(ByteBuffer buffer) throws IOException { + public static List readStringList(ByteBuffer buffer) { int size = readInt(buffer); if (size <= 0) { return null; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java index 70ee89a36..8212db1a9 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,15 +9,17 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; import java.util.ArrayList; +import java.util.List; /** * this class is used to contact String effectively.It contains a StringBuider and initialize it @@ -81,11 +81,11 @@ public int length() { return totalLength; } - public ArrayList getSequenceList() { + public List getSequenceList() { return sequenceList; } - public ArrayList getReverseList() { + public List getReverseList() { return reverseList; } @@ -132,8 +132,8 @@ public StringContainer addTail(String... strings) { */ public StringContainer addTail(StringContainer myContainer) { isUpdated = true; - ArrayList mySeqList = myContainer.getSequenceList(); - ArrayList myRevList = myContainer.getReverseList(); + List mySeqList = myContainer.getSequenceList(); + List myRevList = myContainer.getReverseList(); count += myRevList.size() + mySeqList.size(); String temp; for (int i = myRevList.size() - 1; i >= 0; i--) { @@ -175,8 +175,8 @@ public StringContainer addHead(String... strings) { */ public StringContainer addHead(StringContainer myContainer) { isUpdated = true; - ArrayList mySeqList = myContainer.getSequenceList(); - ArrayList myRevList = myContainer.getReverseList(); + List mySeqList = myContainer.getSequenceList(); + List myRevList = myContainer.getReverseList(); count += myRevList.size() + mySeqList.size(); String temp; for (int i = mySeqList.size() - 1; i >= 0; i--) { @@ -324,6 +324,10 @@ public int hashCode() { @Override public boolean equals(Object sc) { + if (sc == null) + return false; + if (this.getClass() != sc.getClass()) + return false; return this.equals((StringContainer) sc); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java index 93af2f322..961960138 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write; @@ -66,7 +65,7 @@ public class TsFileWriter { /** * all IChunkGroupWriters. **/ - private Map groupWriters = new HashMap(); + private Map groupWriters = new HashMap<>(); /** * min value of threshold of data points num check. @@ -188,16 +187,12 @@ private boolean checkIsTimeSeriesExist(TSRecord record) throws WriteProcessExcep * @throws WriteProcessException exception in write process */ public boolean write(TSRecord record) throws IOException, WriteProcessException { - // make sure the ChunkGroupWriter for this TSRecord exist - if (checkIsTimeSeriesExist(record)) { - - // get corresponding ChunkGroupWriter and write this TSRecord - groupWriters.get(record.deviceId).write(record.time, record.dataPointList); - ++recordCount; - return checkMemorySizeAndMayFlushGroup(); - } - return false; + checkIsTimeSeriesExist(record); + // get corresponding ChunkGroupWriter and write this TSRecord + groupWriters.get(record.deviceId).write(record.time, record.dataPointList); + ++recordCount; + return checkMemorySizeAndMayFlushGroup(); } /** @@ -223,8 +218,9 @@ private long calculateMemSizeForAllGroup() { private boolean checkMemorySizeAndMayFlushGroup() throws IOException { if (recordCount >= recordCountForNextMemCheck) { long memSize = calculateMemSizeForAllGroup(); + assert memSize > 0; if (memSize > chunkGroupSizeThreshold) { - LOG.info("start_flush_row_group, memory space occupy:" + memSize); + LOG.info("start_flush_row_group, memory space occupy:{}", memSize); recordCountForNextMemCheck = recordCount * chunkGroupSizeThreshold / memSize; LOG.debug("current threshold:{}, next check:{}", recordCount, recordCountForNextMemCheck); return flushAllChunkGroups(); @@ -250,9 +246,10 @@ private boolean flushAllChunkGroups() throws IOException { if (recordCount > 0) { long totalMemStart = fileWriter.getPos(); - for (String deviceId : groupWriters.keySet()) { + for (Map.Entry entry: groupWriters.entrySet()) { long pos = fileWriter.getPos(); - IChunkGroupWriter groupWriter = groupWriters.get(deviceId); + String deviceId = entry.getKey(); + IChunkGroupWriter groupWriter = entry.getValue(); fileWriter.startFlushChunkGroup(deviceId); ChunkGroupFooter chunkGroupFooter = groupWriter.flushToFileWriter(fileWriter); if (fileWriter.getPos() - pos != chunkGroupFooter.getDataSize()) { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkBuffer.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkBuffer.java index 0257bac1b..6ab899ea1 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkBuffer.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkBuffer.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.chunk; @@ -41,7 +40,7 @@ */ public class ChunkBuffer { - private static Logger LOG = LoggerFactory.getLogger(ChunkBuffer.class); + private static final Logger LOG = LoggerFactory.getLogger(ChunkBuffer.class); private final Compressor compressor; private final MeasurementSchema schema; @@ -100,7 +99,7 @@ public int writePageHeaderAndDataIntoBuff(ByteBuffer data, int valueCount, } this.maxTimestamp = maxTimestamp; int uncompressedSize = data.remaining(); - int maxSize = compressor.getMaxBytesForCompression(uncompressedSize); + compressor.getMaxBytesForCompression(uncompressedSize); int compressedSize = 0; int compressedPosition = 0; byte[] compressedBytes = null; @@ -108,13 +107,10 @@ public int writePageHeaderAndDataIntoBuff(ByteBuffer data, int valueCount, if (compressor.getType().equals(CompressionType.UNCOMPRESSED)) { compressedSize = data.remaining(); } else { - // data is never a directByteBuffer now. - if (compressedBytes == null - || compressedBytes.length < compressor.getMaxBytesForCompression(uncompressedSize)) { compressedBytes = new byte[compressor.getMaxBytesForCompression(uncompressedSize)]; - } try { compressedPosition = 0; + // data is never a directByteBuffer now, so we can use data.array() compressedSize = compressor .compress(data.array(), data.position(), data.remaining(), compressedBytes); } catch (IOException e) { @@ -145,16 +141,15 @@ public int writePageHeaderAndDataIntoBuff(ByteBuffer data, int valueCount, this.totalValueCount += valueCount; // write page content to temp PBAOS - try { + try(WritableByteChannel channel = Channels.newChannel(pageBuffer)) { LOG.debug("start to flush a page data into buffer, buffer position {} ", pageBuffer.size()); if (compressor.getType().equals(CompressionType.UNCOMPRESSED)) { - WritableByteChannel channel = Channels.newChannel(pageBuffer); channel.write(data); } else { if (data.isDirect()) { - WritableByteChannel channel = Channels.newChannel(pageBuffer); channel.write(compressedData); } else { + assert compressedBytes != null; pageBuffer.write(compressedBytes, compressedPosition, compressedSize); } } @@ -222,12 +217,11 @@ public void reset() { * @return the max possible allocated size currently */ public long estimateMaxPageMemSize() { - // return size of buffer + page max size; - return pageBuffer.size() + estimateMaxPageHeaderSize(); + // return the sum of size of buffer and page max size + return (long)(pageBuffer.size() + estimateMaxPageHeaderSize()); } private int estimateMaxPageHeaderSize() { - int digestSize = (totalValueCount == 0) ? 0 : schema.getTypeLength() * 2; return PageHeader.calculatePageHeaderSize(schema.getType()); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkGroupWriterImpl.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkGroupWriterImpl.java index b085cb5e5..8f5007954 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkGroupWriterImpl.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkGroupWriterImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.chunk; @@ -37,7 +36,7 @@ */ public class ChunkGroupWriterImpl implements IChunkGroupWriter { - private static Logger LOG = LoggerFactory.getLogger(ChunkGroupWriterImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(ChunkGroupWriterImpl.class); private final String deviceId; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java index 2ed9bab1c..086c38a61 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.chunk; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkGroupWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkGroupWriter.java index 17802ad03..3c9544f18 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkGroupWriter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkGroupWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.chunk; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java index 3646ad23b..8b388783a 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.chunk; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java index f573390f1..f41d55809 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.page; @@ -139,7 +138,7 @@ private void prepareEndWriteOnePage() throws IOException { public ByteBuffer getUncompressedBytes() throws IOException { prepareEndWriteOnePage(); ByteBuffer buffer = ByteBuffer.allocate(timeOut.size() + valueOut.size() + 4); - int length1 = ReadWriteForEncodingUtils.writeUnsignedVarInt(timeOut.size(), buffer); + ReadWriteForEncodingUtils.writeUnsignedVarInt(timeOut.size(), buffer); buffer.put(timeOut.getBuf(), 0, timeOut.size()); buffer.put(valueOut.getBuf(), 0, valueOut.size()); buffer.flip(); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/TSRecord.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/TSRecord.java index e29adf67d..b30a4830c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/TSRecord.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/TSRecord.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.record; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/BooleanDataPoint.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/BooleanDataPoint.java index d2fe93133..066bb3f08 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/BooleanDataPoint.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/BooleanDataPoint.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.record.datapoint; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DataPoint.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DataPoint.java index 702aea358..83b7f2ae7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DataPoint.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DataPoint.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.record.datapoint; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DoubleDataPoint.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DoubleDataPoint.java index e49a69726..825ff43c3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DoubleDataPoint.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/DoubleDataPoint.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.record.datapoint; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/FloatDataPoint.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/FloatDataPoint.java index b86b21b47..72176beaf 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/FloatDataPoint.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/FloatDataPoint.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.record.datapoint; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/IntDataPoint.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/IntDataPoint.java index 7806ac01d..4425fde90 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/IntDataPoint.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/IntDataPoint.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.record.datapoint; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/LongDataPoint.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/LongDataPoint.java index 0014cf446..701b44b8c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/LongDataPoint.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/LongDataPoint.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.record.datapoint; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/StringDataPoint.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/StringDataPoint.java index a393f330b..5eb6ab818 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/StringDataPoint.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/datapoint/StringDataPoint.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.record.datapoint; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/FileSchema.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/FileSchema.java index bc0bea91e..349fa50d3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/FileSchema.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/FileSchema.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.schema; @@ -24,8 +23,6 @@ import org.apache.iotdb.tsfile.exception.write.InvalidJsonSchemaException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.json.JSONObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * FileSchema stores the schema of the measurements and devices that exist in this file. All @@ -37,8 +34,6 @@ */ public class FileSchema { - private static final Logger LOG = LoggerFactory.getLogger(FileSchema.class); - /** * the key is the measurementId. */ @@ -52,6 +47,7 @@ public FileSchema() { } /** + * @deprecated * example: { "measurement_id": "sensor_cpu_50", "data_type": "INT32", "encoding": "RLE" }. * {"schema": [ { "measurement_id": "sensor_1", "data_type": "FLOAT", "encoding": "RLE" }, * { "measurement_id": "sensor_2", "data_type": "INT32", "encoding": "TS_2DIFF" }, @@ -81,11 +77,11 @@ public FileSchema(Map measurements) { * @return */ public TSDataType getMeasurementDataType(String measurementId) { - MeasurementSchema measurementSchema = this.measurementSchema.get(measurementId); - if (measurementSchema == null) { + MeasurementSchema mSchema = this.measurementSchema.get(measurementId); + if (mSchema == null) { return null; } - return measurementSchema.getType(); + return mSchema.getType(); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/JsonConverter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/JsonConverter.java index 01f3145a0..57b2eb2c5 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/JsonConverter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/JsonConverter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.schema; @@ -72,7 +71,7 @@ public class JsonConverter { private static final Logger LOG = LoggerFactory.getLogger(JsonConverter.class); - + private JsonConverter(){} /** * input a FileSchema and a jsonObject to be converted. * @@ -155,7 +154,7 @@ public static long convertJsonToChunkGroupSize(JSONObject jsonSchema) { if (jsonSchema.has(JsonFormatConstant.ROW_GROUP_SIZE)) { return jsonSchema.getLong(JsonFormatConstant.ROW_GROUP_SIZE); } - return 128 * 1024 * 1024; + return 128L * 1024 * 1024; } /** diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java index ae554d834..5142bcdff 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.schema; @@ -38,8 +37,6 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; import org.apache.iotdb.tsfile.utils.StringContainer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * This class describes a measurement's information registered in {@linkplain FileSchema FilSchema}, @@ -52,7 +49,6 @@ */ public class MeasurementSchema implements Comparable { - private static final Logger LOG = LoggerFactory.getLogger(MeasurementSchema.class); private TSDataType type; private TSEncoding encoding; private String measurementId; @@ -131,7 +127,7 @@ public static MeasurementSchema deserializeFrom(InputStream inputStream) throws /** * function for deserializing data from byte buffer. */ - public static MeasurementSchema deserializeFrom(ByteBuffer buffer) throws IOException { + public static MeasurementSchema deserializeFrom(ByteBuffer buffer) { MeasurementSchema measurementSchema = new MeasurementSchema(); measurementSchema.measurementId = ReadWriteIOUtils.readString(buffer); @@ -208,7 +204,6 @@ public int getTypeLength() { * function for getting time encoder. */ public Encoder getTimeEncoder() { - TSFileConfig conf = TSFileDescriptor.getInstance().getConfig(); TSEncoding timeSeriesEncoder = TSEncoding.valueOf(conf.timeSeriesEncoder); TSDataType timeType = TSDataType.valueOf(conf.timeSeriesDataType); return TSEncodingBuilder.getConverter(timeSeriesEncoder).getEncoder(timeType); @@ -257,7 +252,7 @@ public int serializeTo(OutputStream outputStream) throws IOException { /** * function for serializing data to byte buffer. */ - public int serializeTo(ByteBuffer buffer) throws IOException { + public int serializeTo(ByteBuffer buffer) { int byteLen = 0; byteLen += ReadWriteIOUtils.write(measurementId, buffer); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/SchemaBuilder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/SchemaBuilder.java index 7f1509ce9..57fbb72a3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/SchemaBuilder.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/SchemaBuilder.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.schema; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/DefaultTsFileOutput.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/DefaultTsFileOutput.java index caff74932..4ea8be840 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/DefaultTsFileOutput.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/DefaultTsFileOutput.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.writer; @@ -25,7 +24,6 @@ import java.io.IOException; import java.io.OutputStream; import java.nio.ByteBuffer; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; /** * a TsFileOutput implementation with FileOutputStream. If the file is not existed, it will be @@ -39,7 +37,7 @@ public DefaultTsFileOutput(File file) throws FileNotFoundException { this.outputStream = new FileOutputStream(file); } - public DefaultTsFileOutput(FileOutputStream outputStream) throws FileNotFoundException { + public DefaultTsFileOutput(FileOutputStream outputStream) { this.outputStream = outputStream; } @@ -50,7 +48,7 @@ public void write(byte[] b) throws IOException { @Override public void write(ByteBuffer b) throws IOException { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } @Override diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java index ebf068ef8..1789c2ca4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.writer; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java index 3d3e95f5f..455338c20 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.writer; @@ -99,7 +98,7 @@ public TsFileIOWriter(TsFileOutput out, List chunkGroupMetaD throws IOException { this.out = out; this.chunkGroupMetaDataList = chunkGroupMetaDataList; - if (chunkGroupMetaDataList.size() == 0) { + if (chunkGroupMetaDataList.isEmpty()) { startFile(); } } @@ -207,8 +206,8 @@ public void endChunkGroup(ChunkGroupFooter chunkGroupFooter) throws IOException */ public void endFile(FileSchema schema) throws IOException { - // serialize the Separator of MetaData and ChunkGroups - ReadWriteIOUtils.write(MetaMarker.Separator, out.wrapAsStream()); + // serialize the SEPARATOR of MetaData and ChunkGroups + ReadWriteIOUtils.write(MetaMarker.SEPARATOR, out.wrapAsStream()); // get all measurementSchema of this TsFile Map schemaDescriptors = schema.getAllMeasurementSchema(); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileOutput.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileOutput.java index de4ca6d03..19c084a73 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileOutput.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileOutput.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.writer; diff --git a/tsfile/src/main/resources/tsfile-format.properties.template b/tsfile/src/main/resources/tsfile-format.properties.template index b20026fb7..796be06a7 100644 --- a/tsfile/src/main/resources/tsfile-format.properties.template +++ b/tsfile/src/main/resources/tsfile-format.properties.template @@ -1,3 +1,24 @@ +# +# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + # Memory size threshold for flushing to disk or HDFS, default value is 128MB group_size_in_byte=134217728 diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/LRUCacheTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/common/LRUCacheTest.java index d38730d8e..a9f01c5a4 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/common/LRUCacheTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/common/LRUCacheTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.common; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/CompressTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/CompressTest.java index 9391b75c2..fc8d41260 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/CompressTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/CompressTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.compress; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/SnappyTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/SnappyTest.java index a9c308f46..3c640d7f4 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/SnappyTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/compress/SnappyTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.compress; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/constant/TimeseriesTestConstant.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/constant/TimeseriesTestConstant.java index 9eff12833..0c80e523e 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/constant/TimeseriesTestConstant.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/constant/TimeseriesTestConstant.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.constant; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPackerTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPackerTest.java index f90ba9e7b..6a45c6264 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPackerTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/IntPackerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.encoding.bitpacking; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPackerTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPackerTest.java index 036b23884..98d8ae687 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPackerTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/bitpacking/LongPackerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.encoding.bitpacking; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoderTest.java index 8bfe64b09..8846f46c9 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/BitmapDecoderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.encoding.decoder; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoderTest.java index 064bee846..8ab203b62 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/FloatDecoderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.encoding.decoder; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderTest.java index 34a0c90a7..96072228f 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.encoding.decoder; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoderTest.java index d6165999d..65d31f3fc 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/IntRleDecoderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.encoding.decoder; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoderTest.java index 4fa721c29..a90293f91 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/LongRleDecoderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.encoding.decoder; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderIntegerTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderIntegerTest.java index 3d63a82ea..14e396552 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderIntegerTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderIntegerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.encoding.decoder.delta; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderLongTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderLongTest.java index d874a5959..eeee4ed29 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderLongTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/delta/DeltaBinaryEncoderLongTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.encoding.decoder.delta; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaDataTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaDataTest.java index 9c512d88b..5ad323848 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaDataTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaDataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaDataTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaDataTest.java index 938ecfc6b..39e85e082 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaDataTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaDataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TimeSeriesMetadataTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TimeSeriesMetadataTest.java index 8ddc98dc2..106c738a8 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TimeSeriesMetadataTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TimeSeriesMetadataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataIndexTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataIndexTest.java index e7c77fc2f..fb3e4ab00 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataIndexTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataIndexTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataTest.java index 23aefa1e4..034a8ef73 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetaDataTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetaDataTest.java index e84f7a239..46267f1f6 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetaDataTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetaDataTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java index f83f94b07..949c39fcb 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/BooleanStatisticsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata.statistics; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java index c413292f5..b19ffa1f3 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/DoubleStatisticsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata.statistics; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java index 855c58ead..867be8c67 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/FloatStatisticsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata.statistics; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java index fc9ea91cf..8b6a5949d 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/IntegerStatisticsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata.statistics; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java index fcbe091b6..6be700fd6 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/LongStatisticsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata.statistics; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java index 30de3bac3..7a6cfcdfe 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/statistics/StringStatisticsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata.statistics; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java index 30efb9e84..e0f785654 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/Utils.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/Utils.java index 5e4623c16..b94473251 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/Utils.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/Utils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.file.metadata.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFileTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFileTest.java index ae7c1fd0b..ff8f8b216 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFileTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFileTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java index 726e5666c..260490f3f 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read; @@ -74,10 +73,10 @@ public void queryOneMeasurementWithoutFilterTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (count == 0) { - assertEquals(r.getTimestamp(), 1480562618010L); + assertEquals(1480562618010L, r.getTimestamp()); } if (count == 499) { - assertEquals(r.getTimestamp(), 1480562618999L); + assertEquals(1480562618999L, r.getTimestamp()); } count++; } @@ -139,14 +138,14 @@ public void queryOneMeasurementsWithSameFilterTest() throws IOException { RowRecord record = dataSet.next(); Field value = record.getFields().get(0); if (cnt == 0) { - assertEquals(record.getTimestamp(), 1480562618973L); - assertEquals(value.getLongV(), 9732); + assertEquals(1480562618973L, record.getTimestamp()); + assertEquals(9732, value.getLongV()); } else if (cnt == 1) { - assertEquals(record.getTimestamp(), 1480562618974L); - assertEquals(value.getLongV(), 9742); + assertEquals(1480562618974L, record.getTimestamp()); + assertEquals(9742, value.getLongV()); } else if (cnt == 7) { - assertEquals(record.getTimestamp(), 1480562618985L); - assertEquals(value.getLongV(), 9852); + assertEquals(1480562618985L, record.getTimestamp()); + assertEquals(9852, value.getLongV()); } cnt++; @@ -207,18 +206,18 @@ public void queryWithCrossSeriesTimeValueFilterTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618970L); + assertEquals(1480562618970L, r.getTimestamp()); } else if (cnt == 2) { - assertEquals(r.getTimestamp(), 1480562618971L); + assertEquals(1480562618971L, r.getTimestamp()); } else if (cnt == 3) { - assertEquals(r.getTimestamp(), 1480562618973L); + assertEquals(1480562618973L, r.getTimestamp()); } else if (cnt == 4) { - assertEquals(r.getTimestamp(), 1480562618974L); + assertEquals(1480562618974L, r.getTimestamp()); } // System.out.println(r); cnt++; } - assertEquals(cnt, 5); + assertEquals(5, cnt); pathList.clear(); pathList.add(new Path("d1.s1")); @@ -240,7 +239,7 @@ public void queryWithCrossSeriesTimeValueFilterTest() throws IOException { dataSet.next(); cnt++; } - assertEquals(cnt, 4); + assertEquals(4, cnt); } @Test @@ -259,14 +258,14 @@ public void queryBooleanTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618972L); + assertEquals(1480562618972L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.getBoolV(), false); + assertEquals(false, f1.getBoolV()); } if (cnt == 2) { - assertEquals(r.getTimestamp(), 1480562618981L); + assertEquals(1480562618981L, r.getTimestamp()); Field f2 = r.getFields().get(0); - assertEquals(f2.getBoolV(), false); + assertEquals(false, f2.getBoolV()); } cnt++; } @@ -289,14 +288,14 @@ public void queryStringTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 0) { - assertEquals(r.getTimestamp(), 1480562618976L); + assertEquals(1480562618976L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.toString(), "dog976"); + assertEquals("dog976", f1.toString()); } // System.out.println(r); cnt++; } - Assert.assertEquals(cnt, 1); + Assert.assertEquals(1, cnt); pathList = new ArrayList<>(); pathList.add(new Path("d1.s4")); @@ -310,14 +309,14 @@ public void queryStringTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618976L); + assertEquals(1480562618976L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.getBinaryV().getStringValue(), "dog976"); + assertEquals("dog976", f1.getBinaryV().getStringValue()); } // System.out.println(r); cnt++; } - Assert.assertEquals(cnt, 0); + Assert.assertEquals(0, cnt); } @@ -337,14 +336,14 @@ public void queryFloatTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618980L); + assertEquals(1480562618980L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.getFloatV(), 108.0, 0.0); + assertEquals(108.0, f1.getFloatV(), 0.0); } if (cnt == 2) { - assertEquals(r.getTimestamp(), 1480562618990L); + assertEquals(1480562618990L, r.getTimestamp()); Field f2 = r.getFields().get(0); - assertEquals(f2.getFloatV(), 110.0, 0.0); + assertEquals(110.0, f2.getFloatV(),0.0); } cnt++; } @@ -366,14 +365,14 @@ public void queryDoubleTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618022L); + assertEquals(1480562618022L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.getDoubleV(), 2.0, 0.0); + assertEquals(2.0, f1.getDoubleV(), 0.0); } if (cnt == 2) { - assertEquals(r.getTimestamp(), 1480562618033L); + assertEquals(1480562618033L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.getDoubleV(), 3.0, 0.0); + assertEquals(3.0, f1.getDoubleV(), 0.0); } cnt++; } diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java index bee55f17a..94940ab1b 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read; @@ -76,14 +75,14 @@ public void queryOneMeasurementWithoutFilterTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (count == 0) { - assertEquals(r.getTimestamp(), 1480562618010L); + assertEquals(1480562618010L, r.getTimestamp()); } if (count == 499) { - assertEquals(r.getTimestamp(), 1480562618999L); + assertEquals(1480562618999L, r.getTimestamp()); } count++; } - assertEquals(count, 500); + assertEquals(500, count); } @Test @@ -104,7 +103,7 @@ public void queryTwoMeasurementsWithoutFilterTest() throws IOException { } count++; } - assertEquals(count, 750); + assertEquals(750, count); } @Test @@ -144,16 +143,16 @@ public void queryWithTwoSeriesTimeValueFilterCrossTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618970L); + assertEquals(1480562618970L, r.getTimestamp()); } else if (cnt == 2) { - assertEquals(r.getTimestamp(), 1480562618971L); + assertEquals(1480562618971L, r.getTimestamp()); } else if (cnt == 3) { - assertEquals(r.getTimestamp(), 1480562618973L); + assertEquals(1480562618973L, r.getTimestamp()); } // System.out.println(r); cnt++; } - assertEquals(cnt, 7); + assertEquals(7, cnt); } @Test @@ -178,18 +177,18 @@ public void queryWithCrossSeriesTimeValueFilterTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618973L); + assertEquals(1480562618973L, r.getTimestamp()); } else if (cnt == 2) { - assertEquals(r.getTimestamp(), 1480562618974L); + assertEquals(1480562618974L, r.getTimestamp()); } else if (cnt == 3) { - assertEquals(r.getTimestamp(), 1480562618975L); + assertEquals(1480562618975L, r.getTimestamp()); } else if (cnt == 4) { - assertEquals(r.getTimestamp(), 1480562618976L); + assertEquals(1480562618976L, r.getTimestamp()); } // System.out.println(r); cnt++; } - assertEquals(cnt, 5); + assertEquals(5, cnt); pathList.clear(); pathList.add(new Path("d1.s1")); @@ -219,13 +218,13 @@ public void queryWithCrossSeriesTimeValueFilterTest() throws IOException { RowRecord r = dataSet.next(); // System.out.println(r); if (cnt == 4) { - assertEquals(r.getTimestamp(), 1480562618913L); + assertEquals(1480562618913L, r.getTimestamp()); } else if (cnt == 7) { - assertEquals(r.getTimestamp(), 1480562618930L); + assertEquals(1480562618930L, r.getTimestamp()); } cnt++; } - assertEquals(cnt, 9); + assertEquals(9, cnt); } @Test @@ -245,14 +244,14 @@ public void queryBooleanTest() throws IOException { RowRecord r = dataSet.next(); System.out.println(r); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618972L); + assertEquals(1480562618972L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.getBoolV(), false); + assertEquals(false, f1.getBoolV()); } if (cnt == 2) { - assertEquals(r.getTimestamp(), 1480562618981L); + assertEquals(1480562618981L, r.getTimestamp()); Field f2 = r.getFields().get(0); - assertEquals(f2.getBoolV(), false); + assertEquals(false, f2.getBoolV()); } cnt++; } @@ -275,14 +274,14 @@ public void queryStringTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 0) { - assertEquals(r.getTimestamp(), 1480562618976L); + assertEquals(1480562618976L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.toString(), "dog976"); + assertEquals("dog976", f1.toString()); } // System.out.println(r); cnt++; } - Assert.assertEquals(cnt, 1); + Assert.assertEquals(1, cnt); pathList = new ArrayList<>(); pathList.add(new Path("d1.s4")); @@ -296,14 +295,14 @@ public void queryStringTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618976L); + assertEquals(1480562618976L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.getBinaryV(), "dog976"); + assertEquals("dog976", f1.getBinaryV()); } // System.out.println(r); cnt++; } - Assert.assertEquals(cnt, 0); + Assert.assertEquals(0, cnt); } @@ -323,14 +322,14 @@ public void queryFloatTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618980L); + assertEquals(1480562618980L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.getFloatV(), 108.0, 0.0); + assertEquals(108.0, f1.getFloatV(), 0.0); } if (cnt == 2) { - assertEquals(r.getTimestamp(), 1480562618990L); + assertEquals(1480562618990L, r.getTimestamp()); Field f2 = r.getFields().get(0); - assertEquals(f2.getFloatV(), 110.0, 0.0); + assertEquals(110.0, f2.getFloatV(), 0.0); } cnt++; } @@ -352,14 +351,14 @@ public void queryDoubleTest() throws IOException { while (dataSet.hasNext()) { RowRecord r = dataSet.next(); if (cnt == 1) { - assertEquals(r.getTimestamp(), 1480562618022L); + assertEquals(1480562618022L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.getDoubleV(), 2.0, 0.0); + assertEquals(2.0, f1.getDoubleV(), 0.0); } if (cnt == 2) { - assertEquals(r.getTimestamp(), 1480562618033L); + assertEquals(1480562618033L, r.getTimestamp()); Field f1 = r.getFields().get(0); - assertEquals(f1.getDoubleV(), 3.0, 0.0); + assertEquals(3.0, f1.getDoubleV(), 0.0); } cnt++; } diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/PathTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/PathTest.java index cea18d22b..a2e0d8527 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/PathTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/PathTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.common; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java index 011e587d6..48785d947 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.controller; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImplTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImplTest.java index 7ffaa1e9a..2867310f5 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImplTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImplTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.controller; @@ -54,7 +53,7 @@ public void test() throws IOException { List chunkMetaDataList = metadataQuerierByFile .getChunkMetaDataList(new Path("d2.s1")); for (ChunkMetaData chunkMetaData : chunkMetaDataList) { - Assert.assertEquals(chunkMetaData.getMeasurementUid(), "s1"); + Assert.assertEquals("s1", chunkMetaData.getMeasurementUid()); } } } diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/DigestFilterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/DigestFilterTest.java index 52fefb7af..e66aa1c42 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/DigestFilterTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/DigestFilterTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/IExpressionOptimizerTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/IExpressionOptimizerTest.java index 76ca2371d..674283417 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/IExpressionOptimizerTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/IExpressionOptimizerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/MinTimeMaxTimeFilterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/MinTimeMaxTimeFilterTest.java index b7cf11a67..eab2cfe8f 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/MinTimeMaxTimeFilterTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/MinTimeMaxTimeFilterTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/OperatorTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/OperatorTest.java index 531e64c63..c757f05b2 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/OperatorTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/OperatorTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.filter; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutorTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutorTest.java index 22d3cc4d6..2f437f57e 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutorTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutorTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.executor; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/NodeTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/NodeTest.java index 13f4f2da6..08555cb6b 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/NodeTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/NodeTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReaderByTimestampTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReaderByTimestampTest.java index 22620f2ed..5f1ecd57e 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReaderByTimestampTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReaderByTimestampTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorTest.java index d12cd8f18..364f91462 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java index e60582866..7df56d303 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.query.timegenerator; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/PageReaderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/PageReaderTest.java index 7931c04a6..681cd5a5b 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/PageReaderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/PageReaderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java index 15661dd2b..6bc2e8c22 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.read.reader; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BytesUtilsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BytesUtilsTest.java index b342966c7..e2ce97aa3 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BytesUtilsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/BytesUtilsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/CommonTestConstant.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/CommonTestConstant.java index 57ae6d85d..e104e3bd1 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/CommonTestConstant.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/CommonTestConstant.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java index 2c50bec5c..ecdfd2378 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtils.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtils.java index a3d1c4e3f..4bc03ec7f 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtils.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtilsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtilsTest.java index 02b97a17c..a7571efb3 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtilsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileUtilsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/PairTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/PairTest.java index 5ea6f2a98..e5d9986e3 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/PairTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/PairTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteStreamUtilsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteStreamUtilsTest.java index a0f2178e0..639adc49c 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteStreamUtilsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteStreamUtilsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteToBytesUtilsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteToBytesUtilsTest.java index 8518bbbf8..9404a94d9 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteToBytesUtilsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteToBytesUtilsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java index 50321b58c..266ff90ab 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java index 2b8d0777d..80f5cfce4 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/StringContainerTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/StringContainerTest.java index 848e28c39..ec8bddf50 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/StringContainerTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/StringContainerTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java index 46f9651c2..d727e1188 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.utils; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java index a92c38f03..f41e73ef6 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java index 79158f874..4b2b33822 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java index b52e42dd2..e73e232c3 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write; @@ -85,17 +84,17 @@ public void endFileTest() throws IOException { Assert.assertEquals(TSFileConfig.MAGIC_STRING, reader.readTailMagic()); // chunk header - Assert.assertEquals(MetaMarker.ChunkHeader, reader.readMarker()); + Assert.assertEquals(MetaMarker.CHUNK_HEADER, reader.readMarker()); ChunkHeader header = reader.readChunkHeader(); Assert.assertEquals(TimeSeriesMetadataTest.measurementUID, header.getMeasurementID()); // chunk group footer - Assert.assertEquals(MetaMarker.ChunkGroupFooter, reader.readMarker()); + Assert.assertEquals(MetaMarker.CHUNK_GROUP_FOOTER, reader.readMarker()); ChunkGroupFooter footer = reader.readChunkGroupFooter(); Assert.assertEquals(deviceId, footer.getDeviceID()); // separator - Assert.assertEquals(MetaMarker.Separator, reader.readMarker()); + Assert.assertEquals(MetaMarker.SEPARATOR, reader.readMarker()); // FileMetaData TsFileMetaData metaData = reader.readFileMetadata(); diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java index 3e0e30f53..53d2d02a4 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java index d22d840d0..34077a899 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java index d10155dd6..02d599c2c 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.schema.converter; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java index eebebd29d..89174e60b 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.schema.converter; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/series/PageWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/series/PageWriterTest.java index 009af9c74..588932ea1 100755 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/series/PageWriterTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/series/PageWriterTest.java @@ -1,6 +1,4 @@ /** - * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org) - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -11,11 +9,12 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.iotdb.tsfile.write.series; diff --git a/tsfile/src/test/resources/logback.xml b/tsfile/src/test/resources/logback.xml index 2eabd4316..a850d93ff 100644 --- a/tsfile/src/test/resources/logback.xml +++ b/tsfile/src/test/resources/logback.xml @@ -1,4 +1,24 @@ +