You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/01/28 15:59:08 UTC

[incubator-iotdb] 01/01: Merge pull request #31 from apache/fix_sonar

This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit f2523d6721b42644f9bc13382d6d2a58ff7622a4
Merge: 2c03bb4 ea0caf5
Author: Xiangdong Huang <hx...@qq.com>
AuthorDate: Mon Jan 28 23:59:02 2019 +0800

    Merge pull request #31 from apache/fix_sonar
    
    Fix code smells and vulnerabilities reported by sonar

 checkstyle.xml                                     |   1 +
 .../web/grafana/TsfileWebDemoApplication.java      |   3 +-
 .../controller/DatabaseConnectController.java      |   5 +-
 .../iotdb/web/grafana/dao/impl/BasicDaoImpl.java   |   6 +-
 iotdb/pom.xml                                      |  27 -
 .../iotdb/db/auth/authorizer/BasicAuthorizer.java  |   6 +-
 .../java/org/apache/iotdb/db/auth/entity/User.java |  51 +-
 .../iotdb/db/auth/role/LocalFileRoleAccessor.java  |  33 +-
 .../iotdb/db/auth/user/BasicUserManager.java       |  16 +-
 .../iotdb/db/auth/user/LocalFileUserAccessor.java  |  62 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   2 +-
 .../strategy/MinDirOccupiedSpaceFirstStrategy.java |  12 +-
 .../MinFolderOccupiedSpaceFirstStrategy.java       |  12 +-
 .../bufferwrite/RestorableTsFileIOWriter.java      |   2 +-
 .../db/engine/filenode/FileNodeProcessor.java      |  20 +-
 .../db/engine/overflow/ioV2/OverflowResource.java  |   2 +-
 .../db/exception/builder/ExceptionBuilder.java     |   2 +-
 .../org/apache/iotdb/db/metadata/ColumnSchema.java |   7 +-
 .../db/postback/conf/PostBackSenderConfig.java     | 110 +++-
 .../db/postback/conf/PostBackSenderDescriptor.java |  76 +--
 .../iotdb/db/postback/receiver/ServerManager.java  |  17 +-
 .../db/postback/receiver/ServerServiceImpl.java    | 725 ++++++++++-----------
 .../iotdb/db/postback/sender/FileManager.java      |  95 ++-
 .../iotdb/db/postback/sender/FileSender.java       |   2 +-
 .../iotdb/db/postback/sender/FileSenderImpl.java   | 266 +++-----
 .../iotdb/db/postback/utils/CreateDataSender1.java |  90 ++-
 .../iotdb/db/postback/utils/CreateDataSender2.java |  79 ++-
 .../iotdb/db/postback/utils/CreateDataSender3.java | 105 ++-
 .../apache/iotdb/db/postback/utils/RandomNum.java  |  17 +-
 .../org/apache/iotdb/db/postback/utils/Utils.java  |  20 +-
 .../iotdb/db/qp/executor/OverflowQPExecutor.java   |   6 +-
 .../qp/strategy/optimizer/ConcatPathOptimizer.java | 117 ++--
 .../qp/strategy/optimizer/DnfFilterOptimizer.java  |  35 +-
 .../db/qp/strategy/optimizer/IFilterOptimizer.java |   1 +
 .../qp/strategy/optimizer/ILogicalOptimizer.java   |   1 +
 .../optimizer/MergeSingleFilterOptimizer.java      |  24 +-
 .../qp/strategy/optimizer/RemoveNotOptimizer.java  |   5 +
 .../iotdb/db/query/control/FileReaderManager.java  |  16 +-
 .../db/query/control/OpenedFilePathsManager.java   |   4 +
 .../iotdb/db/query/control/QueryTokenManager.java  |   4 +
 .../executor/EngineExecutorWithTimeGenerator.java  |  15 +-
 .../EngineExecutorWithoutTimeGenerator.java        |  77 ++-
 .../iotdb/db/query/executor/EngineQueryRouter.java |  18 +-
 .../db/query/factory/SeriesReaderFactory.java      |   4 +
 .../java/org/apache/iotdb/db/query/fill/IFill.java |   5 +-
 .../org/apache/iotdb/db/query/fill/LinearFill.java |   4 +-
 .../apache/iotdb/db/query/fill/PreviousFill.java   |   3 +-
 .../db/query/reader/merge/PriorityMergeReader.java |  32 +-
 .../query/reader/sequence/SealedTsFilesReader.java |  11 +-
 .../query/timegenerator/EngineNodeConstructor.java |   8 +-
 .../apache/iotdb/db/service/CloseMergeService.java |  19 +-
 .../java/org/apache/iotdb/db/service/IoTDB.java    |  15 +-
 .../org/apache/iotdb/db/service/IoTDBMBean.java    |   4 +-
 .../org/apache/iotdb/db/service/JDBCService.java   |  14 +-
 .../org/apache/iotdb/db/service/JMXService.java    |  22 +-
 .../java/org/apache/iotdb/db/service/Monitor.java  |   7 +
 .../org/apache/iotdb/db/service/StartupCheck.java  |   1 +
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 122 ++--
 .../java/org/apache/iotdb/db/service/Utils.java    |  39 +-
 .../org/apache/iotdb/db/sql/ParseGenerator.java    |   4 +
 .../apache/iotdb/db/sql/parse/AstErrorNode.java    |   6 +-
 .../org/apache/iotdb/db/sql/parse/AstNode.java     |  26 +-
 .../java/org/apache/iotdb/db/sql/parse/Node.java   |   2 +-
 .../org/apache/iotdb/db/sql/parse/ParseDriver.java |  31 +-
 .../apache/iotdb/db/sql/parse/ParseException.java  |   6 +-
 .../java/org/apache/iotdb/db/utils/AuthUtils.java  |  28 +-
 .../org/apache/iotdb/db/utils/CommonUtils.java     |   9 +-
 .../org/apache/iotdb/db/utils/FileSchemaUtils.java |  20 +-
 .../java/org/apache/iotdb/db/utils/FileUtils.java  |   6 +-
 .../java/org/apache/iotdb/db/utils/IOUtils.java    |   2 +
 .../org/apache/iotdb/db/utils/LoadDataUtils.java   |  46 +-
 .../java/org/apache/iotdb/db/utils/MemUtils.java   |   5 +-
 .../org/apache/iotdb/db/utils/OpenFileNumUtil.java |  24 +-
 .../org/apache/iotdb/db/utils/PostbackUtils.java   |  96 ++-
 .../apache/iotdb/db/utils/PrimitiveArrayList.java  |   7 +-
 .../iotdb/db/utils/PrimitiveArrayListFactory.java  |   2 +
 .../org/apache/iotdb/db/utils/RecordUtils.java     |   4 +-
 .../apache/iotdb/db/utils/TimeValuePairUtils.java  |   1 +
 .../org/apache/iotdb/db/utils/TsPrimitiveType.java | 110 +++-
 .../org/apache/iotdb/db/writelog/RecoverStage.java |  10 +-
 .../apache/iotdb/db/writelog/io/RAFLogReader.java  |   8 +-
 .../writelog/manager/MultiFileLogNodeManager.java  |  15 +-
 .../db/writelog/node/ExclusiveWriteLogNode.java    |  29 +-
 .../recover/ExclusiveLogRecoverPerformer.java      |  89 ++-
 .../db/writelog/recover/RecoverPerformer.java      |   1 +
 .../db/writelog/replay/ConcreteLogReplayer.java    |   1 +
 .../db/writelog/transfer/PhysicalPlanCodec.java    |  16 +-
 .../writelog/transfer/PhysicalPlanLogTransfer.java |   4 +-
 .../db/writelog/transfer/SystemLogOperator.java    |   2 +
 .../iotdb/db/auth/LocalFileAuthorizerTest.java     |  46 +-
 .../iotdb/db/auth/LocalFileUserAccessorTest.java   |  14 +-
 .../iotdb/db/auth/LocalFileUserManagerTest.java    |  64 +-
 .../bufferwrite/RestorableTsFileIOWriterTest.java  |   4 +-
 .../memcontrol/BufferwriteFileSizeControlTest.java |  10 +-
 .../memcontrol/BufferwriteMetaSizeControlTest.java |  10 +-
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java |  10 +-
 .../iotdb/db/postback/sender/FileManagerTest.java  |  93 ++-
 .../sender/IoTDBSingleClientPostBackTest.java      | 197 +++---
 .../sender/MultipleClientPostBackTest.java         | 125 +---
 .../org/apache/iotdb/db/writelog/RecoverTest.java  |   4 +-
 jdbc/example/data/kafka_data.csv                   |  20 -
 jdbc/example/readme.md                             |  83 ---
 .../iotdb/jdbc/jdbcDemo/SendDataToIotdb.java       |  97 ---
 .../iotdb/jdbc/kafka_iotdbDemo/KafkaConsumer.java  | 138 ----
 .../iotdb/jdbc/kafka_iotdbDemo/KafkaProducer.java  |  76 ---
 jdbc/pom.xml                                       |   3 +-
 .../main/java/org/apache/iotdb/jdbc/Config.java    |   4 +-
 .../main/java/org/apache/iotdb/jdbc/Constant.java  |  10 +-
 .../org/apache/iotdb/jdbc/IoTDBConnection.java     |  15 +-
 .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java   |  15 +-
 .../java/org/apache/iotdb/jdbc/IoTDBStatement.java |   4 +-
 .../iotdb/jdbc/IoTDBDatabaseMetadataTest.java      |  10 +-
 .../tsfile/encoding/encoder/BitmapEncoder.java     |  10 +-
 .../encoding/encoder/DeltaBinaryEncoder.java       |   5 +-
 .../encoding/encoder/DoublePrecisionEncoder.java   |   5 +-
 .../iotdb/tsfile/encoding/encoder/Encoder.java     |   2 +-
 .../tsfile/encoding/encoder/FloatEncoder.java      |   3 -
 .../tsfile/encoding/encoder/IntRleEncoder.java     |  13 +-
 .../tsfile/encoding/encoder/LongRleEncoder.java    |  13 +-
 .../tsfile/encoding/encoder/PlainEncoder.java      |  12 +-
 .../iotdb/tsfile/encoding/encoder/RleEncoder.java  |  28 +-
 .../encoding/encoder/SinglePrecisionEncoder.java   |   1 +
 .../tsfile/encoding/encoder/TSEncodingBuilder.java |  19 +-
 .../tsfile/file/metadata/TsDeviceMetadata.java     |   2 +-
 .../org/apache/iotdb/tsfile/read/common/Path.java  |   4 +
 .../read/controller/MetadataQuerierByFileImpl.java |   4 +-
 .../tsfile/read/reader/chunk/ChunkReader.java      |   4 +-
 .../java/org/apache/iotdb/tsfile/utils/Binary.java |   2 +-
 .../iotdb/tsfile/utils/ReadWriteIOUtils.java       |  10 +-
 .../apache/iotdb/tsfile/write/TsFileWriter.java    |   4 +-
 .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java  |   4 +-
 .../iotdb/tsfile/write/schema/JsonConverter.java   |   4 +-
 .../tsfile/write/schema/MeasurementSchema.java     |   8 +-
 .../iotdb/tsfile/file/metadata/utils/Utils.java    |  10 +-
 134 files changed, 2009 insertions(+), 2324 deletions(-)