From 8a0097cfb932c0ff480ff1472009d597036a938b Mon Sep 17 00:00:00 2001 From: morrySnow <101034200+morrySnow@users.noreply.github.com> Date: Thu, 12 May 2022 20:14:38 +0800 Subject: [PATCH] [style](java) format fe code with some check rules (#9460) Issue Number: close #9403 set below rules' severity to error and format code according check info. a. Merge conflicts unresolved b. Avoid using corresponding octal or Unicode escape c. Avoid Escaped Unicode Characters d. No Line Wrap e. Package Name f. Type Name g. Annotation Location h. Interface Type Parameter i. CatchParameterName j. Pattern Variable Name k. Record Component Name l. Record Type Parameter Name m. Method Type Parameter Name n. Redundant Import o. Custom Import Order p. Unused Imports q. Avoid Star Import r. tab character in file s. Newline At End Of File t. Trailing whitespace found --- fe/check/checkstyle/checkstyle.xml | 21 ++- .../apache/doris/common/FeMetaVersion.java | 4 +- .../org/apache/doris/common/io/Codec.java | 2 - .../doris/common/io/DataInputBuffer.java | 4 +- .../doris/common/io/DataOutputBuffer.java | 4 +- .../org/apache/doris/common/io/DeepCopy.java | 3 +- .../org/apache/doris/common/io/IOUtils.java | 14 +- .../apache/doris/common/io/InputBuffer.java | 4 +- .../doris/common/io/LimitInputStream.java | 2 +- .../doris/common/io/LimitOutputStream.java | 2 +- .../apache/doris/common/io/OutputBuffer.java | 6 +- .../java/org/apache/doris/common/io/Text.java | 34 ++-- .../org/apache/doris/common/io/Writable.java | 14 +- .../doris/common/jmockit/FieldReflection.java | 2 +- .../doris/common/property/PropertySchema.java | 4 +- .../org/apache/doris/meta/MetaContext.java | 6 +- .../doris/common/io/BitmapValueTest.java | 4 +- .../common/property/PropertiesSetTest.java | 7 +- .../common/property/PropertySchemaTest.java | 1 + .../main/java/org/apache/doris/PaloFe.java | 11 +- .../java/org/apache/doris/alter/Alter.java | 1 - .../org/apache/doris/alter/AlterHandler.java | 13 +- .../org/apache/doris/alter/AlterJobV2.java | 3 +- .../apache/doris/alter/AlterOperations.java | 2 +- .../doris/alter/BatchAlterJobPersistInfo.java | 1 + .../doris/alter/MaterializedViewHandler.java | 1 - .../org/apache/doris/alter/RollupJobV2.java | 3 +- .../doris/alter/SchemaChangeHandler.java | 3 +- .../apache/doris/alter/SchemaChangeJobV2.java | 13 +- .../org/apache/doris/alter/SystemHandler.java | 5 +- .../doris/analysis/AbstractBackupStmt.java | 2 - .../AbstractBackupTableRefClause.java | 3 +- .../doris/analysis/AddBackendClause.java | 5 +- .../doris/analysis/AddColumnClause.java | 1 - .../AdminCancelRebalanceDiskStmt.java | 2 +- .../doris/analysis/AdminCleanTrashStmt.java | 2 +- .../doris/analysis/AdminCompactTableStmt.java | 5 +- .../analysis/AdminRebalanceDiskStmt.java | 2 +- .../doris/analysis/AdminSetConfigStmt.java | 2 +- .../apache/doris/analysis/AggregateInfo.java | 27 ++- .../doris/analysis/AggregateInfoBase.java | 1 - .../doris/analysis/AlterDatabaseRename.java | 6 +- .../analysis/AlterLoadErrorUrlClause.java | 1 - .../doris/analysis/AlterUserClause.java | 17 +- .../apache/doris/analysis/AlterUserType.java | 2 +- .../apache/doris/analysis/AnalyticExpr.java | 8 +- .../apache/doris/analysis/AnalyticInfo.java | 1 - .../apache/doris/analysis/AnalyticWindow.java | 5 +- .../apache/doris/analysis/AnalyzeStmt.java | 2 - .../org/apache/doris/analysis/Analyzer.java | 19 +- .../apache/doris/analysis/ArithmeticExpr.java | 1 - .../apache/doris/analysis/BackendClause.java | 1 - .../apache/doris/analysis/BaseTableRef.java | 1 - .../apache/doris/analysis/BaseViewStmt.java | 1 - .../doris/analysis/BetweenPredicate.java | 1 + .../doris/analysis/BinaryPredicate.java | 5 +- .../apache/doris/analysis/BoolLiteral.java | 16 +- .../org/apache/doris/analysis/BrokerDesc.java | 1 - .../analysis/BuiltinAggregateFunction.java | 4 +- .../doris/analysis/CancelAlterTableStmt.java | 3 +- .../doris/analysis/CancelBackupStmt.java | 2 +- .../org/apache/doris/analysis/CastExpr.java | 3 +- .../doris/analysis/ChannelDescription.java | 1 - .../apache/doris/analysis/ClusterName.java | 9 +- .../org/apache/doris/analysis/ColumnDef.java | 5 +- .../doris/analysis/CompoundPredicate.java | 3 +- .../doris/analysis/CreateClusterStmt.java | 2 +- .../doris/analysis/CreateEncryptKeyStmt.java | 4 +- .../apache/doris/analysis/CreateFileStmt.java | 8 +- .../doris/analysis/CreateFunctionStmt.java | 6 +- .../doris/analysis/CreateResourceStmt.java | 1 - .../doris/analysis/CreateRoutineLoadStmt.java | 11 +- .../doris/analysis/CreateTableLikeStmt.java | 5 +- .../doris/analysis/CreateTableStmt.java | 3 +- .../apache/doris/analysis/CreateUserStmt.java | 1 - .../apache/doris/analysis/CreateViewStmt.java | 1 - .../doris/analysis/DataDescription.java | 5 +- .../apache/doris/analysis/DataSortInfo.java | 3 +- .../apache/doris/analysis/DateLiteral.java | 24 ++- .../apache/doris/analysis/DecimalLiteral.java | 1 - .../org/apache/doris/analysis/DeleteStmt.java | 6 +- .../apache/doris/analysis/DescribeStmt.java | 7 +- .../doris/analysis/DescriptorTable.java | 1 - .../doris/analysis/DropFunctionStmt.java | 2 +- .../doris/analysis/DropRepositoryStmt.java | 6 +- .../doris/analysis/EnableFeatureClause.java | 2 +- .../apache/doris/analysis/EncryptKeyName.java | 4 +- .../apache/doris/analysis/EncryptKeyRef.java | 4 +- .../org/apache/doris/analysis/EnterStmt.java | 5 +- .../doris/analysis/ExistsPredicate.java | 5 +- .../org/apache/doris/analysis/ExportStmt.java | 1 - .../java/org/apache/doris/analysis/Expr.java | 3 +- .../org/apache/doris/analysis/ExprId.java | 2 +- .../doris/analysis/ExprSubstitutionMap.java | 9 +- .../doris/analysis/ExpressionFunctions.java | 4 +- .../apache/doris/analysis/FloatLiteral.java | 5 +- .../apache/doris/analysis/FrontendClause.java | 1 - .../apache/doris/analysis/FunctionArgs.java | 1 + .../doris/analysis/FunctionCallExpr.java | 4 +- .../apache/doris/analysis/FunctionName.java | 1 - .../apache/doris/analysis/GroupByClause.java | 1 - .../doris/analysis/HashDistributionDesc.java | 2 +- .../apache/doris/analysis/InPredicate.java | 5 +- .../apache/doris/analysis/InlineViewRef.java | 1 - .../org/apache/doris/analysis/InsertStmt.java | 7 +- .../doris/analysis/InstallPluginStmt.java | 1 - .../org/apache/doris/analysis/IntLiteral.java | 1 - .../doris/analysis/IsNullPredicate.java | 3 +- .../apache/doris/analysis/JoinOperator.java | 4 +- .../org/apache/doris/analysis/KeysDesc.java | 1 - .../org/apache/doris/analysis/KillStmt.java | 3 +- .../org/apache/doris/analysis/LabelName.java | 1 - .../apache/doris/analysis/LateralViewRef.java | 2 - .../apache/doris/analysis/LimitElement.java | 8 +- .../apache/doris/analysis/LiteralExpr.java | 4 +- .../org/apache/doris/analysis/LoadStmt.java | 1 - .../apache/doris/analysis/LockTablesStmt.java | 1 - .../apache/doris/analysis/MVColumnItem.java | 2 +- .../doris/analysis/ModifyBackendClause.java | 1 - .../doris/analysis/ModifyBrokerClause.java | 1 - .../analysis/ModifyColumnCommentClause.java | 5 +- .../doris/analysis/ModifyEngineClause.java | 1 - .../doris/analysis/ModifyPartitionClause.java | 2 +- .../analysis/ModifyTableCommentClause.java | 5 +- .../analysis/ModifyTablePropertiesClause.java | 2 +- .../apache/doris/analysis/NullLiteral.java | 4 +- .../apache/doris/analysis/OrderByElement.java | 8 +- .../apache/doris/analysis/OutFileClause.java | 7 +- .../org/apache/doris/analysis/ParseNode.java | 1 - .../apache/doris/analysis/PartitionDesc.java | 1 - .../apache/doris/analysis/PartitionName.java | 2 +- .../apache/doris/analysis/PredicateUtils.java | 4 +- .../org/apache/doris/analysis/QueryStmt.java | 5 +- .../doris/analysis/RangePartitionDesc.java | 2 +- .../apache/doris/analysis/RedirectStatus.java | 8 +- .../apache/doris/analysis/RefreshDbStmt.java | 3 +- .../analysis/ReplacePartitionClause.java | 2 +- .../doris/analysis/ResourcePattern.java | 3 +- .../RoutineLoadDataSourceProperties.java | 1 - .../doris/analysis/SchemaTableType.java | 1 - .../org/apache/doris/analysis/SelectList.java | 6 +- .../org/apache/doris/analysis/SelectStmt.java | 1 - .../doris/analysis/SetOperationStmt.java | 1 - .../org/apache/doris/analysis/SetStmt.java | 3 +- .../doris/analysis/SetUserPropertyStmt.java | 1 - .../apache/doris/analysis/ShowAlterStmt.java | 17 +- .../doris/analysis/ShowBackendsStmt.java | 5 +- .../doris/analysis/ShowCollationStmt.java | 2 +- .../analysis/ShowCreateFunctionStmt.java | 3 +- .../apache/doris/analysis/ShowDataStmt.java | 3 +- .../org/apache/doris/analysis/ShowDbStmt.java | 3 +- .../doris/analysis/ShowEncryptKeysStmt.java | 3 +- .../apache/doris/analysis/ShowExportStmt.java | 1 - .../doris/analysis/ShowFrontendsStmt.java | 1 - .../doris/analysis/ShowFunctionsStmt.java | 3 +- .../apache/doris/analysis/ShowGrantsStmt.java | 4 +- .../apache/doris/analysis/ShowIndexStmt.java | 2 +- .../apache/doris/analysis/ShowLoadStmt.java | 1 - .../doris/analysis/ShowLoadWarningsStmt.java | 1 - .../doris/analysis/ShowMigrationsStmt.java | 4 +- .../doris/analysis/ShowPartitionsStmt.java | 1 - .../doris/analysis/ShowProcesslistStmt.java | 2 +- .../doris/analysis/ShowRepositoriesStmt.java | 2 +- .../doris/analysis/ShowResourcesStmt.java | 5 +- .../doris/analysis/ShowRestoreStmt.java | 1 - .../apache/doris/analysis/ShowRollupStmt.java | 2 +- .../doris/analysis/ShowRoutineLoadStmt.java | 1 - .../doris/analysis/ShowSnapshotStmt.java | 3 +- .../doris/analysis/ShowStreamLoadStmt.java | 5 +- .../doris/analysis/ShowSyncJobStmt.java | 1 - .../doris/analysis/ShowTableStatsStmt.java | 1 - .../doris/analysis/ShowTableStatusStmt.java | 2 +- .../apache/doris/analysis/ShowTableStmt.java | 3 +- .../apache/doris/analysis/ShowTabletStmt.java | 2 +- .../doris/analysis/ShowTransactionStmt.java | 3 +- .../doris/analysis/ShowTrashDiskStmt.java | 6 +- .../apache/doris/analysis/ShowTrashStmt.java | 6 +- .../doris/analysis/ShowUserPropertyStmt.java | 3 +- .../apache/doris/analysis/ShowUserStmt.java | 1 - .../doris/analysis/ShowVariablesStmt.java | 1 - .../apache/doris/analysis/ShowViewStmt.java | 1 + .../org/apache/doris/analysis/SlotRef.java | 1 - .../org/apache/doris/analysis/SortInfo.java | 2 - .../apache/doris/analysis/StatementBase.java | 4 +- .../apache/doris/analysis/StmtRewriter.java | 1 - .../doris/analysis/StopRoutineLoadStmt.java | 1 - .../apache/doris/analysis/StorageBackend.java | 1 - .../apache/doris/analysis/StringLiteral.java | 5 +- .../org/apache/doris/analysis/Subquery.java | 15 +- .../org/apache/doris/analysis/SyncStmt.java | 2 +- .../org/apache/doris/analysis/TableName.java | 1 - .../apache/doris/analysis/TablePattern.java | 2 +- .../org/apache/doris/analysis/TableRef.java | 2 - .../analysis/TimestampArithmeticExpr.java | 2 +- .../doris/analysis/TupleDescriptor.java | 7 +- .../doris/analysis/TupleIsNullPredicate.java | 2 +- .../org/apache/doris/analysis/UpdateStmt.java | 2 +- .../org/apache/doris/analysis/UseStmt.java | 3 +- .../apache/doris/analysis/UserIdentity.java | 1 - .../org/apache/doris/analysis/ValueList.java | 3 +- .../org/apache/doris/analysis/WithClause.java | 1 + .../org/apache/doris/backup/AbstractJob.java | 3 +- .../apache/doris/backup/BackupHandler.java | 11 +- .../org/apache/doris/backup/BackupJob.java | 14 +- .../apache/doris/backup/BackupJobInfo.java | 9 +- .../apache/doris/backup/BrokerStorage.java | 1 - .../org/apache/doris/backup/RemoteFile.java | 2 +- .../org/apache/doris/backup/Repository.java | 1 - .../apache/doris/backup/RepositoryMgr.java | 1 - .../doris/backup/RestoreFileMapping.java | 8 +- .../org/apache/doris/backup/RestoreJob.java | 8 +- .../org/apache/doris/backup/S3Storage.java | 28 ++- .../apache/doris/blockrule/SqlBlockRule.java | 1 - .../doris/blockrule/SqlBlockRuleMgr.java | 1 - .../doris/catalog/AggregateFunction.java | 41 ++--- .../apache/doris/catalog/AggregateType.java | 1 - .../apache/doris/catalog/AliasFunction.java | 3 +- .../org/apache/doris/catalog/BrokerMgr.java | 1 - .../org/apache/doris/catalog/BrokerTable.java | 1 - .../org/apache/doris/catalog/Catalog.java | 5 +- .../doris/catalog/CatalogRecycleBin.java | 13 +- .../doris/catalog/ColocateTableIndex.java | 3 +- .../java/org/apache/doris/catalog/Column.java | 3 +- .../org/apache/doris/catalog/ColumnStats.java | 9 +- .../org/apache/doris/catalog/ColumnType.java | 4 +- .../org/apache/doris/catalog/Database.java | 3 +- .../doris/catalog/DatabaseEncryptKey.java | 7 +- .../org/apache/doris/catalog/DiskInfo.java | 3 +- .../doris/catalog/DistributionInfo.java | 3 +- .../apache/doris/catalog/DomainResolver.java | 5 +- .../org/apache/doris/catalog/EncryptKey.java | 2 +- .../doris/catalog/EncryptKeyHelper.java | 1 + .../org/apache/doris/catalog/EsTable.java | 3 +- .../org/apache/doris/catalog/FsBroker.java | 3 +- .../org/apache/doris/catalog/Function.java | 9 +- .../org/apache/doris/catalog/FunctionSet.java | 35 ++-- .../catalog/HiveMetaStoreClientHelper.java | 3 +- .../apache/doris/catalog/IcebergTable.java | 9 +- .../apache/doris/catalog/InfoSchemaDb.java | 4 +- .../org/apache/doris/catalog/KeysType.java | 1 - .../org/apache/doris/catalog/MapType.java | 1 - .../doris/catalog/MaterializedIndex.java | 2 +- .../org/apache/doris/catalog/MetaObject.java | 2 +- .../apache/doris/catalog/MetadataViewer.java | 14 +- .../org/apache/doris/catalog/MysqlTable.java | 9 +- .../doris/catalog/OdbcCatalogResource.java | 5 +- .../org/apache/doris/catalog/OdbcTable.java | 8 +- .../org/apache/doris/catalog/OlapTable.java | 23 ++- .../org/apache/doris/catalog/Partition.java | 17 +- .../apache/doris/catalog/PartitionInfo.java | 1 - .../apache/doris/catalog/PartitionKey.java | 1 - .../apache/doris/catalog/PrimitiveType.java | 4 +- .../doris/catalog/RandomDistributionInfo.java | 8 +- .../doris/catalog/RangePartitionInfo.java | 3 +- .../org/apache/doris/catalog/Replica.java | 15 +- .../org/apache/doris/catalog/Resource.java | 6 +- .../apache/doris/catalog/ResourceGroup.java | 2 +- .../org/apache/doris/catalog/ResourceMgr.java | 4 +- .../apache/doris/catalog/ScalarFunction.java | 11 +- .../org/apache/doris/catalog/ScalarType.java | 14 +- .../org/apache/doris/catalog/SchemaTable.java | 1 - .../apache/doris/catalog/SparkResource.java | 5 +- .../org/apache/doris/catalog/StructField.java | 2 - .../org/apache/doris/catalog/StructType.java | 1 - .../java/org/apache/doris/catalog/Table.java | 3 +- .../apache/doris/catalog/TableProperty.java | 9 +- .../java/org/apache/doris/catalog/Tablet.java | 1 - .../doris/catalog/TabletInvertedIndex.java | 2 - .../apache/doris/catalog/TabletStatMgr.java | 3 +- .../java/org/apache/doris/catalog/Type.java | 18 +- .../java/org/apache/doris/catalog/View.java | 1 - .../doris/clone/BackendLoadStatistic.java | 11 +- .../org/apache/doris/clone/BalanceStatus.java | 14 +- .../apache/doris/clone/BeLoadRebalancer.java | 1 - .../doris/clone/ClusterLoadStatistic.java | 1 - .../ColocateTableCheckerAndBalancer.java | 1 - .../apache/doris/clone/DiskRebalancer.java | 5 +- .../clone/DynamicPartitionScheduler.java | 1 - .../org/apache/doris/clone/MovesCacheMap.java | 1 - .../doris/clone/PartitionRebalancer.java | 1 - .../org/apache/doris/clone/Rebalancer.java | 2 +- .../org/apache/doris/clone/TabletChecker.java | 1 - .../apache/doris/clone/TabletSchedCtx.java | 159 ++++++++--------- .../apache/doris/clone/TabletScheduler.java | 3 +- .../doris/clone/TabletSchedulerStat.java | 4 +- .../TwoDimensionalGreedyRebalanceAlgo.java | 9 +- .../org/apache/doris/cluster/BaseParam.java | 9 +- .../org/apache/doris/cluster/Cluster.java | 3 +- .../doris/cluster/ClusterNamespace.java | 8 +- .../apache/doris/common/AliasGenerator.java | 5 +- .../org/apache/doris/common/AuditLog.java | 6 +- .../java/org/apache/doris/common/CIDR.java | 1 - .../apache/doris/common/CaseSensibility.java | 6 +- .../org/apache/doris/common/CheckedMath.java | 1 - .../org/apache/doris/common/ClientPool.java | 2 +- .../doris/common/ColumnAliasGenerator.java | 5 +- .../org/apache/doris/common/ConfigBase.java | 11 +- .../apache/doris/common/ConfigWatcher.java | 9 +- .../org/apache/doris/common/Log4jConfig.java | 13 +- .../apache/doris/common/MarkDownParser.java | 3 +- .../org/apache/doris/common/MetaFooter.java | 1 - .../org/apache/doris/common/MetaReader.java | 1 - .../org/apache/doris/common/MetaWriter.java | 1 - .../doris/common/NotLiteralExprPredicate.java | 3 +- .../apache/doris/common/PatternMatcher.java | 12 +- .../java/org/apache/doris/common/Status.java | 14 +- .../doris/common/TableAliasGenerator.java | 1 - .../doris/common/ThreadPoolManager.java | 2 - .../org/apache/doris/common/ThriftServer.java | 1 - .../common/ThriftServerEventProcessor.java | 1 - .../org/apache/doris/common/TreeNode.java | 10 +- .../doris/common/logger/TaggableLogger.java | 1 + .../doris/common/parquet/BrokerInputFile.java | 1 - .../doris/common/parquet/LocalInputFile.java | 1 - .../doris/common/parquet/ParquetReader.java | 1 - .../apache/doris/common/path/PathTrie.java | 60 +++---- .../apache/doris/common/proc/AuthProcDir.java | 1 - .../doris/common/proc/BackendProcNode.java | 4 +- .../doris/common/proc/BackendsProcDir.java | 9 +- .../apache/doris/common/proc/BaseProcDir.java | 6 +- .../doris/common/proc/BaseProcResult.java | 4 +- .../common/proc/ClusterHealthProcDir.java | 5 +- .../CurrentQueryBackendInstanceProcDir.java | 3 +- .../proc/CurrentQueryFragmentProcNode.java | 7 +- .../common/proc/CurrentQueryInfoProvider.java | 1 - .../proc/CurrentQueryStatementsProcNode.java | 7 +- .../proc/CurrentQueryStatisticsProcDir.java | 2 +- .../doris/common/proc/EsShardProcDir.java | 13 +- .../doris/common/proc/FrontendsProcNode.java | 2 - .../doris/common/proc/IndexInfoProcDir.java | 2 +- .../common/proc/IndexSchemaProcNode.java | 1 - .../doris/common/proc/IndicesProcDir.java | 4 +- .../common/proc/LoadErrorHubProcNode.java | 1 - .../apache/doris/common/proc/ProcService.java | 5 +- .../doris/common/proc/ReplicasProcNode.java | 3 +- .../doris/common/proc/RollupProcDir.java | 6 +- .../common/proc/RoutineLoadsProcDir.java | 5 +- .../common/proc/SchemaChangeProcDir.java | 3 +- .../doris/common/proc/StreamLoadProcNode.java | 3 +- .../doris/common/proc/TablesProcDir.java | 2 +- .../common/proc/TabletHealthProcDir.java | 5 +- .../proc/TabletSchedulerDetailProcDir.java | 4 +- .../doris/common/proc/TabletsProcDir.java | 1 - .../doris/common/proc/TransStateProcDir.java | 2 +- .../doris/common/proc/TrashProcDir.java | 9 +- .../doris/common/proc/TrashProcNode.java | 9 +- .../profile/MultiProfileTreeBuilder.java | 1 - .../common/profile/ProfileTreeBuilder.java | 5 +- .../common/publish/AckResponseHandler.java | 4 +- .../doris/common/publish/ResponseHandler.java | 1 + .../org/apache/doris/common/util/BitUtil.java | 1 - .../apache/doris/common/util/BrokerUtil.java | 1 - .../doris/common/util/CommandResult.java | 2 +- .../org/apache/doris/common/util/Counter.java | 2 +- .../org/apache/doris/common/util/Daemon.java | 16 +- .../apache/doris/common/util/DebugUtil.java | 20 +-- .../doris/common/util/DigitalVersion.java | 5 +- .../common/util/DynamicPartitionUtil.java | 6 +- .../apache/doris/common/util/KafkaUtil.java | 7 +- .../apache/doris/common/util/MysqlUtil.java | 2 - .../apache/doris/common/util/OrderByPair.java | 1 - .../doris/common/util/PlatformName.java | 4 +- .../doris/common/util/PrintableMap.java | 4 +- .../doris/common/util/ProfileManager.java | 23 ++- .../doris/common/util/PropertyAnalyzer.java | 13 +- .../apache/doris/common/util/RangeUtils.java | 10 +- .../doris/common/util/ReflectionUtils.java | 40 ++--- .../doris/common/util/RuntimeProfile.java | 2 - .../org/apache/doris/common/util/S3URI.java | 2 - .../doris/common/util/SmallFileMgr.java | 5 +- .../doris/common/util/SqlBlockUtil.java | 2 - .../doris/common/util/SqlParserUtils.java | 15 +- .../common/util/SymmetricEncryption.java | 2 - .../apache/doris/common/util/TimeUtils.java | 19 +- .../org/apache/doris/common/util/Util.java | 22 ++- .../doris/common/util/VectorizedUtil.java | 1 - .../consistency/CheckConsistencyJob.java | 6 +- .../doris/consistency/ConsistencyChecker.java | 11 +- .../apache/doris/deploy/DeployManager.java | 43 +++-- .../deploy/impl/AmbariDeployManager.java | 15 +- .../doris/deploy/impl/K8sDeployManager.java | 20 +-- .../deploy/impl/LocalFileDeployManager.java | 1 - .../external/elasticsearch/EsRepository.java | 1 - .../external/elasticsearch/EsRestClient.java | 10 +- .../elasticsearch/EsShardPartitions.java | 1 - .../elasticsearch/EsShardRouting.java | 7 +- .../elasticsearch/EsTablePartitions.java | 13 +- .../doris/external/elasticsearch/EsUtil.java | 18 +- .../external/elasticsearch/QueryBuilders.java | 1 + .../external/elasticsearch/SearchContext.java | 1 - .../doris/external/iceberg/HiveCatalog.java | 1 + .../external/iceberg/IcebergCatalog.java | 1 + .../external/iceberg/IcebergCatalogMgr.java | 37 ++-- .../IcebergTableCreationRecordMgr.java | 1 - .../external/iceberg/util/IcebergUtils.java | 1 - .../main/java/org/apache/doris/ha/BDBHA.java | 13 +- .../doris/ha/BDBStateChangeListener.java | 1 - .../java/org/apache/doris/ha/HAProtocol.java | 18 +- .../java/org/apache/doris/ha/MasterInfo.java | 14 +- .../apache/doris/httpv2/HttpAuthManager.java | 2 - .../doris/httpv2/IllegalArgException.java | 1 + .../doris/httpv2/config/WebConfigurer.java | 1 - .../httpv2/controller/BaseController.java | 12 +- .../httpv2/controller/ConfigController.java | 1 - .../controller/HardwareInfoController.java | 13 +- .../httpv2/controller/HelpController.java | 2 - .../httpv2/controller/LogController.java | 2 - .../httpv2/controller/LoginController.java | 4 +- .../controller/QueryProfileController.java | 1 - .../httpv2/controller/SessionController.java | 5 +- .../httpv2/controller/SystemController.java | 2 - .../doris/httpv2/entity/RestBaseResult.java | 1 + .../doris/httpv2/entity/RestResult.java | 4 +- .../interceptor/ServletTraceIterceptor.java | 2 +- .../httpv2/meta/ColocateMetaService.java | 2 - .../apache/doris/httpv2/meta/MetaService.java | 9 +- .../doris/httpv2/rest/BackendsAction.java | 6 +- .../httpv2/rest/BootstrapFinishAction.java | 21 ++- .../doris/httpv2/rest/CancelLoadAction.java | 1 - .../httpv2/rest/CheckDecommissionAction.java | 10 +- .../doris/httpv2/rest/ConnectionAction.java | 14 +- .../httpv2/rest/ExtraBasepathAction.java | 2 - .../doris/httpv2/rest/GetDdlStmtAction.java | 2 - .../doris/httpv2/rest/GetLoadInfoAction.java | 4 +- .../doris/httpv2/rest/GetLogFileAction.java | 2 - .../doris/httpv2/rest/GetSmallFileAction.java | 2 - .../doris/httpv2/rest/GetStreamLoadState.java | 1 - .../apache/doris/httpv2/rest/LoadAction.java | 5 +- .../doris/httpv2/rest/MetaInfoAction.java | 111 ++++++------ .../httpv2/rest/MetaReplayerCheckAction.java | 1 - .../doris/httpv2/rest/MetricsAction.java | 2 - .../apache/doris/httpv2/rest/MultiAction.java | 3 - .../doris/httpv2/rest/ProfileAction.java | 4 +- .../doris/httpv2/rest/QueryDetailAction.java | 3 - .../doris/httpv2/rest/RestBaseController.java | 2 - .../doris/httpv2/rest/RowCountAction.java | 7 +- .../doris/httpv2/rest/SetConfigAction.java | 8 +- .../apache/doris/httpv2/rest/ShowAction.java | 3 +- .../httpv2/rest/StmtExecutionAction.java | 11 +- .../httpv2/rest/StorageTypeCheckAction.java | 9 +- .../httpv2/rest/TableQueryPlanAction.java | 4 +- .../httpv2/rest/TableRowCountAction.java | 1 - .../doris/httpv2/rest/TableSchemaAction.java | 1 - .../doris/httpv2/rest/UploadAction.java | 10 +- .../httpv2/rest/manager/ClusterAction.java | 16 +- .../doris/httpv2/rest/manager/HttpUtils.java | 1 - .../doris/httpv2/rest/manager/NodeAction.java | 145 ++++++++------- .../rest/manager/QueryProfileAction.java | 16 +- .../doris/httpv2/restv2/ImportAction.java | 7 +- .../doris/httpv2/restv2/MetaInfoActionV2.java | 37 ++-- .../doris/httpv2/restv2/StatisticAction.java | 8 +- .../apache/doris/httpv2/util/HttpUtil.java | 8 +- .../doris/httpv2/util/LoadSubmitter.java | 1 - .../doris/httpv2/util/StatementSubmitter.java | 6 +- .../apache/doris/httpv2/util/TmpFileMgr.java | 2 - .../org/apache/doris/journal/Journal.java | 24 +-- .../apache/doris/journal/JournalCursor.java | 6 +- .../apache/doris/journal/JournalEntity.java | 2 - .../doris/journal/bdbje/BDBDebugger.java | 1 - .../doris/journal/bdbje/BDBEnvironment.java | 55 +++--- .../doris/journal/bdbje/BDBJEJournal.java | 49 +++-- .../doris/journal/bdbje/BDBJournalCursor.java | 15 +- .../apache/doris/journal/bdbje/BDBTool.java | 7 +- .../apache/doris/journal/bdbje/Timestamp.java | 6 +- .../doris/journal/local/LocalJournal.java | 14 +- .../journal/local/LocalJournalCursor.java | 1 - .../apache/doris/ldap/LdapAuthenticate.java | 1 - .../org/apache/doris/ldap/LdapClient.java | 4 +- .../apache/doris/ldap/LdapPrivsChecker.java | 3 +- .../apache/doris/load/BrokerFileGroup.java | 11 +- .../doris/load/BrokerFileGroupAggInfo.java | 51 +++--- .../apache/doris/load/BrokerLoadErrorHub.java | 2 +- .../org/apache/doris/load/DeleteHandler.java | 1 - .../java/org/apache/doris/load/DeleteJob.java | 1 - .../java/org/apache/doris/load/DppConfig.java | 2 +- .../org/apache/doris/load/DppScheduler.java | 33 ++-- .../org/apache/doris/load/EtlJobInfo.java | 4 +- .../java/org/apache/doris/load/EtlStatus.java | 16 +- .../org/apache/doris/load/ExportChecker.java | 1 - .../java/org/apache/doris/load/ExportJob.java | 5 +- .../java/org/apache/doris/load/ExportMgr.java | 1 - .../java/org/apache/doris/load/FailMsg.java | 12 +- .../apache/doris/load/HadoopEtlJobInfo.java | 8 +- .../main/java/org/apache/doris/load/Load.java | 1 - .../org/apache/doris/load/LoadChecker.java | 55 +++--- .../org/apache/doris/load/LoadErrorHub.java | 1 - .../java/org/apache/doris/load/LoadJob.java | 7 +- .../org/apache/doris/load/MiniEtlJobInfo.java | 8 +- .../apache/doris/load/MiniEtlTaskInfo.java | 16 +- .../apache/doris/load/MysqlLoadErrorHub.java | 1 - .../apache/doris/load/PartitionLoadInfo.java | 22 +-- .../apache/doris/load/RoutineLoadDesc.java | 2 +- .../java/org/apache/doris/load/Source.java | 33 ++-- .../doris/load/StreamLoadRecordMgr.java | 4 +- .../org/apache/doris/load/TableLoadInfo.java | 25 +-- .../org/apache/doris/load/TabletLoadInfo.java | 20 +-- .../doris/load/loadv2/BrokerLoadJob.java | 5 +- .../load/loadv2/BrokerLoadPendingTask.java | 1 - .../apache/doris/load/loadv2/BulkLoadJob.java | 7 +- .../doris/load/loadv2/LoadEtlChecker.java | 1 + .../org/apache/doris/load/loadv2/LoadJob.java | 1 - .../doris/load/loadv2/LoadJobScheduler.java | 1 - .../doris/load/loadv2/LoadLoadingChecker.java | 1 + .../apache/doris/load/loadv2/LoadManager.java | 1 - .../doris/load/loadv2/LoadingTaskPlanner.java | 1 - .../apache/doris/load/loadv2/MiniLoadJob.java | 1 - .../doris/load/loadv2/SparkEtlJobHandler.java | 13 +- .../load/loadv2/SparkLauncherMonitor.java | 1 - .../doris/load/loadv2/SparkLoadAppHandle.java | 2 +- .../doris/load/loadv2/SparkLoadJob.java | 1 - .../load/loadv2/SparkLoadPendingTask.java | 1 - .../doris/load/loadv2/SparkRepository.java | 2 +- .../load/loadv2/SparkYarnConfigFiles.java | 2 +- .../load/loadv2/YarnApplicationReport.java | 34 ++-- .../doris/load/routineload/KafkaProgress.java | 1 - .../load/routineload/KafkaRoutineLoadJob.java | 1 - .../doris/load/routineload/KafkaTaskInfo.java | 1 - .../load/routineload/LoadDataSourceType.java | 1 - .../load/routineload/RoutineLoadJob.java | 11 +- .../load/routineload/RoutineLoadManager.java | 1 - .../load/routineload/RoutineLoadProgress.java | 2 +- .../routineload/RoutineLoadScheduler.java | 1 - .../load/routineload/RoutineLoadTaskInfo.java | 11 +- .../routineload/RoutineLoadTaskScheduler.java | 8 +- .../doris/load/routineload/ScheduleRule.java | 1 + .../apache/doris/load/sync/SyncChannel.java | 1 - .../org/apache/doris/load/sync/SyncJob.java | 2 +- .../doris/load/sync/SyncJobManager.java | 3 +- .../load/sync/canal/CanalSyncChannel.java | 2 - .../sync/canal/CanalSyncDataConsumer.java | 10 +- .../sync/canal/CanalSyncDataReceiver.java | 2 + .../doris/load/sync/canal/CanalSyncJob.java | 2 - .../doris/load/sync/canal/CanalUtils.java | 2 - .../load/sync/canal/SyncCanalClient.java | 2 - .../load/sync/position/EntryPosition.java | 1 - .../doris/load/update/UpdatePlanner.java | 7 +- .../doris/load/update/UpdateStmtExecutor.java | 3 +- .../org/apache/doris/master/Checkpoint.java | 3 +- .../org/apache/doris/master/MasterImpl.java | 57 +++--- .../org/apache/doris/master/MetaHelper.java | 4 +- .../PartitionInMemoryInfoCollector.java | 3 +- .../apache/doris/master/ReportHandler.java | 1 - .../doris/metric/JsonMetricVisitor.java | 3 +- .../org/apache/doris/metric/MetricLabel.java | 2 +- .../org/apache/doris/metric/MetricRepo.java | 6 +- .../doris/metric/PrometheusMetricVisitor.java | 5 +- .../apache/doris/metric/SystemMetrics.java | 1 - .../doris/monitor/jvm/JvmPauseMonitor.java | 3 - .../apache/doris/monitor/jvm/JvmService.java | 19 +- .../apache/doris/monitor/jvm/JvmStats.java | 2 +- .../org/apache/doris/mysql/MysqlColType.java | 2 +- .../org/apache/doris/mysql/MysqlPassword.java | 4 +- .../org/apache/doris/mysql/MysqlProto.java | 1 - .../apache/doris/mysql/MysqlSerializer.java | 8 +- .../org/apache/doris/mysql/MysqlServer.java | 1 + .../doris/mysql/nio/AcceptListener.java | 1 + .../doris/mysql/nio/NConnectContext.java | 2 +- .../apache/doris/mysql/nio/NMysqlChannel.java | 2 + .../apache/doris/mysql/nio/NMysqlServer.java | 2 + .../apache/doris/mysql/nio/ReadListener.java | 2 + .../mysql/privilege/CommonUserProperties.java | 4 +- .../doris/mysql/privilege/DbPrivEntry.java | 6 +- .../mysql/privilege/GlobalPrivEntry.java | 6 +- .../doris/mysql/privilege/PaloAuth.java | 4 +- .../doris/mysql/privilege/PrivEntry.java | 16 +- .../doris/mysql/privilege/PrivTable.java | 1 - .../doris/mysql/privilege/RoleManager.java | 6 +- .../doris/mysql/privilege/UserProperty.java | 1 - .../mysql/privilege/UserPropertyMgr.java | 2 - .../doris/mysql/privilege/WhiteList.java | 1 - .../apache/doris/persist/AlterViewInfo.java | 5 +- .../doris/persist/BackendIdsUpdateInfo.java | 11 +- .../apache/doris/persist/BatchDropInfo.java | 4 +- .../persist/BatchModifyPartitionsInfo.java | 1 + .../org/apache/doris/persist/ClusterInfo.java | 13 +- .../apache/doris/persist/CreateTableInfo.java | 14 +- .../org/apache/doris/persist/DropDbInfo.java | 3 +- .../org/apache/doris/persist/DropInfo.java | 18 +- .../persist/DropLinkDbAndUpdateDbInfo.java | 8 +- .../doris/persist/DropPartitionInfo.java | 10 +- .../persist/EditLogFileOutputStream.java | 4 +- .../doris/persist/EditLogInputStream.java | 4 +- .../doris/persist/EditLogOutputStream.java | 4 +- .../doris/persist/GlobalVarPersistInfo.java | 1 - .../org/apache/doris/persist/LinkDbInfo.java | 6 +- .../org/apache/doris/persist/MetaCleaner.java | 10 +- ...aultDistributionBucketNumOperationLog.java | 3 +- .../ModifyTablePropertyOperationLog.java | 3 +- .../doris/persist/PartitionPersistInfo.java | 12 +- .../persist/RefreshExternalTableInfo.java | 10 +- .../doris/persist/ReplicaPersistInfo.java | 36 ++-- .../org/apache/doris/persist/Storage.java | 4 +- .../org/apache/doris/persist/StorageInfo.java | 2 +- .../apache/doris/persist/gson/GsonUtils.java | 28 +-- .../gson/RuntimeTypeAdapterFactory.java | 30 ++-- .../apache/doris/planner/AggregationNode.java | 1 - .../doris/planner/AnalyticEvalNode.java | 1 - .../apache/doris/planner/AnalyticPlanner.java | 1 - .../apache/doris/planner/BrokerScanNode.java | 12 +- .../org/apache/doris/planner/ColumnRange.java | 7 +- .../apache/doris/planner/CrossJoinNode.java | 3 +- .../apache/doris/planner/DataPartition.java | 3 +- .../doris/planner/DistributedPlanner.java | 1 - .../doris/planner/DistributionPruner.java | 1 - .../apache/doris/planner/EmptySetNode.java | 5 +- .../org/apache/doris/planner/EsScanNode.java | 5 +- .../org/apache/doris/planner/ExceptNode.java | 4 +- .../apache/doris/planner/ExchangeNode.java | 1 - .../doris/planner/HashDistributionPruner.java | 5 +- .../apache/doris/planner/HashJoinNode.java | 3 +- .../apache/doris/planner/HiveScanNode.java | 5 +- .../apache/doris/planner/IcebergScanNode.java | 3 +- .../apache/doris/planner/IntersectNode.java | 4 +- .../doris/planner/JoinCostEvaluation.java | 1 + .../doris/planner/ListPartitionPruner.java | 5 +- .../apache/doris/planner/LoadScanNode.java | 1 - .../planner/MaterializedViewSelector.java | 3 - .../apache/doris/planner/MysqlScanNode.java | 5 +- .../apache/doris/planner/OdbcScanNode.java | 7 +- .../apache/doris/planner/OlapScanNode.java | 3 +- .../apache/doris/planner/OlapTableSink.java | 4 +- .../doris/planner/PartitionColumnFilter.java | 1 - .../doris/planner/PartitionPrunerV2Base.java | 22 +-- .../apache/doris/planner/PlanFragment.java | 3 +- .../org/apache/doris/planner/PlanNode.java | 3 +- .../org/apache/doris/planner/Planner.java | 5 +- .../apache/doris/planner/ProjectPlanner.java | 1 - .../doris/planner/RangePartitionPruner.java | 1 - .../org/apache/doris/planner/RepeatNode.java | 1 - .../apache/doris/planner/ResultFileSink.java | 4 +- .../apache/doris/planner/RollupSelector.java | 5 +- .../apache/doris/planner/RuntimeFilter.java | 1 - .../doris/planner/RuntimeFilterGenerator.java | 1 - .../org/apache/doris/planner/ScanNode.java | 6 +- .../apache/doris/planner/SchemaScanNode.java | 1 - .../doris/planner/SetOperationNode.java | 6 +- .../doris/planner/SingleNodePlanner.java | 11 +- .../org/apache/doris/planner/SortNode.java | 1 - .../doris/planner/StreamLoadPlanner.java | 7 +- .../doris/planner/StreamLoadScanNode.java | 7 +- .../doris/planner/TableFunctionNode.java | 1 - .../org/apache/doris/planner/UnionNode.java | 4 +- .../org/apache/doris/plugin/AuditEvent.java | 2 +- .../doris/plugin/DynamicPluginLoader.java | 2 +- .../apache/doris/plugin/PluginContext.java | 1 - .../org/apache/doris/plugin/PluginInfo.java | 3 +- .../org/apache/doris/plugin/PluginLoader.java | 1 - .../org/apache/doris/plugin/PluginMgr.java | 9 +- .../org/apache/doris/plugin/PluginZip.java | 1 - .../doris/qe/AbstractResultSetMetaData.java | 3 +- .../apache/doris/qe/AuditEventProcessor.java | 3 +- .../org/apache/doris/qe/AuditLogBuilder.java | 7 +- .../org/apache/doris/qe/ConnectContext.java | 1 - .../org/apache/doris/qe/ConnectProcessor.java | 1 - .../org/apache/doris/qe/ConnectScheduler.java | 1 - .../java/org/apache/doris/qe/Coordinator.java | 4 - .../org/apache/doris/qe/GlobalVariable.java | 1 - .../java/org/apache/doris/qe/HelpModule.java | 37 ++-- .../org/apache/doris/qe/HelpObjectLoader.java | 3 +- .../java/org/apache/doris/qe/HelpTopic.java | 1 - .../apache/doris/qe/JournalObservable.java | 11 +- .../org/apache/doris/qe/JournalObserver.java | 12 +- .../org/apache/doris/qe/MasterOpExecutor.java | 9 +- .../apache/doris/qe/MasterTxnExecutor.java | 1 - .../org/apache/doris/qe/MultiLoadMgr.java | 4 +- .../org/apache/doris/qe/OriginStatement.java | 2 +- .../org/apache/doris/qe/QeProcessorImpl.java | 3 +- .../java/org/apache/doris/qe/QeService.java | 1 - .../java/org/apache/doris/qe/QueryDetail.java | 8 +- .../org/apache/doris/qe/QueryDetailQueue.java | 3 +- .../apache/doris/qe/QueryStateException.java | 3 +- .../apache/doris/qe/QueryStatisticsItem.java | 1 + .../org/apache/doris/qe/ResultReceiver.java | 10 +- .../doris/qe/RuntimeFilterTypeHelper.java | 1 - .../org/apache/doris/qe/SessionVariable.java | 19 +- .../java/org/apache/doris/qe/SetExecutor.java | 2 +- .../org/apache/doris/qe/ShowExecutor.java | 3 +- .../org/apache/doris/qe/ShowResultSet.java | 7 +- .../doris/qe/ShowResultSetMetaData.java | 3 +- .../org/apache/doris/qe/SimpleScheduler.java | 9 +- .../org/apache/doris/qe/SqlModeHelper.java | 8 +- .../org/apache/doris/qe/StmtExecutor.java | 4 +- .../java/org/apache/doris/qe/VariableMgr.java | 1 - .../doris/qe/VariableVarConverters.java | 3 +- .../java/org/apache/doris/qe/cache/Cache.java | 1 + .../apache/doris/qe/cache/CacheAnalyzer.java | 3 +- .../doris/qe/cache/CacheCoordinator.java | 1 - .../org/apache/doris/qe/cache/CacheProxy.java | 1 - .../apache/doris/qe/cache/PartitionCache.java | 3 +- .../apache/doris/qe/cache/PartitionRange.java | 18 +- .../doris/qe/cache/RowBatchBuilder.java | 2 - .../java/org/apache/doris/resource/Tag.java | 8 +- .../org/apache/doris/resource/TagManager.java | 2 +- .../rewrite/ExtractCommonFactorsRule.java | 1 - .../org/apache/doris/rewrite/FEFunctions.java | 12 +- .../doris/rewrite/FoldConstantsRule.java | 4 +- .../doris/rewrite/InferFiltersRule.java | 7 +- .../mvrewrite/CountDistinctToBitmap.java | 2 +- .../rewrite/mvrewrite/CountFieldToSum.java | 2 +- .../mvrewrite/HLLHashToSlotRefRule.java | 2 +- .../doris/rewrite/mvrewrite/NDVToHll.java | 2 +- .../mvrewrite/ToBitmapToSlotRefRule.java | 2 +- .../doris/rpc/BackendServiceClient.java | 5 +- .../apache/doris/rpc/BackendServiceProxy.java | 1 - .../org/apache/doris/rpc/RpcException.java | 1 - .../org/apache/doris/service/FeServer.java | 2 +- .../apache/doris/service/FrontendOptions.java | 2 - .../doris/service/FrontendServiceImpl.java | 7 +- .../doris/statistics/BaseStatsDerive.java | 5 +- .../doris/statistics/OlapScanStatsDerive.java | 3 +- .../doris/statistics/StatisticsJob.java | 1 - .../statistics/StatisticsJobManager.java | 1 - .../statistics/StatisticsJobScheduler.java | 2 - .../doris/statistics/StatisticsManager.java | 1 - .../statistics/StatisticsTaskScheduler.java | 1 - .../doris/statistics/StatsCategoryDesc.java | 1 - .../doris/statistics/StatsDeriveResult.java | 3 +- .../statistics/StatsGranularityDesc.java | 1 - .../java/org/apache/doris/system/Backend.java | 2 - .../doris/system/BackendHbResponse.java | 2 +- .../org/apache/doris/system/Diagnoser.java | 1 - .../org/apache/doris/system/Frontend.java | 14 +- .../apache/doris/system/HeartbeatFlags.java | 32 ++-- .../org/apache/doris/system/HeartbeatMgr.java | 4 +- .../doris/system/SystemInfoService.java | 5 +- .../org/apache/doris/task/AgentBatchTask.java | 5 +- .../org/apache/doris/task/AgentClient.java | 30 ++-- .../java/org/apache/doris/task/AgentTask.java | 2 +- .../apache/doris/task/AgentTaskExecutor.java | 2 +- .../org/apache/doris/task/AgentTaskQueue.java | 16 +- .../apache/doris/task/AlterReplicaTask.java | 3 +- .../doris/task/ClearTransactionTask.java | 2 +- .../java/org/apache/doris/task/CloneTask.java | 2 +- .../apache/doris/task/CreateReplicaTask.java | 6 +- .../apache/doris/task/DropReplicaTask.java | 2 +- .../doris/task/ExportExportingTask.java | 3 +- .../apache/doris/task/ExportPendingTask.java | 2 +- .../apache/doris/task/HadoopLoadEtlTask.java | 14 +- .../doris/task/HadoopLoadPendingTask.java | 7 +- .../org/apache/doris/task/LoadEtlTask.java | 35 ++-- .../apache/doris/task/LoadPendingTask.java | 7 +- .../org/apache/doris/task/MasterTask.java | 8 +- .../apache/doris/task/MasterTaskExecutor.java | 7 +- .../apache/doris/task/PublishVersionTask.java | 10 +- .../java/org/apache/doris/task/PushTask.java | 24 +-- .../org/apache/doris/task/StreamLoadTask.java | 5 +- .../doris/task/UpdateTabletMetaInfoTask.java | 1 - .../AbortTransactionException.java | 6 +- .../transaction/DatabaseTransactionMgr.java | 1 - .../DbUsedDataQuotaInfoCollector.java | 1 + .../transaction/GlobalTransactionMgr.java | 3 +- .../transaction/PartitionCommitInfo.java | 6 +- .../transaction/PublishVersionDaemon.java | 23 ++- .../doris/transaction/TableCommitInfo.java | 12 +- .../TransactionCommitFailedException.java | 2 +- .../transaction/TransactionException.java | 6 +- .../transaction/TransactionIdGenerator.java | 16 +- .../doris/transaction/TransactionState.java | 1 - .../doris/transaction/TransactionStatus.java | 10 +- .../transaction/TxnStateCallbackFactory.java | 1 - .../org/apache/doris/alter/AlterTest.java | 1 - .../doris/alter/BatchRollupJobTest.java | 1 - .../alter/MaterializedViewHandlerTest.java | 6 +- .../apache/doris/alter/RollupJobV2Test.java | 38 ++-- .../doris/alter/SchemaChangeHandlerTest.java | 6 +- .../doris/alter/SchemaChangeJobV2Test.java | 51 +++--- .../apache/doris/analysis/AccessTestUtil.java | 6 +- .../doris/analysis/AddColumnClauseTest.java | 10 +- .../doris/analysis/AddColumnsClauseTest.java | 1 - .../doris/analysis/AddRollupClauseTest.java | 3 +- .../AdminCancelRebalanceDiskStmtTest.java | 4 +- .../analysis/AdminRebalanceDiskStmtTest.java | 5 +- .../analysis/AdminSetConfigStmtTest.java | 14 +- .../doris/analysis/AlterClusterStmtTest.java | 3 +- .../analysis/AlterDatabaseQuotaStmtTest.java | 9 +- .../analysis/AlterRoutineLoadStmtTest.java | 6 +- .../analysis/AlterSqlBlockRuleStmtTest.java | 3 +- .../doris/analysis/AlterTableStmtTest.java | 8 +- .../doris/analysis/BackendStmtTest.java | 1 - .../org/apache/doris/analysis/BackupTest.java | 5 +- .../doris/analysis/BetweenPredicateTest.java | 5 +- .../doris/analysis/BinaryPredicateTest.java | 1 - .../doris/analysis/CancelAlterStmtTest.java | 6 +- .../doris/analysis/CancelLoadStmtTest.java | 3 +- .../apache/doris/analysis/CaseExprTest.java | 7 +- .../doris/analysis/CreateClusterStmtTest.java | 3 +- .../analysis/CreateDataSyncJobStmtTest.java | 8 +- .../doris/analysis/CreateDbStmtTest.java | 3 +- .../doris/analysis/CreateIndexClauseTest.java | 1 - .../CreateMaterializedViewStmtTest.java | 9 +- .../analysis/CreateRoutineLoadStmtTest.java | 12 +- .../analysis/CreateSqlBlockRuleStmtTest.java | 3 +- .../doris/analysis/CreateTableStmtTest.java | 20 +-- .../doris/analysis/CreateUserStmtTest.java | 7 +- .../doris/analysis/DataDescriptionTest.java | 12 +- .../doris/analysis/DecimalLiteralTest.java | 4 +- .../apache/doris/analysis/DeleteStmtTest.java | 8 +- .../doris/analysis/DescribeStmtTest.java | 5 +- .../doris/analysis/DropClusterStmtTest.java | 5 +- .../apache/doris/analysis/DropDbStmtTest.java | 3 +- .../DropMaterializedViewStmtTest.java | 5 +- .../doris/analysis/DropTableStmtTest.java | 5 +- .../doris/analysis/DropUserStmtTest.java | 5 +- .../org/apache/doris/analysis/ExprTest.java | 11 +- .../apache/doris/analysis/GrantStmtTest.java | 6 +- .../doris/analysis/GroupByClauseTest.java | 1 - .../doris/analysis/InPredicateTest.java | 4 +- .../apache/doris/analysis/IndexDefTest.java | 1 - .../apache/doris/analysis/InsertStmtTest.java | 11 +- .../doris/analysis/InstallPluginStmtTest.java | 7 +- .../doris/analysis/IsNullPredicateTest.java | 9 +- .../apache/doris/analysis/LabelNameTest.java | 4 +- .../apache/doris/analysis/LinkDbStmtTest.java | 3 +- .../apache/doris/analysis/LoadStmtTest.java | 10 +- .../MVColumnBitmapUnionPatternTest.java | 6 +- .../analysis/MVColumnHLLUnionPatternTest.java | 6 +- .../analysis/MVColumnOneChildPatternTest.java | 6 +- .../doris/analysis/MigrateDbStmtTest.java | 3 +- .../analysis/ModifyColumnClauseTest.java | 8 +- .../analysis/OutFileClauseFunctionTest.java | 6 +- .../doris/analysis/PartitionKeyDescTest.java | 1 - .../apache/doris/analysis/QueryStmtTest.java | 1 - .../doris/analysis/RangeCompareTest.java | 5 +- .../analysis/ReorderColumnsClauseTest.java | 1 - .../doris/analysis/ResourceDescTest.java | 4 +- .../RoutineLoadDataSourcePropertiesTest.java | 1 - .../apache/doris/analysis/SelectStmtTest.java | 6 +- .../doris/analysis/SetOperationStmtTest.java | 3 +- .../apache/doris/analysis/SetPassVarTest.java | 3 +- .../apache/doris/analysis/SetStmtTest.java | 4 +- .../analysis/SetUserPropertyStmtTest.java | 4 +- .../org/apache/doris/analysis/SetVarTest.java | 3 +- .../doris/analysis/ShowAlterStmtTest.java | 10 +- .../doris/analysis/ShowCreateDbStmtTest.java | 3 +- .../analysis/ShowCreateTableStmtTest.java | 3 +- .../doris/analysis/ShowDataStmtTest.java | 11 +- .../doris/analysis/ShowDbIdStmtTest.java | 3 +- .../apache/doris/analysis/ShowDbStmtTest.java | 6 +- .../analysis/ShowEncryptKeysStmtTest.java | 5 +- .../doris/analysis/ShowExportStmtTest.java | 1 + .../doris/analysis/ShowFunctionsStmtTest.java | 5 +- .../doris/analysis/ShowIndexStmtTest.java | 3 +- .../doris/analysis/ShowLoadStmtTest.java | 3 +- .../analysis/ShowPartitionIdStmtTest.java | 8 +- .../analysis/ShowPartitionsStmtTest.java | 5 +- .../analysis/ShowTableCreationStmtTest.java | 3 +- .../doris/analysis/ShowTableIdStmtTest.java | 2 +- .../doris/analysis/ShowTableStmtTest.java | 3 +- .../analysis/ShowUserPropertyStmtTest.java | 3 +- .../doris/analysis/ShowVariablesStmtTest.java | 28 ++- .../doris/analysis/ShowViewStmtTest.java | 1 - .../analysis/TupleIsNullPredicateTest.java | 1 - .../apache/doris/analysis/UpdateStmtTest.java | 4 +- .../apache/doris/analysis/UseStmtTest.java | 3 +- .../doris/analysis/VirtualSlotRefTest.java | 3 +- .../doris/backup/BackupHandlerTest.java | 19 +- .../doris/backup/BackupJobInfoTest.java | 10 +- .../apache/doris/backup/BackupJobTest.java | 22 ++- .../doris/backup/BrokerStorageTest.java | 11 +- .../apache/doris/backup/CatalogMocker.java | 13 +- .../doris/backup/PartitionNameTest.java | 1 - .../apache/doris/backup/RepositoryTest.java | 24 ++- .../doris/backup/RestoreFileMappingTest.java | 3 +- .../apache/doris/backup/RestoreJobTest.java | 42 +++-- .../org/apache/doris/bdb/BDBToolTest.java | 3 +- .../doris/blockrule/SqlBlockRuleMgrTest.java | 24 +-- .../apache/doris/catalog/AdminStmtTest.java | 11 +- .../org/apache/doris/catalog/BackendTest.java | 1 - .../org/apache/doris/catalog/CatalogTest.java | 26 +-- .../apache/doris/catalog/CatalogTestUtil.java | 2 +- .../doris/catalog/ColocateTableIndexTest.java | 1 - .../doris/catalog/ColocateTableTest.java | 5 +- .../catalog/ColumnGsonSerializationTest.java | 3 +- .../apache/doris/catalog/ColumnStatsTest.java | 22 +-- .../org/apache/doris/catalog/ColumnTest.java | 20 +-- .../apache/doris/catalog/ColumnTypeTest.java | 22 +-- .../doris/catalog/CreateFunctionTest.java | 2 +- .../doris/catalog/CreateTableLikeTest.java | 3 +- .../doris/catalog/DataPropertyTest.java | 1 + .../apache/doris/catalog/DatabaseTest.java | 30 ++-- .../apache/doris/catalog/DiskInfoTest.java | 8 +- .../catalog/DynamicPartitionTableTest.java | 1 - .../org/apache/doris/catalog/FakeCatalog.java | 3 +- .../org/apache/doris/catalog/FakeEditLog.java | 18 +- .../doris/catalog/InfoSchemaDbTest.java | 1 + .../doris/catalog/ListPartitionInfoTest.java | 1 - .../catalog/MaterializedIndexMetaTest.java | 6 +- .../doris/catalog/MaterializedIndexTest.java | 12 +- .../doris/catalog/MetadataViewerTest.java | 10 +- .../doris/catalog/ModifyBackendTest.java | 1 - .../apache/doris/catalog/MysqlTableTest.java | 3 +- .../catalog/OdbcCatalogResourceTest.java | 1 - .../apache/doris/catalog/OlapTableTest.java | 12 +- .../doris/catalog/PartitionKeyTest.java | 24 +-- .../doris/catalog/RangePartitionInfoTest.java | 1 - .../doris/catalog/ReplicaAllocationTest.java | 1 - .../org/apache/doris/catalog/ReplicaTest.java | 103 ++++++----- .../org/apache/doris/catalog/TableTest.java | 15 +- .../org/apache/doris/catalog/TabletTest.java | 24 ++- .../doris/catalog/TempPartitionTest.java | 23 ++- .../doris/catalog/UserPropertyTest.java | 5 +- .../clone/ClusterLoadStatisticsTest.java | 7 +- .../ColocateTableCheckerAndBalancerTest.java | 8 +- .../apache/doris/clone/DiskRebalanceTest.java | 15 +- .../org/apache/doris/clone/RebalanceTest.java | 23 +-- .../doris/clone/RebalancerTestUtil.java | 7 +- .../clone/RootPathLoadStatisticTest.java | 1 - .../clone/TabletRepairAndBalanceTest.java | 3 - .../doris/clone/TabletReplicaTooSlowTest.java | 1 - .../doris/clone/TabletSchedCtxTest.java | 1 - ...TwoDimensionalGreedyRebalanceAlgoTest.java | 9 +- .../doris/cluster/SystemInfoServiceTest.java | 6 +- .../apache/doris/common/ExceptionChecker.java | 1 - .../doris/common/MarkDownParserTest.java | 1 - .../doris/common/PropertyAnalyzerTest.java | 3 +- .../doris/common/ThreadPoolManagerTest.java | 2 +- .../common/parquet/ParquetReaderTest.java | 1 - .../doris/common/path/PathTrieTest.java | 28 ++- .../common/proc/BackendProcNodeTest.java | 5 +- .../common/proc/BackendsProcDirTest.java | 5 +- .../doris/common/proc/DbsProcDirTest.java | 6 +- .../common/proc/IndexSchemaProcNodeTest.java | 1 - .../doris/common/util/BrokerUtilTest.java | 56 +++--- .../doris/common/util/DebugUtilTest.java | 31 ++-- .../common/util/DynamicPartitionUtilTest.java | 5 +- .../doris/common/util/ListComparatorTest.java | 2 +- .../doris/common/util/ListUtilTest.java | 3 +- .../doris/common/util/MetaLockUtilsTest.java | 3 +- .../doris/common/util/RuntimeProfileTest.java | 33 ++-- .../doris/common/util/SmallFileMgrTest.java | 15 +- .../doris/common/util/TimeUtilsTest.java | 6 +- .../doris/common/util/UnitTestUtil.java | 11 +- .../apache/doris/common/util/VersionTest.java | 33 ++-- .../doris/deploy/AmbariDeployManagerTest.java | 2 +- .../elasticsearch/EsNodeInfoTest.java | 11 +- .../elasticsearch/EsShardPartitionsTest.java | 10 +- .../elasticsearch/MappingPhaseTest.java | 35 ++-- .../elasticsearch/PartitionPhaseTest.java | 12 +- .../elasticsearch/QueryBuildersTest.java | 81 +++++---- .../elasticsearch/VersionPhaseTest.java | 11 +- .../apache/doris/http/DorisHttpTestCase.java | 18 +- .../doris/http/HttpAuthManagerTest.java | 11 +- .../doris/http/TableQueryPlanActionTest.java | 7 +- .../doris/http/TableRowCountActionTest.java | 5 +- .../doris/http/TableSchemaActionTest.java | 8 +- .../doris/ldap/LdapAuthenticateTest.java | 9 +- .../org/apache/doris/ldap/LdapClientTest.java | 10 +- .../doris/ldap/LdapPrivsCheckerTest.java | 5 +- .../apache/doris/load/DeleteHandlerTest.java | 14 +- .../org/apache/doris/load/DppConfigTest.java | 6 +- .../apache/doris/load/DppSchedulerTest.java | 34 ++-- .../apache/doris/load/EtlJobStatusTest.java | 6 +- .../org/apache/doris/load/FailMsgTest.java | 6 +- .../apache/doris/load/LoadCheckerTest.java | 44 +++-- .../org/apache/doris/load/LoadJobTest.java | 42 ++--- .../doris/load/PartitionLoadInfoTest.java | 18 +- .../org/apache/doris/load/SourceTest.java | 14 +- .../apache/doris/load/TabletLoadInfoTest.java | 8 +- .../loadv2/BrokerFileGroupAggInfoTest.java | 5 +- .../doris/load/loadv2/BrokerLoadJobTest.java | 12 +- .../loadv2/BrokerLoadPendingTaskTest.java | 12 +- .../doris/load/loadv2/ExportMgrTest.java | 5 +- .../doris/load/loadv2/InsertLoadJobTest.java | 9 +- .../apache/doris/load/loadv2/LoadJobTest.java | 10 +- .../doris/load/loadv2/LoadManagerTest.java | 12 +- .../load/loadv2/SparkEtlJobHandlerTest.java | 16 +- .../load/loadv2/SparkLoadPendingTaskTest.java | 12 +- .../load/loadv2/SparkRepositoryTest.java | 11 +- .../load/loadv2/SparkYarnConfigFilesTest.java | 5 +- .../routineload/KafkaRoutineLoadJobTest.java | 14 +- .../load/routineload/RoutineLoadJobTest.java | 14 +- .../routineload/RoutineLoadManagerTest.java | 12 +- .../routineload/RoutineLoadSchedulerTest.java | 8 +- .../RoutineLoadTaskSchedulerTest.java | 8 +- .../doris/load/sync/SyncJobManagerTest.java | 8 +- .../load/sync/canal/CanalSyncDataTest.java | 9 +- .../load/sync/canal/CanalSyncJobTest.java | 14 +- .../doris/load/update/UpdateManagerTest.java | 9 +- .../load/update/UpdateStmtExecutorTest.java | 4 +- .../org/apache/doris/metric/MetricsTest.java | 3 +- .../apache/doris/mysql/MysqlChannelTest.java | 7 +- .../doris/mysql/MysqlErrPacketTest.java | 1 - .../apache/doris/mysql/MysqlOkPacketTest.java | 1 - .../apache/doris/mysql/MysqlProtoTest.java | 6 +- .../apache/doris/mysql/MysqlServerTest.java | 6 +- .../doris/mysql/privilege/AuthTest.java | 6 +- .../doris/mysql/privilege/MockedAuth.java | 3 +- .../mysql/privilege/SetPasswordTest.java | 9 +- .../AlterRoutineLoadOperationLogTest.java | 1 - .../doris/persist/AlterViewInfoTest.java | 3 +- .../BatchModifyPartitionsInfoTest.java | 1 - .../BatchRemoveTransactionOperationTest.java | 3 +- .../doris/persist/CreateTableInfoTest.java | 59 +++--- .../apache/doris/persist/DropDbInfoTest.java | 1 + .../apache/doris/persist/DropInfoTest.java | 15 +- .../doris/persist/DropPartitionInfoTest.java | 1 + .../org/apache/doris/persist/EditLogTest.java | 18 +- .../apache/doris/persist/FsBrokerTest.java | 6 +- .../persist/GlobalVarPersistInfoTest.java | 1 - .../doris/persist/LoadJobV2PersistTest.java | 10 +- .../ModifyCommentOperationLogTest.java | 5 +- .../ModifyDynamicPartitionInfoTest.java | 1 + .../persist/RefreshExternalTableInfoTest.java | 26 +-- .../persist/ReplaceTableOperationLogTest.java | 1 - .../doris/persist/ReplicaPersistInfoTest.java | 6 +- .../apache/doris/persist/StorageInfoTest.java | 6 +- .../GsonDerivedClassSerializationTest.java | 13 +- .../persist/gson/GsonSerializationTest.java | 19 +- .../doris/planner/ColocatePlanTest.java | 9 +- .../doris/planner/DistributedPlannerTest.java | 8 +- .../planner/HashDistributionPrunerTest.java | 19 +- .../doris/planner/JoinCostEvaluationTest.java | 6 +- .../planner/MaterializedViewSelectorTest.java | 8 +- .../doris/planner/OlapScanNodeTest.java | 31 ++-- .../doris/planner/OlapTableSinkTest.java | 6 +- .../org/apache/doris/planner/PlannerTest.java | 8 +- .../apache/doris/planner/QueryPlanTest.java | 5 +- .../apache/doris/planner/RepeatNodeTest.java | 1 - .../doris/planner/ResourceTagQueryTest.java | 3 - .../planner/RuntimeFilterGeneratorTest.java | 6 +- .../doris/planner/SingleNodePlannerTest.java | 12 +- .../apache/doris/planner/SqlDigestTest.java | 4 +- .../doris/planner/StreamLoadPlannerTest.java | 8 +- .../doris/planner/StreamLoadScanNodeTest.java | 13 +- .../doris/planner/UpdatePlannerTest.java | 7 +- .../apache/doris/plugin/PluginInfoTest.java | 32 ++-- .../apache/doris/plugin/PluginLoaderTest.java | 21 +-- .../apache/doris/plugin/PluginMgrTest.java | 73 ++++---- .../apache/doris/plugin/PluginZipTest.java | 40 ++--- .../apache/doris/qe/ConnectContextTest.java | 6 +- .../apache/doris/qe/ConnectProcessorTest.java | 5 +- .../apache/doris/qe/ConnectSchedulerTest.java | 7 +- .../org/apache/doris/qe/CoordinatorTest.java | 15 +- .../apache/doris/qe/HelpObjectLoaderTest.java | 3 +- .../doris/qe/JournalObservableTest.java | 6 +- .../org/apache/doris/qe/MultiLoadMgrTest.java | 8 +- .../apache/doris/qe/PartitionCacheTest.java | 15 +- .../apache/doris/qe/QueryDetailQueueTest.java | 11 +- .../org/apache/doris/qe/SetExecutorTest.java | 6 +- .../org/apache/doris/qe/ShowExecutorTest.java | 10 +- .../doris/qe/ShowResultSetMetaDataTest.java | 2 +- .../apache/doris/qe/SimpleSchedulerTest.java | 1 - .../apache/doris/qe/SqlModeHelperTest.java | 1 + .../org/apache/doris/qe/StmtExecutorTest.java | 9 +- .../org/apache/doris/qe/VariableMgrTest.java | 1 - .../doris/resource/TagSerializationTest.java | 1 - .../org/apache/doris/resource/TagTest.java | 1 - .../ExtractCommonFactorsRuleFunctionTest.java | 3 +- .../rewrite/ExtractCommonFactorsRuleTest.java | 10 +- .../apache/doris/rewrite/FEFunctionsTest.java | 19 +- .../doris/rewrite/InferFiltersRuleTest.java | 5 +- .../rewrite/RewriteDateLiteralRuleTest.java | 3 +- .../mvrewrite/CountFieldToSumTest.java | 8 +- .../apache/doris/system/HeartbeatMgrTest.java | 9 +- .../doris/system/SystemInfoServiceTest.java | 5 +- .../org/apache/doris/task/AgentTaskTest.java | 3 +- .../apache/doris/task/LoadEtlTaskTest.java | 21 ++- .../doris/task/LoadPendingTaskTest.java | 12 +- .../doris/task/MasterTaskExecutorTest.java | 12 +- .../DatabaseTransactionMgrTest.java | 122 ++++++------- .../FakeTransactionIDGenerator.java | 6 +- .../transaction/GlobalTransactionMgrTest.java | 168 +++++++++--------- .../transaction/TransactionStateTest.java | 1 - .../apache/doris/utframe/AnotherDemoTest.java | 2 +- .../doris/utframe/DemoMultiBackendsTest.java | 2 - .../apache/doris/utframe/MockedBackend.java | 9 +- .../doris/utframe/MockedBackendFactory.java | 12 +- .../apache/doris/utframe/MockedFrontend.java | 14 +- .../apache/doris/utframe/UtFrameUtils.java | 2 - .../src/test/java/plugin/PluginTest.java | 8 +- .../apache/doris/common/BitmapValueUtil.java | 3 +- .../org/apache/doris/udf/BitmapAndUDF.java | 2 + .../org/apache/doris/udf/BitmapCountUDF.java | 1 + .../org/apache/doris/udf/BitmapOrUDF.java | 1 + .../org/apache/doris/udf/BitmapUnionUDAF.java | 1 + .../org/apache/doris/udf/BitmapXorUDF.java | 1 + .../org/apache/doris/udf/ToBitmapUDAF.java | 7 +- .../org/apache/doris/udf/JMXJsonUtil.java | 12 +- .../java/org/apache/doris/udf/JniUtil.java | 18 +- .../org/apache/doris/udf/UdfExecutor.java | 8 +- .../java/org/apache/doris/udf/UdfUtils.java | 3 +- .../org/apache/doris/udf/UdfExecutorTest.java | 1 + .../doris/load/loadv2/dpp/ColumnParser.java | 1 + .../loadv2/dpp/DorisRangePartitioner.java | 1 + .../doris/load/loadv2/dpp/DppColumns.java | 6 +- .../doris/load/loadv2/dpp/DppUtils.java | 7 +- .../doris/load/loadv2/dpp/SparkDpp.java | 6 +- .../load/loadv2/dpp/SparkRDDAggregator.java | 5 +- .../load/loadv2/dpp/StringAccumulator.java | 3 +- .../doris/load/loadv2/etl/EtlJobConfig.java | 2 +- .../doris/load/loadv2/etl/SparkEtlJob.java | 7 +- .../load/loadv2/dpp/ColumnParserTest.java | 3 +- .../loadv2/dpp/DorisRangePartitionerTest.java | 2 +- .../doris/load/loadv2/dpp/DppUtilsTest.java | 7 +- .../MinimumCoverageRollupTreeBuilderTest.java | 2 +- .../doris/load/loadv2/dpp/SparkDppTest.java | 3 +- 1096 files changed, 3669 insertions(+), 4491 deletions(-) diff --git a/fe/check/checkstyle/checkstyle.xml b/fe/check/checkstyle/checkstyle.xml index e576ac6938..c367452c90 100644 --- a/fe/check/checkstyle/checkstyle.xml +++ b/fe/check/checkstyle/checkstyle.xml @@ -39,6 +39,7 @@ under the License. + @@ -53,15 +54,18 @@ under the License. + + + @@ -71,11 +75,13 @@ under the License. + + @@ -151,12 +157,15 @@ under the License. - + + + + @@ -216,6 +225,7 @@ under the License. + @@ -247,6 +257,7 @@ under the License. + @@ -257,6 +268,7 @@ under the License. + @@ -282,11 +294,13 @@ under the License. + + @@ -297,22 +311,26 @@ under the License. + + + + @@ -344,6 +362,7 @@ under the License. + = the minimum version, so that we could remove many if clause, for example - // if (FE_METAVERSION < VERSION_94) ... - // these clause will be useless and we could remove them + // if (FE_METAVERSION < VERSION_94) ... + // these clause will be useless and we could remove them public static final int MINIMUM_VERSION_REQUIRED = VERSION_100; } diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/Codec.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/Codec.java index ceb7a51373..05dada1601 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/Codec.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/Codec.java @@ -54,5 +54,3 @@ public class Codec { return result; } } - - diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/DataInputBuffer.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/DataInputBuffer.java index 1c8f808265..28d3a64e77 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/DataInputBuffer.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/DataInputBuffer.java @@ -30,7 +30,7 @@ import java.io.DataInputStream; * *

* Typical usage is something like the following: - * + * *

  *
  * DataInputBuffer buffer = new DataInputBuffer();
@@ -41,7 +41,7 @@ import java.io.DataInputStream;
  *   ... read buffer using DataInput methods ...
  * }
  * 
- * + * */ public class DataInputBuffer extends DataInputStream { private static class Buffer extends ByteArrayInputStream { diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/DataOutputBuffer.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/DataOutputBuffer.java index e5abdf6a45..f0337217d8 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/DataOutputBuffer.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/DataOutputBuffer.java @@ -34,7 +34,7 @@ import java.io.OutputStream; * *

* Typical usage is something like the following: - * + * *

  *
  * DataOutputBuffer buffer = new DataOutputBuffer();
@@ -46,7 +46,7 @@ import java.io.OutputStream;
  *   ... write data to its ultimate destination ...
  * }
  * 
- * + * */ public class DataOutputBuffer extends DataOutputStream { diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/DeepCopy.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/DeepCopy.java index 2f9bfda721..c4e74e968c 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/DeepCopy.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/DeepCopy.java @@ -18,6 +18,7 @@ package org.apache.doris.common.io; import org.apache.doris.meta.MetaContext; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +52,7 @@ public class DeepCopy { out.close(); DataInputStream in = new DataInputStream(byteArrayOutputStream.getInputStream()); - + Method readMethod = c.getDeclaredMethod(READ_FIELDS_METHOD_NAME, DataInput.class); readMethod.invoke(dest, in); in.close(); diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/IOUtils.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/IOUtils.java index 819a41020a..137315eddf 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/IOUtils.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/IOUtils.java @@ -59,7 +59,7 @@ public class IOUtils { /** * Copies from one stream to another. - * + * * @param in * InputStream to read from * @param out @@ -117,7 +117,7 @@ public class IOUtils { /** * Copies from one stream to another. - * + * * @param in * InputStream to read from * @param out @@ -155,7 +155,7 @@ public class IOUtils { /** * Reads len bytes in a loop. - * + * * @param in * The InputStream to read from * @param buf @@ -184,7 +184,7 @@ public class IOUtils { /** * Similar to readFully(). Skips bytes in a loop. - * + * * @param in * The InputStream to skip bytes from * @param len @@ -207,7 +207,7 @@ public class IOUtils { /** * Close the Closeable objects and ignore any {@link IOException} or * null pointers. Must only be used for cleanup in exception handlers. - * + * * @param log * the log to record problems to at debug level. Can be null. * @param closeables @@ -230,7 +230,7 @@ public class IOUtils { /** * Closes the stream ignoring {@link IOException}. Must only be called in * cleaning up from exception handlers. - * + * * @param stream * the Stream to close */ @@ -240,7 +240,7 @@ public class IOUtils { /** * Closes the socket ignoring {@link IOException} - * + * * @param sock * the Socket to close */ diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/InputBuffer.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/InputBuffer.java index 8fd52b0fe0..716064c0ef 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/InputBuffer.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/InputBuffer.java @@ -30,7 +30,7 @@ import java.io.FilterInputStream; * *

* Typical usage is something like the following: - * + * *

  *
  * InputBuffer buffer = new InputBuffer();
@@ -41,7 +41,7 @@ import java.io.FilterInputStream;
  *   ... read buffer using InputStream methods ...
  * }
  * 
- * + * * @see DataInputBuffer * @see DataOutput */ diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/LimitInputStream.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/LimitInputStream.java index d098c1892d..0138b66945 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/LimitInputStream.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/LimitInputStream.java @@ -40,7 +40,7 @@ public class LimitInputStream extends InputStream { /** * An input stream that reads the limited bytes to the given stream. - * + * * @param in * The stream to be limited * @param limitspeed diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/LimitOutputStream.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/LimitOutputStream.java index 5533a84d0e..648f2e49ee 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/LimitOutputStream.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/LimitOutputStream.java @@ -40,7 +40,7 @@ public class LimitOutputStream extends OutputStream { /** * A output stream that writes the limited bytes to the given stream. - * + * * @param out * The stream to be limited * @param limitspeed diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/OutputBuffer.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/OutputBuffer.java index 63e17b2029..8f95d7401b 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/OutputBuffer.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/OutputBuffer.java @@ -19,8 +19,8 @@ package org.apache.doris.common.io; import java.io.ByteArrayOutputStream; import java.io.FilterOutputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; /** * A reusable {@link OutputStream} implementation that writes to an in-memory @@ -32,7 +32,7 @@ import java.io.IOException; * *

* Typical usage is something like the following: - * + * *

  *
  * OutputBuffer buffer = new OutputBuffer();
@@ -44,7 +44,7 @@ import java.io.IOException;
  *   ... write data to its ultimate destination ...
  * }
  * 
- * + * * @see DataOutputBuffer * @see InputBuffer */ diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/Text.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/Text.java index aae99564ab..8309e245ba 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/Text.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/Text.java @@ -20,9 +20,9 @@ package org.apache.doris.common.io; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.io.DataInput; import java.io.DataOutput; +import java.io.IOException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.CharacterCodingException; @@ -85,7 +85,7 @@ public class Text implements Writable { set(utf8); } - + // Returns the raw bytes; however, only data up to getLength() is valid. public byte[] getBytes() { return bytes; @@ -111,13 +111,13 @@ public class Text implements Writable { * Returns the Unicode Scalar Value (32-bit integer value) for the character * at position. Note that this method avoids using the * converter or doing String instantiation - * + * * @return the Unicode scalar value at position or -1 if the position is * invalid or points to a trailing byte */ public int charAt(int position) { if (position > this.length) { - return -1; + return -1; } if (position < 0) { return -1; @@ -136,7 +136,7 @@ public class Text implements Writable { * as position start. The starting position is measured in * bytes and the return value is in terms of byte position in the buffer. * The backing buffer is not converted to a string for this operation. - * + * * @return byte position of the first occurence of the search string in the * UTF-8 buffer or -1 if not found */ @@ -204,7 +204,7 @@ public class Text implements Writable { /** * Set the Text to range of bytes - * + * * @param utf8 * the data to copy from * @param start @@ -220,7 +220,7 @@ public class Text implements Writable { /** * Append a range of bytes to the end of the given text - * + * * @param utf8 * the data to copy from * @param start @@ -237,7 +237,7 @@ public class Text implements Writable { /** * Append a range of bytes to the end of the given text, and adjust * underlying buffer to reduce mem copy times - * + * * @param utf8 * the data to copy from * @param start @@ -265,9 +265,9 @@ public class Text implements Writable { * capacity and existing content of the buffer are unchanged. If * len is larger than the current capacity, the Text object's * capacity is increased to match. - * + * * @param len the number of bytes we need - * + * * @param keepData should the old data be kept */ public void setCapacity(int len, boolean keepData) { @@ -282,7 +282,7 @@ public class Text implements Writable { /** * Convert text back to string - * + * * @see java.lang.Object#toString() */ public String toString() { @@ -336,7 +336,7 @@ public class Text implements Writable { public int hashCode() { return super.hashCode(); } - + public static String decode(byte[] utf8) throws CharacterCodingException { return decode(ByteBuffer.wrap(utf8), true); } @@ -371,7 +371,7 @@ public class Text implements Writable { /** * Converts the provided String to bytes using the UTF-8 encoding. If the * input is malformed, invalid chars are replaced by a default value. - * + * * @return ByteBuffer: bytes stores at ByteBuffer.array() and length is * ByteBuffer.limit() */ @@ -386,7 +386,7 @@ public class Text implements Writable { * replace is true, then malformed input is replaced with the * substitution character, which is U+FFFD. Otherwise the method throws a * MalformedInputException. - * + * * @return ByteBuffer: bytes stores at ByteBuffer.array() and length is * ByteBuffer.limit() */ @@ -438,7 +438,7 @@ public class Text implements Writable { /** * Check if a byte array contains valid utf-8 - * + * * @param utf8 * byte array * @throws MalformedInputException @@ -450,7 +450,7 @@ public class Text implements Writable { /** * Check to see if a byte array is valid utf-8 - * + * * @param utf8 * the array of bytes * @param start @@ -604,7 +604,7 @@ public class Text implements Writable { /** * For the given string, returns the number of UTF-8 bytes required to * encode the string. - * + * * @param string * text to encode * @return number of UTF-8 bytes required to encode diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/Writable.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/Writable.java index 8c7964ce8a..21b8299013 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/Writable.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/Writable.java @@ -25,7 +25,7 @@ import java.io.IOException; * This interface requires only a uniform writable method "write()", * but does not require a uniform read method. * The usage of writable interface implementation class is as follows: - * + * * Class A implements Writable { * @Override * public void write(DataOutput out) throws IOException { @@ -33,32 +33,32 @@ import java.io.IOException; * in.write(y); * ... * } - * + * * private void readFields(DataInput in) throws IOException { * x = in.read(); * y = in.read(); * ... * } - * + * * public static A read(DataInput in) throws IOException { * A a = new A(); * a.readFields(); * return a; * } * } - * + * * A a = new A(); * a.write(out); * ... * A other = A.read(in); - * + * * The "readFields()" can be implemented as whatever you like, or even without it * by just implementing the static read method. */ public interface Writable { - /** + /** * Serialize the fields of this object to out. - * + * * @param out DataOutput to serialize this object into. * @throws IOException */ diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/jmockit/FieldReflection.java b/fe/fe-common/src/main/java/org/apache/doris/common/jmockit/FieldReflection.java index 4939737129..e7aaae6daf 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/jmockit/FieldReflection.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/jmockit/FieldReflection.java @@ -244,7 +244,7 @@ public final class FieldReflection { } catch (NoSuchFieldException e) { throw new RuntimeException(e); } - + modifiersField.setAccessible(true); int nonFinalModifiers = modifiersField.getInt(field) - 16; modifiersField.setInt(field, nonFinalModifiers); diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/property/PropertySchema.java b/fe/fe-common/src/main/java/org/apache/doris/common/property/PropertySchema.java index 867106cfe6..af61642ac1 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/property/PropertySchema.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/property/PropertySchema.java @@ -17,10 +17,11 @@ package org.apache.doris.common.property; -import com.google.common.collect.ImmutableMap; import org.apache.doris.common.io.Text; import org.apache.doris.thrift.TPropertyVal; +import com.google.common.collect.ImmutableMap; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -396,4 +397,3 @@ public abstract class PropertySchema { public abstract void write(T val, DataOutput out) throws IOException; } - diff --git a/fe/fe-common/src/main/java/org/apache/doris/meta/MetaContext.java b/fe/fe-common/src/main/java/org/apache/doris/meta/MetaContext.java index 0db5cbca91..3d9844cc1d 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/meta/MetaContext.java +++ b/fe/fe-common/src/main/java/org/apache/doris/meta/MetaContext.java @@ -35,8 +35,8 @@ public class MetaContext { public void setMetaVersion(int metaVersion) { if (metaVersion < FeMetaVersion.MINIMUM_VERSION_REQUIRED) { - throw new IllegalArgumentException("Could not set meta version to " - + metaVersion + " since it is lower than minimum required version " + throw new IllegalArgumentException("Could not set meta version to " + + metaVersion + " since it is lower than minimum required version " + FeMetaVersion.MINIMUM_VERSION_REQUIRED); } this.metaVersion = metaVersion; @@ -49,7 +49,7 @@ public class MetaContext { public void setThreadLocalInfo() { threadLocalInfo.set(this); } - + public static MetaContext get() { return threadLocalInfo.get(); } diff --git a/fe/fe-common/src/test/java/org/apache/doris/common/io/BitmapValueTest.java b/fe/fe-common/src/test/java/org/apache/doris/common/io/BitmapValueTest.java index 8a33ceded4..d30e734c91 100644 --- a/fe/fe-common/src/test/java/org/apache/doris/common/io/BitmapValueTest.java +++ b/fe/fe-common/src/test/java/org/apache/doris/common/io/BitmapValueTest.java @@ -27,8 +27,6 @@ import java.io.DataOutput; import java.io.DataOutputStream; import java.io.IOException; -import static org.junit.Assert.assertEquals; - public class BitmapValueTest { @Test @@ -38,7 +36,7 @@ public class BitmapValueTest { ByteArrayOutputStream byteArrayOutput = new ByteArrayOutputStream(); DataOutput output = new DataOutputStream(byteArrayOutput); Codec.encodeVarint64(value, output); - assertEquals(value, Codec.decodeVarint64(new DataInputStream(new ByteArrayInputStream(byteArrayOutput.toByteArray())))); + Assert.assertEquals(value, Codec.decodeVarint64(new DataInputStream(new ByteArrayInputStream(byteArrayOutput.toByteArray())))); } } diff --git a/fe/fe-common/src/test/java/org/apache/doris/common/property/PropertiesSetTest.java b/fe/fe-common/src/test/java/org/apache/doris/common/property/PropertiesSetTest.java index a9a9623041..15b549b3db 100644 --- a/fe/fe-common/src/test/java/org/apache/doris/common/property/PropertiesSetTest.java +++ b/fe/fe-common/src/test/java/org/apache/doris/common/property/PropertiesSetTest.java @@ -17,9 +17,10 @@ package org.apache.doris.common.property; +import org.apache.doris.thrift.TPropertyVal; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import org.apache.doris.thrift.TPropertyVal; import org.junit.Assert; import org.junit.Test; @@ -33,8 +34,6 @@ import java.util.HashMap; import java.util.Map; import java.util.NoSuchElementException; -import static org.junit.Assert.fail; - public class PropertiesSetTest { @Test public void testReadFromStr() { @@ -116,7 +115,7 @@ public class PropertiesSetTest { public void testCheckRequiredOpts() { try { PropertiesSet.readFromStrMap(FileFormat.get(), Maps.newHashMap()); - fail("Expected an NoSuchElementException to be thrown"); + Assert.fail("Expected an NoSuchElementException to be thrown"); } catch (NoSuchElementException e) { Assert.assertTrue(e.getMessage().contains("Missing")); } diff --git a/fe/fe-common/src/test/java/org/apache/doris/common/property/PropertySchemaTest.java b/fe/fe-common/src/test/java/org/apache/doris/common/property/PropertySchemaTest.java index e9ff8e70a0..e5afeb63f9 100644 --- a/fe/fe-common/src/test/java/org/apache/doris/common/property/PropertySchemaTest.java +++ b/fe/fe-common/src/test/java/org/apache/doris/common/property/PropertySchemaTest.java @@ -18,6 +18,7 @@ package org.apache.doris.common.property; import org.apache.doris.thrift.TPropertyVal; + import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Rule; diff --git a/fe/fe-core/src/main/java/org/apache/doris/PaloFe.java b/fe/fe-core/src/main/java/org/apache/doris/PaloFe.java index 91daef9eb5..612c978937 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/PaloFe.java +++ b/fe/fe-core/src/main/java/org/apache/doris/PaloFe.java @@ -38,7 +38,6 @@ import org.apache.doris.service.FrontendOptions; import com.google.common.base.Charsets; import com.google.common.base.Strings; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; @@ -66,9 +65,9 @@ public class PaloFe { // entrance for doris frontend public static void start(String dorisHomeDir, String pidDir, String[] args) { - if (System.getenv("DORIS_LOG_TO_STDERR") != null) { - Log4jConfig.foreground = true; - } + if (System.getenv("DORIS_LOG_TO_STDERR") != null) { + Log4jConfig.foreground = true; + } if (Strings.isNullOrEmpty(dorisHomeDir)) { System.err.println("env DORIS_HOME is not set."); return; @@ -148,7 +147,7 @@ public class PaloFe { httpServer.setMinThreads(Config.jetty_threadPool_minThreads); httpServer.setMaxHttpHeaderSize (Config.jetty_server_max_http_header_size); httpServer.start(); - + qeService.start(); ThreadPoolManager.registerAllThreadPoolMetric(); @@ -369,5 +368,3 @@ public class PaloFe { } } } - - diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/Alter.java b/fe/fe-core/src/main/java/org/apache/doris/alter/Alter.java index 2f8a9d7cbe..d64440713a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/Alter.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/Alter.java @@ -76,7 +76,6 @@ import org.apache.doris.thrift.TTabletType; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java index 8ad5e78bf3..7cdd1d3a5e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java @@ -39,7 +39,6 @@ import org.apache.doris.task.AlterReplicaTask; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -64,15 +63,15 @@ public abstract class AlterHandler extends MasterDaemon { * Operations like Get or Put do not need lock. */ protected ReentrantLock lock = new ReentrantLock(); - + protected void lock() { lock.lock(); } - + protected void unlock() { lock.unlock(); } - + public AlterHandler(String name) { this(name, FeConstants.default_scheduler_interval_millisecond); } @@ -161,7 +160,7 @@ public abstract class AlterHandler extends MasterDaemon { public abstract List> getAlterJobInfosByDb(Database db); /* - * entry function. handle alter ops + * entry function. handle alter ops */ public abstract void process(List alterClauses, String clusterName, Database db, OlapTable olapTable) throws UserException; @@ -189,7 +188,7 @@ public abstract class AlterHandler extends MasterDaemon { * After alter table process starts, there are some load job being processed. * Case 2.1: * None of them succeed on this replica. so the version is still 1. We should modify the replica's version to X. - * Case 2.2 + * Case 2.2 * There are new load jobs after alter task, and at least one of them is succeed on this replica. * So the replica's version should be larger than X. So we don't need to modify the replica version * because its already looks like normal. @@ -227,7 +226,7 @@ public abstract class AlterHandler extends MasterDaemon { if (versionChanged) { ReplicaPersistInfo info = ReplicaPersistInfo.createForClone(task.getDbId(), task.getTableId(), task.getPartitionId(), task.getIndexId(), task.getTabletId(), task.getBackendId(), - replica.getId(), replica.getVersion(), -1, + replica.getId(), replica.getVersion(), -1, replica.getDataSize(), replica.getRowCount(), replica.getLastFailedVersion(), replica.getLastSuccessVersion()); Catalog.getCurrentCatalog().getEditLog().logUpdateReplica(info); diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java index 1d0f69f704..34fc631f2e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java @@ -29,7 +29,6 @@ import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -147,7 +146,7 @@ public abstract class AlterJobV2 implements Writable { * run() and cancel() * Only these 2 methods can be visited by different thread(internal working thread and user connection thread) * So using 'synchronized' to make sure only one thread can run the job at one time. - * + * * lock order: * synchronized * db lock diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterOperations.java b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterOperations.java index dc9d42b81a..5d5c346cf3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterOperations.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterOperations.java @@ -32,7 +32,7 @@ import java.util.Set; */ public class AlterOperations { private Set currentOps = Sets.newHashSet(); - + public AlterOperations() { } diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/BatchAlterJobPersistInfo.java b/fe/fe-core/src/main/java/org/apache/doris/alter/BatchAlterJobPersistInfo.java index d883a9b2a5..3d6caefee5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/BatchAlterJobPersistInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/BatchAlterJobPersistInfo.java @@ -14,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.alter; import org.apache.doris.common.io.Writable; diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java index f2c1b5b8d3..a2d04a12c6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java @@ -62,7 +62,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java index a328fb0400..53027c2357 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java @@ -69,7 +69,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -615,7 +614,7 @@ public class RollupJobV2 extends AlterJobV2 implements GsonPostProcessable { } } } - + this.jobState = JobState.FINISHED; this.finishedTimeMs = replayedJob.finishedTimeMs; diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java index d12382f926..89b40db88b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java @@ -87,7 +87,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -1114,7 +1113,7 @@ public class SchemaChangeHandler extends AlterHandler { schemaChangeJob.setStorageFormat(storageFormat); // begin checking each table - // ATTN: DO NOT change any meta in this loop + // ATTN: DO NOT change any meta in this loop long tableId = olapTable.getId(); Map indexIdToShortKeyColumnCount = Maps.newHashMap(); Map> changedIndexIdToSchema = Maps.newHashMap(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java index 856df527ea..605df4cb96 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java @@ -61,7 +61,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Table; import com.google.common.collect.Table.Cell; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -228,19 +227,19 @@ public class SchemaChangeJobV2 extends AlterJobV2 { continue; } TStorageMedium storageMedium = tbl.getPartitionInfo().getDataProperty(partitionId).getStorageMedium(); - + Map shadowIndexMap = partitionIndexMap.row(partitionId); for (Map.Entry entry : shadowIndexMap.entrySet()) { long shadowIdxId = entry.getKey(); MaterializedIndex shadowIdx = entry.getValue(); - + short shadowShortKeyColumnCount = indexShortKeyMap.get(shadowIdxId); List shadowSchema = indexSchemaMap.get(shadowIdxId); int shadowSchemaHash = indexSchemaVersionAndHashMap.get(shadowIdxId).schemaHash; long originIndexId = indexIdMap.get(shadowIdxId); int originSchemaHash = tbl.getSchemaHashByIndexId(originIndexId); KeysType originKeysType = tbl.getKeysTypeByIndexId(originIndexId); - + for (Tablet shadowTablet : shadowIdx.getTablets()) { long shadowTabletId = shadowTablet.getId(); List shadowReplicas = shadowTablet.getReplicas(); @@ -273,7 +272,7 @@ public class SchemaChangeJobV2 extends AlterJobV2 { // send all tasks and wait them finished AgentTaskQueue.addBatchTask(batchTask); AgentTaskExecutor.submit(batchTask); - long timeout = Math.min(Config.tablet_create_timeout_second * 1000L * totalReplicaNum, + long timeout = Math.min(Config.tablet_create_timeout_second * 1000L * totalReplicaNum, Config.max_create_table_timeout_second * 1000L); boolean ok = false; try { @@ -672,13 +671,13 @@ public class SchemaChangeJobV2 extends AlterJobV2 { } } } - + // set table state olapTable.setState(OlapTableState.SCHEMA_CHANGE); } finally { olapTable.writeUnlock(); } - + this.watershedTxnId = replayedJob.watershedTxnId; jobState = JobState.WAITING_TXN; LOG.info("replay pending schema change job: {}, table id: {}", jobId, tableId); diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SystemHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SystemHandler.java index 81348b9373..44cd210c78 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/SystemHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SystemHandler.java @@ -47,7 +47,6 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.apache.commons.lang.NotImplementedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -117,12 +116,12 @@ public class SystemHandler extends AlterHandler { // add backend AddBackendClause addBackendClause = (AddBackendClause) alterClause; final String destClusterName = addBackendClause.getDestCluster(); - + if ((!Strings.isNullOrEmpty(destClusterName) || addBackendClause.isFree()) && Config.disable_cluster_feature) { ErrorReport.reportAnalysisException(ErrorCode.ERR_INVALID_OPERATION, "ADD BACKEND TO CLUSTER"); } - if (!Strings.isNullOrEmpty(destClusterName) + if (!Strings.isNullOrEmpty(destClusterName) && Catalog.getCurrentCatalog().getCluster(destClusterName) == null) { throw new DdlException("Cluster: " + destClusterName + " does not exist."); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AbstractBackupStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AbstractBackupStmt.java index d6a54fae3c..2bf8a48fd5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AbstractBackupStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AbstractBackupStmt.java @@ -28,7 +28,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -142,4 +141,3 @@ public class AbstractBackupStmt extends DdlStmt { return timeoutMs; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AbstractBackupTableRefClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AbstractBackupTableRefClause.java index bf1f7bfe8a..8b53b6d196 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AbstractBackupTableRefClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AbstractBackupTableRefClause.java @@ -19,11 +19,10 @@ package org.apache.doris.analysis; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; +import org.apache.doris.qe.GlobalVariable; import com.google.common.base.Joiner; import com.google.common.collect.Maps; - -import org.apache.doris.qe.GlobalVariable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddBackendClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddBackendClause.java index c29cfea548..1cd7d61250 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddBackendClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddBackendClause.java @@ -30,7 +30,7 @@ import java.util.Map; public class AddBackendClause extends BackendClause { // be in free state is not owned by any cluster protected boolean isFree; - // cluster that backend will be added to + // cluster that backend will be added to protected String destCluster; protected Map properties = Maps.newHashMap(); private Tag tag; @@ -96,11 +96,10 @@ public class AddBackendClause extends BackendClause { public boolean isFree() { return this.isFree; - } + } public String getDestCluster() { return destCluster; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java index 918baaa99b..f92ee18ba0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java @@ -24,7 +24,6 @@ import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCancelRebalanceDiskStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCancelRebalanceDiskStmt.java index 626366f4b9..f9006f4c33 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCancelRebalanceDiskStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCancelRebalanceDiskStmt.java @@ -21,9 +21,9 @@ import org.apache.doris.catalog.Catalog; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; +import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.system.Backend; -import org.apache.doris.mysql.privilege.PrivPredicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCleanTrashStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCleanTrashStmt.java index 263897e5e1..6a1e716102 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCleanTrashStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCleanTrashStmt.java @@ -21,9 +21,9 @@ import org.apache.doris.catalog.Catalog; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; +import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.system.Backend; -import org.apache.doris.mysql.privilege.PrivPredicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCompactTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCompactTableStmt.java index b5149f8631..1cd448a0fd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCompactTableStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminCompactTableStmt.java @@ -17,8 +17,6 @@ package org.apache.doris.analysis; -import com.google.common.base.Strings; -import com.google.common.collect.Lists; import org.apache.doris.catalog.Catalog; import org.apache.doris.cluster.ClusterNamespace; import org.apache.doris.common.AnalysisException; @@ -28,6 +26,9 @@ import org.apache.doris.common.UserException; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; +import com.google.common.base.Strings; +import com.google.common.collect.Lists; + import java.util.List; public class AdminCompactTableStmt extends DdlStmt { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminRebalanceDiskStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminRebalanceDiskStmt.java index 9b861e79be..cbda427a66 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminRebalanceDiskStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminRebalanceDiskStmt.java @@ -21,9 +21,9 @@ import org.apache.doris.catalog.Catalog; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; +import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.system.Backend; -import org.apache.doris.mysql.privilege.PrivPredicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminSetConfigStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminSetConfigStmt.java index 11708772d4..a66ea13afd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminSetConfigStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminSetConfigStmt.java @@ -32,7 +32,7 @@ import java.util.Map; // admin set frontend config ("key" = "value"); public class AdminSetConfigStmt extends DdlStmt { - + public enum ConfigType { FRONTEND, BACKEND diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfo.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfo.java index 1f8f67da66..6040850916 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfo.java @@ -28,7 +28,6 @@ import org.apache.doris.thrift.TPartitionType; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -156,7 +155,7 @@ public final class AggregateInfo extends AggregateInfoBase { public List getPartitionExprs() { return partitionExprs_; } public void setPartitionExprs(List exprs) { partitionExprs_ = exprs; } - + /** * Creates complete AggregateInfo for groupingExprs and aggExprs, including * aggTupleDesc and aggTupleSMap. If parameter tupleDesc != null, sets aggTupleDesc to @@ -188,12 +187,12 @@ public final class AggregateInfo extends AggregateInfoBase { // aggregation algorithm includes two kinds:one stage aggregation, tow stage aggregation. // for case: // 1: if aggExprs don't have distinct or have multi distinct , create aggregate info for - // one stage aggregation. + // one stage aggregation. // 2: if aggExprs have one distinct , create aggregate info for two stage aggregation boolean isMultiDistinct = result.estimateIfContainsMultiDistinct(distinctAggExprs); - if (distinctAggExprs.isEmpty() + if (distinctAggExprs.isEmpty() || isMultiDistinct) { - // It is used to map new aggr expr to old expr to help create an external + // It is used to map new aggr expr to old expr to help create an external // reference to the aggregation node tuple result.setIsMultiDistinct(isMultiDistinct); if (tupleDesc == null) { @@ -223,9 +222,9 @@ public final class AggregateInfo extends AggregateInfoBase { * @param distinctAggExprs * @return */ - public static boolean estimateIfContainsMultiDistinct(List distinctAggExprs) + public static boolean estimateIfContainsMultiDistinct(List distinctAggExprs) throws AnalysisException { - + if (distinctAggExprs == null || distinctAggExprs.size() <= 0) { return false; } @@ -255,7 +254,7 @@ public final class AggregateInfo extends AggregateInfoBase { if (!Expr.equalLists(expr0Children, exprIChildren)) { if (exprIChildren.size() > 1 || expr0Children.size() > 1) { throw new AnalysisException("The query contains multi count distinct or " - + "sum distinct, each can't have multi columns."); + + "sum distinct, each can't have multi columns."); } hasMultiDistinct = true; } @@ -316,7 +315,7 @@ public final class AggregateInfo extends AggregateInfoBase { // add DISTINCT parameters to grouping exprs if (!isMultiDistinct_) { groupingExprs_.addAll(expr0Children); - } + } // remove DISTINCT aggregate functions from aggExprs aggregateExprs_.removeAll(distinctAggExprs); @@ -572,7 +571,7 @@ public final class AggregateInfo extends AggregateInfoBase { aggExpr = new FunctionCallExpr(inputExpr.getFnName(), Lists.newArrayList(aggExprParam)); } } else { - // multi distinct can't run here + // multi distinct can't run here Preconditions.checkState(false); } secondPhaseAggExprs.add(aggExpr); @@ -755,7 +754,7 @@ public final class AggregateInfo extends AggregateInfoBase { materializedSlots_.clear(); List exprs = Lists.newArrayList(); exprs.addAll(groupingExprs_); - + int aggregateExprsSize = aggregateExprs_.size(); int groupExprsSize = groupingExprs_.size(); boolean isDistinctAgg = isDistinctAgg(); @@ -769,14 +768,14 @@ public final class AggregateInfo extends AggregateInfoBase { slotDesc.setIsMaterialized(true); intermediateSlotDesc.setIsMaterialized(true); } - + if (!slotDesc.isMaterialized()) continue; - + intermediateSlotDesc.setIsMaterialized(true); exprs.add(functionCallExpr); materializedSlots_.add(i); } - + List resolvedExprs = Expr.substituteList(exprs, smap, analyzer, false); analyzer.materializeSlots(resolvedExprs); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfoBase.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfoBase.java index 1abdbcc11c..9961931b29 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfoBase.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AggregateInfoBase.java @@ -27,7 +27,6 @@ import org.apache.doris.catalog.Type; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterDatabaseRename.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterDatabaseRename.java index 5982e025d0..b7606a3e1a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterDatabaseRename.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterDatabaseRename.java @@ -55,7 +55,7 @@ public class AlterDatabaseRename extends DdlStmt { if (Strings.isNullOrEmpty(dbName)) { throw new AnalysisException("Database name is not set"); } - + if (!Catalog.getCurrentCatalog().getAuth().checkDbPriv(ConnectContext.get(), dbName, PrivPredicate.of(PrivBitSet.of(PaloPrivilege.ADMIN_PRIV, PaloPrivilege.ALTER_PRIV), @@ -66,9 +66,9 @@ public class AlterDatabaseRename extends DdlStmt { if (Strings.isNullOrEmpty(newDbName)) { throw new AnalysisException("New database name is not set"); } - + FeNameFormat.checkDbName(newDbName); - + dbName = ClusterNamespace.getFullName(getClusterName(), dbName); newDbName = ClusterNamespace.getFullName(getClusterName(), newDbName); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterLoadErrorUrlClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterLoadErrorUrlClause.java index 376c4cf04c..e2b7ef7364 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterLoadErrorUrlClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterLoadErrorUrlClause.java @@ -23,7 +23,6 @@ import org.apache.doris.common.util.PrintableMap; import org.apache.doris.load.LoadErrorHub; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterUserClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterUserClause.java index 52ffbaac3b..2187270029 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterUserClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterUserClause.java @@ -23,7 +23,6 @@ import org.apache.doris.common.AnalysisException; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.commons.lang.NotImplementedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -35,12 +34,12 @@ import java.util.Set; public class AlterUserClause extends AlterClause { private static final Logger LOG = LogManager.getLogger(AlterUserClause.class); private List hostOrIps; - + private List ips; // for 123.321.1.1 private List starIps; // for 123.*.*.* private List hosts; // for www.baidu.com private AlterUserType type; - + public AlterUserClause(AlterUserType type, List hostOrIps) { super(AlterOpType.ALTER_OTHER); this.type = type; @@ -62,7 +61,7 @@ public class AlterUserClause extends AlterClause { } return sb.toString(); } - + private boolean isHostName(String host) throws AnalysisException { if (Strings.isNullOrEmpty(host)) { throw new AnalysisException("host=[" + host + "] is empty"); @@ -100,19 +99,19 @@ public class AlterUserClause extends AlterClause { } // NOTICE: if we del hostname from whiteList, the hostname must be totally equal with catalog's hostname; } - + public List getIps() { return ips; } - + public List getStarIps() { return starIps; - } - + } + public List getHosts() { return hosts; } - + public AlterUserType getAlterUserType() { return type; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterUserType.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterUserType.java index 99d8682bed..8e27cf679b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterUserType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterUserType.java @@ -22,7 +22,7 @@ public enum AlterUserType { DELETE_USER_WHITELIST("delete_whiteList"); private String type; - + private AlterUserType(String type) { this.type = type; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticExpr.java index 35a460df47..98e06b5e76 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticExpr.java @@ -28,13 +28,13 @@ import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.catalog.Type; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.TreeNode; +import org.apache.doris.common.util.VectorizedUtil; import org.apache.doris.thrift.TExprNode; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.apache.doris.common.util.VectorizedUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -480,7 +480,7 @@ public class AnalyticExpr extends Expr { standardize(analyzer); // But in Vectorized mode, after calculate a window, will be call reset() to reset state, - // And then restarted calculate next new window; + // And then restarted calculate next new window; if (!VectorizedUtil.isVectorized()) { // min/max is not currently supported on sliding windows (i.e. start bound is not // unbounded). @@ -710,14 +710,14 @@ public class AnalyticExpr extends Expr { resetWindow = true; } - // Change first_value/last_value RANGE windows to ROWS + // Change first_value/last_value RANGE windows to ROWS if ((analyticFnName.getFunction().equalsIgnoreCase(FIRSTVALUE) || analyticFnName.getFunction().equalsIgnoreCase(LASTVALUE)) && window != null && window.getType() == AnalyticWindow.Type.RANGE) { window = new AnalyticWindow(AnalyticWindow.Type.ROWS, window.getLeftBoundary(), window.getRightBoundary()); - } + } } /** diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticInfo.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticInfo.java index 5fb714f498..4e84643917 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticInfo.java @@ -25,7 +25,6 @@ import org.apache.doris.catalog.Type; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticWindow.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticWindow.java index 2acceb9275..b148a45960 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticWindow.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticWindow.java @@ -20,15 +20,16 @@ package org.apache.doris.analysis; -import java.math.BigDecimal; - import org.apache.doris.common.AnalysisException; import org.apache.doris.thrift.TAnalyticWindow; import org.apache.doris.thrift.TAnalyticWindowBoundary; import org.apache.doris.thrift.TAnalyticWindowBoundaryType; import org.apache.doris.thrift.TAnalyticWindowType; + import com.google.common.base.Preconditions; +import java.math.BigDecimal; + /** * Windowing clause of an analytic expr * Both left and right boundaries are always non-null after analyze(). diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java index 5cc11e25e1..7c2b94f1ad 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java @@ -37,7 +37,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -245,4 +244,3 @@ public class AnalyzeStmt extends DdlStmt { this.properties.put(CBO_STATISTICS_TASK_TIMEOUT_SEC, String.valueOf(taskTimeout)); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java index 101b6fe636..bcc9eca16e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java @@ -70,7 +70,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -172,7 +171,7 @@ public class Analyzer { public boolean hasPlanHints() { return globalState.hasPlanHints; } public void setIsWithClause() { isWithClause_ = true; } public boolean isWithClause() { return isWithClause_; } - + public void setUDFAllowed(boolean val) { this.isUDFAllowed = val; } public boolean isUDFAllowed() { return this.isUDFAllowed; } public void setTimezone(String timezone) { this.timezone = timezone; } @@ -816,7 +815,7 @@ public class Analyzer { for (TupleDescriptor desc : tupleByAlias.get(tblName.toString())) { //result = desc; if (!colName.equalsIgnoreCase(Column.DELETE_SIGN) && !isVisible(desc.getId())) { - ErrorReport.reportAnalysisException(ErrorCode.ERR_ILLEGAL_COLUMN_REFERENCE_ERROR, + ErrorReport.reportAnalysisException(ErrorCode.ERR_ILLEGAL_COLUMN_REFERENCE_ERROR, Joiner.on(".").join(tblName.getTbl(),colName)); } Column col = desc.getTable().getColumn(colName); @@ -1102,14 +1101,14 @@ public class Analyzer { e.setId(globalState.conjunctIdGenerator.getNextId()); globalState.conjuncts.put(e.getId(), e); - + // LOG.info("registered conjunct " + p.getId().toString() + ": " + p.toSql()); ArrayList tupleIds = Lists.newArrayList(); ArrayList slotIds = Lists.newArrayList(); e.getIds(tupleIds, slotIds); // register full join conjuncts registerFullOuterJoinedConjunct(e); - + // update tuplePredicates for (TupleId id : tupleIds) { if (!tuplePredicates.containsKey(id)) { @@ -1277,9 +1276,9 @@ public class Analyzer { public List getAllUnassignedConjuncts(List tupleIds) { List result = Lists.newArrayList(); for (Expr e : globalState.conjuncts.values()) { - if (!e.isAuxExpr() - && e.isBoundByTupleIds(tupleIds) - && !globalState.assignedConjuncts.contains(e.getId()) + if (!e.isAuxExpr() + && e.isBoundByTupleIds(tupleIds) + && !globalState.assignedConjuncts.contains(e.getId()) && !globalState.ojClauseByConjunct.containsKey(e.getId())) { result.add(e); } @@ -1962,7 +1961,7 @@ public class Analyzer { } return globalState.context.getSessionVariable().isEnableJoinReorderBasedCost() && !globalState.context.getSessionVariable().isDisableJoinReorder(); } - + public boolean safeIsEnableFoldConstantByBe() { if (globalState.context == null) { return false; @@ -2017,7 +2016,7 @@ public class Analyzer { } if (e.isOnClauseConjunct()) { - + if (isAntiJoinedConjunct(e)) return canEvalAntiJoinedConjunct(e, tupleIds); if (isIjConjunct(e) || isSjConjunct(e)) { if (!containsOuterJoinedTid(tids)) return true; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ArithmeticExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ArithmeticExpr.java index e614881603..361d8c4cf6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ArithmeticExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ArithmeticExpr.java @@ -33,7 +33,6 @@ import org.apache.doris.thrift.TExprOpcode; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BackendClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BackendClause.java index 342b154aa7..fb3e325292 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BackendClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BackendClause.java @@ -23,7 +23,6 @@ import org.apache.doris.common.Pair; import org.apache.doris.system.SystemInfoService; import com.google.common.base.Preconditions; - import org.apache.commons.lang.NotImplementedException; import java.util.LinkedList; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BaseTableRef.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BaseTableRef.java index 5c0a8f4d47..09269f37f8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BaseTableRef.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BaseTableRef.java @@ -74,4 +74,3 @@ public class BaseTableRef extends TableRef { analyzeHints(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BaseViewStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BaseViewStmt.java index 0a992a83ce..6d6bdeaf11 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BaseViewStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BaseViewStmt.java @@ -29,7 +29,6 @@ import org.apache.doris.common.util.ToSqlContext; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BetweenPredicate.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BetweenPredicate.java index f1f00de50a..d3787c26bb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BetweenPredicate.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BetweenPredicate.java @@ -22,6 +22,7 @@ package org.apache.doris.analysis; import org.apache.doris.common.AnalysisException; import org.apache.doris.thrift.TExprNode; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BinaryPredicate.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BinaryPredicate.java index c23659edf5..cc1c4cc29c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BinaryPredicate.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BinaryPredicate.java @@ -37,7 +37,6 @@ import org.apache.doris.thrift.TExprOpcode; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Range; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -513,8 +512,8 @@ public class BinaryPredicate extends Predicate implements Writable { // private final FunctionOperator functionOp; // private final FunctionOperator filterFunctionOp; // - // private Operator(String description, - // FunctionOperator functionOp, + // private Operator(String description, + // FunctionOperator functionOp, // FunctionOperator filterFunctionOp) { // this.description = description; // this.functionOp = functionOp; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BoolLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BoolLiteral.java index f551439ba9..4a6ef66c0f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BoolLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BoolLiteral.java @@ -20,12 +20,6 @@ package org.apache.doris.analysis; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; - import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.catalog.Type; import org.apache.doris.common.AnalysisException; @@ -33,9 +27,15 @@ import org.apache.doris.thrift.TBoolLiteral; import org.apache.doris.thrift.TExprNode; import org.apache.doris.thrift.TExprNodeType; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; + public class BoolLiteral extends LiteralExpr { private boolean value; - + private BoolLiteral() { } @@ -141,7 +141,7 @@ public class BoolLiteral extends LiteralExpr { super.readFields(in); this.setValue(in.readBoolean()); } - + public static BoolLiteral read(DataInput in) throws IOException { BoolLiteral literal = new BoolLiteral(); literal.readFields(in); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BrokerDesc.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BrokerDesc.java index eb50173894..eb79f65267 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BrokerDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BrokerDesc.java @@ -24,7 +24,6 @@ import org.apache.doris.common.util.PrintableMap; import org.apache.doris.thrift.TFileType; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BuiltinAggregateFunction.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BuiltinAggregateFunction.java index 3263abb348..bef35e2b06 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BuiltinAggregateFunction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BuiltinAggregateFunction.java @@ -37,7 +37,7 @@ public class BuiltinAggregateFunction extends Function { private final Operator op_; // this is to judge the analytic function private boolean isAnalyticFn = false; - + public boolean isAnalyticFn() { return isAnalyticFn; } @@ -48,7 +48,7 @@ public class BuiltinAggregateFunction extends Function { public boolean isReqIntermediateTuple() { return reqIntermediateTuple; } - + public BuiltinAggregateFunction(Operator op, ArrayList argTypes, Type retType, org.apache.doris.catalog.Type intermediateType, boolean isAnalyticFn) throws AnalysisException { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CancelAlterTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CancelAlterTableStmt.java index fdc69a8363..d49c68fd1e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CancelAlterTableStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CancelAlterTableStmt.java @@ -17,7 +17,6 @@ package org.apache.doris.analysis; -import org.apache.commons.collections.CollectionUtils; import org.apache.doris.analysis.ShowAlterStmt.AlterType; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.AnalysisException; @@ -26,6 +25,8 @@ import org.apache.doris.common.ErrorReport; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; +import org.apache.commons.collections.CollectionUtils; + import java.util.List; import java.util.stream.Collectors; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CancelBackupStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CancelBackupStmt.java index b1de0688eb..a4cd784688 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CancelBackupStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CancelBackupStmt.java @@ -32,7 +32,7 @@ public class CancelBackupStmt extends CancelStmt { private String dbName; private boolean isRestore; - + public CancelBackupStmt(String dbName, boolean isRestore) { this.dbName = dbName; this.isRestore = isRestore; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CastExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CastExpr.java index 8c71a0e6ad..cca6217816 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CastExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CastExpr.java @@ -38,7 +38,6 @@ import org.apache.doris.thrift.TExprOpcode; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -303,7 +302,7 @@ public class CastExpr extends Expr { // of cast is decided by child. if (targetTypeDef.getType().isScalarType()) { final ScalarType targetType = (ScalarType) targetTypeDef.getType(); - if (!(targetType.getPrimitiveType().isStringType() + if (!(targetType.getPrimitiveType().isStringType() && !targetType.isAssignedStrLenInColDefinition())) { targetTypeDef.analyze(analyzer); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ChannelDescription.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ChannelDescription.java index a85b773c79..13ff1438e6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ChannelDescription.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ChannelDescription.java @@ -29,7 +29,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ClusterName.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ClusterName.java index 3dd05a56be..892924708f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ClusterName.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ClusterName.java @@ -17,17 +17,18 @@ package org.apache.doris.analysis; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; + import com.google.common.base.Strings; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + public class ClusterName implements Writable { private String cluster; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnDef.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnDef.java index bec6f5ac4c..29e3aed56d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnDef.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnDef.java @@ -30,7 +30,6 @@ import org.apache.doris.common.Config; import org.apache.doris.common.FeNameFormat; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -49,11 +48,11 @@ public class ColumnDef { * k1 INT NOT NULL DEFAULT "10" * k1 INT NULL * k1 INT NULL DEFAULT NULL - * + * * ColumnnDef will be transformed to Column in Analysis phase, and in Column, default value is a String. * No matter does the user set the default value as NULL explicitly, or not set default value, * the default value in Column will be "null", so that Doris can not distinguish between "not set" and "set as null". - * + * * But this is OK because Column has another attribute "isAllowNull". * If the column is not allowed to be null, and user does not set the default value, * even if default value saved in Column is null, the "null" value can not be loaded into this column, diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CompoundPredicate.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CompoundPredicate.java index d1e94e03e2..8b454ce533 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CompoundPredicate.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CompoundPredicate.java @@ -20,7 +20,6 @@ package org.apache.doris.analysis; -import com.google.common.collect.Lists; import org.apache.doris.catalog.FunctionSet; import org.apache.doris.catalog.ScalarFunction; import org.apache.doris.catalog.Type; @@ -30,7 +29,7 @@ import org.apache.doris.thrift.TExprNodeType; import org.apache.doris.thrift.TExprOpcode; import com.google.common.base.Preconditions; - +import com.google.common.collect.Lists; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateClusterStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateClusterStmt.java index a4187235aa..c8b0c0a7bd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateClusterStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateClusterStmt.java @@ -89,7 +89,7 @@ public class CreateClusterStmt extends DdlStmt { if (instanceNum < 0) { ErrorReport.reportAnalysisException(ErrorCode.ERR_CLUSTER_CREATE_ISTANCE_NUM_ERROR); } - + final String password = passwd; if (!Strings.isNullOrEmpty(password)) { scramblePassword = MysqlPassword.makeScrambledPassword(password); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateEncryptKeyStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateEncryptKeyStmt.java index 1cbfcf09ea..ad694ad8ca 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateEncryptKeyStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateEncryptKeyStmt.java @@ -23,11 +23,11 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; import org.apache.doris.common.UserException; - -import com.google.common.base.Strings; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; +import com.google.common.base.Strings; + /** * create a encryptKey * diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateFileStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateFileStmt.java index a2c19173ca..6f09144bff 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateFileStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateFileStmt.java @@ -39,7 +39,7 @@ public class CreateFileStmt extends DdlStmt { private static final String PROP_URL = "url"; private static final String PROP_MD5 = "md5"; private static final String PROP_SAVE_CONTENT = "save_content"; - + private static final ImmutableSet PROPERTIES_SET = new ImmutableSet.Builder() .add(PROP_CATALOG).add(PROP_URL).add(PROP_MD5).build(); @@ -134,7 +134,7 @@ public class CreateFileStmt extends DdlStmt { if (properties.containsKey(PROP_MD5)) { checksum = properties.get(PROP_MD5); } - + if (properties.containsKey(PROP_SAVE_CONTENT)) { throw new AnalysisException("'save_content' property is not supported yet"); /* @@ -163,8 +163,8 @@ public class CreateFileStmt extends DdlStmt { sb.append(map.toString()); return sb.toString(); } - - @Override + + @Override public RedirectStatus getRedirectStatus() { return RedirectStatus.FORWARD_WITH_SYNC; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateFunctionStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateFunctionStmt.java index 2446fb8249..3036f1bde3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateFunctionStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateFunctionStmt.java @@ -45,7 +45,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Sets; - +import io.grpc.ManagedChannel; +import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder; import org.apache.commons.codec.binary.Hex; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; @@ -65,9 +66,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import io.grpc.ManagedChannel; -import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder; - // create a user define function public class CreateFunctionStmt extends DdlStmt { private final static Logger LOG = LogManager.getLogger(CreateFunctionStmt.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateResourceStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateResourceStmt.java index 02323a805f..badbe11c0e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateResourceStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateResourceStmt.java @@ -100,4 +100,3 @@ public class CreateResourceStmt extends DdlStmt { return sb.toString(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRoutineLoadStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRoutineLoadStmt.java index 5bf72ab678..c4c6f78593 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRoutineLoadStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRoutineLoadStmt.java @@ -37,7 +37,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -113,7 +112,7 @@ public class CreateRoutineLoadStmt extends DdlStmt { public static final String KAFKA_OFFSETS_PROPERTY = "kafka_offsets"; public static final String KAFKA_DEFAULT_OFFSETS = "kafka_default_offsets"; public static final String KAFKA_ORIGIN_DEFAULT_OFFSETS = "kafka_origin_default_offsets"; - + private static final String NAME_TYPE = "ROUTINE LOAD NAME"; public static final String ENDPOINT_REGEX = "[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]"; public static final String SEND_BATCH_PARALLELISM = "send_batch_parallelism"; @@ -421,15 +420,15 @@ public class CreateRoutineLoadStmt extends DdlStmt { desiredConcurrentNum = ((Long) Util.getLongPropertyOrDefault(jobProperties.get(DESIRED_CONCURRENT_NUMBER_PROPERTY), Config.max_routine_load_task_concurrent_num, DESIRED_CONCURRENT_NUMBER_PRED, DESIRED_CONCURRENT_NUMBER_PROPERTY + " should > 0")).intValue(); - + maxErrorNum = Util.getLongPropertyOrDefault(jobProperties.get(MAX_ERROR_NUMBER_PROPERTY), RoutineLoadJob.DEFAULT_MAX_ERROR_NUM, MAX_ERROR_NUMBER_PRED, MAX_ERROR_NUMBER_PROPERTY + " should >= 0"); - + maxBatchIntervalS = Util.getLongPropertyOrDefault(jobProperties.get(MAX_BATCH_INTERVAL_SEC_PROPERTY), RoutineLoadJob.DEFAULT_MAX_INTERVAL_SECOND, MAX_BATCH_INTERVAL_PRED, MAX_BATCH_INTERVAL_SEC_PROPERTY + " should between 5 and 60"); - + maxBatchRows = Util.getLongPropertyOrDefault(jobProperties.get(MAX_BATCH_ROWS_PROPERTY), RoutineLoadJob.DEFAULT_MAX_BATCH_ROWS, MAX_BATCH_ROWS_PRED, MAX_BATCH_ROWS_PROPERTY + " should > 200000"); @@ -443,7 +442,7 @@ public class CreateRoutineLoadStmt extends DdlStmt { LoadStmt.STRICT_MODE + " should be a boolean"); execMemLimit = Util.getLongPropertyOrDefault(jobProperties.get(EXEC_MEM_LIMIT_PROPERTY), RoutineLoadJob.DEFAULT_EXEC_MEM_LIMIT, EXEC_MEM_LIMIT_PRED, EXEC_MEM_LIMIT_PROPERTY + "should > 0"); - + sendBatchParallelism = ((Long) Util.getLongPropertyOrDefault(jobProperties.get(SEND_BATCH_PARALLELISM), ConnectContext.get().getSessionVariable().getSendBatchParallelism(), SEND_BATCH_PARALLELISM_PRED, SEND_BATCH_PARALLELISM + " should > 0")).intValue(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableLikeStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableLikeStmt.java index 5865cd2821..70223c87cc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableLikeStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableLikeStmt.java @@ -17,8 +17,6 @@ package org.apache.doris.analysis; -import com.google.common.base.Joiner; -import org.apache.commons.collections.CollectionUtils; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.DdlException; import org.apache.doris.common.ErrorCode; @@ -27,6 +25,9 @@ import org.apache.doris.common.FeNameFormat; import org.apache.doris.common.UserException; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; + +import com.google.common.base.Joiner; +import org.apache.commons.collections.CollectionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java index dd4a73fdcf..dde61afa78 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java @@ -38,7 +38,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.commons.collections.CollectionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -535,7 +534,7 @@ public class CreateTableStmt extends DdlStmt { if (partitionDesc != null) { sb.append("\n").append(partitionDesc.toSql()); } - + if (distributionDesc != null) { sb.append("\n").append(distributionDesc.toSql()); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateUserStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateUserStmt.java index b5660866a6..25bdf87b93 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateUserStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateUserStmt.java @@ -30,7 +30,6 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateViewStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateViewStmt.java index cc32ab7dec..d10fb1c713 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateViewStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateViewStmt.java @@ -25,7 +25,6 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DataDescription.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DataDescription.java index fbd8802cca..34a2c23dcd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DataDescription.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DataDescription.java @@ -34,9 +34,6 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.thrift.TNetworkAddress; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; @@ -44,6 +41,8 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.StringReader; import java.util.Arrays; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DataSortInfo.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DataSortInfo.java index 5b33d25cf1..783ccde0ec 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DataSortInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DataSortInfo.java @@ -17,12 +17,13 @@ package org.apache.doris.analysis; -import com.google.gson.annotations.SerializedName; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; import org.apache.doris.thrift.TSortType; +import com.google.gson.annotations.SerializedName; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java index 22ba0c368f..09dd6b1f8d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java @@ -30,9 +30,13 @@ import org.apache.doris.thrift.TExprNodeType; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; +import org.joda.time.LocalDateTime; +import org.joda.time.format.DateTimeFormatter; +import org.joda.time.format.DateTimeFormatterBuilder; import java.io.DataInput; import java.io.DataOutput; @@ -44,12 +48,6 @@ import java.util.Objects; import java.util.TimeZone; import java.util.regex.Pattern; -import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; -import org.joda.time.LocalDateTime; -import org.joda.time.format.DateTimeFormatter; -import org.joda.time.format.DateTimeFormatterBuilder; - public class DateLiteral extends LiteralExpr { private static final Logger LOG = LogManager.getLogger(DateLiteral.class); @@ -68,8 +66,8 @@ public class DateLiteral extends LiteralExpr { private static DateTimeFormatter DATE_TIME_FORMATTER_TO_HOUR = null; private static DateTimeFormatter DATE_TIME_FORMATTER_TO_MINUTE = null; private static DateTimeFormatter DATE_FORMATTER = null; - /* - * Dates containing two-digit year values are ambiguous because the century is unknown. + /* + * Dates containing two-digit year values are ambiguous because the century is unknown. * MySQL interprets two-digit year values using these rules: * Year values in the range 70-99 are converted to 1970-1999. * Year values in the range 00-69 are converted to 2000-2069. @@ -209,7 +207,7 @@ public class DateLiteral extends LiteralExpr { this.type = Type.DATE; } else { this.type = Type.DATETIME; - } + } } public DateLiteral(long year, long month, long day) { @@ -239,7 +237,7 @@ public class DateLiteral extends LiteralExpr { this.hour = dateTime.getHourOfDay(); this.minute = dateTime.getMinuteOfHour(); this.second = dateTime.getSecondOfMinute(); - this.type = type; + this.type = type; } public DateLiteral(DateLiteral other) { @@ -638,12 +636,12 @@ public class DateLiteral extends LiteralExpr { public LocalDateTime getTimeFormatter() throws AnalysisException { if (type.equals(Type.DATE)) { - return DATE_FORMATTER.parseLocalDateTime(getStringValue()); + return DATE_FORMATTER.parseLocalDateTime(getStringValue()); } else if (type.equals(Type.DATETIME)) { return DATE_TIME_FORMATTER.parseLocalDateTime(getStringValue()); } else { throw new AnalysisException("Not support date literal type"); - } + } } public DateLiteral plusYears(int year) throws AnalysisException { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DecimalLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DecimalLiteral.java index 1cf3fcd7de..07abe74bed 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DecimalLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DecimalLiteral.java @@ -27,7 +27,6 @@ import org.apache.doris.thrift.TExprNode; import org.apache.doris.thrift.TExprNodeType; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java index 74760c06a3..9cfd26eece 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java @@ -46,11 +46,11 @@ public class DeleteStmt extends DdlStmt { this.wherePredicate = wherePredicate; this.deleteConditions = new LinkedList(); } - + public String getTableName() { return tbl.getTbl(); } - + public String getDbName() { return tbl.getDb(); } @@ -66,7 +66,7 @@ public class DeleteStmt extends DdlStmt { @Override public void analyze(Analyzer analyzer) throws UserException { super.analyze(analyzer); - + if (tbl == null) { throw new AnalysisException("Table is not set"); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java index 00ac91b804..cb13e07492 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java @@ -42,11 +42,10 @@ import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.commons.lang.StringUtils; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -81,7 +80,7 @@ public class DescribeStmt extends ShowStmt { private TableName dbTableName; private ProcNodeInterface node; - + List> totalRows; private boolean isAllTables; @@ -100,7 +99,7 @@ public class DescribeStmt extends ShowStmt { @Override public void analyze(Analyzer analyzer) throws AnalysisException, UserException { dbTableName.analyze(analyzer); - + if (!Catalog.getCurrentCatalog().getAuth().checkTblPriv(ConnectContext.get(), dbTableName.getDb(), dbTableName.getTbl(), PrivPredicate.SHOW)) { ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR, "DESCRIBE", diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescriptorTable.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescriptorTable.java index 908657fe23..148c93fb91 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescriptorTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescriptorTable.java @@ -26,7 +26,6 @@ import org.apache.doris.thrift.TDescriptorTable; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropFunctionStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropFunctionStmt.java index c0125d4073..da90e1c0f4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropFunctionStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropFunctionStmt.java @@ -64,7 +64,7 @@ public class DropFunctionStmt extends DdlStmt { return stringBuilder.toString(); } - @Override + @Override public RedirectStatus getRedirectStatus() { return RedirectStatus.FORWARD_WITH_SYNC; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropRepositoryStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropRepositoryStmt.java index a2b9b10f08..76836bf943 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropRepositoryStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropRepositoryStmt.java @@ -27,15 +27,15 @@ import org.apache.doris.qe.ConnectContext; public class DropRepositoryStmt extends DdlStmt { private String repoName; - + public DropRepositoryStmt(String repoName) { this.repoName = repoName; } - + public String getRepoName() { return repoName; } - + @Override public void analyze(Analyzer analyzer) throws UserException { super.analyze(analyzer); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/EnableFeatureClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/EnableFeatureClause.java index b145af5607..8aee07316e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/EnableFeatureClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/EnableFeatureClause.java @@ -20,8 +20,8 @@ package org.apache.doris.analysis; import org.apache.doris.alter.AlterOpType; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; - import org.apache.doris.common.util.PrintableMap; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/EncryptKeyName.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/EncryptKeyName.java index 737c515478..fec86f064a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/EncryptKeyName.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/EncryptKeyName.java @@ -25,11 +25,11 @@ import org.apache.doris.common.FeNameFormat; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import com.google.common.base.Strings; import com.google.gson.annotations.SerializedName; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/EncryptKeyRef.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/EncryptKeyRef.java index 00f1881357..9da397cb9d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/EncryptKeyRef.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/EncryptKeyRef.java @@ -25,10 +25,10 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; import org.apache.doris.thrift.TExprNode; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import com.google.common.base.Strings; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class EncryptKeyRef extends Expr { private static final Logger LOG = LogManager.getLogger(EncryptKeyRef.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/EnterStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/EnterStmt.java index ffc180acbf..881b0fbfb3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/EnterStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/EnterStmt.java @@ -21,6 +21,7 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; import org.apache.doris.common.UserException; + import com.google.common.base.Strings; public class EnterStmt extends DdlStmt { @@ -61,10 +62,10 @@ public class EnterStmt extends DdlStmt { public void setClusterName(String name) { this.name = name; } - + @Override public RedirectStatus getRedirectStatus() { return RedirectStatus.NO_FORWARD; } - + } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExistsPredicate.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExistsPredicate.java index 7a4d9512ff..bdb2fbee06 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExistsPredicate.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExistsPredicate.java @@ -18,10 +18,10 @@ package org.apache.doris.analysis; import org.apache.doris.thrift.TExprNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Class representing a [NOT] EXISTS predicate. @@ -87,4 +87,3 @@ public class ExistsPredicate extends Predicate { return 31 * super.hashCode() + Boolean.hashCode(notExists); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java index 80dcf2798e..a77d151168 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java @@ -39,7 +39,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java index e53d6444eb..2a550a3715 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java @@ -42,7 +42,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -1437,7 +1436,7 @@ abstract public class Expr extends TreeNode implements ParseNode, Cloneabl /** * This method is mainly used to find the original column corresponding to the current expr. * Find the initial slotRef from the current slot ref. - * + * * If the initial expr is not a slotRef, it returns null directly. * If the current slotRef comes from another expression transformation, * rather than directly from another slotRef, null will also be returned. diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprId.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprId.java index ee8f119c15..dc8af2cd53 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprId.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprId.java @@ -23,8 +23,8 @@ package org.apache.doris.analysis; import org.apache.doris.common.Id; import org.apache.doris.common.IdGenerator; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class ExprId extends Id { private final static Logger LOG = LogManager.getLogger(ExprId.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprSubstitutionMap.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprSubstitutionMap.java index 2c1710f100..20eccffb4f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprSubstitutionMap.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprSubstitutionMap.java @@ -20,14 +20,13 @@ package org.apache.doris.analysis; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; /** * Map of expression substitutions: lhs[i] gets substituted with rhs[i]. diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java index 308ec47253..2557ad89a8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java @@ -33,7 +33,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -245,7 +244,7 @@ public enum ExpressionFunctions { } else { throw new IllegalArgumentException("Doris doesn't support type:" + argType); } - + // if args all is NullLiteral long size = args.stream().filter(e -> e instanceof NullLiteral).count(); if (args.size() == size) { @@ -304,4 +303,3 @@ public enum ExpressionFunctions { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FloatLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FloatLiteral.java index 0b70f12454..1bceef48de 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FloatLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FloatLiteral.java @@ -34,7 +34,7 @@ import java.nio.ByteOrder; public class FloatLiteral extends LiteralExpr { private double value; - + public FloatLiteral() { } @@ -189,7 +189,7 @@ public class FloatLiteral extends LiteralExpr { super.readFields(in); value = in.readDouble(); } - + public static FloatLiteral read(DataInput in) throws IOException { FloatLiteral literal = new FloatLiteral(); literal.readFields(in); @@ -216,4 +216,3 @@ public class FloatLiteral extends LiteralExpr { } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FrontendClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FrontendClause.java index 4bfcfef7d5..519ff01180 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FrontendClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FrontendClause.java @@ -30,7 +30,6 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.base.Preconditions; import com.google.common.base.Strings; - import org.apache.commons.lang.NotImplementedException; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionArgs.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionArgs.java index 55ed57d4f4..cb00b06923 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionArgs.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionArgs.java @@ -21,6 +21,7 @@ package org.apache.doris.analysis; import org.apache.doris.catalog.Type; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java index 305bdc47dc..40387673bd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java @@ -48,7 +48,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Lists; - import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -85,7 +84,7 @@ public class FunctionCallExpr extends Expr { .add("variance").add("variance_pop").add("variance_pop").add("var_samp").add("var_pop").build(); private static final String ELEMENT_EXTRACT_FN_NAME = "%element_extract%"; - // use to record the num of json_object parameters + // use to record the num of json_object parameters private int originChildSize; // Save the functionCallExpr in the original statement private Expr originStmtFnExpr; @@ -1221,4 +1220,3 @@ public class FunctionCallExpr extends Expr { return result.toString(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionName.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionName.java index 7a85852b9b..b9aadd3265 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionName.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionName.java @@ -29,7 +29,6 @@ import org.apache.doris.common.io.Writable; import org.apache.doris.thrift.TFunctionName; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/GroupByClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/GroupByClause.java index 14d1804e71..302242bd1d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/GroupByClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/GroupByClause.java @@ -22,7 +22,6 @@ import org.apache.doris.common.AnalysisException; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; - import org.apache.commons.collections.CollectionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/HashDistributionDesc.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/HashDistributionDesc.java index d02faa4fc6..e16dd4ea11 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/HashDistributionDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/HashDistributionDesc.java @@ -111,7 +111,7 @@ public class HashDistributionDesc extends DistributionDesc { @Override public DistributionInfo toDistributionInfo(List columns) throws DdlException { List distributionColumns = Lists.newArrayList(); - + // check and get distribution column for (String colName : distributionColumnNames) { boolean find = false; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/InPredicate.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/InPredicate.java index 1bcac67a78..575ce07aa1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/InPredicate.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/InPredicate.java @@ -34,7 +34,6 @@ import org.apache.doris.thrift.TInPredicate; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -164,14 +163,14 @@ public class InPredicate extends Predicate { @Override public void analyzeImpl(Analyzer analyzer) throws AnalysisException { super.analyzeImpl(analyzer); - + if (contains(Subquery.class)) { // An [NOT] IN predicate with a subquery must contain two children, the second of // which is a Subquery. if (children.size() != 2 || !(getChild(1) instanceof Subquery)) { throw new AnalysisException("Unsupported IN predicate with a subquery: " + toSql()); - } + } Subquery subquery = (Subquery)getChild(1); if (!subquery.returnsScalarColumn()) { throw new AnalysisException("Subquery must return a single column: " + diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/InlineViewRef.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/InlineViewRef.java index a708cd60e8..da1195f58f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/InlineViewRef.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/InlineViewRef.java @@ -32,7 +32,6 @@ import org.apache.doris.rewrite.ExprRewriter; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/InsertStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/InsertStmt.java index 5d34004fcf..3c41381576 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/InsertStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/InsertStmt.java @@ -55,7 +55,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -433,7 +432,7 @@ public class InsertStmt extends DdlStmt { * processing, targetColumns: (A, B, C, __doris_shadow_B), and * origColIdxsForExtendCols has 1 element: "1", which is the index of column B * in targetColumns. - * + * * Rule A: If the column which the shadow column related to is not mentioned, * then do not add the shadow column to targetColumns. They will be filled by * null or default value when loading. @@ -485,7 +484,7 @@ public class InsertStmt extends DdlStmt { // Check if all columns mentioned is enough checkColumnCoverage(mentionedColumns, targetTable.getBaseSchema()) ; - + // handle VALUES() or SELECT constant list if (isValuesOrConstantSelect) { SelectStmt selectStmt = (SelectStmt) queryStmt; @@ -600,7 +599,7 @@ public class InsertStmt extends DdlStmt { */ ArrayList extentedRow = Lists.newArrayList(); extentedRow.addAll(row); - + for (Pair entry : origColIdxsForExtendCols) { if (entry != null) { if (entry.second == null) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/InstallPluginStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/InstallPluginStmt.java index b3f7e2584b..5a5c257346 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/InstallPluginStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/InstallPluginStmt.java @@ -88,4 +88,3 @@ public class InstallPluginStmt extends DdlStmt { return RedirectStatus.FORWARD_WITH_SYNC; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/IntLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/IntLiteral.java index 9a43c820de..00662c5e6a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/IntLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/IntLiteral.java @@ -26,7 +26,6 @@ import org.apache.doris.thrift.TExprNodeType; import org.apache.doris.thrift.TIntLiteral; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/IsNullPredicate.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/IsNullPredicate.java index d63dbbff57..f6643720b8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/IsNullPredicate.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/IsNullPredicate.java @@ -27,10 +27,11 @@ import org.apache.doris.catalog.Type; import org.apache.doris.common.AnalysisException; import org.apache.doris.thrift.TExprNode; import org.apache.doris.thrift.TExprNodeType; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class IsNullPredicate extends Predicate { private static final Logger LOG = LogManager.getLogger(IsNullPredicate.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/JoinOperator.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/JoinOperator.java index 263095b0d2..c7e532465e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/JoinOperator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/JoinOperator.java @@ -93,12 +93,10 @@ public enum JoinOperator { } public boolean isLeftOuterJoin() { - return this == LEFT_OUTER_JOIN; + return this == LEFT_OUTER_JOIN; } public boolean isRightOuterJoin() { return this == RIGHT_OUTER_JOIN; } } - - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/KeysDesc.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/KeysDesc.java index c7b4f2377e..3db8d07bc3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/KeysDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/KeysDesc.java @@ -136,4 +136,3 @@ public class KeysDesc implements Writable { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/KillStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/KillStmt.java index 98120f319c..56f4f24d23 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/KillStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/KillStmt.java @@ -59,10 +59,9 @@ public class KillStmt extends StatementBase { public String toString() { return toSql(); } - + @Override public RedirectStatus getRedirectStatus() { return RedirectStatus.NO_FORWARD; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/LabelName.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/LabelName.java index 0978afac8f..327b183413 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/LabelName.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/LabelName.java @@ -26,7 +26,6 @@ import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import com.google.common.base.Strings; - import org.apache.commons.lang.builder.HashCodeBuilder; import java.io.DataInput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/LateralViewRef.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/LateralViewRef.java index 3af8b5481c..975dc5e235 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/LateralViewRef.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/LateralViewRef.java @@ -207,5 +207,3 @@ public class LateralViewRef extends TableRef { // The reset of @lateralViewRef happens in the reset() of @relatedTableRef. } } - - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/LimitElement.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/LimitElement.java index 7d5f06ac7e..a7d4a5120f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/LimitElement.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/LimitElement.java @@ -25,16 +25,16 @@ package org.apache.doris.analysis; */ public class LimitElement { public static LimitElement NO_LIMIT = new LimitElement(); - + ///////////////////////////////////////// // BEGIN: Members that need to be reset() - + private long limit; private long offset; // END: Members that need to be reset() ///////////////////////////////////////// - + public LimitElement() { limit = -1; offset = 0; @@ -111,7 +111,7 @@ public class LimitElement { public void analyze(Analyzer analyzer) { if (limit == 0) analyzer.setHasEmptyResultSet(); } - + public void reset() { } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/LiteralExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/LiteralExpr.java index 9ae73092cf..375fe8d27c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/LiteralExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/LiteralExpr.java @@ -26,7 +26,6 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.NotImplementedException; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -220,7 +219,7 @@ public abstract class LiteralExpr extends Expr implements Comparable(properties, "=", true, false)); sb.append(")"); - + return sb.toString(); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTableCommentClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTableCommentClause.java index 1e6780b9a9..745ec0ffcc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTableCommentClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTableCommentClause.java @@ -20,11 +20,10 @@ package org.apache.doris.analysis; import org.apache.doris.alter.AlterOpType; import org.apache.doris.common.AnalysisException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.google.common.base.Strings; import com.google.common.collect.Maps; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTablePropertiesClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTablePropertiesClause.java index ab69aaa690..37b50fa73e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTablePropertiesClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTablePropertiesClause.java @@ -106,7 +106,7 @@ public class ModifyTablePropertiesClause extends AlterTableClause { sb.append("PROPERTIES ("); sb.append(new PrintableMap(properties, "=", true, false)); sb.append(")"); - + return sb.toString(); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/NullLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/NullLiteral.java index f153924f66..144915fabb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/NullLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/NullLiteral.java @@ -64,7 +64,7 @@ public class NullLiteral extends LiteralExpr { super.resetAnalysisState(); type = Type.NULL; } - + @Override public Expr clone() { return new NullLiteral(this); @@ -144,7 +144,7 @@ public class NullLiteral extends LiteralExpr { public void readFields(DataInput in) throws IOException { super.readFields(in); } - + public static NullLiteral read(DataInput in) throws IOException { NullLiteral literal = new NullLiteral(); literal.readFields(in); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/OrderByElement.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/OrderByElement.java index aadb13b171..3743f055e5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/OrderByElement.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/OrderByElement.java @@ -37,18 +37,18 @@ public class OrderByElement { // Represents the NULLs ordering specified: true when "NULLS FIRST", false when // "NULLS LAST", and null if not specified. private final Boolean nullsFirstParam; - + public OrderByElement(Expr expr, boolean isAsc, Boolean nullsFirstParam) { super(); this.expr = expr; this.isAsc = isAsc; this.nullsFirstParam = nullsFirstParam; } - + public void setExpr(Expr e) { this.expr = e; } - + public Expr getExpr() { return expr; } @@ -56,7 +56,7 @@ public class OrderByElement { public boolean getIsAsc() { return isAsc; } - + public Boolean getNullsFirstParam() { return nullsFirstParam; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/OutFileClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/OutFileClause.java index 8df9a0477b..9f3a8973f0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/OutFileClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/OutFileClause.java @@ -23,11 +23,11 @@ import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.catalog.Type; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.Config; +import org.apache.doris.common.FeConstants; import org.apache.doris.common.FeNameFormat; import org.apache.doris.common.UserException; import org.apache.doris.common.util.ParseUtil; import org.apache.doris.common.util.PrintableMap; -import org.apache.doris.common.FeConstants; import org.apache.doris.qe.ConnectContext; import org.apache.doris.thrift.TFileFormatType; import org.apache.doris.thrift.TResultFileSinkOptions; @@ -37,7 +37,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.commons.collections.map.CaseInsensitiveMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -335,7 +334,7 @@ public class OutFileClause { if (filePath.startsWith(LOCAL_FILE_PREFIX)) { if (!Config.enable_outfile_to_local) { - throw new AnalysisException("Exporting results to local disk is not allowed." + throw new AnalysisException("Exporting results to local disk is not allowed." + " To enable this feature, you need to add `enable_outfile_to_local=true` in fe.conf and restart FE"); } isLocalOutput = true; @@ -560,5 +559,3 @@ public class OutFileClause { return sinkOptions; } } - - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ParseNode.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ParseNode.java index 2ca0c59723..255065bec0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ParseNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ParseNode.java @@ -20,7 +20,6 @@ package org.apache.doris.analysis; -import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; public interface ParseNode { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java index 83c592c4dc..d9ffa793b2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java @@ -29,7 +29,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.commons.lang.NotImplementedException; import java.util.List; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionName.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionName.java index 7d8f2c22ae..63077e7b74 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionName.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionName.java @@ -49,7 +49,7 @@ public class PartitionName { * 2. t1 AS t2 ==> t1 AS t2 * 3. t1.p1 ==> t1.p1 AS t1.p1 * 4. t1.p1 AS t2.p1 ==> t1.p1 AS t2.p1 - * + * * ERR: * 1. t1 AS t1.p1 * 2. t1.p1 AS t1 diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/PredicateUtils.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/PredicateUtils.java index e8bb325730..f6d058d450 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/PredicateUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/PredicateUtils.java @@ -17,11 +17,11 @@ package org.apache.doris.analysis; +import com.google.common.collect.Lists; + import java.util.ArrayList; import java.util.List; -import com.google.common.collect.Lists; - public class PredicateUtils { /** * Split predicates in disjunctive form recursively, i.e., split the input expression diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/QueryStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/QueryStmt.java index 8ddb4f024b..676380bbb9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/QueryStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/QueryStmt.java @@ -30,7 +30,6 @@ import org.apache.doris.rewrite.ExprRewriter; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -222,7 +221,7 @@ public abstract class QueryStmt extends StatementBase { for (TableRef tblRef : tblRefs) { if (absoluteRef == null && !tblRef.isRelative()) absoluteRef = tblRef; /*if (tblRef.isCorrelated()) { - * + * * // Check if the correlated table ref is rooted at a tuple descriptor from within * // this query stmt. If so, the correlation is contained within this stmt * // and the table ref does not conflict with absolute refs. @@ -233,7 +232,7 @@ public abstract class QueryStmt extends StatementBase { * if (correlatedRef == null) correlatedRef = tblRef; * correlatedTupleIds.add(t.getResolvedPath().getRootDesc().getId()); * } - * + * }*/ if (correlatedRef != null && absoluteRef != null) { throw new AnalysisException(String.format( diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/RangePartitionDesc.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/RangePartitionDesc.java index d5b4854303..a95ff31a77 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/RangePartitionDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/RangePartitionDesc.java @@ -58,7 +58,7 @@ public class RangePartitionDesc extends PartitionDesc { idx++; } sb.append(")\n(\n"); - + for (int i = 0; i < singlePartitionDescs.size(); i++) { if (i != 0) { sb.append(",\n"); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/RedirectStatus.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/RedirectStatus.java index 9186d86055..478f9fdf07 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/RedirectStatus.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/RedirectStatus.java @@ -20,17 +20,17 @@ package org.apache.doris.analysis; public class RedirectStatus { private boolean isForwardToMaster; private boolean needToWaitJournalSync; - + public RedirectStatus() { isForwardToMaster = true; needToWaitJournalSync = true; } - + public RedirectStatus(boolean isForwardToMaster, boolean needToWaitJournalSync) { this.isForwardToMaster = isForwardToMaster; this.needToWaitJournalSync = needToWaitJournalSync; } - + public boolean isForwardToMaster() { return isForwardToMaster; } @@ -46,7 +46,7 @@ public class RedirectStatus { public void setNeedToWaitJournalSync(boolean needToWaitJournalSync) { this.needToWaitJournalSync = needToWaitJournalSync; } - + public static RedirectStatus FORWARD_NO_SYNC = new RedirectStatus(true, false); public static RedirectStatus FORWARD_WITH_SYNC = new RedirectStatus(true, true); public static RedirectStatus NO_FORWARD = new RedirectStatus(false, false); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/RefreshDbStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/RefreshDbStmt.java index c87863de99..66a4cc9ee8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/RefreshDbStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/RefreshDbStmt.java @@ -27,11 +27,10 @@ import org.apache.doris.common.UserException; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; +import com.google.common.base.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.google.common.base.Strings; - public class RefreshDbStmt extends DdlStmt { private static final Logger LOG = LogManager.getLogger(RefreshDbStmt.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ReplacePartitionClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ReplacePartitionClause.java index ddb347ee79..666f1c0b18 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ReplacePartitionClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ReplacePartitionClause.java @@ -38,7 +38,7 @@ public class ReplacePartitionClause extends AlterTableClause { // "isStrictMode" is got from property "strict_range", and default is true. // If true, when replacing partition, the range of partitions must same as the range of temp partitions. private boolean isStrictRange; - + // "useTempPartitionName" is got from property "use_temp_partition_name", and default is false. // If false, after replacing, the replaced partition's name will remain unchanged. // Otherwise, the replaced partition's name will be the temp partitions name. diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ResourcePattern.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ResourcePattern.java index b0d2449521..059f4bfa6a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ResourcePattern.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ResourcePattern.java @@ -22,10 +22,10 @@ import org.apache.doris.common.FeNameFormat; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.mysql.privilege.PaloAuth.PrivLevel; +import org.apache.doris.persist.gson.GsonUtils; import com.google.common.base.Strings; import com.google.gson.annotations.SerializedName; -import org.apache.doris.persist.gson.GsonUtils; import java.io.DataInput; import java.io.DataOutput; @@ -105,4 +105,3 @@ public class ResourcePattern implements Writable { return GsonUtils.GSON.fromJson(json, ResourcePattern.class); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/RoutineLoadDataSourceProperties.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/RoutineLoadDataSourceProperties.java index 41d3a7b6fd..ea0b20d7b2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/RoutineLoadDataSourceProperties.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/RoutineLoadDataSourceProperties.java @@ -31,7 +31,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; - import org.apache.commons.lang3.math.NumberUtils; import java.util.List; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java index ff3e29d6f6..2eb892ed1c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java @@ -99,4 +99,3 @@ public enum SchemaTableType { return tableType; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectList.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectList.java index f12e3b69ac..77a2084f79 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectList.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectList.java @@ -45,7 +45,7 @@ public class SelectList { // END: Members that need to be reset() // /////////////////////////////////////// - + public SelectList(SelectList other) { items = Lists.newArrayList(); for (SelectListItem item : other.items) { @@ -58,7 +58,7 @@ public class SelectList { items = Lists.newArrayList(); this.isDistinct = false; } - + public SelectList(List items, boolean isDistinct) { this.isDistinct = isDistinct; this.items = items; @@ -115,7 +115,7 @@ public class SelectList { item.setExpr(rewriter.rewrite(item.getExpr(), analyzer)); } } - + @Override public SelectList clone() { return new SelectList(this); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java index f85b618c55..c2f3d32c35 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java @@ -52,7 +52,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.commons.collections.CollectionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SetOperationStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SetOperationStmt.java index 0162dcad13..976e13eb0c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SetOperationStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SetOperationStmt.java @@ -24,7 +24,6 @@ import org.apache.doris.rewrite.ExprRewriter; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SetStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SetStmt.java index f299cf581d..d6f2382e8e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SetStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SetStmt.java @@ -75,7 +75,7 @@ public class SetStmt extends StatementBase { public String toString() { return toSql(); } - + @Override public RedirectStatus getRedirectStatus() { if (setVars != null) { @@ -90,4 +90,3 @@ public class SetStmt extends StatementBase { return RedirectStatus.NO_FORWARD; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SetUserPropertyStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SetUserPropertyStmt.java index b12937b1b8..dc1d19e448 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SetUserPropertyStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SetUserPropertyStmt.java @@ -99,4 +99,3 @@ public class SetUserPropertyStmt extends DdlStmt { return toSql(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowAlterStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowAlterStmt.java index a50f396fcb..49ea6c839c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowAlterStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowAlterStmt.java @@ -17,8 +17,8 @@ package org.apache.doris.analysis; -import org.apache.doris.catalog.Database; import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.Database; import org.apache.doris.catalog.ScalarType; import org.apache.doris.catalog.Type; import org.apache.doris.cluster.ClusterNamespace; @@ -36,7 +36,6 @@ import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -88,11 +87,11 @@ public class ShowAlterStmt extends ShowStmt { private void getPredicateValue(Expr subExpr) throws AnalysisException { if (!(subExpr instanceof BinaryPredicate)) { - throw new AnalysisException("The operator =|>=|<=|>|<|!= are supported."); + throw new AnalysisException("The operator =|>=|<=|>|<|!= are supported."); } BinaryPredicate binaryPredicate = (BinaryPredicate) subExpr; if (!(subExpr.getChild(0) instanceof SlotRef)) { - throw new AnalysisException("Only support column = xxx syntax."); + throw new AnalysisException("Only support column = xxx syntax."); } String leftKey = ((SlotRef) subExpr.getChild(0)).getColumnName().toLowerCase(); if (leftKey.equals("tablename") || leftKey.equals("state")) { @@ -131,13 +130,13 @@ public class ShowAlterStmt extends ShowStmt { @Override public void analyze(Analyzer analyzer) throws AnalysisException, UserException { - //first analyze - analyzeSyntax(analyzer); + //first analyze + analyzeSyntax(analyzer); // check auth when get job info handleShowAlterTable(analyzer); } - + public void analyzeSyntax(Analyzer analyzer) throws AnalysisException, UserException { super.analyze(analyzer); if (Strings.isNullOrEmpty(dbName)) { @@ -174,8 +173,8 @@ public class ShowAlterStmt extends ShowStmt { limitElement.analyze(analyzer); } } - - + + public void handleShowAlterTable(Analyzer analyzer) throws UserException { Database db = analyzer.getCatalog().getDbOrAnalysisException(dbName); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowBackendsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowBackendsStmt.java index 2c894a4288..12b037eec4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowBackendsStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowBackendsStmt.java @@ -30,9 +30,9 @@ import org.apache.doris.qe.ShowResultSetMetaData; public class ShowBackendsStmt extends ShowStmt { - public ShowBackendsStmt() { + public ShowBackendsStmt() { } - + @Override public void analyze(Analyzer analyzer) throws AnalysisException { if (!Catalog.getCurrentCatalog().getAuth().checkGlobalPriv(ConnectContext.get(), PrivPredicate.ADMIN) @@ -64,4 +64,3 @@ public class ShowBackendsStmt extends ShowStmt { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCollationStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCollationStmt.java index 938517cd58..df7e1f6a16 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCollationStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCollationStmt.java @@ -18,8 +18,8 @@ package org.apache.doris.analysis; import org.apache.doris.catalog.Column; -import org.apache.doris.catalog.ScalarType; import org.apache.doris.catalog.PrimitiveType; +import org.apache.doris.catalog.ScalarType; import org.apache.doris.qe.ShowResultSetMetaData; public class ShowCollationStmt extends ShowStmt { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateFunctionStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateFunctionStmt.java index c0de0c62d2..a7d9db8c1d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateFunctionStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowCreateFunctionStmt.java @@ -17,7 +17,6 @@ package org.apache.doris.analysis; -import com.google.common.base.Strings; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.Column; import org.apache.doris.catalog.FunctionSearchDesc; @@ -30,6 +29,8 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.ShowResultSetMetaData; +import com.google.common.base.Strings; + public class ShowCreateFunctionStmt extends ShowStmt { private static final ShowResultSetMetaData META_DATA = ShowResultSetMetaData.builder() diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDataStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDataStmt.java index 6d084eb688..0422bbbe2b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDataStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDataStmt.java @@ -105,7 +105,7 @@ public class ShowDataStmt extends ShowStmt { } else { dbName = ClusterNamespace.getFullName(getClusterName(), dbName); } - + Database db = Catalog.getCurrentCatalog().getDbOrAnalysisException(dbName); // order by @@ -386,4 +386,3 @@ public class ShowDataStmt extends ShowStmt { return toSql(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDbStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDbStmt.java index 15ea4f140e..04469517c8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDbStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDbStmt.java @@ -18,11 +18,12 @@ package org.apache.doris.analysis; import org.apache.doris.catalog.Column; -import org.apache.doris.catalog.ScalarType; import org.apache.doris.catalog.InfoSchemaDb; +import org.apache.doris.catalog.ScalarType; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; import org.apache.doris.qe.ShowResultSetMetaData; + import com.google.common.collect.Lists; // Show database statement. diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowEncryptKeysStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowEncryptKeysStmt.java index 89a570958f..9aa45192dd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowEncryptKeysStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowEncryptKeysStmt.java @@ -17,7 +17,6 @@ package org.apache.doris.analysis; -import com.google.common.base.Strings; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.Column; import org.apache.doris.catalog.ScalarType; @@ -30,6 +29,8 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.ShowResultSetMetaData; +import com.google.common.base.Strings; + public class ShowEncryptKeysStmt extends ShowStmt{ private static final ShowResultSetMetaData META_DATA = ShowResultSetMetaData.builder() diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowExportStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowExportStmt.java index 3face77b15..b6f04f979e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowExportStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowExportStmt.java @@ -31,7 +31,6 @@ import org.apache.doris.load.ExportJob.JobState; import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowFrontendsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowFrontendsStmt.java index 779d7937f8..8022f300cb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowFrontendsStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowFrontendsStmt.java @@ -64,4 +64,3 @@ public class ShowFrontendsStmt extends ShowStmt { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowFunctionsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowFunctionsStmt.java index 22c5fd7955..ba26148472 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowFunctionsStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowFunctionsStmt.java @@ -17,7 +17,6 @@ package org.apache.doris.analysis; -import com.google.common.base.Strings; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.Column; import org.apache.doris.catalog.ScalarType; @@ -30,6 +29,8 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.ShowResultSetMetaData; +import com.google.common.base.Strings; + public class ShowFunctionsStmt extends ShowStmt { private static final ShowResultSetMetaData META_DATA = ShowResultSetMetaData.builder() diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowGrantsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowGrantsStmt.java index f73d83777c..197f61df59 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowGrantsStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowGrantsStmt.java @@ -33,10 +33,10 @@ import com.google.common.base.Preconditions; /* * SHOW ALL GRANTS; * show all grants. - * + * * SHOW GRANTS: * show grants of current user - * + * * SHOW GRANTS FOR user@'xxx'; * show grants for specified user identity */ diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowIndexStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowIndexStmt.java index f01cf94cae..58c35a9284 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowIndexStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowIndexStmt.java @@ -57,7 +57,7 @@ public class ShowIndexStmt extends ShowStmt { @Override public void analyze(Analyzer analyzer) throws AnalysisException, UserException { super.analyze(analyzer); - + if (!Strings.isNullOrEmpty(dbName)) { // if user specify the `from db`, overwrite the db in tableName with this db. // for example: diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowLoadStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowLoadStmt.java index 20cabde7a6..0cc9707d6e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowLoadStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowLoadStmt.java @@ -31,7 +31,6 @@ import org.apache.doris.load.LoadJob.JobState; import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowLoadWarningsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowLoadWarningsStmt.java index 011e3411a9..af858587d6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowLoadWarningsStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowLoadWarningsStmt.java @@ -27,7 +27,6 @@ import org.apache.doris.common.UserException; import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMigrationsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMigrationsStmt.java index 03b10c78e5..8a96dd00f3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMigrationsStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowMigrationsStmt.java @@ -34,9 +34,9 @@ public class ShowMigrationsStmt extends ShowStmt { .add("cluster").add("srcdb").add("desdb").add("progress").build(); public ShowMigrationsStmt() { - + } - + @Override public ShowResultSetMetaData getMetaData() { ShowResultSetMetaData.Builder builder = ShowResultSetMetaData.builder(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowPartitionsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowPartitionsStmt.java index e9d8c9b623..3091112cfd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowPartitionsStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowPartitionsStmt.java @@ -38,7 +38,6 @@ import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowProcesslistStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowProcesslistStmt.java index 4b592f7d12..8097ffacc2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowProcesslistStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowProcesslistStmt.java @@ -18,8 +18,8 @@ package org.apache.doris.analysis; import org.apache.doris.catalog.Column; -import org.apache.doris.catalog.ScalarType; import org.apache.doris.catalog.PrimitiveType; +import org.apache.doris.catalog.ScalarType; import org.apache.doris.qe.ShowResultSetMetaData; // SHOW PROCESSLIST statement. diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRepositoriesStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRepositoriesStmt.java index d5a8476c6e..73f8977690 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRepositoriesStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRepositoriesStmt.java @@ -30,7 +30,7 @@ public class ShowRepositoriesStmt extends ShowStmt { .build(); public ShowRepositoriesStmt() { - + } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowResourcesStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowResourcesStmt.java index 48fadc4909..df11a77f5e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowResourcesStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowResourcesStmt.java @@ -17,7 +17,6 @@ package org.apache.doris.analysis; -import com.google.common.base.Strings; import org.apache.doris.catalog.Column; import org.apache.doris.catalog.Resource.ResourceType; import org.apache.doris.catalog.ResourceMgr; @@ -27,6 +26,8 @@ import org.apache.doris.common.UserException; import org.apache.doris.common.util.OrderByPair; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.ShowResultSetMetaData; + +import com.google.common.base.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -232,7 +233,7 @@ public class ShowResourcesStmt extends ShowStmt { public String toString() { return toSql(); } - + @Override public ShowResultSetMetaData getMetaData() { ShowResultSetMetaData.Builder builder = ShowResultSetMetaData.builder(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRestoreStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRestoreStmt.java index c8b7898861..0c42178415 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRestoreStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRestoreStmt.java @@ -183,4 +183,3 @@ public class ShowRestoreStmt extends ShowStmt { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRollupStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRollupStmt.java index 77dcac40f8..c4c6b0a7cb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRollupStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRollupStmt.java @@ -85,7 +85,7 @@ public class ShowRollupStmt extends ShowStmt { public ShowResultSetMetaData getMetaData() { return META_DATA; } - + @Override public RedirectStatus getRedirectStatus() { return RedirectStatus.FORWARD_NO_SYNC; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRoutineLoadStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRoutineLoadStmt.java index eb63d97e1b..3d3afea86a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRoutineLoadStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowRoutineLoadStmt.java @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. - package org.apache.doris.analysis; import org.apache.doris.catalog.Column; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowSnapshotStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowSnapshotStmt.java index 037c7e527a..bdf33ddfec 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowSnapshotStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowSnapshotStmt.java @@ -119,7 +119,7 @@ public class ShowSnapshotStmt extends ShowStmt { } return false; - + } public String getRepoName() { @@ -150,4 +150,3 @@ public class ShowSnapshotStmt extends ShowStmt { } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowStreamLoadStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowStreamLoadStmt.java index 2afba94c07..961b760807 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowStreamLoadStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowStreamLoadStmt.java @@ -17,8 +17,6 @@ package org.apache.doris.analysis; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; import org.apache.doris.analysis.BinaryPredicate.Operator; import org.apache.doris.catalog.Column; import org.apache.doris.catalog.ScalarType; @@ -29,6 +27,9 @@ import org.apache.doris.common.ErrorReport; import org.apache.doris.common.UserException; import org.apache.doris.common.util.OrderByPair; import org.apache.doris.qe.ShowResultSetMetaData; + +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowSyncJobStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowSyncJobStmt.java index 4f50a8555b..e469f32cdc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowSyncJobStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowSyncJobStmt.java @@ -27,7 +27,6 @@ import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStatsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStatsStmt.java index 90541cb7dc..ce39ac0016 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStatsStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStatsStmt.java @@ -26,7 +26,6 @@ import org.apache.doris.qe.ShowResultSetMetaData; import org.apache.doris.statistics.TableStats; import com.google.common.collect.ImmutableList; - import org.apache.parquet.Preconditions; import org.apache.parquet.Strings; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStatusStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStatusStmt.java index 356dfde23e..a17407f757 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStatusStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStatusStmt.java @@ -19,9 +19,9 @@ package org.apache.doris.analysis; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.Column; -import org.apache.doris.catalog.ScalarType; import org.apache.doris.catalog.InfoSchemaDb; import org.apache.doris.catalog.PrimitiveType; +import org.apache.doris.catalog.ScalarType; import org.apache.doris.cluster.ClusterNamespace; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStmt.java index 41dd44adfd..f145e2f6bd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTableStmt.java @@ -18,8 +18,8 @@ package org.apache.doris.analysis; import org.apache.doris.catalog.Column; -import org.apache.doris.catalog.ScalarType; import org.apache.doris.catalog.InfoSchemaDb; +import org.apache.doris.catalog.ScalarType; import org.apache.doris.cluster.ClusterNamespace; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; @@ -28,7 +28,6 @@ import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTabletStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTabletStmt.java index d31db2655d..5cc10e741d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTabletStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTabletStmt.java @@ -107,7 +107,7 @@ public class ShowTabletStmt extends ShowStmt { public boolean hasPartition() { return partitionNames != null; } public PartitionNames getPartitionNames() { return partitionNames; } - + public boolean hasLimit() { return limitElement != null && limitElement.hasLimit(); } public long getLimit() { return limitElement.getLimit(); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTransactionStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTransactionStmt.java index 624d07149d..d0bcba502a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTransactionStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTransactionStmt.java @@ -27,10 +27,9 @@ import org.apache.doris.common.ErrorReport; import org.apache.doris.common.UserException; import org.apache.doris.common.proc.TransProcDir; import org.apache.doris.qe.ShowResultSetMetaData; +import org.apache.doris.transaction.TransactionStatus; import com.google.common.base.Strings; - -import org.apache.doris.transaction.TransactionStatus; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTrashDiskStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTrashDiskStmt.java index 3cca857ed7..cc2e5bfaf4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTrashDiskStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTrashDiskStmt.java @@ -24,10 +24,10 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; import org.apache.doris.common.proc.TrashProcNode; -import org.apache.doris.qe.ShowResultSetMetaData; -import org.apache.doris.qe.ConnectContext; -import org.apache.doris.system.Backend; import org.apache.doris.mysql.privilege.PrivPredicate; +import org.apache.doris.qe.ConnectContext; +import org.apache.doris.qe.ShowResultSetMetaData; +import org.apache.doris.system.Backend; import com.google.common.collect.ImmutableMap; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTrashStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTrashStmt.java index 5b6a2862d9..ef55d36904 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTrashStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowTrashStmt.java @@ -24,10 +24,10 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; import org.apache.doris.common.proc.TrashProcDir; -import org.apache.doris.qe.ShowResultSetMetaData; -import org.apache.doris.qe.ConnectContext; -import org.apache.doris.system.Backend; import org.apache.doris.mysql.privilege.PrivPredicate; +import org.apache.doris.qe.ConnectContext; +import org.apache.doris.qe.ShowResultSetMetaData; +import org.apache.doris.system.Backend; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowUserPropertyStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowUserPropertyStmt.java index c96eef6c8e..f5e5542ca1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowUserPropertyStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowUserPropertyStmt.java @@ -25,8 +25,8 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.CaseSensibility; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; -import org.apache.doris.common.UserException; import org.apache.doris.common.PatternMatcher; +import org.apache.doris.common.UserException; import org.apache.doris.common.proc.UserPropertyProcNode; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; @@ -34,7 +34,6 @@ import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowUserStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowUserStmt.java index eb29eb7a9f..31754c282a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowUserStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowUserStmt.java @@ -55,4 +55,3 @@ public class ShowUserStmt extends ShowStmt { } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowVariablesStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowVariablesStmt.java index f0b2f2ad16..a2ad9a4271 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowVariablesStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowVariablesStmt.java @@ -23,7 +23,6 @@ import org.apache.doris.catalog.ScalarType; import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowViewStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowViewStmt.java index 12486ac74b..2842c4f48d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowViewStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowViewStmt.java @@ -30,6 +30,7 @@ import org.apache.doris.common.UserException; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.ShowResultSetMetaData; + import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotRef.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotRef.java index 1e37a0338f..788b81f55c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotRef.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotRef.java @@ -33,7 +33,6 @@ import org.apache.doris.thrift.TSlotRef; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SortInfo.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SortInfo.java index 83490372bb..128a88459b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SortInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SortInfo.java @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicates; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -257,4 +256,3 @@ public class SortInfo { return substOrderBy; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/StatementBase.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/StatementBase.java index 2a4f2aeec7..897c5a7b6d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StatementBase.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StatementBase.java @@ -151,11 +151,11 @@ public abstract class StatementBase implements ParseNode { Preconditions.checkNotNull(resultExprs); Preconditions.checkState(resultExprs.size() == types.size()); for (int i = 0; i < types.size(); ++i) { - //The specific type of the date type is determined by the + //The specific type of the date type is determined by the //actual type of the return value, not by the function return value type in FE Function //such as the result of str_to_date may be either DATE or DATETIME if (resultExprs.get(i).getType().isDateType() && types.get(i).isDateType()) { - continue; + continue; } if (!resultExprs.get(i).getType().equals(types.get(i))) { resultExprs.set(i, resultExprs.get(i).castTo(types.get(i))); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/StmtRewriter.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/StmtRewriter.java index a2b0122f50..8ce0529714 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StmtRewriter.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StmtRewriter.java @@ -1210,4 +1210,3 @@ public class StmtRewriter { return reAnalyze; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/StopRoutineLoadStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/StopRoutineLoadStmt.java index 068e49c52b..58ed8a441e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StopRoutineLoadStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StopRoutineLoadStmt.java @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. - package org.apache.doris.analysis; import org.apache.doris.common.AnalysisException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java index 6cbe3ec521..12e570296c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java @@ -25,7 +25,6 @@ import org.apache.doris.common.util.PrintableMap; import org.apache.doris.thrift.TStorageBackendType; import com.google.common.base.Strings; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/StringLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/StringLiteral.java index c0098e6aae..16eaddf455 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StringLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StringLiteral.java @@ -32,11 +32,10 @@ import org.apache.doris.thrift.TExprNode; import org.apache.doris.thrift.TExprNodeType; import org.apache.doris.thrift.TStringLiteral; +import com.google.common.base.Preconditions; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.google.common.base.Preconditions; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -255,7 +254,7 @@ public class StringLiteral extends LiteralExpr { super.readFields(in); value = Text.readString(in); } - + public static StringLiteral read(DataInput in) throws IOException { StringLiteral literal = new StringLiteral(); literal.readFields(in); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/Subquery.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/Subquery.java index 4a0501bd6c..c29a2ada22 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/Subquery.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/Subquery.java @@ -20,23 +20,21 @@ package org.apache.doris.analysis; -import java.util.ArrayList; -import java.util.List; - import org.apache.doris.catalog.MultiRowType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.doris.catalog.StructField; import org.apache.doris.catalog.StructType; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; - - import org.apache.doris.thrift.TExprNode; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.List; /** * Class representing a subquery. A Subquery consists of a QueryStmt and has @@ -200,4 +198,3 @@ public class Subquery extends Expr { @Override protected void toThrift(TExprNode msg) {} } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SyncStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SyncStmt.java index c46f857d53..cdafe07c97 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SyncStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SyncStmt.java @@ -27,7 +27,7 @@ public class SyncStmt extends DdlStmt { // throw new AnalysisException("No need to Sync, for you are master"); // } } - + @Override public RedirectStatus getRedirectStatus() { return RedirectStatus.FORWARD_WITH_SYNC; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TableName.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TableName.java index 46dff1623e..047d518e16 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TableName.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TableName.java @@ -150,4 +150,3 @@ public class TableName implements Writable { return tableName; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TablePattern.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TablePattern.java index 8b5c8eb0e3..f03a71fb3d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TablePattern.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TablePattern.java @@ -66,7 +66,7 @@ public class TablePattern implements Writable { public String getTbl() { return tbl; } - + public PrivLevel getPrivLevel() { Preconditions.checkState(isAnalyzed); if (db.equals("*")) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TableRef.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TableRef.java index 2375a523ca..d178f44fa5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TableRef.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TableRef.java @@ -35,7 +35,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.commons.collections.CollectionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -850,4 +849,3 @@ public class TableRef implements ParseNode, Writable { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TimestampArithmeticExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TimestampArithmeticExpr.java index f398cc8340..1517bfff89 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TimestampArithmeticExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TimestampArithmeticExpr.java @@ -221,7 +221,7 @@ public class TimestampArithmeticExpr extends Expr { @Override protected void toThrift(TExprNode msg) { msg.node_type = TExprNodeType.COMPUTE_FUNCTION_CALL; - msg.setOpcode(opcode); + msg.setOpcode(opcode); } public ArithmeticExpr.Operator getOp() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleDescriptor.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleDescriptor.java index e0d11c0331..edd1e299a9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleDescriptor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleDescriptor.java @@ -29,7 +29,6 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -130,10 +129,10 @@ public class TupleDescriptor { for (SlotDescriptor slotDesc : slots) { if (slotDesc.getColumn() != null && slotDesc.getColumn().getName().equalsIgnoreCase(columnName)) { return slotDesc; - } - } + } + } return null; - } + } public Table getTable() { return table; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleIsNullPredicate.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleIsNullPredicate.java index b113a9b234..f944c1f763 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleIsNullPredicate.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleIsNullPredicate.java @@ -20,13 +20,13 @@ package org.apache.doris.analysis; -import com.google.common.base.Joiner; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; import org.apache.doris.thrift.TExprNode; import org.apache.doris.thrift.TExprNodeType; import org.apache.doris.thrift.TTupleIsNullPredicate; +import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/UpdateStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/UpdateStmt.java index b87d514d1b..f19f73dda5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/UpdateStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/UpdateStmt.java @@ -26,9 +26,9 @@ import org.apache.doris.catalog.Table; import org.apache.doris.catalog.Type; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; +import org.apache.doris.rewrite.ExprRewriter; import com.google.common.base.Preconditions; -import org.apache.doris.rewrite.ExprRewriter; import java.util.List; import java.util.Set; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/UseStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/UseStmt.java index 2a9410fae8..8727418625 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/UseStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/UseStmt.java @@ -27,7 +27,6 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -62,7 +61,7 @@ public class UseStmt extends StatementBase { ErrorReport.reportAnalysisException(ErrorCode.ERR_NO_DB_ERROR); } database = ClusterNamespace.getFullName(getClusterName(), database); - + if (!Catalog.getCurrentCatalog().getAuth().checkDbPriv(ConnectContext.get(), database, PrivPredicate.SHOW)) { ErrorReport.reportAnalysisException(ErrorCode.ERR_DBACCESS_DENIED_ERROR, analyzer.getQualifiedUser(), database); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/UserIdentity.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/UserIdentity.java index 46724612f9..a55e3c6786 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/UserIdentity.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/UserIdentity.java @@ -260,4 +260,3 @@ public class UserIdentity implements Writable { isAnalyzed = true; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ValueList.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ValueList.java index bb440059fa..03e36c201e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ValueList.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ValueList.java @@ -17,10 +17,11 @@ package org.apache.doris.analysis; -import com.google.common.collect.Lists; import org.apache.doris.catalog.Type; import org.apache.doris.common.AnalysisException; +import com.google.common.collect.Lists; + import java.util.ArrayList; import java.util.List; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/WithClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/WithClause.java index c6b143cfa7..729bac76a0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/WithClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/WithClause.java @@ -24,6 +24,7 @@ import org.apache.doris.catalog.Table; import org.apache.doris.catalog.View; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; + import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/AbstractJob.java b/fe/fe-core/src/main/java/org/apache/doris/backup/AbstractJob.java index 07cbdc45a0..daa20e5112 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/AbstractJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/AbstractJob.java @@ -34,7 +34,7 @@ import java.util.Map; * The design of JobI is as follows * 1. Here are only two methods: run() and cancel() that can modify the internal state of a Job. * And each method is implemented as synchronized to avoid handling concurrent modify things. - * + * * 2. isDone() method is used to check whether we can submit the next job. */ public abstract class AbstractJob implements Writable { @@ -241,4 +241,3 @@ public abstract class AbstractJob implements Writable { return sb.toString(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupHandler.java b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupHandler.java index a5b6cd9ec9..d6a0824788 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupHandler.java @@ -56,7 +56,6 @@ import org.apache.doris.thrift.TTaskType; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.commons.collections.CollectionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -80,7 +79,7 @@ import java.util.stream.Collectors; public class BackupHandler extends MasterDaemon implements Writable { private static final Logger LOG = LogManager.getLogger(BackupHandler.class); - + public static final int SIGNATURE_VERSION = 1; public static final Path BACKUP_ROOT_DIR = Paths.get(Config.tmp_dir, "backup").normalize(); public static final Path RESTORE_ROOT_DIR = Paths.get(Config.tmp_dir, "restore").normalize(); @@ -223,7 +222,7 @@ public class BackupHandler extends MasterDaemon implements Writable { + " Can not drop it"); } } - + Status st = repoMgr.removeRepo(repo.getName(), false /* not replay */); if (!st.ok()) { ErrorReport.reportDdlException(ErrorCode.ERR_COMMON_ERROR, @@ -539,7 +538,7 @@ public class BackupHandler extends MasterDaemon implements Writable { public void cancel(CancelBackupStmt stmt) throws DdlException { String dbName = stmt.getDbName(); Database db = catalog.getDbOrDdlException(dbName); - + AbstractJob job = getCurrentJob(db.getId()); if (job == null || (job instanceof BackupJob && stmt.isRestore()) || (job instanceof RestoreJob && !stmt.isRestore())) { @@ -552,7 +551,7 @@ public class BackupHandler extends MasterDaemon implements Writable { if (!status.ok()) { ErrorReport.reportDdlException(ErrorCode.ERR_COMMON_ERROR, "Failed to cancel job: " + status.getErrMsg()); } - + LOG.info("finished to cancel {} job: {}", (stmt.isRestore() ? "restore" : "backup"), job); } @@ -689,5 +688,3 @@ public class BackupHandler extends MasterDaemon implements Writable { } } } - - diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java index 5f07552c79..9e48700fd3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java @@ -56,7 +56,6 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -158,7 +157,7 @@ public class BackupJob extends AbstractJob { public synchronized boolean finishTabletSnapshotTask(SnapshotTask task, TFinishTaskRequest request) { Preconditions.checkState(task.getJobId() == jobId); - + if (request.getTaskStatus().getStatusCode() != TStatusCode.OK) { taskErrMsg.put(task.getSignature(), Joiner.on(",").join(request.getTaskStatus().getErrorMsgs())); // snapshot task could not finish if status_code is OLAP_ERR_VERSION_ALREADY_MERGED, @@ -181,7 +180,7 @@ public class BackupJob extends AbstractJob { task.getIndexId(), task.getTabletId(), task.getBackendId(), task.getSchemaHash(), request.getSnapshotPath(), request.getSnapshotFiles()); - + snapshotInfos.put(task.getTabletId(), info); taskProgress.remove(task.getTabletId()); Long oldValue = unfinishedTaskIds.remove(task.getTabletId()); @@ -292,7 +291,7 @@ public class BackupJob extends AbstractJob { return; } } - + LOG.debug("run backup job: {}", this); // run job base on current state @@ -594,7 +593,7 @@ public class BackupJob extends AbstractJob { return; } Preconditions.checkState(brokers.size() == 1); - + // allot tasks int index = 0; for (int batch = 0; batch < batchNum; batch++) { @@ -771,7 +770,7 @@ public class BackupJob extends AbstractJob { for (Replica replica : tablet.getReplicas()) { replicaIds.add(replica.getId()); } - + Collections.sort(replicaIds); for (Long replicaId : replicaIds) { Replica replica = tablet.getReplicaById(replicaId); @@ -825,7 +824,7 @@ public class BackupJob extends AbstractJob { catalog.getEditLog().logBackupJob(this); LOG.info("finished to cancel backup job. current state: {}. {}", curState.name(), this); } - + public List getInfo() { List info = Lists.newArrayList(); info.add(String.valueOf(jobId)); @@ -972,4 +971,3 @@ public class BackupJob extends AbstractJob { return sb.toString(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java index c7522fd237..c871412978 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java @@ -41,7 +41,8 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - +import com.google.gson.Gson; +import com.google.gson.annotations.SerializedName; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -60,9 +61,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.google.gson.Gson; -import com.google.gson.annotations.SerializedName; - /* * This is a memory structure mapping the job info file in repository. * It contains all content of a job info file. @@ -581,7 +579,7 @@ public class BackupJobInfo implements Writable { } private static BackupJobInfo genFromJson(String json) { - /* parse the json string: + /* parse the json string: * { * "backup_time": 1522231864000, * "name": "snapshot1", @@ -708,4 +706,3 @@ public class BackupJobInfo implements Writable { return toJson(true); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BrokerStorage.java b/fe/fe-core/src/main/java/org/apache/doris/backup/BrokerStorage.java index 1200e268ec..e1edd61a57 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/BrokerStorage.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BrokerStorage.java @@ -50,7 +50,6 @@ import org.apache.doris.thrift.TNetworkAddress; import org.apache.doris.thrift.TPaloBrokerService; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/RemoteFile.java b/fe/fe-core/src/main/java/org/apache/doris/backup/RemoteFile.java index d2bcd98d4d..170f3c62c3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/RemoteFile.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/RemoteFile.java @@ -26,7 +26,7 @@ public class RemoteFile { private String name; private boolean isFile; private long size; - + public RemoteFile(String name, boolean isFile, long size) { Preconditions.checkState(!Strings.isNullOrEmpty(name)); this.name = name; diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/Repository.java b/fe/fe-core/src/main/java/org/apache/doris/backup/Repository.java index 4851917aff..5a99017b2c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/Repository.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/Repository.java @@ -33,7 +33,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/RepositoryMgr.java b/fe/fe-core/src/main/java/org/apache/doris/backup/RepositoryMgr.java index 2076a75279..b5123df77e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/RepositoryMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/RepositoryMgr.java @@ -24,7 +24,6 @@ import org.apache.doris.common.util.Daemon; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreFileMapping.java b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreFileMapping.java index d511d157b5..bcc3b7477b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreFileMapping.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreFileMapping.java @@ -62,7 +62,7 @@ public class RestoreFileMapping implements Writable { public long getReplicaId() { return chain[4]; } - + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -77,7 +77,7 @@ public class RestoreFileMapping implements Writable { if (!(obj instanceof IdChain)) { return false; } - + IdChain other = (IdChain) obj; for (int i = 0; i < 5; i++) { // DO NOT use ==, Long_1 != Long_2 @@ -85,7 +85,7 @@ public class RestoreFileMapping implements Writable { return false; } } - + return true; } @@ -120,7 +120,7 @@ public class RestoreFileMapping implements Writable { return chain; } } - + // catalog ids -> repository ids private Map mapping = Maps.newHashMap(); // tablet id -> is overwrite diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java index a70ad7fd57..e638909045 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java @@ -83,7 +83,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Table.Cell; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -179,7 +178,7 @@ public class RestoreJob extends AbstractJob { public RestoreFileMapping getFileMapping() { return fileMapping; } - + public int getMetaVersion() { return metaVersion; } @@ -407,7 +406,7 @@ public class RestoreJob extends AbstractJob { * * A. View already exist. The same signature is allowed. * * B. View does not exist. * All newly created table/partition/index/tablet/replica should be saved for rolling back. - * + * * Step: * 1. download and deserialize backup meta from repository. * 2. set all existing restored table's state to RESTORE. @@ -1707,7 +1706,7 @@ public class RestoreJob extends AbstractJob { Text.writeString(out, backupTimestamp); jobInfo.write(out); out.writeBoolean(allowLoad); - + Text.writeString(out, state.name()); if (backupMeta != null) { @@ -1858,4 +1857,3 @@ public class RestoreJob extends AbstractJob { return sb.toString(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/S3Storage.java b/fe/fe-core/src/main/java/org/apache/doris/backup/S3Storage.java index 60dc9d8d47..a67b0992e5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/S3Storage.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/S3Storage.java @@ -30,20 +30,6 @@ import org.apache.http.HttpStatus; import org.apache.http.client.utils.URIBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URI; -import java.nio.file.FileVisitOption; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.time.Duration; -import java.util.Comparator; -import java.util.List; -import java.util.Map; - import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.auth.signer.AwsS3V4Signer; @@ -65,6 +51,19 @@ import software.amazon.awssdk.services.s3.model.PutObjectRequest; import software.amazon.awssdk.services.s3.model.PutObjectResponse; import software.amazon.awssdk.services.s3.model.S3Exception; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URI; +import java.nio.file.FileVisitOption; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.time.Duration; +import java.util.Comparator; +import java.util.List; +import java.util.Map; + public class S3Storage extends BlobStorage { public static final String S3_PROPERTIES_PREFIX = "AWS"; public static final String S3_AK = "AWS_ACCESS_KEY"; @@ -410,4 +409,3 @@ public class S3Storage extends BlobStorage { return StorageBackend.StorageType.S3; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRule.java b/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRule.java index 97304715dc..f0c1c4c3e9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRule.java +++ b/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRule.java @@ -25,7 +25,6 @@ import org.apache.doris.persist.gson.GsonUtils; import com.google.common.collect.Lists; import com.google.gson.annotations.SerializedName; - import org.apache.commons.lang3.StringUtils; import java.io.DataInput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java b/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java index c1ddf633df..207930b18b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java @@ -34,7 +34,6 @@ import org.apache.doris.persist.gson.GsonUtils; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; - import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/AggregateFunction.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/AggregateFunction.java index 1820fba43b..9230fae4b8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/AggregateFunction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/AggregateFunction.java @@ -17,19 +17,17 @@ package org.apache.doris.catalog; -import static org.apache.doris.common.io.IOUtils.readOptionStringOrNull; -import static org.apache.doris.common.io.IOUtils.writeOptionString; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; -import com.google.gson.Gson; import org.apache.doris.analysis.CreateFunctionStmt; - import org.apache.doris.analysis.FunctionName; +import org.apache.doris.common.io.IOUtils; import org.apache.doris.common.util.URI; import org.apache.doris.thrift.TAggregateFunction; import org.apache.doris.thrift.TFunction; import org.apache.doris.thrift.TFunctionBinaryType; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; +import com.google.gson.Gson; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -505,13 +503,13 @@ public class AggregateFunction extends Function { if (hasInterType) { ColumnType.write(output, intermediateType); } - writeOptionString(output, updateFnSymbol); - writeOptionString(output, initFnSymbol); - writeOptionString(output, serializeFnSymbol); - writeOptionString(output, mergeFnSymbol); - writeOptionString(output, getValueFnSymbol); - writeOptionString(output, removeFnSymbol); - writeOptionString(output, finalizeFnSymbol); + IOUtils.writeOptionString(output, updateFnSymbol); + IOUtils.writeOptionString(output, initFnSymbol); + IOUtils.writeOptionString(output, serializeFnSymbol); + IOUtils.writeOptionString(output, mergeFnSymbol); + IOUtils.writeOptionString(output, getValueFnSymbol); + IOUtils.writeOptionString(output, removeFnSymbol); + IOUtils.writeOptionString(output, finalizeFnSymbol); output.writeBoolean(ignoresDistinct); output.writeBoolean(isAnalyticFn); @@ -525,13 +523,13 @@ public class AggregateFunction extends Function { if (input.readBoolean()) { intermediateType = ColumnType.read(input); } - updateFnSymbol = readOptionStringOrNull(input); - initFnSymbol = readOptionStringOrNull(input); - serializeFnSymbol = readOptionStringOrNull(input); - mergeFnSymbol = readOptionStringOrNull(input); - getValueFnSymbol = readOptionStringOrNull(input); - removeFnSymbol = readOptionStringOrNull(input); - finalizeFnSymbol = readOptionStringOrNull(input); + updateFnSymbol = IOUtils.readOptionStringOrNull(input); + initFnSymbol = IOUtils.readOptionStringOrNull(input); + serializeFnSymbol = IOUtils.readOptionStringOrNull(input); + mergeFnSymbol = IOUtils.readOptionStringOrNull(input); + getValueFnSymbol = IOUtils.readOptionStringOrNull(input); + removeFnSymbol = IOUtils.readOptionStringOrNull(input); + finalizeFnSymbol = IOUtils.readOptionStringOrNull(input); ignoresDistinct = input.readBoolean(); isAnalyticFn = input.readBoolean(); isAggregateFn = input.readBoolean(); @@ -559,4 +557,3 @@ public class AggregateFunction extends Function { return new Gson().toJson(properties); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/AggregateType.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/AggregateType.java index df11d151b8..5445253cac 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/AggregateType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/AggregateType.java @@ -167,4 +167,3 @@ public enum AggregateType { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/AliasFunction.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/AliasFunction.java index 1203b7f803..0329352d69 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/AliasFunction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/AliasFunction.java @@ -35,7 +35,6 @@ import org.apache.doris.thrift.TFunctionBinaryType; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.gson.Gson; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -281,7 +280,7 @@ public class AliasFunction extends Function { /** * set slotRef label to column name - * + * * @param expr */ private void setSlotRefLabel(Expr expr) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerMgr.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerMgr.java index 74a03e5297..8eb79864ac 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerMgr.java @@ -397,4 +397,3 @@ public class BrokerMgr { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerTable.java index 232de5d3c7..c0c09375c4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerTable.java @@ -26,7 +26,6 @@ import org.apache.doris.thrift.TTableType; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.commons.lang.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java index a833c6e3e3..c75c636fef 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java @@ -264,7 +264,6 @@ import com.google.common.collect.Sets; import com.sleepycat.je.rep.InsufficientLogException; import com.sleepycat.je.rep.NetworkRestore; import com.sleepycat.je.rep.NetworkRestoreConfig; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hive.metastore.HiveMetaStoreClient; @@ -272,7 +271,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.jackson.map.ObjectMapper; -import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -298,6 +296,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; +import javax.annotation.Nullable; public class Catalog { private static final Logger LOG = LogManager.getLogger(Catalog.class); @@ -6564,7 +6563,7 @@ public class Catalog { + cluster.getBackendIdList().size()); } // The number of BE in cluster is not same as in SystemInfoService, when perform 'ALTER - // SYSTEM ADD BACKEND TO ...' or 'ALTER SYSTEM ADD BACKEND ...', because both of them are + // SYSTEM ADD BACKEND TO ...' or 'ALTER SYSTEM ADD BACKEND ...', because both of them are // for adding BE to some Cluster, but loadCluster is after loadBackend. cluster.setBackendIdList(latestBackendIds); diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java index 68ef8a8e6d..bbaaeab465 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java @@ -36,7 +36,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Range; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -73,7 +72,7 @@ public class CatalogRecycleBin extends MasterDaemon implements Writable { LOG.error("db[{}] already in recycle bin.", db.getId()); return false; } - + // db should be empty. all tables are recycled before Preconditions.checkState(db.getTables().isEmpty()); @@ -294,7 +293,7 @@ public class CatalogRecycleBin extends MasterDaemon implements Writable { break; } } - + if (dbInfo == null) { ErrorReport.reportDdlException(ErrorCode.ERR_BAD_DB_ERROR, dbName); } @@ -597,7 +596,7 @@ public class CatalogRecycleBin extends MasterDaemon implements Writable { eraseTable(currentTimeMs); eraseDatabase(currentTimeMs); } - + @Override public void write(DataOutput out) throws IOException { int count = idToDatabase.size(); @@ -696,7 +695,7 @@ public class CatalogRecycleBin extends MasterDaemon implements Writable { public void readFields(DataInput in) throws IOException { db = Database.read(in); - + int count = in.readInt(); for (int i = 0; i < count; i++) { String tableName = Text.readString(in); @@ -712,7 +711,7 @@ public class CatalogRecycleBin extends MasterDaemon implements Writable { public RecycleTableInfo() { // for persist } - + public RecycleTableInfo(long dbId, Table table) { this.dbId = dbId; this.table = table; @@ -826,7 +825,7 @@ public class CatalogRecycleBin extends MasterDaemon implements Writable { isInMemory = in.readBoolean(); } } - + // currently only used when loading image. So no synchronized protected. public List getAllDbIds() { return Lists.newArrayList(idToDatabase.keySet()); diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java index 2df4e51ab7..8f508466fb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java @@ -36,7 +36,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import com.google.common.collect.Table; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -110,7 +109,7 @@ public class ColocateTableIndex implements Writable { result = 31 * result + grpId.hashCode(); return result; } - + @Override public String toString() { return dbId + "." + grpId; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java index 6ebcd9c080..2da813b79f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java @@ -34,7 +34,6 @@ import org.apache.doris.thrift.TColumnType; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -343,7 +342,7 @@ public class Column implements Writable { tColumn.setDefaultValue(this.defaultValue); tColumn.setVisible(visible); toChildrenThrift(this, tColumn); - + // ATTN: // Currently, this `toThrift()` method is only used from CreateReplicaTask. // And CreateReplicaTask does not need `defineExpr` field. diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnStats.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnStats.java index d0ac6db119..441c9af726 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnStats.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnStats.java @@ -24,7 +24,6 @@ import org.apache.doris.common.io.Writable; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -138,7 +137,7 @@ public class ColumnStats implements Writable { columnStats.readFields(in); return columnStats; } - + public boolean equals(Object obj) { if (this == obj) { return true; @@ -146,11 +145,11 @@ public class ColumnStats implements Writable { if (!(obj instanceof ColumnStats)) { return false; } - + ColumnStats stats = (ColumnStats) obj; - return (numDistinctValues == stats.numDistinctValues) + return (numDistinctValues == stats.numDistinctValues) && (avgSerializedSize == stats.avgSerializedSize) - && (maxSize == stats.maxSize) + && (maxSize == stats.maxSize) && (numNulls == stats.numNulls); } /** diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnType.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnType.java index 55f212a2eb..41575518b4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnType.java @@ -17,9 +17,10 @@ package org.apache.doris.catalog; -import com.google.common.base.Preconditions; import org.apache.doris.common.io.Text; +import com.google.common.base.Preconditions; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -151,4 +152,3 @@ public abstract class ColumnType { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java index bf9843697f..3c3534b5e0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java @@ -36,12 +36,10 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.annotation.Nullable; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -57,6 +55,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Collectors; +import javax.annotation.Nullable; /** * Internal representation of db-related metadata. Owned by Catalog instance. diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/DatabaseEncryptKey.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/DatabaseEncryptKey.java index eafe2b0fc7..e6f523585a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DatabaseEncryptKey.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DatabaseEncryptKey.java @@ -17,15 +17,14 @@ package org.apache.doris.catalog; -import com.google.gson.annotations.SerializedName; - import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import com.google.common.collect.Maps; +import com.google.gson.annotations.SerializedName; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/DiskInfo.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/DiskInfo.java index 3c26635ee6..6c415acb15 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DiskInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DiskInfo.java @@ -24,7 +24,6 @@ import org.apache.doris.persist.gson.GsonUtils; import org.apache.doris.thrift.TStorageMedium; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,7 +38,7 @@ public class DiskInfo implements Writable { ONLINE, OFFLINE } - + private static final long DEFAULT_CAPACITY_B = 1024 * 1024 * 1024 * 1024L; // 1T @SerializedName("rootPath") diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/DistributionInfo.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/DistributionInfo.java index ef1712baa5..3a22f44f0f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DistributionInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DistributionInfo.java @@ -24,7 +24,6 @@ import org.apache.doris.common.io.Writable; import com.google.common.collect.Lists; import com.google.gson.annotations.SerializedName; - import org.apache.commons.lang.NotImplementedException; import java.io.DataInput; @@ -45,7 +44,7 @@ public abstract class DistributionInfo implements Writable { protected String typeStr; @SerializedName(value = "type") protected DistributionInfoType type; - + public DistributionInfo() { // for persist } diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/DomainResolver.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/DomainResolver.java index e512d0804f..67b5336862 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DomainResolver.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DomainResolver.java @@ -23,7 +23,6 @@ import org.apache.doris.mysql.privilege.PaloAuth; import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -58,7 +57,7 @@ public class DomainResolver extends MasterDaemon { // domain names Set allDomains = Sets.newHashSet(); auth.getAllDomains(allDomains); - + // resolve domain name Map> resolvedIPsMap = Maps.newHashMap(); for (String domain : allDomains) { @@ -78,7 +77,7 @@ public class DomainResolver extends MasterDaemon { /** * Check if domain name is valid - * + * * @param host: * currently is the user's whitelist bns or dns name * @return true of false diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/EncryptKey.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/EncryptKey.java index e9f2786833..46ec58b47c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/EncryptKey.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/EncryptKey.java @@ -20,10 +20,10 @@ package org.apache.doris.catalog; import org.apache.doris.analysis.EncryptKeyName; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; +import org.apache.doris.persist.gson.GsonUtils; import com.google.common.collect.Lists; import com.google.gson.annotations.SerializedName; -import org.apache.doris.persist.gson.GsonUtils; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/EncryptKeyHelper.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/EncryptKeyHelper.java index cede16e319..86b89ee412 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/EncryptKeyHelper.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/EncryptKeyHelper.java @@ -22,6 +22,7 @@ import org.apache.doris.analysis.DropEncryptKeyStmt; import org.apache.doris.analysis.EncryptKeyName; import org.apache.doris.common.MetaNotFoundException; import org.apache.doris.common.UserException; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/EsTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/EsTable.java index df19a86d96..c1c89155d2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/EsTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/EsTable.java @@ -29,7 +29,6 @@ import org.apache.doris.thrift.TTableDescriptor; import org.apache.doris.thrift.TTableType; import com.google.common.base.Strings; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -359,7 +358,7 @@ public class EsTable extends Table { } else { throw new IOException("invalid partition type: " + partType); } - + } public String getHosts() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/FsBroker.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/FsBroker.java index 409e9722bb..4b20a63881 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/FsBroker.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/FsBroker.java @@ -37,7 +37,7 @@ public class FsBroker implements Writable, Comparable { // msg for ping result public String heartbeatErrMsg = ""; public long lastUpdateTime = -1; - + @SerializedName(value = "lastStartTime") public long lastStartTime = -1; @SerializedName(value = "isAlive") @@ -134,4 +134,3 @@ public class FsBroker implements Writable, Comparable { return GsonUtils.GSON.fromJson(json, FsBroker.class); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Function.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Function.java index 17f03a3cba..c1caa4313c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Function.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Function.java @@ -17,10 +17,9 @@ package org.apache.doris.catalog; -import static org.apache.doris.common.io.IOUtils.writeOptionString; - import org.apache.doris.analysis.FunctionName; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.io.IOUtils; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.common.util.URI; @@ -30,7 +29,6 @@ import org.apache.doris.thrift.TFunctionBinaryType; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,7 +37,6 @@ import java.io.DataOutput; import java.io.IOException; import java.util.List; - /** * Base class for all functions. */ @@ -640,8 +637,8 @@ public class Function implements Writable { if (location != null) { libUrl = location.getLocation(); } - writeOptionString(output, libUrl); - writeOptionString(output, checksum); + IOUtils.writeOptionString(output, libUrl); + IOUtils.writeOptionString(output, checksum); } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java index 85d63ca599..2193317f93 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java @@ -32,7 +32,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -403,8 +402,8 @@ public class FunctionSet STDDEV_REMOVE_SYMBOL = ImmutableMap.builder() .put(Type.TINYINT, @@ -421,7 +420,7 @@ public class FunctionSet STDDEV_MERGE_SYMBOL = ImmutableMap.builder() .put(Type.TINYINT, @@ -510,8 +509,8 @@ public class FunctionSet VAR_FINALIZE_SYMBOL = ImmutableMap.builder() .put(Type.TINYINT, @@ -546,8 +545,8 @@ public class FunctionSet VAR_POP_FINALIZE_SYMBOL = ImmutableMap.builder() .put(Type.TINYINT, @@ -582,7 +581,7 @@ public class FunctionSetnewArrayList(), Type.BIGINT, Type.VARCHAR, @@ -2428,7 +2427,7 @@ public class FunctionSet row = Lists.newArrayList(); - + ReplicaStatus status = ReplicaStatus.OK; Backend be = infoService.getBackend(replica.getBackendId()); if (be == null || !be.isAlive() || replica.isBad()) { @@ -93,11 +93,11 @@ public class MetadataViewer { } else if (replica.getSchemaHash() != -1 && replica.getSchemaHash() != schemaHash) { status = ReplicaStatus.SCHEMA_ERROR; } - + if (filterReplica(status, statusFilter, op)) { continue; } - + row.add(String.valueOf(tabletId)); row.add(String.valueOf(replica.getId())); row.add(String.valueOf(replica.getBackendId())); @@ -161,7 +161,7 @@ public class MetadataViewer { private static List> getTabletDistribution(String dbName, String tblName, PartitionNames partitionNames) throws DdlException { DecimalFormat df = new DecimalFormat("00.00 %"); - + List> result = Lists.newArrayList(); Catalog catalog = Catalog.getCurrentCatalog(); @@ -230,7 +230,7 @@ public class MetadataViewer { row.add(totalReplicaSize == sizeMap.get(beId) ? "100.00%" : df.format((double) sizeMap.get(beId) / totalReplicaSize)); result.add(row); } - + } finally { olapTable.readUnlock(); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/MysqlTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/MysqlTable.java index d76b70602d..d1332d3c33 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/MysqlTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/MysqlTable.java @@ -27,7 +27,6 @@ import org.apache.doris.thrift.TTableType; import com.google.common.base.Strings; import com.google.common.collect.Maps; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -136,7 +135,7 @@ public class MysqlTable extends Table { + "Please set charset 'utf8' or 'utf8mb4', other charsets not be unsupported now."); } } - + mysqlDatabaseName = properties.get(MYSQL_DATABASE); if (Strings.isNullOrEmpty(mysqlDatabaseName)) { throw new DdlException("Database of MySQL table is null. " @@ -149,14 +148,14 @@ public class MysqlTable extends Table { + "Please add properties('table'='xxxx') when create table"); } } - + private String getPropertyFromResource(String propertyName) { OdbcCatalogResource odbcCatalogResource = (OdbcCatalogResource) (Catalog.getCurrentCatalog().getResourceMgr().getResource(odbcCatalogResourceName)); if (odbcCatalogResource == null) { throw new RuntimeException("Resource does not exist. name: " + odbcCatalogResourceName); } - + String property = odbcCatalogResource.getProperty(propertyName); if (property == null) { throw new RuntimeException("The property:" + propertyName + " do not set in resource " + odbcCatalogResourceName); @@ -212,7 +211,7 @@ public class MysqlTable extends Table { } public TTableDescriptor toThrift() { - TMySQLTable tMySQLTable = new TMySQLTable(getHost(), getPort(), getUserName(), getPasswd(), + TMySQLTable tMySQLTable = new TMySQLTable(getHost(), getPort(), getUserName(), getPasswd(), mysqlDatabaseName, mysqlTableName, getCharset()); TTableDescriptor tTableDescriptor = new TTableDescriptor(getId(), TTableType.MYSQL_TABLE, fullSchema.size(), 0, getName(), ""); diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcCatalogResource.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcCatalogResource.java index ae15863d69..e77f9ffe15 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcCatalogResource.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcCatalogResource.java @@ -24,7 +24,7 @@ import org.apache.doris.common.proc.BaseProcResult; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import com.google.gson.annotations.SerializedName; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -32,8 +32,6 @@ import java.io.UnsupportedEncodingException; import java.util.Map; import java.util.zip.Adler32; -import com.google.gson.annotations.SerializedName; - /** * External ODBC Catalog resource for external table query. * @@ -186,4 +184,3 @@ public class OdbcCatalogResource extends Resource { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java index b1efecdd52..ac92ca9cb5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java @@ -30,7 +30,6 @@ import org.apache.doris.thrift.TTableType; import com.google.common.base.Strings; import com.google.common.collect.Maps; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -42,8 +41,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; - -import static java.util.stream.Collectors.joining; +import java.util.stream.Collectors; public class OdbcTable extends Table { private static final Logger LOG = LogManager.getLogger(OlapTable.class); @@ -193,7 +191,7 @@ public class OdbcTable extends Table { charset = properties.get(ODBC_CHARSET); copiedProperties.remove(ODBC_CHARSET); - + String tableType = properties.get(ODBC_TYPE); if (Strings.isNullOrEmpty(tableType)) { throw new DdlException("Type of Odbc table is null. " @@ -244,7 +242,7 @@ public class OdbcTable extends Table { return ";" + extraMap.entrySet() .stream() .map(e -> e.getKey() + "=" + e.getValue()) - .collect(joining(";")); + .collect(Collectors.joining(";")); } public String getExtraParam() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java index e3ac7e8f5a..064aad90e5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java @@ -61,7 +61,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Range; import com.google.common.collect.Sets; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -130,7 +129,7 @@ public class OlapTable extends Table { private Type sequenceType; private TableIndexes indexes; - + // In former implementation, base index id is same as table id. // But when refactoring the process of alter table job, we find that // using same id is not suitable for our new framework. @@ -151,7 +150,7 @@ public class OlapTable extends Table { this.colocateGroup = null; this.indexes = null; - + this.tableProperty = null; this.hasSequenceCol = false; @@ -804,7 +803,7 @@ public class OlapTable extends Table { * `getAllPartitions()` * */ - + // get partition by name, not including temp partitions @Override public Partition getPartition(String partitionName) { @@ -828,7 +827,7 @@ public class OlapTable extends Table { } return partition; } - + // get all partitions except temp partitions public Collection getPartitions() { return idToPartition.values(); @@ -936,7 +935,7 @@ public class OlapTable extends Table { public void setColocateGroup(String colocateGroup) { this.colocateGroup = colocateGroup; } - + // when the table is creating new rollup and enter finishing state, should tell be not auto load to new rollup // it is used for stream load // the caller should get db lock when call this method @@ -1132,7 +1131,7 @@ public class OlapTable extends Table { } else { out.writeBoolean(false); } - + // tableProperty if (tableProperty == null) { out.writeBoolean(false); @@ -1221,7 +1220,7 @@ public class OlapTable extends Table { if (in.readBoolean()) { tableProperty = TableProperty.read(in); } - + // temp partitions tempPartitions = TempPartitions.read(in); RangePartitionInfo tempRangeInfo = tempPartitions.getPartitionInfo(); @@ -1298,7 +1297,7 @@ public class OlapTable extends Table { copied.dropPartitionAndReserveTablet(partName); } } - + return copied; } @@ -1588,19 +1587,19 @@ public class OlapTable extends Table { * 2. {[0, 10), [15, 20)} === {[0, 10), [15, 18), [18, 20)} * 3. {[0, 10), [15, 20)} === {[0, 10), [15, 20)} * 4. {[0, 10), [15, 20)} !== {[0, 20)} - * + * * If useTempPartitionName is false and replaced partition number are equal, * the replaced partitions' name will remain unchanged. * What is "remain unchange"? * 1. replace partition (p1, p2) with temporary partition (tp1, tp2). After replacing, the partition * names are still p1 and p2. - * + * */ public void replaceTempPartitions(List partitionNames, List tempPartitionNames, boolean strictRange, boolean useTempPartitionName) throws DdlException { // check partition items checkPartition(partitionNames, tempPartitionNames, strictRange); - + // begin to replace // 1. drop old partitions for (String partitionName : partitionNames) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java index 045b4cc877..abf23a3203 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java @@ -28,7 +28,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -106,12 +105,12 @@ public class Partition extends MetaObject implements Writable { private Partition() { } - public Partition(long id, String name, + public Partition(long id, String name, MaterializedIndex baseIndex, DistributionInfo distributionInfo) { this.id = id; this.name = name; this.state = PartitionState.NORMAL; - + this.baseIndex = baseIndex; this.visibleVersion = PARTITION_INIT_VERSION; @@ -160,7 +159,7 @@ public class Partition extends MetaObject implements Writable { public void updateVisibleVersionAndTime(long visibleVersion, long visibleVersionTime) { this.setVisibleVersionAndTime(visibleVersion, visibleVersionTime); } - + public long getVisibleVersion() { return visibleVersion; } @@ -168,7 +167,7 @@ public class Partition extends MetaObject implements Writable { public long getVisibleVersionTime() { return visibleVersionTime; } - + // The method updateVisibleVersionAndVersionHash is called when fe restart, the visibleVersionTime is updated private void setVisibleVersion(long visibleVersion) { this.visibleVersion = visibleVersion; @@ -215,7 +214,7 @@ public class Partition extends MetaObject implements Writable { public void setNextVersion(long nextVersion) { this.nextVersion = nextVersion; } - + public long getCommittedVersion() { return this.nextVersion - 1; } @@ -308,7 +307,7 @@ public class Partition extends MetaObject implements Writable { out.writeLong(id); Text.writeString(out, name); Text.writeString(out, state.name()); - + baseIndex.write(out); int rollupCount = (idToVisibleRollupIndex != null) ? idToVisibleRollupIndex.size() : 0; @@ -343,7 +342,7 @@ public class Partition extends MetaObject implements Writable { id = in.readLong(); name = Text.readString(in); state = PartitionState.valueOf(Text.readString(in)); - + baseIndex = MaterializedIndex.read(in); int rollupCount = in.readInt(); @@ -351,7 +350,7 @@ public class Partition extends MetaObject implements Writable { MaterializedIndex rollupTable = MaterializedIndex.read(in); idToVisibleRollupIndex.put(rollupTable.getId(), rollupTable); } - + int shadowIndexCount = in.readInt(); for (int i = 0; i < shadowIndexCount; i++) { MaterializedIndex shadowIndex = MaterializedIndex.read(in); diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java index a912a35dea..73cbde708e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java @@ -28,7 +28,6 @@ import org.apache.doris.thrift.TTabletType; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionKey.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionKey.java index e451c6b18b..72c79a95d4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionKey.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionKey.java @@ -32,7 +32,6 @@ import org.apache.doris.common.io.Writable; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/PrimitiveType.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/PrimitiveType.java index 8990cbb6d4..702e9daf37 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/PrimitiveType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/PrimitiveType.java @@ -293,7 +293,7 @@ public enum PrimitiveType { // BITMAP builder.put(BITMAP, BITMAP); - + // QUANTILE_STATE builder.put(QUANTILE_STATE, QUANTILE_STATE); @@ -535,7 +535,7 @@ public enum PrimitiveType { compatibilityMatrix[DECIMALV2.ordinal()][DECIMALV2.ordinal()] = DECIMALV2; compatibilityMatrix[DECIMALV2.ordinal()][TIME.ordinal()] = INVALID_TYPE; - + compatibilityMatrix[HLL.ordinal()][HLL.ordinal()] = HLL; compatibilityMatrix[HLL.ordinal()][TIME.ordinal()] = INVALID_TYPE; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/RandomDistributionInfo.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/RandomDistributionInfo.java index 72fbf06a02..5a9589b43d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/RandomDistributionInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/RandomDistributionInfo.java @@ -28,18 +28,18 @@ import java.io.IOException; * Random partition. */ public class RandomDistributionInfo extends DistributionInfo { - + private int bucketNum; public RandomDistributionInfo() { super(); } - + public RandomDistributionInfo(int bucketNum) { super(DistributionInfoType.RANDOM); this.bucketNum = bucketNum; } - + @Override public DistributionDesc toDistributionDesc() { DistributionDesc distributionDesc = new RandomDistributionDesc(bucketNum); @@ -72,7 +72,7 @@ public class RandomDistributionInfo extends DistributionInfo { distributionInfo.readFields(in); return distributionInfo; } - + public boolean equals(DistributionInfo info) { if (this == info) { return true; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/RangePartitionInfo.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/RangePartitionInfo.java index b4e267d19a..5cc4ce13bc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/RangePartitionInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/RangePartitionInfo.java @@ -17,7 +17,6 @@ package org.apache.doris.catalog; -import com.google.common.collect.Lists; import org.apache.doris.analysis.PartitionKeyDesc; import org.apache.doris.analysis.SinglePartitionDesc; import org.apache.doris.common.AnalysisException; @@ -25,6 +24,7 @@ import org.apache.doris.common.DdlException; import org.apache.doris.common.util.RangeUtils; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.common.collect.Range; import java.io.DataInput; @@ -272,4 +272,3 @@ public class RangePartitionInfo extends PartitionInfo { return sb.toString(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java index 4ef3b7c071..99c37a0fe7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java @@ -21,7 +21,6 @@ import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -142,7 +141,7 @@ public class Replica implements Writable { } public Replica(long replicaId, long backendId, long version, int schemaHash, - long dataSize, long rowCount, ReplicaState state, + long dataSize, long rowCount, ReplicaState state, long lastFailedVersion, long lastSuccessVersion) { this.id = replicaId; @@ -255,7 +254,7 @@ public class Replica implements Writable { public synchronized void updateVersionInfo(long newVersion, long newDataSize, long newRowCount) { updateReplicaInfo(newVersion, this.lastFailedVersion, this.lastSuccessVersion, newDataSize, newRowCount); } - + public synchronized void updateVersionWithFailedInfo(long newVersion, long lastFailedVersion, long lastSuccessVersion) { updateReplicaInfo(newVersion, lastFailedVersion, lastSuccessVersion, dataSize, rowCount); } @@ -284,8 +283,8 @@ public class Replica implements Writable { * the V(hash) equals to LSV(hash), and V equals to LFV, but LFV hash is 0 or some unknown number. * We just reset the LFV(hash) to recovery this replica. */ - private void updateReplicaInfo(long newVersion, - long lastFailedVersion, long lastSuccessVersion, + private void updateReplicaInfo(long newVersion, + long lastFailedVersion, long lastSuccessVersion, long newDataSize, long newRowCount) { if (LOG.isDebugEnabled()) { LOG.debug("before update: {}", this.toString()); @@ -323,7 +322,7 @@ public class Replica implements Writable { // TODO: this case is unknown, add log to observe if (this.version > lastFailedVersion && lastFailedVersion > 0) { LOG.debug("current version {} is larger than last failed version {}, " - + "maybe a fatal error or be report version, print a stack here ", + + "maybe a fatal error or be report version, print a stack here ", this.version, lastFailedVersion, new Exception()); } @@ -359,7 +358,7 @@ public class Replica implements Writable { LOG.debug("after update {}", this.toString()); } } - + public synchronized void updateLastFailedVersion(long lastFailedVersion) { updateReplicaInfo(this.version, lastFailedVersion, this.lastSuccessVersion, dataSize, rowCount); } @@ -376,7 +375,7 @@ public class Replica implements Writable { if (ignoreAlter && state == ReplicaState.ALTER && version == Partition.PARTITION_INIT_VERSION) { return true; } - + if (expectedVersion == Partition.PARTITION_INIT_VERSION) { // no data is loaded into this replica, just return true return true; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Resource.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Resource.java index 73b24be6db..d2c2e7f48f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Resource.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Resource.java @@ -17,7 +17,6 @@ package org.apache.doris.catalog; -import com.google.common.base.Strings; import org.apache.doris.analysis.CreateResourceStmt; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.DdlException; @@ -28,11 +27,11 @@ import org.apache.doris.common.io.Writable; import org.apache.doris.common.proc.BaseProcResult; import org.apache.doris.persist.gson.GsonUtils; +import com.google.common.base.Strings; +import com.google.gson.annotations.SerializedName; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.google.gson.annotations.SerializedName; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -171,4 +170,3 @@ public abstract class Resource implements Writable { return copied; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceGroup.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceGroup.java index eeea765559..9d1b3c43e9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceGroup.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceGroup.java @@ -57,7 +57,7 @@ public class ResourceGroup implements Writable { } if (type == ResourceType.CPU_SHARE || type == ResourceType.IO_SHARE) { if (value < 100 || value > 1000) { - throw new DdlException("Value for resource type(" + throw new DdlException("Value for resource type(" + desc + ") has to be in [100, 1000]"); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceMgr.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceMgr.java index 9908e5ef52..d7d57272ab 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceMgr.java @@ -36,7 +36,7 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import com.google.gson.annotations.SerializedName; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -49,8 +49,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import com.google.gson.annotations.SerializedName; - /** * Resource manager is responsible for managing external resources used by Doris. * For example, Spark/MapReduce used for ETL, Spark/GPU used for queries, HDFS/S3 used for external storage. diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarFunction.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarFunction.java index f8d48094a2..527e81357a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarFunction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarFunction.java @@ -19,6 +19,7 @@ package org.apache.doris.catalog; import org.apache.doris.analysis.CreateFunctionStmt; import org.apache.doris.analysis.FunctionName; +import org.apache.doris.common.io.IOUtils; import org.apache.doris.common.io.Text; import org.apache.doris.common.util.URI; import org.apache.doris.thrift.TFunction; @@ -28,7 +29,7 @@ import org.apache.doris.thrift.TScalarFunction; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import com.google.gson.Gson; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -40,10 +41,6 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.google.gson.Gson; - -import static org.apache.doris.common.io.IOUtils.writeOptionString; - // import org.apache.doris.thrift.TSymbolType; /** @@ -385,8 +382,8 @@ public class ScalarFunction extends Function { super.writeFields(output); // 3.symbols Text.writeString(output, symbolName); - writeOptionString(output, prepareFnSymbol); - writeOptionString(output, closeFnSymbol); + IOUtils.writeOptionString(output, prepareFnSymbol); + IOUtils.writeOptionString(output, closeFnSymbol); } public void readFields(DataInput input) throws IOException { diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarType.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarType.java index fda252309a..f21798d51d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarType.java @@ -17,11 +17,6 @@ package org.apache.doris.catalog; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.util.Objects; - import org.apache.doris.common.io.Text; import org.apache.doris.persist.gson.GsonUtils; import org.apache.doris.thrift.TColumnType; @@ -29,12 +24,17 @@ import org.apache.doris.thrift.TScalarType; import org.apache.doris.thrift.TTypeDesc; import org.apache.doris.thrift.TTypeNode; import org.apache.doris.thrift.TTypeNodeType; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.gson.annotations.SerializedName; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.Objects; /** * Describes a scalar type. For most types this class just wraps a PrimitiveType enum, diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java index 2d634fb559..c1b8ff513f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java @@ -448,4 +448,3 @@ public class SchemaTable extends Table { return tTableDescriptor; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/SparkResource.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/SparkResource.java index 0e2a5109bf..1a95031e3e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/SparkResource.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/SparkResource.java @@ -28,13 +28,12 @@ import org.apache.doris.common.proc.BaseProcResult; import org.apache.doris.load.loadv2.SparkRepository; import org.apache.doris.load.loadv2.SparkYarnConfigFiles; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.File; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/StructField.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/StructField.java index e2494db0b4..6e87b1be40 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/StructField.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/StructField.java @@ -114,5 +114,3 @@ public class StructField { return otherStructField.name.equals(name) && otherStructField.type.equals(type); } } - - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/StructType.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/StructType.java index 9105e6db16..5d68be8f5c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/StructType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/StructType.java @@ -119,4 +119,3 @@ public class StructType extends Type { return toSql(0); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java index 0d70cec2b8..838a6989f7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java @@ -31,7 +31,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.commons.lang.NotImplementedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -83,7 +82,7 @@ public class Table extends MetaObject implements Writable { * to query but visible to load process. * If you want to get all visible columns, you should call getBaseSchema() method, which is override in * sub classes. - * + * * NOTICE: the order of this fullSchema is meaningless to OlapTable */ /** diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/TableProperty.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/TableProperty.java index 580fba8ae3..54977acea1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/TableProperty.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/TableProperty.java @@ -32,7 +32,6 @@ import org.apache.doris.thrift.TStorageFormat; import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -222,10 +221,10 @@ public class TableProperty implements Writable { } public TStorageFormat getStorageFormat() { - // Force convert all V1 table to V2 table - if (TStorageFormat.V1 == storageFormat) { - return TStorageFormat.V2; - } + // Force convert all V1 table to V2 table + if (TStorageFormat.V1 == storageFormat) { + return TStorageFormat.V2; + } return storageFormat; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java index 7f1cc537e1..c1d3f5e2cf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java @@ -33,7 +33,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletInvertedIndex.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletInvertedIndex.java index 5f60c9e054..ff37661e7d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletInvertedIndex.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletInvertedIndex.java @@ -39,7 +39,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.collect.Table; import com.google.common.collect.TreeMultimap; - import org.apache.commons.lang3.tuple.ImmutableTriple; import org.apache.commons.lang3.tuple.Triple; import org.apache.logging.log4j.LogManager; @@ -657,4 +656,3 @@ public class TabletInvertedIndex { return tabletMetaMap; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java index 57a5c1625b..f05abec852 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java @@ -28,11 +28,10 @@ import org.apache.doris.thrift.TNetworkAddress; import org.apache.doris.thrift.TTabletStat; import org.apache.doris.thrift.TTabletStatResult; +import com.google.common.collect.ImmutableMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.google.common.collect.ImmutableMap; - import java.util.List; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Type.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Type.java index 471e6599e8..e95b70d561 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Type.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Type.java @@ -28,10 +28,10 @@ import org.apache.doris.thrift.TStructField; import org.apache.doris.thrift.TTypeDesc; import org.apache.doris.thrift.TTypeNode; import org.apache.doris.thrift.TTypeNodeType; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.primitives.Longs; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -248,7 +248,7 @@ public abstract class Type { return isScalarType(PrimitiveType.TINYINT) || isScalarType(PrimitiveType.SMALLINT) || isScalarType(PrimitiveType.INT); } - + public boolean isLargeIntType() { return isScalarType(PrimitiveType.LARGEINT); } @@ -273,7 +273,7 @@ public abstract class Type { public boolean isDatetime() { return isScalarType(PrimitiveType.DATETIME); } - + public boolean isTime() { return isScalarType(PrimitiveType.TIME); } @@ -558,7 +558,7 @@ public abstract class Type { } return result; } - + public static Type fromThrift(TTypeDesc thrift) { Preconditions.checkState(thrift.types.size() > 0); Pair t = fromThrift(thrift, 0); @@ -880,7 +880,7 @@ public abstract class Type { compatibilityMatrix[SMALLINT.ordinal()][QUANTILE_STATE.ordinal()] = PrimitiveType.INVALID_TYPE; // INT - compatibilityMatrix[INT.ordinal()][BIGINT.ordinal()] = PrimitiveType.BIGINT; + compatibilityMatrix[INT.ordinal()][BIGINT.ordinal()] = PrimitiveType.BIGINT; compatibilityMatrix[INT.ordinal()][LARGEINT.ordinal()] = PrimitiveType.LARGEINT; // 32 bit integer fits only mantissa of double. // TODO: arguably we should promote INT + FLOAT to DOUBLE to avoid loss of precision, @@ -901,7 +901,7 @@ public abstract class Type { compatibilityMatrix[INT.ordinal()][QUANTILE_STATE.ordinal()] = PrimitiveType.INVALID_TYPE; - // BIGINT + // BIGINT // 64 bit integer does not fit in mantissa of double or float. // TODO: arguably we should always promote BIGINT + FLOAT to double here to keep as // much precision as possible, but we depend on this implicit cast for some use @@ -917,7 +917,7 @@ public abstract class Type { compatibilityMatrix[BIGINT.ordinal()][CHAR.ordinal()] = PrimitiveType.INVALID_TYPE; compatibilityMatrix[BIGINT.ordinal()][VARCHAR.ordinal()] = PrimitiveType.INVALID_TYPE; compatibilityMatrix[BIGINT.ordinal()][DECIMALV2.ordinal()] = PrimitiveType.INVALID_TYPE; - compatibilityMatrix[BIGINT.ordinal()][HLL.ordinal()] = PrimitiveType.INVALID_TYPE; + compatibilityMatrix[BIGINT.ordinal()][HLL.ordinal()] = PrimitiveType.INVALID_TYPE; compatibilityMatrix[BIGINT.ordinal()][TIME.ordinal()] = PrimitiveType.DOUBLE; compatibilityMatrix[BIGINT.ordinal()][BITMAP.ordinal()] = PrimitiveType.INVALID_TYPE; compatibilityMatrix[BIGINT.ordinal()][STRING.ordinal()] = PrimitiveType.INVALID_TYPE; @@ -1008,7 +1008,7 @@ public abstract class Type { compatibilityMatrix[STRING.ordinal()][QUANTILE_STATE.ordinal()] = PrimitiveType.INVALID_TYPE; - // DECIMALV2 + // DECIMALV2 compatibilityMatrix[DECIMALV2.ordinal()][HLL.ordinal()] = PrimitiveType.INVALID_TYPE; compatibilityMatrix[DECIMALV2.ordinal()][TIME.ordinal()] = PrimitiveType.INVALID_TYPE; compatibilityMatrix[DECIMALV2.ordinal()][BITMAP.ordinal()] = PrimitiveType.INVALID_TYPE; @@ -1104,7 +1104,7 @@ public abstract class Type { // Following logical is compatible with MySQL. if (t1ResultType == PrimitiveType.VARCHAR && t2ResultType == PrimitiveType.VARCHAR) { - return Type.VARCHAR; + return Type.VARCHAR; } if ((t1ResultType == PrimitiveType.STRING && t2ResultType == PrimitiveType.STRING) || (t1ResultType == PrimitiveType.STRING && t2ResultType == PrimitiveType.VARCHAR) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/View.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/View.java index ce5b945703..08c7e359ff 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/View.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/View.java @@ -30,7 +30,6 @@ import org.apache.doris.common.util.Util; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/BackendLoadStatistic.java b/fe/fe-core/src/main/java/org/apache/doris/clone/BackendLoadStatistic.java index f01c0175c3..69474e57fc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/BackendLoadStatistic.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/BackendLoadStatistic.java @@ -31,7 +31,6 @@ import org.apache.doris.thrift.TStorageMedium; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -252,7 +251,7 @@ public class BackendLoadStatistic { public void calcScore(Map avgClusterUsedCapacityPercentMap, Map avgClusterReplicaNumPerBackendMap) { - + for (TStorageMedium medium : TStorageMedium.values()) { LoadScore loadScore = calcSore(totalUsedCapacityMap.getOrDefault(medium, 0L), totalCapacityMap.getOrDefault(medium, 1L), @@ -269,13 +268,13 @@ public class BackendLoadStatistic { public static LoadScore calcSore(long beUsedCapacityB, long beTotalCapacityB, long beTotalReplicaNum, double avgClusterUsedCapacityPercent, double avgClusterReplicaNumPerBackend) { - + double usedCapacityPercent = (beUsedCapacityB / (double) beTotalCapacityB); double capacityProportion = avgClusterUsedCapacityPercent <= 0 ? 0.0 : usedCapacityPercent / avgClusterUsedCapacityPercent; double replicaNumProportion = avgClusterReplicaNumPerBackend <= 0 ? 0.0 : beTotalReplicaNum / avgClusterReplicaNumPerBackend; - + LoadScore loadScore = new LoadScore(); // If this backend's capacity used percent < 50%, set capacityCoefficient to 0.5. @@ -288,7 +287,7 @@ public class BackendLoadStatistic { loadScore.replicaNumCoefficient = 1 - loadScore.capacityCoefficient; loadScore.score = capacityProportion * loadScore.capacityCoefficient + replicaNumProportion * loadScore.replicaNumCoefficient; - + return loadScore; } @@ -380,7 +379,7 @@ public class BackendLoadStatistic { /** * Classify the paths into 'low', 'mid' and 'high', - * and skip offline path, and path with different storage medium + * and skip offline path, and path with different storage medium */ public void getPathStatisticByClass( Set low, Set mid, Set high, TStorageMedium storageMedium) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/BalanceStatus.java b/fe/fe-core/src/main/java/org/apache/doris/clone/BalanceStatus.java index 608ed93cac..5652b749ae 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/BalanceStatus.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/BalanceStatus.java @@ -28,12 +28,12 @@ public class BalanceStatus { STATE_NOT_NORMAL, COMMON_ERROR } - + private ErrCode errCode; private List errMsgs = Lists.newArrayList(); - + public static final BalanceStatus OK = new BalanceStatus(ErrCode.OK, ""); - + public BalanceStatus(ErrCode errCode) { this.errCode = errCode; } @@ -42,15 +42,15 @@ public class BalanceStatus { this.errCode = errCode; this.errMsgs.add(errMsg); } - + public ErrCode getErrCode() { return errCode; } - + public List getErrMsgs() { return errMsgs; } - + public void addErrMsgs(List errMsgs) { this.errMsgs.addAll(errMsgs); } @@ -62,7 +62,7 @@ public class BalanceStatus { public boolean ok() { return errCode == ErrCode.OK; } - + @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/BeLoadRebalancer.java b/fe/fe-core/src/main/java/org/apache/doris/clone/BeLoadRebalancer.java index fb99b881da..50f9e82007 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/BeLoadRebalancer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/BeLoadRebalancer.java @@ -32,7 +32,6 @@ import org.apache.doris.thrift.TStorageMedium; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/ClusterLoadStatistic.java b/fe/fe-core/src/main/java/org/apache/doris/clone/ClusterLoadStatistic.java index 4626274e64..8d9c6ecd2e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/ClusterLoadStatistic.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/ClusterLoadStatistic.java @@ -30,7 +30,6 @@ import org.apache.doris.thrift.TStorageMedium; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.TreeMultimap; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/ColocateTableCheckerAndBalancer.java b/fe/fe-core/src/main/java/org/apache/doris/clone/ColocateTableCheckerAndBalancer.java index 8e9d81f99e..0bc2239579 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/ColocateTableCheckerAndBalancer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/ColocateTableCheckerAndBalancer.java @@ -45,7 +45,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.collect.Table; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.parquet.Strings; diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/DiskRebalancer.java b/fe/fe-core/src/main/java/org/apache/doris/clone/DiskRebalancer.java index f32e31a7ef..152f47a5e8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/DiskRebalancer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/DiskRebalancer.java @@ -21,8 +21,8 @@ import org.apache.doris.catalog.Replica; import org.apache.doris.catalog.TabletInvertedIndex; import org.apache.doris.catalog.TabletMeta; import org.apache.doris.clone.SchedException.Status; -import org.apache.doris.clone.TabletSchedCtx.Priority; import org.apache.doris.clone.TabletSchedCtx.BalanceType; +import org.apache.doris.clone.TabletSchedCtx.Priority; import org.apache.doris.clone.TabletScheduler.PathSlot; import org.apache.doris.system.SystemInfoService; import org.apache.doris.thrift.TStorageMedium; @@ -30,7 +30,6 @@ import org.apache.doris.thrift.TStorageMedium; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -208,7 +207,7 @@ public class DiskRebalancer extends Rebalancer { tabletCtx.setTempSrc(replica); tabletCtx.setTag(clusterStat.getTag()); if (prioBackends.containsKey(beStat.getBeId())) { - // priority of balance task of prio BE is NORMAL + // priority of balance task of prio BE is NORMAL tabletCtx.setOrigPriority(Priority.NORMAL); } else { // balance task's default priority is LOW diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java index c299e42b38..761404e6ef 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java @@ -53,7 +53,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Range; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/MovesCacheMap.java b/fe/fe-core/src/main/java/org/apache/doris/clone/MovesCacheMap.java index ad4c8d893f..51fd8bd930 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/MovesCacheMap.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/MovesCacheMap.java @@ -26,7 +26,6 @@ import com.google.common.cache.CacheBuilder; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; import com.google.common.collect.Table; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/PartitionRebalancer.java b/fe/fe-core/src/main/java/org/apache/doris/clone/PartitionRebalancer.java index 9fefd9b833..0962afd9e6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/PartitionRebalancer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/PartitionRebalancer.java @@ -32,7 +32,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.collect.Table; import com.google.common.collect.TreeMultimap; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/Rebalancer.java b/fe/fe-core/src/main/java/org/apache/doris/clone/Rebalancer.java index a7177c2f54..ef7ae27995 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/Rebalancer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/Rebalancer.java @@ -26,8 +26,8 @@ import org.apache.doris.task.AgentTask; import org.apache.doris.thrift.TStorageMedium; import com.google.common.collect.HashBasedTable; -import com.google.common.collect.Maps; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Table; import java.util.List; diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletChecker.java b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletChecker.java index 0025a27dc5..d51cae0fe4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletChecker.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletChecker.java @@ -46,7 +46,6 @@ import com.google.common.collect.HashBasedTable; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.collect.Table.Cell; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java index 60e8080fa8..6e36c06072 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java @@ -51,7 +51,6 @@ import org.apache.doris.thrift.TTaskType; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -66,24 +65,24 @@ import java.util.Set; */ public class TabletSchedCtx implements Comparable { private static final Logger LOG = LogManager.getLogger(TabletSchedCtx.class); - + /* * SCHED_FAILED_COUNTER_THRESHOLD: * threshold of times a tablet failed to be scheduled - * + * * MIN_ADJUST_PRIORITY_INTERVAL_MS: * min interval time of adjusting a tablet's priority - * + * * MAX_NOT_BEING_SCHEDULED_INTERVAL_MS: * max gap time of a tablet NOT being scheduled. - * + * * These 3 params is for adjusting priority. * If a tablet being scheduled failed for more than SCHED_FAILED_COUNTER_THRESHOLD times, its priority * will be downgraded. And the interval between adjustment is larger than MIN_ADJUST_PRIORITY_INTERVAL_MS, * to avoid being downgraded too soon. * And if a tablet is not being scheduled longer than MAX_NOT_BEING_SCHEDULED_INTERVAL_MS, its priority * will be upgraded, to avoid starvation. - * + * */ private static final int SCHED_FAILED_COUNTER_THRESHOLD = 5; private static final long MIN_ADJUST_PRIORITY_INTERVAL_MS = 5 * 60 * 1000L; // 5 min @@ -110,7 +109,7 @@ public class TabletSchedCtx implements Comparable { } public enum BalanceType { - BE_BALANCE, DISK_BALANCE + BE_BALANCE, DISK_BALANCE } public enum Priority { @@ -118,7 +117,7 @@ public class TabletSchedCtx implements Comparable { NORMAL, HIGH, VERY_HIGH; - + // VERY_HIGH can only be downgraded to NORMAL // LOW can only be upgraded to HIGH public Priority adjust(Priority origPriority, boolean isUp) { @@ -133,9 +132,9 @@ public class TabletSchedCtx implements Comparable { return isUp ? NORMAL : LOW; } } - + } - + public enum State { PENDING, // tablet is not being scheduled RUNNING, // tablet is being scheduled @@ -144,7 +143,7 @@ public class TabletSchedCtx implements Comparable { TIMEOUT, // task is timeout UNEXPECTED // other unexpected errors } - + private Type type; private BalanceType balanceType; @@ -155,17 +154,17 @@ public class TabletSchedCtx implements Comparable { */ private Priority origPriority; private Priority dynamicPriority; - + // we change the dynamic priority based on how many times it fails to be scheduled private int failedSchedCounter = 0; // clone task failed counter private int failedRunningCounter = 0; - + // last time this tablet being scheduled private long lastSchedTime = 0; // last time the dynamic priority being adjusted private long lastAdjustPrioTime = 0; - + // last time this tablet being visited. // being visited means: // 1. being visited in TabletScheduler.schedulePendingTablets() @@ -177,10 +176,10 @@ public class TabletSchedCtx implements Comparable { // an approximate timeout of this task, only be set when sending clone task. private long taskTimeoutMs = 0; - + private State state; private TabletStatus tabletStatus; - + private String cluster; private long dbId; private long tblId; @@ -189,14 +188,14 @@ public class TabletSchedCtx implements Comparable { private long tabletId; private int schemaHash; private TStorageMedium storageMedium; - + private long createTime = -1; private long finishedTime = -1; - + private Tablet tablet = null; private long visibleVersion = -1; private long committedVersion = -1; - + private Replica srcReplica = null; private long srcPathHash = -1; // for disk balance to keep src path, and avoid take slot on selectAlternativeTabletsForCluster @@ -206,10 +205,10 @@ public class TabletSchedCtx implements Comparable { // for disk balance to set migration task's datadir private String destPath = null; private String errMsg = null; - + private CloneTask cloneTask = null; private StorageMediaMigrationTask storageMediaMigrationTask = null; - + // statistics gathered from clone task report // the total size of clone files and the total cost time in ms. private long copySize = 0; @@ -272,7 +271,7 @@ public class TabletSchedCtx implements Comparable { public Priority getOrigPriority() { return origPriority; } - + public void setOrigPriority(Priority origPriority) { this.origPriority = origPriority; // reset dynamic priority along with the origin priority being set. @@ -281,15 +280,15 @@ public class TabletSchedCtx implements Comparable { this.lastSchedTime = 0; this.lastAdjustPrioTime = 0; } - + public Priority getDynamicPriority() { return dynamicPriority; } - + public void increaseFailedSchedCounter() { ++failedSchedCounter; } - + public int getFailedSchedCounter() { return failedSchedCounter; } @@ -297,15 +296,15 @@ public class TabletSchedCtx implements Comparable { public void increaseFailedRunningCounter() { ++failedRunningCounter; } - + public int getFailedRunningCounter() { return failedRunningCounter; } - + public void setLastSchedTime(long lastSchedTime) { this.lastSchedTime = lastSchedTime; } - + public void setLastVisitedTime(long lastVisitedTime) { this.lastVisitedTime = lastVisitedTime; } @@ -317,15 +316,15 @@ public class TabletSchedCtx implements Comparable { public State getState() { return state; } - + public void setState(State state) { this.state = state; } - + public void setTabletStatus(TabletStatus tabletStatus) { this.tabletStatus = tabletStatus; } - + public TabletStatus getTabletStatus() { return tabletStatus; } @@ -333,23 +332,23 @@ public class TabletSchedCtx implements Comparable { public long getDbId() { return dbId; } - + public long getTblId() { return tblId; } - + public long getPartitionId() { return partitionId; } - + public long getIndexId() { return indexId; } - + public long getTabletId() { return tabletId; } - + public void setSchemaHash(int schemaHash) { this.schemaHash = schemaHash; } @@ -357,7 +356,7 @@ public class TabletSchedCtx implements Comparable { public int getSchemaHash() { return schemaHash; } - + public void setStorageMedium(TStorageMedium storageMedium) { this.storageMedium = storageMedium; } @@ -365,23 +364,23 @@ public class TabletSchedCtx implements Comparable { public TStorageMedium getStorageMedium() { return storageMedium; } - + public String getCluster() { return cluster; } - + public long getCreateTime() { return createTime; } - + public long getCommittedVersion() { return visibleVersion; } - + public void setTablet(Tablet tablet) { this.tablet = tablet; } - + public Tablet getTablet() { return tablet; } @@ -390,12 +389,12 @@ public class TabletSchedCtx implements Comparable { public List getReplicas() { return tablet.getReplicas(); } - + public void setVersionInfo(long visibleVersion, long committedVersion) { this.visibleVersion = visibleVersion; this.committedVersion = committedVersion; } - + public void setDest(Long destBeId, long destPathHash) { this.destBackendId = destBeId; this.destPathHash = destPathHash; @@ -405,15 +404,15 @@ public class TabletSchedCtx implements Comparable { setDest(destBeId, destPathHash); this.destPath = destPath; } - + public void setErrMsg(String errMsg) { this.errMsg = errMsg; } - + public CloneTask getCloneTask() { return cloneTask; } - + public long getCopySize() { return copySize; } @@ -479,7 +478,7 @@ public class TabletSchedCtx implements Comparable { } return max; } - + /* * check if existing replicas are on same BE. * database lock should be held. @@ -509,7 +508,7 @@ public class TabletSchedCtx implements Comparable { } return false; } - + public void setColocateGroupBackendIds(Set backendsSet) { this.colocateBackendsSet = backendsSet; } @@ -605,7 +604,7 @@ public class TabletSchedCtx implements Comparable { } throw new SchedException(Status.SCHEDULE_FAILED, "unable to find source slot"); } - + /* * Same rules as choosing source replica for supplement. * But we need to check that we can not choose the same replica as dest replica, @@ -617,14 +616,14 @@ public class TabletSchedCtx implements Comparable { Preconditions.checkState(srcReplica.getBackendId() != destBackendId, "wrong be id: " + destBackendId); } - + /* * Rules to choose a destination replica for version incomplete * 1. replica's last failed version > 0 * 2. better to choose a replica which has a lower last failed version * 3. best to choose a replica if its last success version > last failed version * 4. if these is replica which need further repair, choose that replica. - * + * * database lock should be held. */ public void chooseDestReplicaForVersionIncomplete(Map backendsWorkingSlots) @@ -654,7 +653,7 @@ public class TabletSchedCtx implements Comparable { chosenReplica = replica; break; } - + if (chosenReplica == null) { chosenReplica = replica; } else if (replica.getLastSuccessVersion() > replica.getLastFailedVersion()) { @@ -665,11 +664,11 @@ public class TabletSchedCtx implements Comparable { chosenReplica = replica; } } - + if (chosenReplica == null) { throw new SchedException(Status.SCHEDULE_FAILED, "unable to choose dest replica"); } - + // check if the dest replica has available slot PathSlot slot = backendsWorkingSlots.get(chosenReplica.getBackendId()); if (slot == null) { @@ -701,7 +700,7 @@ public class TabletSchedCtx implements Comparable { } setDest(chosenReplica.getBackendId(), chosenReplica.getPathHash()); } - + public void releaseResource(TabletScheduler tabletScheduler) { releaseResource(tabletScheduler, false); } @@ -733,7 +732,7 @@ public class TabletSchedCtx implements Comparable { } } } - + if (storageMediaMigrationTask != null) { AgentTaskQueue.removeTask(storageMediaMigrationTask.getBackendId(), TTaskType.STORAGE_MEDIUM_MIGRATE, storageMediaMigrationTask.getSignature()); } @@ -764,7 +763,7 @@ public class TabletSchedCtx implements Comparable { reset(reserveTablet); } - + // reset to save memory after state is done private void reset(boolean reserveTablet) { /* @@ -784,7 +783,7 @@ public class TabletSchedCtx implements Comparable { this.storageMediaMigrationTask = null; } } - + public void deleteReplica(Replica replica) { tablet.deleteReplicaByBackendId(replica.getBackendId()); } @@ -801,7 +800,7 @@ public class TabletSchedCtx implements Comparable { this.state = State.RUNNING; return storageMediaMigrationTask; } - + // database lock should be held. public CloneTask createCloneReplicaAndTask() throws SchedException { Backend srcBe = infoService.getBackend(srcReplica.getBackendId()); @@ -809,13 +808,13 @@ public class TabletSchedCtx implements Comparable { throw new SchedException(Status.SCHEDULE_FAILED, "src backend " + srcReplica.getBackendId() + " does not exist"); } - + Backend destBe = infoService.getBackend(destBackendId); if (destBe == null) { throw new SchedException(Status.SCHEDULE_FAILED, "dest backend " + srcReplica.getBackendId() + " does not exist"); } - + taskTimeoutMs = getApproximateTimeoutMs(); // create the clone task and clone replica. @@ -833,7 +832,7 @@ public class TabletSchedCtx implements Comparable { tabletId, schemaHash, Lists.newArrayList(tSrcBe), storageMedium, visibleVersion, (int) (taskTimeoutMs / 1000)); cloneTask.setPathHash(srcPathHash, destPathHash); - + // if this is a balance task, or this is a repair task with REPLICA_MISSING/REPLICA_RELOCATING or REPLICA_MISSING_IN_CLUSTER, // we create a new replica with state CLONE if (tabletStatus == TabletStatus.REPLICA_MISSING || tabletStatus == TabletStatus.REPLICA_MISSING_IN_CLUSTER @@ -862,11 +861,11 @@ public class TabletSchedCtx implements Comparable { + "current: " + replica.getPathHash() + ", scheduled: " + destPathHash); } } - + this.state = State.RUNNING; return cloneTask; } - + // timeout is between MIN_CLONE_TASK_TIMEOUT_MS and MAX_CLONE_TASK_TIMEOUT_MS private long getApproximateTimeoutMs() { long tabletSize = getTabletSize(); @@ -875,11 +874,11 @@ public class TabletSchedCtx implements Comparable { timeoutMs = Math.min(timeoutMs, Config.max_clone_task_timeout_sec * 1000); return timeoutMs; } - + /* * 1. Check if the tablet is already healthy. If yes, ignore the clone task report, and take it as FINISHED. * 2. If not, check the reported clone replica, and try to make it effective. - * + * * Throw SchedException if error happens * 1. SCHEDULE_FAILED: will keep the tablet RUNNING. * 2. UNRECOVERABLE: will remove the tablet from runningTablets. @@ -1024,25 +1023,25 @@ public class TabletSchedCtx implements Comparable { this.copyTimeMs = request.getCopyTimeMs(); } } - + /* * we try to adjust the priority based on schedule history * 1. If failed counter is larger than FAILED_COUNTER_THRESHOLD, which means this tablet is being scheduled * at least FAILED_TIME_THRESHOLD times and all are failed. So we downgrade its priority. * Also reset the failedCounter, or it will be downgraded forever. - * + * * 2. Else, if it has been a long time since last time the tablet being scheduled, we upgrade its * priority to let it more available to be scheduled. - * + * * The time gap between adjustment should be larger than MIN_ADJUST_PRIORITY_INTERVAL_MS, to avoid * being downgraded too fast. - * + * * eg: * A tablet has been scheduled for 5 times and all were failed. its priority will be downgraded. And if it is * scheduled for 5 times and all are failed again, it will be downgraded again, until to the LOW. * And than, because of LOW, this tablet can not be scheduled for a long time, and it will be upgraded * to NORMAL, if still not being scheduled, it will be upgraded up to VERY_HIGH. - * + * * return true if dynamic priority changed */ public boolean adjustPriority(TabletSchedulerStat stat) { @@ -1056,10 +1055,10 @@ public class TabletSchedCtx implements Comparable { return false; } } - + boolean isDowngrade = false; boolean isUpgrade = false; - + if (failedSchedCounter > SCHED_FAILED_COUNTER_THRESHOLD) { isDowngrade = true; } else { @@ -1068,7 +1067,7 @@ public class TabletSchedCtx implements Comparable { isUpgrade = true; } } - + Priority originDynamicPriority = dynamicPriority; if (isDowngrade) { dynamicPriority = dynamicPriority.adjust(origPriority, false /* downgrade */); @@ -1091,16 +1090,16 @@ public class TabletSchedCtx implements Comparable { } return false; } - + public boolean isTimeout() { if (state != TabletSchedCtx.State.RUNNING) { return false; } - + Preconditions.checkState(lastSchedTime != 0 && taskTimeoutMs != 0, lastSchedTime + "-" + taskTimeoutMs); return System.currentTimeMillis() - lastSchedTime > taskTimeoutMs; } - + public List getBrief() { List result = Lists.newArrayList(); result.add(String.valueOf(tabletId)); @@ -1128,7 +1127,7 @@ public class TabletSchedCtx implements Comparable { result.add(Strings.nullToEmpty(errMsg)); return result; } - + /* * First compared by dynamic priority. higher priority rank ahead. * If priority is equals, compared by last visit time, earlier visit time rank ahead. @@ -1149,7 +1148,7 @@ public class TabletSchedCtx implements Comparable { } } } - + @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletScheduler.java index 68ab63a851..3f7f0e0802 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletScheduler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletScheduler.java @@ -67,7 +67,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.collect.Table; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -106,7 +105,7 @@ public class TabletScheduler extends MasterDaemon { private static final long SCHEDULE_INTERVAL_MS = 1000; // 1s // 1 slot for reduce unnecessary balance task, provided a more accurate estimate of capacity - public static final int BALANCE_SLOT_NUM_FOR_PATH = 1; + public static final int BALANCE_SLOT_NUM_FOR_PATH = 1; /* * Tablet is added to pendingTablets as well it's id in allTabletIds. diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedulerStat.java b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedulerStat.java index f733b05c9f..74120c4e44 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedulerStat.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedulerStat.java @@ -128,7 +128,7 @@ public class TabletSchedulerStat { if (!field.isAnnotationPresent(StatField.class)) { continue; } - + ((AtomicLong) field.get(lastSnapshot)).set(((AtomicLong) field.get(this)).get()); } } catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException e) { @@ -150,7 +150,7 @@ public class TabletSchedulerStat { if (!field.isAnnotationPresent(StatField.class)) { continue; } - + List info = Lists.newArrayList(); info.add(field.getAnnotation(StatField.class).value()); info.add(String.valueOf(((AtomicLong) field.get(this)).get())); diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/TwoDimensionalGreedyRebalanceAlgo.java b/fe/fe-core/src/main/java/org/apache/doris/clone/TwoDimensionalGreedyRebalanceAlgo.java index 3db68792d9..2ce36a371a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/clone/TwoDimensionalGreedyRebalanceAlgo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/clone/TwoDimensionalGreedyRebalanceAlgo.java @@ -17,14 +17,15 @@ package org.apache.doris.clone; +import org.apache.doris.catalog.TabletInvertedIndex.PartitionBalanceInfo; +import org.apache.doris.clone.PartitionRebalancer.ClusterBalanceInfo; +import org.apache.doris.common.Pair; + import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.collect.TreeMultimap; -import org.apache.doris.catalog.TabletInvertedIndex.PartitionBalanceInfo; -import org.apache.doris.clone.PartitionRebalancer.ClusterBalanceInfo; -import org.apache.doris.common.Pair; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -135,7 +136,7 @@ public class TwoDimensionalGreedyRebalanceAlgo { // Nothing to balance: cluster is empty. return Lists.newArrayList(); } - + NavigableSet keySet = info.beByTotalReplicaCount.keySet(); if (keySet.isEmpty() || keySet.last() == 0L) { // the number of replica on specified medium we get from getReplicaNumByBeIdAndStorageMedium() is diff --git a/fe/fe-core/src/main/java/org/apache/doris/cluster/BaseParam.java b/fe/fe-core/src/main/java/org/apache/doris/cluster/BaseParam.java index ba6acdaf12..ca628dabd0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/cluster/BaseParam.java +++ b/fe/fe-core/src/main/java/org/apache/doris/cluster/BaseParam.java @@ -17,15 +17,16 @@ package org.apache.doris.cluster; +import org.apache.doris.common.io.Text; +import org.apache.doris.common.io.Writable; + +import com.google.common.collect.Lists; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.List; -import org.apache.doris.common.io.Text; -import org.apache.doris.common.io.Writable; -import com.google.common.collect.Lists; - public class BaseParam implements Writable { private final List strParams = Lists.newArrayList(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/cluster/Cluster.java b/fe/fe-core/src/main/java/org/apache/doris/cluster/Cluster.java index 4754dc0f75..3d99c45636 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/cluster/Cluster.java +++ b/fe/fe-core/src/main/java/org/apache/doris/cluster/Cluster.java @@ -25,7 +25,6 @@ import org.apache.doris.persist.LinkDbInfo; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -41,7 +40,7 @@ import java.util.concurrent.locks.ReentrantLock; /** * cluster only save db and user's id and name - * + * */ public class Cluster implements Writable { private static final Logger LOG = LogManager.getLogger(Cluster.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/cluster/ClusterNamespace.java b/fe/fe-core/src/main/java/org/apache/doris/cluster/ClusterNamespace.java index 4c14881055..bc1580c943 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/cluster/ClusterNamespace.java +++ b/fe/fe-core/src/main/java/org/apache/doris/cluster/ClusterNamespace.java @@ -22,11 +22,11 @@ import org.apache.doris.mysql.privilege.PaloAuth; import com.google.common.base.Strings; /** - * used to isolate the use for the database name and user name in the catalog, - * all using the database name and user name place need to call the appropriate - * method to makeup full name or get real name, full name is made up generally + * used to isolate the use for the database name and user name in the catalog, + * all using the database name and user name place need to call the appropriate + * method to makeup full name or get real name, full name is made up generally * in stmt's analyze. - * + * */ public class ClusterNamespace { diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/AliasGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/common/AliasGenerator.java index b7da430d4b..422a9520ab 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/AliasGenerator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/AliasGenerator.java @@ -20,11 +20,11 @@ package org.apache.doris.common; -import java.util.Set; - import com.google.common.base.Preconditions; import com.google.common.collect.Sets; +import java.util.Set; + /** * Abstract class representing an alias generator. It uses a prefix and a * monotonically increasing counter to generate new aliases. Classes extending @@ -52,4 +52,3 @@ public abstract class AliasGenerator { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/AuditLog.java b/fe/fe-core/src/main/java/org/apache/doris/common/AuditLog.java index adc0103610..6c308d72a8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/AuditLog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/AuditLog.java @@ -47,7 +47,7 @@ public class AuditLog { } public AuditLog(String auditName) { - logger = LogManager.getLogger(auditName); + logger = LogManager.getLogger(auditName); } public void log(Object message) { @@ -61,9 +61,9 @@ public class AuditLog { public void log(String message, Object... params) { logger.info(message, params); } - + public void log(Message message) { logger.info(message); } - + } diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/CIDR.java b/fe/fe-core/src/main/java/org/apache/doris/common/CIDR.java index f119f43a81..dbe2692fc8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/CIDR.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/CIDR.java @@ -18,7 +18,6 @@ package org.apache.doris.common; import com.google.common.collect.ImmutableMap; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/CaseSensibility.java b/fe/fe-core/src/main/java/org/apache/doris/common/CaseSensibility.java index d0545a14dd..ff4ebdf775 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/CaseSensibility.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/CaseSensibility.java @@ -34,13 +34,13 @@ public enum CaseSensibility { ROUTINE_LOAD(true); private boolean caseSensitive; - + private CaseSensibility(boolean caseSensitive) { this.caseSensitive = caseSensitive; } - + public boolean getCaseSensibility() { return caseSensitive; } - + } diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/CheckedMath.java b/fe/fe-core/src/main/java/org/apache/doris/common/CheckedMath.java index 2e4f641b2f..2d92e24948 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/CheckedMath.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/CheckedMath.java @@ -18,7 +18,6 @@ package org.apache.doris.common; import com.google.common.math.LongMath; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ClientPool.java b/fe/fe-core/src/main/java/org/apache/doris/common/ClientPool.java index 4098e06073..674981fc86 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/ClientPool.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/ClientPool.java @@ -40,7 +40,7 @@ public class ClientPool { heartbeatConfig.setMaxTotal(-1); // (default -1) heartbeatConfig.setMaxWaitMillis(500); // wait for the connection } - + static { backendConfig.setLifo(true); // set Last In First Out strategy backendConfig.setMaxIdlePerKey(128); // (default 8) diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ColumnAliasGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/common/ColumnAliasGenerator.java index da7dc47b55..57291002c1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/ColumnAliasGenerator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/ColumnAliasGenerator.java @@ -20,10 +20,10 @@ package org.apache.doris.common; -import java.util.List; - import com.google.common.base.Preconditions; +import java.util.List; + public class ColumnAliasGenerator extends AliasGenerator { private static final String DEFAULT_COL_ALIAS_PREFIX = "$c$"; @@ -33,4 +33,3 @@ public class ColumnAliasGenerator extends AliasGenerator { usedAliases.addAll(existingLabels); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ConfigBase.java b/fe/fe-core/src/main/java/org/apache/doris/common/ConfigBase.java index 1287c19d2b..bad29927a7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/ConfigBase.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/ConfigBase.java @@ -18,12 +18,12 @@ package org.apache.doris.common; import org.apache.doris.catalog.Catalog; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.File; import java.io.FileOutputStream; @@ -45,7 +45,7 @@ import java.util.stream.Stream; public class ConfigBase { private static final Logger LOG = LogManager.getLogger(ConfigBase.class); - + @Retention(RetentionPolicy.RUNTIME) public @interface ConfField { String value() default ""; @@ -190,14 +190,14 @@ public class ConfigBase { if (anno == null) { continue; } - + // ensure that field has property string String confKey = anno.value().equals("") ? f.getName() : anno.value(); String confVal = props.getProperty(confKey); if (Strings.isNullOrEmpty(confVal)) { continue; } - + setConfigField(f, confVal); // to be compatible with old version @@ -368,4 +368,3 @@ public class ConfigBase { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ConfigWatcher.java b/fe/fe-core/src/main/java/org/apache/doris/common/ConfigWatcher.java index a4a28384ff..2a2a5cbeae 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/ConfigWatcher.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/ConfigWatcher.java @@ -21,18 +21,17 @@ import org.apache.doris.common.util.Daemon; import com.google.common.base.Preconditions; import com.google.common.base.Strings; - -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.nio.file.FileSystems; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardWatchEventKinds; import java.nio.file.WatchEvent; +import java.nio.file.WatchEvent.Kind; import java.nio.file.WatchKey; import java.nio.file.WatchService; -import java.nio.file.WatchEvent.Kind; /* * used for watch config changed @@ -67,11 +66,11 @@ public class ConfigWatcher extends Daemon { if (kind == StandardWatchEventKinds.OVERFLOW) { continue; } - + final WatchEvent watchEventPath = (WatchEvent) watchEvent; final Path filePath = watchEventPath.context(); LOG.info("config watcher [" + kind + " -> " + filePath + "]"); - + if (kind == StandardWatchEventKinds.ENTRY_CREATE) { handleCreate(filePath); } else if (kind == StandardWatchEventKinds.ENTRY_MODIFY) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java b/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java index 7f65abe5f7..0a56d9603e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java @@ -20,7 +20,6 @@ package org.apache.doris.common; import org.apache.doris.httpv2.config.SpringLog4j2Config; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationSource; @@ -32,7 +31,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Map; -// +// // don't use trace. use INFO, WARN, ERROR, FATAL // public class Log4jConfig extends XmlConfiguration { @@ -42,11 +41,11 @@ public class Log4jConfig extends XmlConfiguration { "\n\n" + "\n" + " \n" + - " " + + " " + " \n" + " %d{yyyy-MM-dd HH:mm:ss,SSS} %p (%t|%tid) [%C{1}.%M():%L] %m%n\n" + " \n" + - " " + + " " + " \n" + " \n" + " %d{yyyy-MM-dd HH:mm:ss,SSS} %p (%t|%tid) [%C{1}.%M():%L] %m%n\n" + @@ -119,8 +118,8 @@ public class Log4jConfig extends XmlConfiguration { // Doris uses both system.out and log4j to print log messages. // This variable is used to check whether to add console appender to loggers. // If doris is running under daemon mode, then this variable == false, and console logger will not be added. - // If doris is not running under daemon mode, then this variable == true, and console logger will be added to - // loggers, all logs will be printed to console. + // If doris is not running under daemon mode, then this variable == true, and console logger will be added to + // loggers, all logs will be printed to console. public static boolean foreground = false; private static void reconfig() throws IOException { @@ -177,7 +176,7 @@ public class Log4jConfig extends XmlConfiguration { StringBuilder consoleLogger = new StringBuilder(); consoleLogger.append("\n"); newXmlConfTemplate = newXmlConfTemplate.replaceAll("", - consoleLogger.toString()); + consoleLogger.toString()); } Map properties = Maps.newHashMap(); properties.put("sys_log_dir", sysLogDir); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/MarkDownParser.java b/fe/fe-core/src/main/java/org/apache/doris/common/MarkDownParser.java index e6723b4838..eced29b736 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/common/MarkDownParser.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/MarkDownParser.java @@ -119,7 +119,7 @@ public class MarkDownParser { if (head != null) { documents.put(head, keyValues); } - + checkStructure(); return documents; } @@ -170,4 +170,3 @@ public class MarkDownParser { sb.toString().replaceAll("\\s+$", "\n")); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/MetaFooter.java b/fe/fe-core/src/main/java/org/apache/doris/common/MetaFooter.java index 895d5f9ede..946cd983b8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/MetaFooter.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/MetaFooter.java @@ -18,7 +18,6 @@ package org.apache.doris.common; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/MetaReader.java b/fe/fe-core/src/main/java/org/apache/doris/common/MetaReader.java index 7bd8e07bd7..47b149f506 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/MetaReader.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/MetaReader.java @@ -20,7 +20,6 @@ package org.apache.doris.common; import org.apache.doris.catalog.Catalog; import com.google.common.base.Preconditions; - import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/MetaWriter.java b/fe/fe-core/src/main/java/org/apache/doris/common/MetaWriter.java index 4ecf24140e..0f1adbe571 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/MetaWriter.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/MetaWriter.java @@ -21,7 +21,6 @@ import org.apache.doris.catalog.Catalog; import org.apache.doris.common.io.CountingDataOutputStream; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/NotLiteralExprPredicate.java b/fe/fe-core/src/main/java/org/apache/doris/common/NotLiteralExprPredicate.java index 6039143da7..9164fd1ad7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/NotLiteralExprPredicate.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/NotLiteralExprPredicate.java @@ -19,9 +19,8 @@ package org.apache.doris.common; import org.apache.doris.analysis.LiteralExpr; -import org.checkerframework.checker.nullness.qual.Nullable; - import com.google.common.base.Predicate; +import org.checkerframework.checker.nullness.qual.Nullable; public class NotLiteralExprPredicate implements Predicate { diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/PatternMatcher.java b/fe/fe-core/src/main/java/org/apache/doris/common/PatternMatcher.java index 141f336a3b..a9eddc1b5e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/PatternMatcher.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/PatternMatcher.java @@ -48,19 +48,19 @@ public class PatternMatcher { * '%' to match any character sequence * '_' to master any single character. * So we convert '%' to '.*', and '_' to '.' - * + * * eg: * abc% -> abc.* * ab_c -> ab.c - * + * * We also need to handle escape character '\'. * User use '\' to escape reserved words like '%', '_', or '\' it self - * + * * eg: * ab\%c = ab%c * ab\_c = ab_c * ab\\c = ab\c - * + * * We also have to ignore meaningless '\' like:'ab\c', convert it to 'abc'. * The following characters are not permitted: * <([{^=$!|]})?*+> @@ -86,8 +86,8 @@ public class PatternMatcher { // last character of this pattern. leave this '\' as it is sb.append('\\'); break; - } - // we need to look ahead the next character + } + // we need to look ahead the next character // to decide ignore this '\' or treat it as escape character. char nextChar = newMysqlPattern.charAt(i + 1); switch (nextChar) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/Status.java b/fe/fe-core/src/main/java/org/apache/doris/common/Status.java index 1104cc4c3c..3dfe2018e1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/Status.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/Status.java @@ -36,12 +36,12 @@ public class Status { private TStatusCode errorCode; // anything other than OK private String errorMsg; - + public Status() { this.errorCode = TStatusCode.OK; this.errorMsg = null; } - + public Status(Status status) { this(status.getErrorCode(), status.getErrorMsg()); } @@ -61,20 +61,20 @@ public class Status { public boolean ok() { return this.errorCode == TStatusCode.OK; } - + public boolean isCancelled() { return this.errorCode == TStatusCode.CANCELLED; } - + public boolean isRpcError() { return this.errorCode == TStatusCode.THRIFT_RPC_ERROR; } - + public void setStatus(Status status) { this.errorCode = status.errorCode; this.errorMsg = status.getErrorMsg(); } - + public void setStatus(String msg) { this.errorCode = TStatusCode.INTERNAL_ERROR; this.errorMsg = msg; @@ -96,7 +96,7 @@ public class Status { if (ok()) { return; } - + switch (errorCode) { case CANCELLED: { this.errorMsg = "Cancelled"; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/TableAliasGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/common/TableAliasGenerator.java index 0bb1ef2cf6..f7026cc8ea 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/TableAliasGenerator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/TableAliasGenerator.java @@ -36,4 +36,3 @@ public class TableAliasGenerator extends AliasGenerator { // } while (currentAnalyzer != null); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ThreadPoolManager.java b/fe/fe-core/src/main/java/org/apache/doris/common/ThreadPoolManager.java index 147e6de068..bbabf26abf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/ThreadPoolManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/ThreadPoolManager.java @@ -24,7 +24,6 @@ import org.apache.doris.metric.MetricRepo; import com.google.common.collect.Maps; import com.google.common.util.concurrent.ThreadFactoryBuilder; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -221,4 +220,3 @@ public class ThreadPoolManager { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServer.java b/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServer.java index 3eaf98126d..78cd12bdf6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServer.java @@ -20,7 +20,6 @@ package org.apache.doris.common; import org.apache.doris.thrift.TNetworkAddress; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.thrift.TProcessor; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServerEventProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServerEventProcessor.java index f47f23f6d6..4acf2fa2d6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServerEventProcessor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServerEventProcessor.java @@ -20,7 +20,6 @@ package org.apache.doris.common; import org.apache.doris.thrift.TNetworkAddress; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.thrift.protocol.TProtocol; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/TreeNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/TreeNode.java index d28f51f31a..7529d04fad 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/TreeNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/TreeNode.java @@ -20,13 +20,13 @@ package org.apache.doris.common; +import com.google.common.base.Predicate; +import com.google.common.collect.Lists; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.google.common.base.Predicate; -import com.google.common.collect.Lists; - /** * Generic tree structure. Only concrete subclasses of this can be instantiated. */ @@ -44,7 +44,7 @@ public class TreeNode> { public void addChildren(List n) { children.addAll(n); } - + public boolean hasChild(int i) { return children.size() > i; } public void setChild(int index, NodeType n) { children.set(index, n); } public ArrayList getChildren() { return children; } @@ -168,7 +168,7 @@ public class TreeNode> { for (C node: nodeList) if (node.contains(cl)) return true; return false; } - + public boolean containsSubclass(Class cl) { if (cl.isAssignableFrom(this.getClass())) { return true; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/logger/TaggableLogger.java b/fe/fe-core/src/main/java/org/apache/doris/common/logger/TaggableLogger.java index fa98e7819f..c44cd7a408 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/logger/TaggableLogger.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/logger/TaggableLogger.java @@ -20,6 +20,7 @@ package org.apache.doris.common.logger; import org.apache.doris.common.util.DebugUtil; import org.apache.doris.proto.Types; import org.apache.doris.thrift.TUniqueId; + import org.apache.logging.log4j.Logger; import java.util.UUID; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/parquet/BrokerInputFile.java b/fe/fe-core/src/main/java/org/apache/doris/common/parquet/BrokerInputFile.java index f2aa3d6fc1..20ad46a8ee 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/parquet/BrokerInputFile.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/parquet/BrokerInputFile.java @@ -269,4 +269,3 @@ public class BrokerInputFile implements InputFile { }; // end of new SeekableInputStream } // end of newStream } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/parquet/LocalInputFile.java b/fe/fe-core/src/main/java/org/apache/doris/common/parquet/LocalInputFile.java index 6a2cf9294f..3519a506c7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/parquet/LocalInputFile.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/parquet/LocalInputFile.java @@ -194,4 +194,3 @@ public class LocalInputFile implements InputFile { int read(byte[] b, int off, int len) throws IOException; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/parquet/ParquetReader.java b/fe/fe-core/src/main/java/org/apache/doris/common/parquet/ParquetReader.java index 5850af1f80..867b3de714 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/parquet/ParquetReader.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/parquet/ParquetReader.java @@ -21,7 +21,6 @@ import org.apache.doris.analysis.BrokerDesc; import com.google.common.base.Joiner; import com.google.common.collect.Lists; - import org.apache.parquet.ParquetReadOptions; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.page.PageReadStore; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/path/PathTrie.java b/fe/fe-core/src/main/java/org/apache/doris/common/path/PathTrie.java index 6f587b187b..b0459d1820 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/path/PathTrie.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/path/PathTrie.java @@ -24,21 +24,21 @@ import java.util.Map; // Organized path to be a trie, which is used in Palo to route actions in web interface. // Path can be a local file path, or path part in a URL. -// -// NOTE: Wildcard is supported. If dir names in path have brace in both side, the dir node will -// be regarded as a wildcard, which means it can match any string. A map contains the keys to +// +// NOTE: Wildcard is supported. If dir names in path have brace in both side, the dir node will +// be regarded as a wildcard, which means it can match any string. A map contains the keys to // matched strings will be built. -// e.g. "/api/{database}/{table}", can match "/api/db_name/tb_name", and the map is +// e.g. "/api/{database}/{table}", can match "/api/db_name/tb_name", and the map is // {database => db_name, table => tb_name} public class PathTrie { - + private static final char PATH_SEPARATOR = '/'; private static final char LEFT_BRACE = '{'; private static final char RIGHT_BRACE = '}'; - + private static final String ASTERISK_WILDCARD = "*"; - // Some path may have been encoded, so they need a Decoder, Invoker should supply + // Some path may have been encoded, so they need a Decoder, Invoker should supply // implementation for different path type. // e.g. URL path in a http-request from browser may be encoded as per RFC 3986, Section 2, public static interface Decoder { @@ -104,19 +104,19 @@ public class PathTrie { } return root.retrieve(strings, index, params); } - + public class TrieNode { private transient String key; private transient T value; private boolean isWildcard; private final String wildcard; - + private transient String namedWildcard; - + private ImmutableMap> children; - + private final TrieNode parent; - + public TrieNode(String key, T value, TrieNode parent, String wildcard) { this.key = key; this.wildcard = wildcard; @@ -130,32 +130,32 @@ public class PathTrie { namedWildcard = null; } } - + public void updateKeyWithNamedWildcard(String key) { this.key = key; namedWildcard = key.substring(key.indexOf(LEFT_BRACE) + 1, key.indexOf(RIGHT_BRACE)); } - + public boolean isWildcard() { return isWildcard; } - + public synchronized void addChild(TrieNode child) { Map> temp = Maps.newHashMap(children); temp.put(child.key, child); children = ImmutableMap.copyOf(temp); } - + public TrieNode getChild(String key) { return children.get(key); } - + // construct the trie tree by inserting recursively. public synchronized void insert(String[] path, int index, T value) { if (index >= path.length) { return; } - + String token = path[index]; String key = token; if (isNamedWildcard(token)) { @@ -175,7 +175,7 @@ public class PathTrie { if (isNamedWildcard(token)) { node.updateKeyWithNamedWildcard(token); } - + // In case the target(last) node already exist but without a value // than the value should be updated. if (index == (path.length - 1)) { @@ -185,28 +185,28 @@ public class PathTrie { } } } - + node.insert(path, index + 1, value); } - + private boolean isNamedWildcard(String key) { return key.indexOf(LEFT_BRACE) != -1 && key.indexOf(RIGHT_BRACE) != -1; } - + private boolean isNamedWildcard() { return namedWildcard != null; } - + private String namedWildcard() { return namedWildcard; } - + // Retrieve the trie tree recursively and build the map. public T retrieve(String[] path, int index, Map params) { if (index >= path.length) { return null; } - + String token = path[index]; TrieNode node = children.get(token); boolean usedWildcard; @@ -226,13 +226,13 @@ public class PathTrie { usedWildcard = token.equals(wildcard); } } - + put(params, node, token); - + if (index == (path.length - 1)) { return node.value; } - + T res = node.retrieve(path, index + 1, params); if (res == null && !usedWildcard) { node = children.get(wildcard); @@ -241,10 +241,10 @@ public class PathTrie { res = node.retrieve(path, index + 1, params); } } - + return res; } - + private void put(Map params, TrieNode node, String value) { if (params != null && node.isNamedWildcard()) { params.put(node.namedWildcard(), decoder.decode(value)); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/AuthProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/AuthProcDir.java index 0bf5008c50..33e3b2854c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/AuthProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/AuthProcDir.java @@ -67,4 +67,3 @@ public class AuthProcDir implements ProcDirInterface { return result; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendProcNode.java index dbb8c89d21..0ce21396cf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendProcNode.java @@ -52,13 +52,13 @@ public class BackendProcNode implements ProcNodeInterface { for (Map.Entry entry : backend.getDisks().entrySet()) { List info = Lists.newArrayList(); info.add(entry.getKey()); - + // data used long dataUsedB = entry.getValue().getDataUsedCapacityB(); Pair dataUsedUnitPair = DebugUtil.getByteUint(dataUsedB); info.add(DebugUtil.DECIMAL_FORMAT_SCALE_3.format(dataUsedUnitPair.first) + " " + dataUsedUnitPair.second); - + // avail long availB = entry.getValue().getAvailableCapacityB(); Pair availUnitPair = DebugUtil.getByteUint(availB); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendsProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendsProcDir.java index 580c6ae803..4cc330afd2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendsProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BackendsProcDir.java @@ -35,7 +35,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.gson.Gson; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -78,12 +77,12 @@ public class BackendsProcDir implements ProcDirInterface { } return result; } - + /** * get backends of cluster * @param clusterName * @return - */ + */ public static List> getClusterBackendInfos(String clusterName) { final SystemInfoService clusterInfoService = Catalog.getCurrentSystemInfo(); List> backendInfos = new LinkedList<>(); @@ -191,7 +190,7 @@ public class BackendsProcDir implements ProcDirInterface { } backendInfos.add(oneInfo); } - + return backendInfos; } @@ -222,5 +221,3 @@ public class BackendsProcDir implements ProcDirInterface { } } - - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BaseProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BaseProcDir.java index 266d1f42df..5f7688f383 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BaseProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BaseProcDir.java @@ -19,13 +19,13 @@ package org.apache.doris.common.proc; import org.apache.doris.common.AnalysisException; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + import java.util.Collections; import java.util.List; import java.util.Map; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; - // 通用PROC DIR类,可以进行注册,返回底层节点内容。 // 非线程安全的,需要调用者考虑线程安全内容。 diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BaseProcResult.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BaseProcResult.java index 6e671353a2..f5678f9781 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BaseProcResult.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BaseProcResult.java @@ -17,10 +17,10 @@ package org.apache.doris.common.proc; -import java.util.List; - import com.google.common.collect.Lists; +import java.util.List; + public class BaseProcResult implements ProcResult { protected List names; protected List> rows; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/ClusterHealthProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ClusterHealthProcDir.java index c0e3b1b343..db231f84b5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/ClusterHealthProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ClusterHealthProcDir.java @@ -17,11 +17,12 @@ package org.apache.doris.common.proc; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.AnalysisException; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + import java.util.ArrayList; import java.util.List; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryBackendInstanceProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryBackendInstanceProcDir.java index fa352ea0fa..62e5cf77d3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryBackendInstanceProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryBackendInstanceProcDir.java @@ -19,8 +19,9 @@ package org.apache.doris.common.proc; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.util.DebugUtil; -import org.apache.doris.qe.QueryStatisticsItem; import org.apache.doris.qe.QeProcessorImpl; +import org.apache.doris.qe.QueryStatisticsItem; + import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryFragmentProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryFragmentProcNode.java index 166df29fee..27b7e673d3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryFragmentProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryFragmentProcNode.java @@ -17,11 +17,12 @@ package org.apache.doris.common.proc; +import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.util.QueryStatisticsFormatter; +import org.apache.doris.qe.QueryStatisticsItem; + import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import org.apache.doris.common.AnalysisException; -import org.apache.doris.qe.QueryStatisticsItem; -import org.apache.doris.common.util.QueryStatisticsFormatter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryInfoProvider.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryInfoProvider.java index 49e93a1f2d..427ef2a935 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryInfoProvider.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryInfoProvider.java @@ -28,7 +28,6 @@ import org.apache.doris.thrift.TUniqueId; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatementsProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatementsProcNode.java index 3b0474d9b0..477f3eb8bb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatementsProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatementsProcNode.java @@ -17,13 +17,14 @@ package org.apache.doris.common.proc; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import org.apache.commons.codec.digest.DigestUtils; import org.apache.doris.common.AnalysisException; import org.apache.doris.qe.QeProcessorImpl; import org.apache.doris.qe.QueryStatisticsItem; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import org.apache.commons.codec.digest.DigestUtils; + import java.util.List; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java index a2c1818058..acb1cbf5ed 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java @@ -61,7 +61,7 @@ public class CurrentQueryStatisticsProcDir implements ProcDirInterface { @Override public ProcResult fetchResult() throws AnalysisException { final BaseProcResult result = new BaseProcResult(); - final Map statistic = + final Map statistic = QeProcessorImpl.INSTANCE.getQueryStatistics(); result.setNames(TITLE_NAMES.asList()); final List> sortedRowData = Lists.newArrayList(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/EsShardProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/EsShardProcDir.java index 4c748831fe..3c0bc26632 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/EsShardProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/EsShardProcDir.java @@ -17,19 +17,20 @@ package org.apache.doris.common.proc; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.doris.catalog.Database; import org.apache.doris.catalog.EsTable; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.util.ListComparator; import org.apache.doris.external.elasticsearch.EsShardPartitions; import org.apache.doris.external.elasticsearch.EsShardRouting; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class EsShardProcDir implements ProcDirInterface { public static final ImmutableList TITLE_NAMES = new ImmutableList.Builder() .add("ShardId").add("Host").add("IsPrimary") @@ -38,13 +39,13 @@ public class EsShardProcDir implements ProcDirInterface { private Database db; private EsTable esTable; private String indexName; - + public EsShardProcDir(Database db, EsTable esTable, String indexName) { this.db = db; this.esTable = esTable; this.indexName = indexName; } - + @Override public ProcResult fetchResult() { Preconditions.checkNotNull(db); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java index 8bfcb5957a..367d0201e8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java @@ -28,7 +28,6 @@ import org.apache.doris.system.Frontend; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -162,4 +161,3 @@ public class FrontendsProcNode implements ProcNodeInterface { return hostPortPair; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexInfoProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexInfoProcDir.java index f9583e422a..5857adc629 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexInfoProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexInfoProcDir.java @@ -110,7 +110,7 @@ public class IndexInfoProcDir implements ProcDirInterface { public ProcNodeInterface lookup(String idxIdStr) throws AnalysisException { Preconditions.checkNotNull(db); Preconditions.checkNotNull(table); - + long idxId; try { idxId = Long.valueOf(idxIdStr); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java index 73f626af2b..b6b92f9f89 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java @@ -24,7 +24,6 @@ import org.apache.doris.common.FeConstants; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; - import org.apache.commons.lang.StringUtils; import java.util.Arrays; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndicesProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndicesProcDir.java index 9116ea66b9..249eedffc4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndicesProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndicesProcDir.java @@ -105,14 +105,14 @@ public class IndicesProcDir implements ProcDirInterface { if (Strings.isNullOrEmpty(indexIdStr)) { throw new AnalysisException("Index id is null"); } - + long indexId; try { indexId = Long.valueOf(indexIdStr); } catch (NumberFormatException e) { throw new AnalysisException("Invalid index id format: " + indexIdStr); } - + olapTable.readLock(); try { MaterializedIndex materializedIndex = partition.getIndex(indexId); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/LoadErrorHubProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/LoadErrorHubProcNode.java index fae242f941..7a81986a8f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/LoadErrorHubProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/LoadErrorHubProcNode.java @@ -45,4 +45,3 @@ public class LoadErrorHubProcNode implements ProcNodeInterface { return result; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/ProcService.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ProcService.java index da966634da..59a354265b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/ProcService.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ProcService.java @@ -19,11 +19,10 @@ package org.apache.doris.common.proc; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.AnalysisException; - -import com.google.common.base.Strings; - import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; + +import com.google.common.base.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java index 1543a44fc1..f0242ec80e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java @@ -39,7 +39,7 @@ public class ReplicasProcNode implements ProcNodeInterface { .add("LstFailedTime").add("SchemaHash").add("DataSize").add("RowCount").add("State") .add("IsBad").add("VersionCount").add("PathHash").add("MetaUrl").add("CompactionStatus") .build(); - + private long tabletId; private List replicas; @@ -88,4 +88,3 @@ public class ReplicasProcNode implements ProcNodeInterface { return result; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/RollupProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/RollupProcDir.java index 26f9526e4f..c10eeb4418 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/RollupProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/RollupProcDir.java @@ -17,7 +17,6 @@ package org.apache.doris.common.proc; -import com.google.common.collect.Lists; import org.apache.doris.alter.AlterJobV2; import org.apache.doris.alter.MaterializedViewHandler; import org.apache.doris.alter.RollupJobV2; @@ -29,12 +28,13 @@ import org.apache.doris.analysis.StringLiteral; import org.apache.doris.catalog.Database; import org.apache.doris.catalog.Type; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.util.ListComparator; +import org.apache.doris.common.util.OrderByPair; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; -import org.apache.doris.common.util.ListComparator; -import org.apache.doris.common.util.OrderByPair; +import com.google.common.collect.Lists; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/RoutineLoadsProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/RoutineLoadsProcDir.java index 91e4c32874..411e0fe640 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/RoutineLoadsProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/RoutineLoadsProcDir.java @@ -17,14 +17,15 @@ package org.apache.doris.common.proc; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.MetaNotFoundException; import org.apache.doris.load.routineload.RoutineLoadJob; import org.apache.doris.load.routineload.RoutineLoadManager; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; + import java.util.List; /* diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/SchemaChangeProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/SchemaChangeProcDir.java index cfe9eace90..8e91cbd31c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/SchemaChangeProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/SchemaChangeProcDir.java @@ -35,7 +35,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -109,7 +108,7 @@ public class SchemaChangeProcDir implements ProcDirInterface { if (filter == null || filter.size() == 0){ jobInfos = schemaChangeJobInfos; } else { - jobInfos = Lists.newArrayList(); + jobInfos = Lists.newArrayList(); for (List infoStr : schemaChangeJobInfos) { if (infoStr.size() != TITLE_NAMES.size()) { LOG.warn("SchemaChangeJobInfos.size() " + schemaChangeJobInfos.size() diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/StreamLoadProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/StreamLoadProcNode.java index eb668feafa..596f5131c5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/StreamLoadProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/StreamLoadProcNode.java @@ -17,11 +17,12 @@ package org.apache.doris.common.proc; -import com.google.common.collect.ImmutableList; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.AnalysisException; import org.apache.doris.load.StreamLoadRecordMgr; +import com.google.common.collect.ImmutableList; + import java.util.List; /* diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TablesProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TablesProcDir.java index 58f079a63c..eec7841502 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TablesProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TablesProcDir.java @@ -22,8 +22,8 @@ import org.apache.doris.catalog.Database; import org.apache.doris.catalog.OlapTable; import org.apache.doris.catalog.PartitionType; import org.apache.doris.catalog.RangePartitionInfo; -import org.apache.doris.catalog.Table.TableType; import org.apache.doris.catalog.Table; +import org.apache.doris.catalog.Table.TableType; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.FeConstants; import org.apache.doris.common.util.ListComparator; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletHealthProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletHealthProcDir.java index 2e4122ca53..66108bac92 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletHealthProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletHealthProcDir.java @@ -17,8 +17,6 @@ package org.apache.doris.common.proc; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.ColocateTableIndex; import org.apache.doris.catalog.Database; @@ -38,6 +36,9 @@ import org.apache.doris.task.AgentTask; import org.apache.doris.task.AgentTaskQueue; import org.apache.doris.thrift.TTaskType; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + import java.util.ArrayList; import java.util.Comparator; import java.util.HashSet; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletSchedulerDetailProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletSchedulerDetailProcDir.java index 161cbc27c2..6777c3ede9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletSchedulerDetailProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletSchedulerDetailProcDir.java @@ -41,7 +41,7 @@ public class TabletSchedulerDetailProcDir implements ProcDirInterface { .add("FailedRunning").add("LstAdjPrio").add("VisibleVer").add("VisibleVerHash") .add("CmtVer").add("CmtVerHash").add("ErrMsg") .build(); - + private String type; private TabletScheduler tabletScheduler; @@ -54,7 +54,7 @@ public class TabletSchedulerDetailProcDir implements ProcDirInterface { public ProcResult fetchResult() throws AnalysisException { BaseProcResult result = new BaseProcResult(); result.setNames(TITLE_NAMES); - + // get at most 1000 tablet infos List> tabletInfos = Lists.newArrayList(); if (type.equals(ClusterBalanceProcDir.PENDING_TABLETS)) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletsProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletsProcDir.java index b68038d83c..38a3e67393 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletsProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletsProcDir.java @@ -201,4 +201,3 @@ public class TabletsProcDir implements ProcDirInterface { throw new AnalysisException("Title name[" + columnName + "] does not exist"); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TransStateProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TransStateProcDir.java index e5e3837489..c171841a70 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TransStateProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TransStateProcDir.java @@ -54,7 +54,7 @@ public class TransStateProcDir implements ProcDirInterface { if (Strings.isNullOrEmpty(state)) { throw new AnalysisException("State is not set"); } - + if (!state.equals("running") && !state.equals("finished")) { throw new AnalysisException("State is invalid"); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TrashProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TrashProcDir.java index e1b0b859b3..9b23900931 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TrashProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TrashProcDir.java @@ -17,20 +17,19 @@ package org.apache.doris.common.proc; -import org.apache.doris.thrift.BackendService; -import org.apache.doris.thrift.TNetworkAddress; -import org.apache.doris.system.Backend; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.AnalysisException; -import org.apache.doris.common.Pair; import org.apache.doris.common.ClientPool; +import org.apache.doris.common.Pair; import org.apache.doris.common.util.DebugUtil; +import org.apache.doris.system.Backend; +import org.apache.doris.thrift.BackendService; +import org.apache.doris.thrift.TNetworkAddress; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TrashProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TrashProcNode.java index d01e3cccec..e27708b63f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TrashProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TrashProcNode.java @@ -17,18 +17,17 @@ package org.apache.doris.common.proc; +import org.apache.doris.common.ClientPool; +import org.apache.doris.common.Pair; +import org.apache.doris.common.util.DebugUtil; +import org.apache.doris.system.Backend; import org.apache.doris.thrift.BackendService; import org.apache.doris.thrift.TDiskTrashInfo; import org.apache.doris.thrift.TNetworkAddress; -import org.apache.doris.system.Backend; -import org.apache.doris.common.Pair; -import org.apache.doris.common.ClientPool; -import org.apache.doris.common.util.DebugUtil; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java index fb4a16be88..204113fa94 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java @@ -26,7 +26,6 @@ import org.apache.doris.common.util.RuntimeProfile; import com.clearspring.analytics.util.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.commons.lang3.tuple.Triple; import java.util.List; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/profile/ProfileTreeBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/common/profile/ProfileTreeBuilder.java index d810e02fd1..b193c114a9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/profile/ProfileTreeBuilder.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/profile/ProfileTreeBuilder.java @@ -17,8 +17,6 @@ package org.apache.doris.common.profile; -import lombok.Getter; -import lombok.Setter; import org.apache.doris.common.Pair; import org.apache.doris.common.UserException; import org.apache.doris.common.util.Counter; @@ -28,7 +26,8 @@ import org.apache.doris.thrift.TUnit; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.tuple.ImmutableTriple; import org.apache.commons.lang3.tuple.Triple; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/publish/AckResponseHandler.java b/fe/fe-core/src/main/java/org/apache/doris/common/publish/AckResponseHandler.java index 1d6206ab6e..b95469d691 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/publish/AckResponseHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/publish/AckResponseHandler.java @@ -17,10 +17,10 @@ package org.apache.doris.common.publish; -import java.util.Collection; - import org.apache.doris.system.Backend; +import java.util.Collection; + // Response handler contain a listener public class AckResponseHandler extends ResponseHandler { private Listener listener; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/publish/ResponseHandler.java b/fe/fe-core/src/main/java/org/apache/doris/common/publish/ResponseHandler.java index fe44842bd5..b13eaa50cd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/publish/ResponseHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/publish/ResponseHandler.java @@ -18,6 +18,7 @@ package org.apache.doris.common.publish; import org.apache.doris.system.Backend; + import com.google.common.collect.Sets; import java.util.Collection; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/BitUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/BitUtil.java index 570275559f..84c4ec111a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/BitUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/BitUtil.java @@ -36,4 +36,3 @@ public class BitUtil { return (val + (factor - 1)) & ~(factor - 1); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/BrokerUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/BrokerUtil.java index 9e170e47b7..089a1186c1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/BrokerUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/BrokerUtil.java @@ -59,7 +59,6 @@ import org.apache.doris.thrift.TPaloBrokerService; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/CommandResult.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/CommandResult.java index ea15f9e9c4..327e39eaff 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/CommandResult.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/CommandResult.java @@ -22,7 +22,7 @@ public class CommandResult { private String stdout; private String stderr; private String errMsg; - + public CommandResult() { this.returnCode = -1; this.stdout = null; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/Counter.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/Counter.java index d79a88f5e1..8760021b2a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/Counter.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/Counter.java @@ -19,7 +19,7 @@ package org.apache.doris.common.util; import org.apache.doris.thrift.TUnit; -// Counter means indicators field. The counter's name is key, the counter itself is value. +// Counter means indicators field. The counter's name is key, the counter itself is value. public class Counter { private volatile long value; private volatile int type; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/Daemon.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/Daemon.java index 9edd8f3c2d..4d3e7d0a66 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/Daemon.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/Daemon.java @@ -27,12 +27,12 @@ import java.util.concurrent.atomic.AtomicBoolean; public class Daemon extends Thread { private static final Logger LOG = LogManager.getLogger(Daemon.class); private static final int DEFAULT_INTERVAL_SECONDS = 30; // 30 seconds - + private long intervalMs; private AtomicBoolean isStop; private Runnable runnable; private AtomicBoolean isStart = new AtomicBoolean(false); - + private MetaContext metaContext = null; { @@ -56,7 +56,7 @@ public class Daemon extends Thread { this.runnable = runnable; this.setName(((Object) runnable).toString()); } - + public Daemon(String name) { this(name, DEFAULT_INTERVAL_SECONDS * 1000L); } @@ -65,7 +65,7 @@ public class Daemon extends Thread { this(intervalMs); this.setName(name); } - + public Daemon(long intervalMs) { this(); this.intervalMs = intervalMs; @@ -74,7 +74,7 @@ public class Daemon extends Thread { public Runnable getRunnable() { return runnable; } - + @Override public synchronized void start() { if (isStart.compareAndSet(false, true)) { @@ -89,7 +89,7 @@ public class Daemon extends Thread { public void exit() { isStop.set(true); } - + public long getInterval() { return this.intervalMs; } @@ -97,12 +97,12 @@ public class Daemon extends Thread { public void setInterval(long intervalMs) { this.intervalMs = intervalMs; } - + /** * implement in child */ protected void runOneCycle() { - + } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/DebugUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/DebugUtil.java index 41d911820e..1ee79c0bdf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/DebugUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/DebugUtil.java @@ -32,11 +32,11 @@ public class DebugUtil { public static int THOUSAND = 1000; public static int MILLION = 1000 * THOUSAND; public static int BILLION = 1000 * MILLION; - + public static int SECOND = 1000; // ms public static int MINUTE = 60 * SECOND; public static int HOUR = 60 * MINUTE; - + public static long KILOBYTE = 1024; public static long MEGABYTE = 1024 * KILOBYTE; public static long GIGABYTE = 1024 * MEGABYTE; @@ -54,11 +54,11 @@ public class DebugUtil { } else if (value >= THOUSAND) { unit = "K"; doubleValue /= THOUSAND; - } - Pair returnValue = Pair.create(doubleValue, unit); + } + Pair returnValue = Pair.create(doubleValue, unit); return returnValue; } - + // Print the value (timestamp in ms) to builder // ATTN: for hour and minute granularity, we ignore ms precision. public static void printTimeMs(long value, StringBuilder builder) { @@ -72,7 +72,7 @@ public class DebugUtil { builder.append(newValue / HOUR).append("h"); newValue %= HOUR; hour = true; - } + } if (newValue >= MINUTE) { builder.append(newValue / MINUTE).append("m"); newValue %= MINUTE; @@ -87,13 +87,13 @@ public class DebugUtil { } } } - + public static String getPrettyStringMs(long timestampMs) { StringBuilder builder = new StringBuilder(); printTimeMs(timestampMs, builder); return builder.toString(); } - + public static Pair getByteUint(long value) { Double doubleValue = Double.valueOf(value); String unit = ""; @@ -115,7 +115,7 @@ public class DebugUtil { } else { unit = "B"; } - Pair returnValue = Pair.create(doubleValue, unit); + Pair returnValue = Pair.create(doubleValue, unit); return returnValue; } @@ -147,7 +147,7 @@ public class DebugUtil { builder.append(Long.toHexString(id.getHi())).append("-").append(Long.toHexString(id.getLo())); return builder.toString(); } - + public static String getStackTrace(Exception e) { StringWriter sw = new StringWriter(); e.printStackTrace(new PrintWriter(sw)); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java index ca077bd6c0..531937f085 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java @@ -17,11 +17,10 @@ package org.apache.doris.common.util; -import java.util.Objects; - +import com.google.gson.annotations.SerializedName; import org.apache.commons.lang.StringUtils; -import com.google.gson.annotations.SerializedName; +import java.util.Objects; /** * Parse software's version, like XX.YY.ZZ, where xx is major version, yy is minor version and ZZ is revision diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/DynamicPartitionUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/DynamicPartitionUtil.java index 1725ff4905..370d4a755c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/DynamicPartitionUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/DynamicPartitionUtil.java @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. - package org.apache.doris.common.util; import org.apache.doris.analysis.TimestampArithmeticExpr.TimeUnit; @@ -42,7 +41,6 @@ import org.apache.doris.common.UserException; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Range; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -55,13 +53,13 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Calendar; import java.util.Comparator; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TimeZone; -import java.util.Date; -import java.util.Calendar; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/KafkaUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/KafkaUtil.java index 3739ab22cf..3bdbd7e0a4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/KafkaUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/KafkaUtil.java @@ -28,7 +28,6 @@ import org.apache.doris.thrift.TNetworkAddress; import org.apache.doris.thrift.TStatusCode; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -54,7 +53,7 @@ public class KafkaUtil { Collections.shuffle(backendIds); Backend be = Catalog.getCurrentSystemInfo().getBackend(backendIds.get(0)); address = new TNetworkAddress(be.getHost(), be.getBrpcPort()); - + // create request InternalService.PProxyRequest request = InternalService.PProxyRequest.newBuilder().setKafkaMetaRequest( InternalService.PKafkaMetaProxyRequest.newBuilder() @@ -71,7 +70,7 @@ public class KafkaUtil { ) ) ).build(); - + // get info Future future = BackendServiceProxy.getInstance().getInfo(address, request); InternalService.PProxyResult result = future.get(5, TimeUnit.SECONDS); @@ -209,5 +208,3 @@ public class KafkaUtil { } } } - - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/MysqlUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/MysqlUtil.java index fa838e893b..b59aae97c2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/MysqlUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/MysqlUtil.java @@ -18,7 +18,6 @@ package org.apache.doris.common.util; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -78,4 +77,3 @@ public class MysqlUtil { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/OrderByPair.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/OrderByPair.java index f4600331b2..30e5e9de06 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/OrderByPair.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/OrderByPair.java @@ -39,4 +39,3 @@ public class OrderByPair { return isDesc; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/PlatformName.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/PlatformName.java index 75c677a988..48438b5109 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/PlatformName.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/PlatformName.java @@ -18,11 +18,11 @@ package org.apache.doris.common.util; public class PlatformName { - + private static final String platformName = System.getProperty("os.name") + "-" + System.getProperty("os.arch") + "-" + System.getProperty("sun.arch.data.model"); - + public static String getPlatformName() { return platformName; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java index 7e0d92067e..2eaa0a0533 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java @@ -30,7 +30,7 @@ public class PrintableMap { private boolean wrap; private boolean hidePassword; private String entryDelimiter = ","; - + public static final Set SENSITIVE_KEY; static { SENSITIVE_KEY = Sets.newTreeSet(String.CASE_INSENSITIVE_ORDER); @@ -38,7 +38,7 @@ public class PrintableMap { SENSITIVE_KEY.add("kerberos_keytab_content"); SENSITIVE_KEY.add("bos_secret_accesskey"); } - + public PrintableMap(Map map, String keyValueSeparator, boolean withQuotation, boolean wrap, String entryDelimiter) { this.map = map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/ProfileManager.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/ProfileManager.java index 05103f83ca..84a71c6e55 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/ProfileManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/ProfileManager.java @@ -25,7 +25,6 @@ import org.apache.doris.common.profile.ProfileTreeNode; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.commons.lang3.tuple.Triple; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -46,10 +45,10 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; * if you want to visit the attribute(such as queryID,defaultDb) * you can use profile.getInfoStrings("queryId") * All attributes can be seen from the above. - * + * * why the element in the finished profile array is not RuntimeProfile, - * the purpose is let coordinator can destruct earlier(the fragment profile is in Coordinator) - * + * the purpose is let coordinator can destruct earlier(the fragment profile is in Coordinator) + * */ public class ProfileManager { private static final Logger LOG = LogManager.getLogger(ProfileManager.class); @@ -83,16 +82,16 @@ public class ProfileManager { public MultiProfileTreeBuilder builder = null; public String errMsg = ""; } - + // only protect queryIdDeque; queryIdToProfileMap is concurrent, no need to protect - private ReentrantReadWriteLock lock; + private ReentrantReadWriteLock lock; private ReadLock readLock; private WriteLock writeLock; // record the order of profiles by queryId private Deque queryIdDeque; private Map queryIdToProfileMap; // from QueryId to RuntimeProfile - + public static ProfileManager getInstance() { if (INSTANCE == null) { synchronized (ProfileManager.class) { @@ -103,15 +102,15 @@ public class ProfileManager { } return INSTANCE; } - + private ProfileManager() { - lock = new ReentrantReadWriteLock(true); + lock = new ReentrantReadWriteLock(true); readLock = lock.readLock(); writeLock = lock.writeLock(); queryIdDeque = new LinkedList<>(); queryIdToProfileMap = new ConcurrentHashMap<>(); } - + public ProfileElement createElement(RuntimeProfile profile) { ProfileElement element = new ProfileElement(); RuntimeProfile summaryProfile = profile.getChildList().get(0).first; @@ -131,12 +130,12 @@ public class ProfileManager { element.builder = builder; return element; } - + public void pushProfile(RuntimeProfile profile) { if (profile == null) { return; } - + ProfileElement element = createElement(profile); String queryId = element.infoStrings.get(ProfileManager.QUERY_ID); // check when push in, which can ensure every element in the list has QUERY_ID column, diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java index 256cef8a78..4a27d9ca5e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java @@ -32,16 +32,15 @@ import org.apache.doris.catalog.Type; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.Config; import org.apache.doris.resource.Tag; +import org.apache.doris.thrift.TSortType; import org.apache.doris.thrift.TStorageFormat; import org.apache.doris.thrift.TStorageMedium; import org.apache.doris.thrift.TStorageType; import org.apache.doris.thrift.TTabletType; -import org.apache.doris.thrift.TSortType; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -69,12 +68,12 @@ public class PropertyAnalyzer { public static final String PROPERTIES_BF_FPP = "bloom_filter_fpp"; private static final double MAX_FPP = 0.05; private static final double MIN_FPP = 0.0001; - + public static final String PROPERTIES_COLUMN_SEPARATOR = "column_separator"; public static final String PROPERTIES_LINE_DELIMITER = "line_delimiter"; public static final String PROPERTIES_COLOCATE_WITH = "colocate_with"; - + public static final String PROPERTIES_TIMEOUT = "timeout"; public static final String PROPERTIES_DISTRIBUTION_TYPE = "distribution_type"; @@ -213,7 +212,7 @@ public class PropertyAnalyzer { Preconditions.checkNotNull(storageMedium); return new DataProperty(storageMedium, cooldownTimeStamp, remoteStorageResourceName, remoteCooldownTimeStamp); } - + public static short analyzeShortKeyColumnCount(Map properties) throws AnalysisException { short shortKeyColumnCount = (short) -1; if (properties != null && properties.containsKey(PROPERTIES_SHORT_KEY)) { @@ -306,7 +305,7 @@ public class PropertyAnalyzer { } return tTabletType; } - + public static long analyzeVersionInfo(Map properties) throws AnalysisException { long version = Partition.PARTITION_INIT_VERSION; if (properties != null && properties.containsKey(PROPERTIES_VERSION_INFO)) { @@ -448,7 +447,7 @@ public class PropertyAnalyzer { if (storageFormat.equalsIgnoreCase("v1")) { throw new AnalysisException("Storage format V1 has been deprecated since version 0.14, " - + "please use V2 instead"); + + "please use V2 instead"); } else if (storageFormat.equalsIgnoreCase("v2")) { return TStorageFormat.V2; } else if (storageFormat.equalsIgnoreCase("default")) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/RangeUtils.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/RangeUtils.java index 13e0f5ba0f..bf36a05cbb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/RangeUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/RangeUtils.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; public class RangeUtils { - + public static final Comparator> RANGE_MAP_ENTRY_COMPARATOR = Comparator.comparing(o -> (((RangePartitionItem)o.getValue()).getItems()).lowerEndpoint()); @@ -64,15 +64,15 @@ public class RangeUtils { * 2. {[0, 10), [15, 20)} exactly same as {[0, 10), [15, 18), [18, 20)} * 3. {[0, 10), [15, 20)} exactly same as {[0, 10), [15, 20)} * 4. {[0, 10), [15, 20)} NOT exactly same as {[0, 20)} - * + * * Here I will use an example to explain the algorithm: * list1: {[0, 10), [15, 20)} * list2: {[0, 10), [15, 18), [18, 20)} - * + * * 1. sort 2 lists first (the above 2 lists are already sorted) * 2. Begin to compare ranges from index 0: [0, 10) and [0, 10) * 2.1 lower bounds (0 and 0) are equal. - * 2.2 upper bounds (10 and 10) are equal. + * 2.2 upper bounds (10 and 10) are equal. * 3. Begin to compare next 2 ranges [15, 20) and [15, 18) * 3.1 lower bounds (15 and 15) are equal. * 3.2 upper bounds (20 and 18) are not equal. and 20 > 18 @@ -95,7 +95,7 @@ public class RangeUtils { throw new DdlException("2 range lists are not stricly matched. " + range1.lowerEndpoint() + " vs. " + range2.lowerEndpoint()); } - + int res = range1.upperEndpoint().compareTo(range2.upperEndpoint()); if (res == 0) { ++idx1; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/ReflectionUtils.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/ReflectionUtils.java index 03db66eb69..4bdd0d5be5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/ReflectionUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/ReflectionUtils.java @@ -25,17 +25,17 @@ import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; import java.lang.reflect.Constructor; -import java.util.concurrent.ConcurrentHashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; public class ReflectionUtils { private static final Class[] emptyArray = new Class[]{}; - - /** + + /** * Cache of constructors for each class. Pins the classes so they * can't be garbage collected until ReflectionUtils can be collected. */ - private static final Map, Constructor> CONSTRUCTOR_CACHE = + private static final Map, Constructor> CONSTRUCTOR_CACHE = new ConcurrentHashMap, Constructor>(); /** Create an object for the given class and initialize it from conf @@ -58,23 +58,23 @@ public class ReflectionUtils { return result; } - static private ThreadMXBean threadBean = + static private ThreadMXBean threadBean = ManagementFactory.getThreadMXBean(); - + public static void setContentionTracing(boolean val) { threadBean.setThreadContentionMonitoringEnabled(val); } - + private static String getTaskName(long id, String name) { if (name == null) { return Long.toString(id); } return id + " (" + name + ")"; } - + /** * Print all of the thread's information and stack traces. - * + * * @param stream the stream to * @param title a string title for the stack trace */ @@ -84,14 +84,14 @@ public class ReflectionUtils { long[] threadIds = threadBean.getAllThreadIds(); stream.println("Process Thread Dump: " + title); stream.println(threadIds.length + " active threads"); - + for (long tid: threadIds) { ThreadInfo info = threadBean.getThreadInfo(tid, STACK_DEPTH); if (info == null) { stream.println(" Inactive"); continue; } - stream.println("Thread " + + stream.println("Thread " + getTaskName(info.getThreadId(), info.getThreadName()) + ":"); Thread.State state = info.getThreadState(); stream.println(" State: " + state); @@ -105,7 +105,7 @@ public class ReflectionUtils { stream.println(" Waiting on " + info.getLockName()); } else if (state == Thread.State.BLOCKED) { stream.println(" Blocked on " + info.getLockName()); - stream.println(" Blocked by " + + stream.println(" Blocked by " + getTaskName(info.getLockOwnerId(), info.getLockOwnerName())); } stream.println(" Stack:"); @@ -113,17 +113,17 @@ public class ReflectionUtils { stream.println(" " + frame.toString()); } } - + stream.flush(); } - + private static long previousLogTime = 0; - + /** * Log the current thread stacks at INFO level. * @param log the logger that logs the stack trace * @param title a descriptive title for the call stacks - * @param minInterval the minimum time from the last + * @param minInterval the minimum time from the last */ public static void logThreadInfo(Logger log, String title, long minInterval) { boolean dumpStack = false; @@ -135,7 +135,7 @@ public class ReflectionUtils { dumpStack = true; } } - + if (dumpStack) { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); printThreadInfo(new PrintWriter(buffer), title); @@ -146,19 +146,19 @@ public class ReflectionUtils { /** * Return the correctly-typed {@link Class} of the given object. - * + * * @param o object whose correctly-typed Class is to be obtained * @return the correctly typed Class of the given object. */ public static Class getClass(T o) { return (Class)o.getClass(); } - + // methods to support testing static void clearCache() { CONSTRUCTOR_CACHE.clear(); } - + static int getCacheSize() { return CONSTRUCTOR_CACHE.size(); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/RuntimeProfile.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/RuntimeProfile.java index 9d465020b7..12d78cfe9e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/RuntimeProfile.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/RuntimeProfile.java @@ -27,7 +27,6 @@ import org.apache.doris.thrift.TUnit; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -471,4 +470,3 @@ public class RuntimeProfile { return infoStrings.get(key); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/S3URI.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/S3URI.java index 1cf1b80ca9..aac04354cb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/S3URI.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/S3URI.java @@ -20,7 +20,6 @@ package org.apache.doris.common.util; import org.apache.doris.common.UserException; import com.google.common.collect.ImmutableSet; - import org.apache.parquet.Strings; import org.apache.parquet.glob.GlobExpander; @@ -173,4 +172,3 @@ public class S3URI { return location; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/SmallFileMgr.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/SmallFileMgr.java index 7ee6354b50..ba9305cbfa 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/SmallFileMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/SmallFileMgr.java @@ -31,7 +31,6 @@ import com.google.common.collect.HashBasedTable; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Table; - import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; import org.apache.logging.log4j.LogManager; @@ -298,12 +297,12 @@ public class SmallFileMgr implements Writable { } urlConnection.setReadTimeout(10000); // 10s urlConnection.getInputStream(); - + int contentLength = urlConnection.getContentLength(); if (contentLength == -1 || contentLength > Config.max_small_file_size_bytes) { throw new DdlException("Failed to download file from url: " + url + ", invalid content length: " + contentLength); } - + int bytesRead = 0; String base64Content = null; MessageDigest digest = MessageDigest.getInstance("MD5"); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/SqlBlockUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/SqlBlockUtil.java index a798d03a38..2a140b2e2e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/SqlBlockUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/SqlBlockUtil.java @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. - package org.apache.doris.common.util; import org.apache.doris.blockrule.SqlBlockRule; @@ -97,4 +96,3 @@ public class SqlBlockUtil { } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/SqlParserUtils.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/SqlParserUtils.java index 3985327e06..b75dc49748 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/SqlParserUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/SqlParserUtils.java @@ -25,6 +25,7 @@ import org.apache.doris.analysis.StatementBase; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; import org.apache.doris.qe.ConnectContext; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -59,25 +60,25 @@ public class SqlParserUtils { List stmts = (List) parser.parse().value; /* * When user execute query by some client library such as python MysqlDb, if user execute like: - * + * * "select * from tbl1;" (with a comma at the end of statement) - * + * * The sql parser will produce 2 statements: SelectStmt and EmptyStmt. * Here we discard the second EmptyStmt to make it act like one single statement. * This is for some compatibility. Because in python MysqlDb, if the first SelectStmt results in * some warnings, it will try to execute a 'SHOW WARNINGS' statement right after the SelectStmt, * but before the execution of EmptyStmt. So there will be an exception: - * + * * (2014, "Commands out of sync; you can't run this command now") - * + * * I though it is a flaw of python MysqlDb. * However, in order to maintain the consistency of user use, here we remove all EmptyStmt * at the end to prevent errors.(Leave at least one statement) - * + * * But if user execute statements like: - * + * * "select * from tbl1;;select 2" - * + * * If first "select * from tbl1" has warnings, python MysqlDb will still throw exception. */ while (stmts.size() > 1 && stmts.get(stmts.size() - 1) instanceof EmptyStmt) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/SymmetricEncryption.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/SymmetricEncryption.java index 4ab6f8045b..a8ec88db7c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/SymmetricEncryption.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/SymmetricEncryption.java @@ -18,7 +18,6 @@ package org.apache.doris.common.util; import com.google.common.base.Strings; - import org.apache.commons.codec.binary.Base64; import java.nio.charset.StandardCharsets; @@ -26,7 +25,6 @@ import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; - import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.IvParameterSpec; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/TimeUtils.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/TimeUtils.java index d90325fd30..2a0d8efe0b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/TimeUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/TimeUtils.java @@ -29,7 +29,6 @@ import org.apache.doris.qe.VariableMgr; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -62,7 +61,7 @@ public class TimeUtils { private static final SimpleDateFormat DATE_FORMAT; private static final SimpleDateFormat DATETIME_FORMAT; private static final SimpleDateFormat TIME_FORMAT; - + private static final Pattern DATETIME_FORMAT_REG = Pattern.compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?" + "((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?" @@ -71,12 +70,12 @@ public class TimeUtils { + "[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?" + "((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))" + "(\\s(((0?[0-9])|([1][0-9])|([2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$"); - + private static final Pattern TIMEZONE_OFFSET_FORMAT_REG = Pattern.compile("^[+-]?\\d{1,2}:\\d{2}$"); public static Date MIN_DATE = null; public static Date MAX_DATE = null; - + public static Date MIN_DATETIME = null; public static Date MAX_DATETIME = null; @@ -85,7 +84,7 @@ public class TimeUtils { static { TIME_ZONE = new SimpleTimeZone(8 * 3600 * 1000, ""); - + DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); DATE_FORMAT.setTimeZone(TIME_ZONE); @@ -107,15 +106,15 @@ public class TimeUtils { System.exit(-1); } } - + public static long getStartTime() { return System.nanoTime(); } - + public static long getEstimatedTime(long startTime) { return System.nanoTime() - startTime; } - + public static synchronized String getCurrentFormatTime() { return DATETIME_FORMAT.format(new Date()); } @@ -142,7 +141,7 @@ public class TimeUtils { } return TimeZone.getTimeZone(ZoneId.of(timeZone, timeZoneAliasMap)); } - + public static String longToTimeString(long timeStamp, SimpleDateFormat dateFormat) { if (timeStamp <= 0L) { return FeConstants.null_string; @@ -156,7 +155,7 @@ public class TimeUtils { datetimeFormatTimeZone.setTimeZone(timeZone); return longToTimeString(timeStamp, datetimeFormatTimeZone); } - + public static synchronized Date getTimeAsDate(String timeString) { try { Date date = TIME_FORMAT.parse(timeString); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java index 1ef89510a7..abbecd3684 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java @@ -22,12 +22,11 @@ import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.common.AnalysisException; import org.apache.doris.qe.ConnectContext; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.BufferedReader; import java.io.DataInput; @@ -77,7 +76,7 @@ public class Util { TYPE_STRING_MAP.put(PrimitiveType.ARRAY, "Array<%s>"); TYPE_STRING_MAP.put(PrimitiveType.NULL_TYPE, "null"); } - + private static class CmdWorker extends Thread { private final Process process; private Integer exitValue; @@ -159,7 +158,7 @@ public class Util { exitValue = cmdWorker.getExitValue(); if (exitValue == null) { // if we get this far then we never got an exit value from the worker thread - // as a result of a timeout + // as a result of a timeout LOG.warn("exec command [{}] timed out.", cmd); exitValue = -1; } @@ -182,7 +181,7 @@ public class Util { return result; } - + public static List shellSplit(CharSequence string) { List tokens = new ArrayList(); boolean escaping = false; @@ -225,11 +224,11 @@ public class Util { } return sb.toString(); } - + public static int generateSchemaHash() { return Math.abs(new Random().nextInt()); } - + /** * Chooses k unique random elements from a population sequence */ @@ -241,7 +240,7 @@ public class Util { Collections.shuffle(population); return population.subList(0, kNum); } - + /** * Delete directory and all contents in this directory */ @@ -326,7 +325,7 @@ public class Util { if (Strings.isNullOrEmpty(valStr)) { return defaultVal; } - + long result = defaultVal; try { result = Long.valueOf(valStr); @@ -416,7 +415,7 @@ public class Util { return result; } - + // return the ordinal string of an Integer public static String ordinal(int i) { switch (i % 100) { @@ -457,4 +456,3 @@ public class Util { return s; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/VectorizedUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/VectorizedUtil.java index 4b793a0e9b..6615ad0fb6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/VectorizedUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/VectorizedUtil.java @@ -70,4 +70,3 @@ public class VectorizedUtil { analyzer.disableQueryVec(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/consistency/CheckConsistencyJob.java b/fe/fe-core/src/main/java/org/apache/doris/consistency/CheckConsistencyJob.java index 7315bc68bb..c78fba3925 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/consistency/CheckConsistencyJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/consistency/CheckConsistencyJob.java @@ -41,7 +41,6 @@ import org.apache.doris.thrift.TTaskType; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -60,7 +59,7 @@ public class CheckConsistencyJob { private JobState state; private long tabletId; - + // backend id -> check sum // add backend id to this map only after sending task private Map checksumMap; @@ -124,7 +123,7 @@ public class CheckConsistencyJob { if (ConnectContext.get() != null) { resourceInfo = ConnectContext.get().toResourceCtx(); } - + Tablet tablet = null; AgentBatchTask batchTask = new AgentBatchTask(); @@ -395,4 +394,3 @@ public class CheckConsistencyJob { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/consistency/ConsistencyChecker.java b/fe/fe-core/src/main/java/org/apache/doris/consistency/ConsistencyChecker.java index fd35495f2c..dfcadcef3d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/consistency/ConsistencyChecker.java +++ b/fe/fe-core/src/main/java/org/apache/doris/consistency/ConsistencyChecker.java @@ -37,7 +37,6 @@ import org.apache.doris.task.CheckConsistencyTask; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -53,12 +52,12 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; public class ConsistencyChecker extends MasterDaemon { private static final Logger LOG = LogManager.getLogger(ConsistencyChecker.class); - + private static final int MAX_JOB_NUM = 100; private static final Comparator COMPARATOR = (first, second) -> Long.signum(first.getLastCheckTime() - second.getLastCheckTime()); - + // tabletId -> job private Map jobs; @@ -68,7 +67,7 @@ public class ConsistencyChecker extends MasterDaemon { * jobs lock * CheckConsistencyJob's synchronized * db lock - * + * * if reversal is inevitable. use db.tryLock() instead to avoid dead lock */ private ReentrantReadWriteLock jobsLock; @@ -107,7 +106,7 @@ public class ConsistencyChecker extends MasterDaemon { LOG.info("consistency checker will work from {}:00 to {}:00", startTime, endTime); return true; } - + @Override protected void runAfterCatalogReady() { // for each round. try chose enough new tablets to check @@ -185,7 +184,7 @@ public class ConsistencyChecker extends MasterDaemon { LOG.debug("current time is {}:00, waiting to {}:00 to {}:00", currentTime, startTime, endTime); } - + return isTime; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java b/fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java index 8927484bd3..cfd6969f3b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java @@ -33,7 +33,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.commons.lang.NotImplementedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -46,64 +45,64 @@ import java.util.Map; /* * This deploy manager is to support Kubernetes, Ambari or other system for automating deployment. * The deploy manager will try to get the helper node when initialize catalog. - * When this FE is transfer to Master, it will start a polling thread to detect the node change of at most 4 + * When this FE is transfer to Master, it will start a polling thread to detect the node change of at most 4 * service groups in remote deployment system: - * + * * electableFeServiceGroup: contains Master and Follower FE * backendServiceGroup: contains Backends * observerFeServiceGroup: contains Observer FE (optional, k8s only) * brokerServiceGroup: contains Broker (optional, Ambari only) - * + * * When node changing is detected, the deploy manager will try to ADD or DROP the new or missing node. - * + * * Current support operations: - * + * * A. Startup * 1. Start 1 Frontend(FE), and automatically transfer to the single startup Master. * 2. Start 3 FEs, they will reach a consensus on choosing first FE in node list as startup Master. - * + * * B. Expansion * 1. With 1 existing FE(Master), add 2 FEs to reach HA. * 2. With 1 or 3 existing FE(Master + Follower), add more FE(observer). * 3. With 1 or 3 existing FE(Master + Follower), add more Backends(BE). * 3. With 1 or 3 existing FE(Master + Follower), add more Broker. - * + * * C. Shrink * 1. With 3 existing FEs, drop 2 FEs. * 2. With 1 or 3 existing FE(Master + Follower), drop existing FE(observer). * 3. With 1 or 3 existing FE(Master + Follower), drop existing BE. * 3. With 1 or 3 existing FE(Master + Follower), drop existing Broker. - * + * * Environment variables: - * + * * FE_EXIST_ENTPOINT: * he existing FE(Master + Follower) before the new FE start up. - * The main reason of this var is to indicate whether there is already an alive Master + * The main reason of this var is to indicate whether there is already an alive Master * or the consensus of who is master is needed. - * + * * FE_INIT_NUMBER: * Number of newly start up FE(Master + Follower), can only be 1 or 3. - * + * * Only one of FE_EXIST_ENTPOINT and FE_INIT_NUMBER need to be set. - * + * * eg: - * + * * 1. Start 1 FE as a single Master * set FE_EXIST_ENTPOINT as empty * set FE_INIT_NUMBER = 1 - * + * * 2. Start 3 FE(Master + Follower) * set FE_EXIST_ENTPOINT as empty * set FE_INIT_NUMBER = 3 - * + * * 3. With 1 existing FE(Master), add 2 FEs to reach HA. * set FE_EXIST_ENTPOINT=existing_fe_host:edit_log_port * set FE_INIT_NUMBER as empty - * + * */ public class DeployManager extends MasterDaemon { private static final Logger LOG = LogManager.getLogger(DeployManager.class); - + // We misspelled the environment value ENV_FE_EXIST_ENT(D)POINT. But for forward compatibility, // we have to keep this misspelling for a while. // TODO(cmy): remove it later @@ -303,7 +302,7 @@ public class DeployManager extends MasterDaemon { System.exit(-1); } } - + LOG.info("get electable fe host from remote: {}", feHostPorts); break; } @@ -493,7 +492,7 @@ public class DeployManager extends MasterDaemon { * Inspect the node change. * 1. Check if there are some nodes need to be dropped. * 2. Check if there are some nodes need to be added. - * + * * We only handle one change at a time. * Return true if something changed */ @@ -513,7 +512,7 @@ public class DeployManager extends MasterDaemon { LOG.error("self host {}:{} does not exist in remote hosts. Showdown."); System.exit(-1); } - + // Check the detected downtime if (!counterMap.containsKey(localHost.toString())) { // First detected downtime. Add to the map and ignore diff --git a/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/AmbariDeployManager.java b/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/AmbariDeployManager.java index cf8691a1fd..c7dac953f7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/AmbariDeployManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/AmbariDeployManager.java @@ -28,7 +28,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -41,7 +40,7 @@ import java.util.Map; /* * Required env variables: - * + * * FE_EXIST_HOSTS={{fe_hosts}} * FE_INIT_NUMBER={{fe_init_number}} * ENV_AMBARI_HOST={{ambari_server_host}} @@ -77,7 +76,7 @@ public class AmbariDeployManager extends DeployManager { // url public static final String URL_BLUEPRINT = "http://%s/api/v1/clusters/%s?format=blueprint"; public static final String URL_COMPONENTS = "http://%s/api/v1/clusters/%s/services/%s/components/%s"; - + // keywords in json public static final String KEY_BE_HEARTBEAT_PORT = "be_heartbeat_service_port"; public static final String KEY_FE_EDIT_LOG_PORT = "fe_edit_log_port"; @@ -86,7 +85,7 @@ public class AmbariDeployManager extends DeployManager { public static final String KEY_HOST_COMPONENTS = "host_components"; public static final String KEY_HOST_ROLES = "HostRoles"; public static final String KEY_HOST_NAME = "host_name"; - + private String authInfo; private String encodedAuthInfo; private String ambariUrl; @@ -115,7 +114,7 @@ public class AmbariDeployManager extends DeployManager { String envBackendServiceGroup, String envBrokerServiceGroup) { super.initEnvVariables(envElectableFeServiceGroup, envObserverFeServiceGroup, envBackendServiceGroup, envBrokerServiceGroup); - + this.feConfigNode = Strings.nullToEmpty(System.getenv(ENV_AMBARI_FE_COMPONENTS_CONFIG)); this.beConfigNode = Strings.nullToEmpty(System.getenv(ENV_AMBARI_BE_COMPONENTS_CONFIG)); this.brokerConfigNode = Strings.nullToEmpty(System.getenv(ENV_AMBARI_BROKER_COMPONENTS_CONFIG)); @@ -146,7 +145,7 @@ public class AmbariDeployManager extends DeployManager { LOG.error("failed to get ambari host {} or ambari port {}", ambariHost, ambariPort); System.exit(-1); } - + int port = -1; try { port = Integer.valueOf(ambariPort); @@ -181,7 +180,7 @@ public class AmbariDeployManager extends DeployManager { System.exit(-1); } } - + @Override protected boolean init() { super.init(); @@ -267,7 +266,7 @@ public class AmbariDeployManager extends DeployManager { private Integer getBeHeartbeatPort() { return getPort(beConfigNode, KEY_BE_HEARTBEAT_PORT); } - + private Integer getBrokerIpcPort() { return getPort(brokerConfigNode, KEY_BROKER_IPC_PORT); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/K8sDeployManager.java b/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/K8sDeployManager.java index 9144daaf5b..ee329d9af6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/K8sDeployManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/K8sDeployManager.java @@ -26,13 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.List; -import java.util.Map; - import io.fabric8.kubernetes.api.model.EndpointAddress; import io.fabric8.kubernetes.api.model.EndpointPort; import io.fabric8.kubernetes.api.model.EndpointSubset; @@ -41,10 +34,15 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.List; +import java.util.Map; public class K8sDeployManager extends DeployManager { private static final Logger LOG = LogManager.getLogger(K8sDeployManager.class); - + public static final String ENV_APP_NAMESPACE = "APP_NAMESPACE"; // each SERVICE (FE/BE/OBSERVER/BROKER) represents a module of Palo, such as Frontends, Backends, ... // and each service has a name in k8s. @@ -52,7 +50,7 @@ public class K8sDeployManager extends DeployManager { public static final String ENV_FE_OBSERVER_SERVICE = "FE_OBSERVER_SERVICE"; public static final String ENV_BE_SERVICE = "BE_SERVICE"; public static final String ENV_BROKER_SERVICE = "BROKER_SERVICE"; - + // we arbitrarily set all broker name as what ENV_BROKER_NAME specified. public static final String ENV_BROKER_NAME = "BROKER_NAME"; @@ -69,7 +67,7 @@ public class K8sDeployManager extends DeployManager { public static final String K8S_CA_CERT_FILE = "cce-ca.pem"; public static final String K8S_CLIENT_CERT_FILE = "cce-admin.pem"; public static final String K8S_CLIENT_KEY_FILE = "cce-admin-key.pem"; - + public static final String TEST_MASTER_URL = "https://127.0.0.1:1111/"; public static final String TEST_NAMESPACE = "default"; public static final String TEST_SERVICENAME = "palo-fe"; @@ -184,7 +182,7 @@ public class K8sDeployManager extends DeployManager { if (client != null) { return client; } - + try { if (Config.with_k8s_certs) { // for test only diff --git a/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/LocalFileDeployManager.java b/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/LocalFileDeployManager.java index 55538be6a3..cbbae8b34a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/LocalFileDeployManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/LocalFileDeployManager.java @@ -26,7 +26,6 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java index 95816410c3..46108314d3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java @@ -27,7 +27,6 @@ import org.apache.doris.common.Config; import org.apache.doris.common.util.MasterDaemon; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRestClient.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRestClient.java index 467047ac8c..d4fc26040b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRestClient.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRestClient.java @@ -17,6 +17,10 @@ package org.apache.doris.external.elasticsearch; +import okhttp3.Credentials; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; import org.apache.http.HttpHeaders; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -34,7 +38,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; - import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; @@ -42,11 +45,6 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import okhttp3.Credentials; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; - public class EsRestClient { private static final Logger LOG = LogManager.getLogger(EsRestClient.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardPartitions.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardPartitions.java index 967cf18eea..e2db385df2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardPartitions.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardPartitions.java @@ -23,7 +23,6 @@ import org.apache.doris.thrift.TNetworkAddress; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.simple.JSONArray; diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardRouting.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardRouting.java index e54923d99b..01462c5990 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardRouting.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardRouting.java @@ -20,7 +20,6 @@ package org.apache.doris.external.elasticsearch; import org.apache.doris.thrift.TNetworkAddress; import com.google.common.base.Strings; - import org.json.simple.JSONObject; public class EsShardRouting { @@ -32,7 +31,7 @@ public class EsShardRouting { private TNetworkAddress httpAddress; private final String nodeId; - + public EsShardRouting(String indexName, int shardId, boolean isPrimary, TNetworkAddress address, String nodeId) { this.indexName = indexName; this.shardId = shardId; @@ -40,7 +39,7 @@ public class EsShardRouting { this.address = address; this.nodeId = nodeId; } - + public static EsShardRouting newSearchShard(String indexName, int shardId, boolean isPrimary, String nodeId, JSONObject nodesMap) { JSONObject nodeInfo = (JSONObject) nodesMap.get(nodeId); @@ -54,7 +53,7 @@ public class EsShardRouting { } return new EsShardRouting(indexName, shardId, isPrimary, addr, nodeId); } - + public int getShardId() { return shardId; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsTablePartitions.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsTablePartitions.java index 43f70130ad..b493338e43 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsTablePartitions.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsTablePartitions.java @@ -25,11 +25,10 @@ import org.apache.doris.catalog.RangePartitionInfo; import org.apache.doris.catalog.SinglePartitionInfo; import org.apache.doris.common.DdlException; +import com.google.common.collect.Maps; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.google.common.collect.Maps; - import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -106,7 +105,7 @@ public class EsTablePartitions { } return esTablePartitions; } - + public PartitionInfo getPartitionInfo() { return partitionInfo; } @@ -118,11 +117,11 @@ public class EsTablePartitions { public Map getPartitionIdToIndices() { return partitionIdToIndices; } - + public void addPartition(String indexName, long partitionId) { partitionIdToIndices.put(partitionId, indexName); } - + public void addIndexState(String indexName, EsShardPartitions indexState) { if (indexState.getPartitionDesc() != null) { partitionedIndexStates.put(indexName, indexState); @@ -138,14 +137,14 @@ public class EsTablePartitions { public Map getUnPartitionedIndexStates() { return unPartitionedIndexStates; } - + public EsShardPartitions getEsShardPartitions(long partitionId) { if (partitionIdToIndices.containsKey(partitionId)) { return partitionedIndexStates.get(partitionIdToIndices.get(partitionId)); } return null; } - + public EsShardPartitions getEsShardPartitions(String indexName) { if (partitionedIndexStates.containsKey(indexName)) { return partitionedIndexStates.get(indexName); diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsUtil.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsUtil.java index 4dd0fcb2d7..dc1f6b60dc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsUtil.java @@ -28,40 +28,40 @@ import org.json.simple.JSONObject; import java.util.Map; public class EsUtil { - + public static void analyzePartitionAndDistributionDesc(PartitionDesc partitionDesc, DistributionDesc distributionDesc) throws AnalysisException { if (partitionDesc == null && distributionDesc == null) { return; } - + if (partitionDesc != null) { if (!(partitionDesc instanceof RangePartitionDesc)) { throw new AnalysisException("Elasticsearch table only permit range partition"); } - + RangePartitionDesc rangePartitionDesc = (RangePartitionDesc) partitionDesc; analyzePartitionDesc(rangePartitionDesc); } - + if (distributionDesc != null) { throw new AnalysisException("could not support distribution clause"); } } - + private static void analyzePartitionDesc(RangePartitionDesc partDesc) throws AnalysisException { if (partDesc.getPartitionColNames() == null || partDesc.getPartitionColNames().isEmpty()) { throw new AnalysisException("No partition columns."); } - + if (partDesc.getPartitionColNames().size() > 1) { throw new AnalysisException( "Elasticsearch table's partition column could only be a single column"); } } - - + + /** * get the json object from specified jsonObject * @@ -86,7 +86,7 @@ public class EsUtil { return null; } } - + public static boolean getBoolean(Map properties, String name) throws DdlException { String property = properties.get(name).trim(); try { diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/QueryBuilders.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/QueryBuilders.java index cf514707b4..92aea914bd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/QueryBuilders.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/QueryBuilders.java @@ -18,6 +18,7 @@ package org.apache.doris.external.elasticsearch; import com.fasterxml.jackson.core.JsonGenerator; + import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/SearchContext.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/SearchContext.java index 3e9e03dc9f..6d55856209 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/SearchContext.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/SearchContext.java @@ -21,7 +21,6 @@ import org.apache.doris.catalog.Column; import org.apache.doris.catalog.EsTable; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/HiveCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/HiveCatalog.java index 21a3db8ddd..764086f529 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/HiveCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/HiveCatalog.java @@ -18,6 +18,7 @@ package org.apache.doris.external.iceberg; import org.apache.doris.catalog.IcebergProperty; + import org.apache.hadoop.conf.Configuration; import org.apache.iceberg.Table; import org.apache.iceberg.catalog.Namespace; diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergCatalog.java index dda3b876b0..ccb7402677 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergCatalog.java @@ -19,6 +19,7 @@ package org.apache.doris.external.iceberg; import org.apache.doris.catalog.IcebergProperty; + import org.apache.iceberg.Table; import org.apache.iceberg.catalog.TableIdentifier; diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergCatalogMgr.java b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergCatalogMgr.java index bbc6b26922..ab0aba4dc7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergCatalogMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergCatalogMgr.java @@ -25,12 +25,12 @@ import org.apache.doris.catalog.IcebergTable; import org.apache.doris.common.DdlException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; +import org.apache.doris.common.SystemIdGenerator; import org.apache.doris.external.iceberg.util.IcebergUtils; import com.google.common.base.Enums; import com.google.common.base.Strings; import com.google.common.collect.Maps; - import org.apache.iceberg.catalog.TableIdentifier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,12 +39,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static org.apache.doris.catalog.IcebergProperty.ICEBERG_CATALOG_TYPE; -import static org.apache.doris.catalog.IcebergProperty.ICEBERG_DATABASE; -import static org.apache.doris.catalog.IcebergProperty.ICEBERG_HIVE_METASTORE_URIS; -import static org.apache.doris.catalog.IcebergProperty.ICEBERG_TABLE; -import static org.apache.doris.common.SystemIdGenerator.getNextId; - /** * Iceberg catalog manager */ @@ -92,27 +86,29 @@ public class IcebergCatalogMgr { } Map copiedProps = Maps.newHashMap(properties); - String icebergDb = copiedProps.get(ICEBERG_DATABASE); + String icebergDb = copiedProps.get(IcebergProperty.ICEBERG_DATABASE); if (Strings.isNullOrEmpty(icebergDb)) { - throw new DdlException(String.format(PROPERTY_MISSING_MSG, ICEBERG_DATABASE, ICEBERG_DATABASE)); + throw new DdlException(String.format(PROPERTY_MISSING_MSG, + IcebergProperty.ICEBERG_DATABASE, IcebergProperty.ICEBERG_DATABASE)); } - copiedProps.remove(ICEBERG_DATABASE); + copiedProps.remove(IcebergProperty.ICEBERG_DATABASE); // check hive properties // hive.metastore.uris - String hiveMetastoreUris = copiedProps.get(ICEBERG_HIVE_METASTORE_URIS); + String hiveMetastoreUris = copiedProps.get(IcebergProperty.ICEBERG_HIVE_METASTORE_URIS); if (Strings.isNullOrEmpty(hiveMetastoreUris)) { - throw new DdlException(String.format(PROPERTY_MISSING_MSG, ICEBERG_HIVE_METASTORE_URIS, ICEBERG_HIVE_METASTORE_URIS)); + throw new DdlException(String.format(PROPERTY_MISSING_MSG, + IcebergProperty.ICEBERG_HIVE_METASTORE_URIS, IcebergProperty.ICEBERG_HIVE_METASTORE_URIS)); } - copiedProps.remove(ICEBERG_HIVE_METASTORE_URIS); + copiedProps.remove(IcebergProperty.ICEBERG_HIVE_METASTORE_URIS); // check iceberg catalog type - String icebergCatalogType = copiedProps.get(ICEBERG_CATALOG_TYPE); + String icebergCatalogType = copiedProps.get(IcebergProperty.ICEBERG_CATALOG_TYPE); if (Strings.isNullOrEmpty(icebergCatalogType)) { icebergCatalogType = IcebergCatalogMgr.CatalogType.HIVE_CATALOG.name(); - properties.put(ICEBERG_CATALOG_TYPE, icebergCatalogType); + properties.put(IcebergProperty.ICEBERG_CATALOG_TYPE, icebergCatalogType); } else { - copiedProps.remove(ICEBERG_CATALOG_TYPE); + copiedProps.remove(IcebergProperty.ICEBERG_CATALOG_TYPE); } if (!Enums.getIfPresent(IcebergCatalogMgr.CatalogType.class, icebergCatalogType).isPresent()) { @@ -121,11 +117,12 @@ public class IcebergCatalogMgr { // only check table property when it's an iceberg table if (isTable) { - String icebergTbl = copiedProps.get(ICEBERG_TABLE); + String icebergTbl = copiedProps.get(IcebergProperty.ICEBERG_TABLE); if (Strings.isNullOrEmpty(icebergTbl)) { - throw new DdlException(String.format(PROPERTY_MISSING_MSG, ICEBERG_TABLE, ICEBERG_TABLE)); + throw new DdlException(String.format(PROPERTY_MISSING_MSG, + IcebergProperty.ICEBERG_TABLE, IcebergProperty.ICEBERG_TABLE)); } - copiedProps.remove(ICEBERG_TABLE); + copiedProps.remove(IcebergProperty.ICEBERG_TABLE); } if (!copiedProps.isEmpty()) { @@ -192,7 +189,7 @@ public class IcebergCatalogMgr { // 1. Already set column def in Create Stmt, just create table // 2. No column def in Create Stmt, get it from remote Iceberg schema. IcebergTable table; - long tableId = getNextId(); + long tableId = SystemIdGenerator.getNextId(); if (stmt.getColumns().size() > 0) { // set column def in CREATE TABLE table = new IcebergTable(tableId, tableName, stmt.getColumns(), icebergProperty, null); diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergTableCreationRecordMgr.java b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergTableCreationRecordMgr.java index 16da4456b1..1765c9946b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergTableCreationRecordMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/IcebergTableCreationRecordMgr.java @@ -30,7 +30,6 @@ import org.apache.doris.common.property.PropertySchema; import org.apache.doris.common.util.MasterDaemon; import com.google.common.collect.Maps; - import org.apache.iceberg.catalog.TableIdentifier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/util/IcebergUtils.java b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/util/IcebergUtils.java index 779860baf4..325541e79d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/util/IcebergUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/util/IcebergUtils.java @@ -42,7 +42,6 @@ import org.apache.doris.thrift.TExprOpcode; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.iceberg.CombinedScanTask; import org.apache.iceberg.MetadataTableType; import org.apache.iceberg.MetadataTableUtils; diff --git a/fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java b/fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java index bbe7326ef7..c08011a603 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java +++ b/fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java @@ -32,7 +32,6 @@ import com.sleepycat.je.rep.ReplicationGroup; import com.sleepycat.je.rep.ReplicationNode; import com.sleepycat.je.rep.UnknownMasterException; import com.sleepycat.je.rep.util.ReplicationGroupAdmin; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -43,11 +42,11 @@ import java.util.Set; public class BDBHA implements HAProtocol { private static final Logger LOG = LogManager.getLogger(BDBHA.class); - + private BDBEnvironment environment; private String nodeName; private static final int RETRY_TIME = 3; - + public BDBHA(BDBEnvironment env, String nodeName) { this.environment = env; this.nodeName = nodeName; @@ -61,7 +60,7 @@ public class BDBHA implements HAProtocol { @Override public boolean fencing() { Database epochDb = environment.getEpochDB(); - + for (int i = 0; i < RETRY_TIME; i++) { try { long count = epochDb.count(); @@ -172,12 +171,12 @@ public class BDBHA implements HAProtocol { @Override public void transferToMaster() { - + } - + @Override public void transferToNonMaster() { - + } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/ha/BDBStateChangeListener.java b/fe/fe-core/src/main/java/org/apache/doris/ha/BDBStateChangeListener.java index 3b519dd38b..61058efc51 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/ha/BDBStateChangeListener.java +++ b/fe/fe-core/src/main/java/org/apache/doris/ha/BDBStateChangeListener.java @@ -23,7 +23,6 @@ import org.apache.doris.common.util.Util; import com.google.common.base.Preconditions; import com.sleepycat.je.rep.StateChangeEvent; import com.sleepycat.je.rep.StateChangeListener; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/ha/HAProtocol.java b/fe/fe-core/src/main/java/org/apache/doris/ha/HAProtocol.java index 87c8f403b2..8160c0b9f1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/ha/HAProtocol.java +++ b/fe/fe-core/src/main/java/org/apache/doris/ha/HAProtocol.java @@ -23,31 +23,31 @@ import java.util.List; public interface HAProtocol { // get current epoch number public long getEpochNumber(); - + // increase epoch number by one public boolean fencing(); - + // get observer nodes in the current group public List getObserverNodes(); - + // get replica nodes in the current group public List getElectableNodes(boolean leaderIncluded); - + // get the leader of current group public InetSocketAddress getLeader(); - + // get all the nodes except leader in the current group public List getNoneLeaderNodes(); - + // transfer from nonMaster(unknown, follower or init) to master public void transferToMaster(); - + // transfer to non-master public void transferToNonMaster(); - + // check if the current node is leader public boolean isLeader(); - + // remove a node from the group public boolean removeElectableNode(String nodeName); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/ha/MasterInfo.java b/fe/fe-core/src/main/java/org/apache/doris/ha/MasterInfo.java index 77fb838ba2..343731f036 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/ha/MasterInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/ha/MasterInfo.java @@ -25,7 +25,7 @@ import java.io.DataOutput; import java.io.IOException; public class MasterInfo implements Writable { - + private String ip; private int httpPort; private int rpcPort; @@ -35,7 +35,7 @@ public class MasterInfo implements Writable { this.httpPort = 0; this.rpcPort = 0; } - + public MasterInfo(String ip, int httpPort, int rpcPort) { this.ip = ip; this.httpPort = httpPort; @@ -45,23 +45,23 @@ public class MasterInfo implements Writable { public String getIp() { return this.ip; } - + public void setIp(String ip) { this.ip = ip; } - + public int getHttpPort() { return this.httpPort; } - + public void setHttpPort(int httpPort) { this.httpPort = httpPort; } - + public int getRpcPort() { return this.rpcPort; } - + public void setRpcPort(int rpcPort) { this.rpcPort = rpcPort; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/HttpAuthManager.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/HttpAuthManager.java index a0fbbaf1ab..26e1318f8d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/HttpAuthManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/HttpAuthManager.java @@ -22,7 +22,6 @@ import org.apache.doris.analysis.UserIdentity; import com.google.common.base.Strings; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -85,4 +84,3 @@ public final class HttpAuthManager { return authSessions; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/IllegalArgException.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/IllegalArgException.java index e7f5db7713..c66acaeeb6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/IllegalArgException.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/IllegalArgException.java @@ -14,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.httpv2; public class IllegalArgException extends Exception { diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebConfigurer.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebConfigurer.java index 8fd2442e5c..afa07db96c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebConfigurer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebConfigurer.java @@ -72,4 +72,3 @@ public class WebConfigurer implements WebMvcConfigurer { return multipartResolver; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/BaseController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/BaseController.java index 47511be011..d831e34723 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/BaseController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/BaseController.java @@ -17,11 +17,6 @@ package org.apache.doris.httpv2.controller; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.handler.codec.base64.Base64; -import io.netty.util.CharsetUtil; - import org.apache.doris.analysis.CompoundPredicate; import org.apache.doris.analysis.UserIdentity; import org.apache.doris.catalog.Catalog; @@ -40,14 +35,16 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; - +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.handler.codec.base64.Base64; +import io.netty.util.CharsetUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.nio.ByteBuffer; import java.util.List; import java.util.UUID; - import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -299,4 +296,3 @@ public class BaseController { return "http://" + FrontendOptions.getLocalHostAddress() + ":" + Config.http_port; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/ConfigController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/ConfigController.java index 4353d8cf20..cbb3024121 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/ConfigController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/ConfigController.java @@ -22,7 +22,6 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HardwareInfoController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HardwareInfoController.java index 214d8e44be..26be6d274c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HardwareInfoController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HardwareInfoController.java @@ -17,6 +17,12 @@ package org.apache.doris.httpv2.controller; +import org.apache.doris.common.Version; +import org.apache.doris.httpv2.entity.ResponseEntityBuilder; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; import oshi.SystemInfo; import oshi.hardware.CentralProcessor; import oshi.hardware.GlobalMemory; @@ -33,13 +39,6 @@ import oshi.software.os.OperatingSystem; import oshi.util.FormatUtil; import oshi.util.Util; -import org.apache.doris.common.Version; -import org.apache.doris.httpv2.entity.ResponseEntityBuilder; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HelpController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HelpController.java index d04c55b1b8..986b141b04 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HelpController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HelpController.java @@ -22,7 +22,6 @@ import org.apache.doris.qe.HelpModule; import org.apache.doris.qe.HelpTopic; import com.google.common.base.Strings; - import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -31,7 +30,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; @RestController diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java index 10d7ba8d3f..db04dc3499 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java @@ -24,7 +24,6 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,7 +38,6 @@ import java.io.RandomAccessFile; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; @RestController diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LoginController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LoginController.java index eb941ada24..7962ce2a9e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LoginController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LoginController.java @@ -21,10 +21,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("/rest/v1") diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/QueryProfileController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/QueryProfileController.java index 985e87dd7b..1b349aad02 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/QueryProfileController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/QueryProfileController.java @@ -24,7 +24,6 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.http.ResponseEntity; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SessionController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SessionController.java index ace361dbc4..55b202354d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SessionController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SessionController.java @@ -22,14 +22,13 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder; import org.apache.doris.qe.ConnectContext; import org.apache.doris.service.ExecuteEnv; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; - import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java index 02603c59c2..81ff51ab2b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java @@ -35,7 +35,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.commons.validator.routines.UrlValidator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -50,7 +49,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; - import javax.servlet.http.HttpServletRequest; @RestController diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/entity/RestBaseResult.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/entity/RestBaseResult.java index 5d27d9e691..4b04755737 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/entity/RestBaseResult.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/entity/RestBaseResult.java @@ -14,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.httpv2.entity; import com.google.gson.Gson; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/entity/RestResult.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/entity/RestResult.java index d501bfdc59..881c22b1eb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/entity/RestResult.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/entity/RestResult.java @@ -17,11 +17,11 @@ package org.apache.doris.httpv2.entity; -import java.util.Map; - import com.google.common.collect.Maps; import com.google.gson.Gson; +import java.util.Map; + public class RestResult extends RestBaseResult { private Map resultMap; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/ServletTraceIterceptor.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/ServletTraceIterceptor.java index 4e223429e9..31ea134792 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/ServletTraceIterceptor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/ServletTraceIterceptor.java @@ -20,6 +20,7 @@ package org.apache.doris.httpv2.interceptor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.io.IOException; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -29,7 +30,6 @@ import javax.servlet.ServletResponse; import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; @WebFilter (urlPatterns = "/*", filterName = "traceIterceptor") public class ServletTraceIterceptor implements Filter { diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/ColocateMetaService.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/ColocateMetaService.java index 8fc22ae7b2..fbce0cc35c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/ColocateMetaService.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/ColocateMetaService.java @@ -30,7 +30,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Preconditions; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestBody; @@ -41,7 +40,6 @@ import org.springframework.web.servlet.view.RedirectView; import java.lang.reflect.Type; import java.util.List; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java index 48d0e4720f..fa47003e16 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java @@ -29,22 +29,21 @@ import org.apache.doris.persist.Storage; import org.apache.doris.persist.StorageInfo; import org.apache.doris.system.Frontend; +import com.google.common.base.Strings; +import com.google.common.collect.Maps; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.google.common.base.Strings; -import com.google.common.collect.Maps; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.OutputStream; import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; @RestController public class MetaService extends RestBaseController { diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BackendsAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BackendsAction.java index 4d88c52697..73705c6a68 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BackendsAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BackendsAction.java @@ -24,7 +24,8 @@ import org.apache.doris.system.Backend; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Strings; import com.google.common.collect.Lists; - +import lombok.Getter; +import lombok.Setter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; @@ -35,9 +36,6 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import lombok.Getter; -import lombok.Setter; - /** * This class responsible for returning current backends info. * Mainly used for flink/spark connector, which need backends info to execute stream load. diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java index 23460edec8..47c4b0f228 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java @@ -23,7 +23,6 @@ import org.apache.doris.common.Version; import org.apache.doris.httpv2.entity.ResponseEntityBuilder; import com.google.common.base.Strings; - import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -35,16 +34,16 @@ import javax.servlet.http.HttpServletResponse; /** * Api for checking the whether the FE has been started successfully. * Response - * { - * "msg": "OK", - * "code": 0, - * "data": { - * "queryPort": 9030, - * "rpcPort": 9020, - * "maxReplayedJournal": 17287 - * }, - * "count": 0 - * } + * { + * "msg": "OK", + * "code": 0, + * "data": { + * "queryPort": 9030, + * "rpcPort": 9020, + * "maxReplayedJournal": 17287 + * }, + * "count": 0 + * } */ @RestController public class BootstrapFinishAction { diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CancelLoadAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CancelLoadAction.java index 4b716b47b6..63c2a88aa4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CancelLoadAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CancelLoadAction.java @@ -27,7 +27,6 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; - import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckDecommissionAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckDecommissionAction.java index 3724113abc..f24f852b9d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckDecommissionAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckDecommissionAction.java @@ -29,14 +29,12 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.stream.Collectors; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -45,10 +43,10 @@ import javax.servlet.http.HttpServletResponse; * fe_host:fe_http_port/api/check_decommission?host_ports=host:port,host2:port2... * return: * { - * "msg": "OK", - * "code": 0, - * "data": ["192.168.10.11:9050", "192.168.10.11:9050"], - * "count": 0 + * "msg": "OK", + * "code": 0, + * "data": ["192.168.10.11:9050", "192.168.10.11:9050"], + * "count": 0 * } */ @RestController diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ConnectionAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ConnectionAction.java index e601e8223f..42d009cd36 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ConnectionAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ConnectionAction.java @@ -25,7 +25,6 @@ import org.apache.doris.service.ExecuteEnv; import com.google.common.base.Strings; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; @@ -33,7 +32,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -43,12 +41,12 @@ import javax.servlet.http.HttpServletResponse; * So we can get query_id firstly, and get query by query_id. * * { - * "msg": "OK", - * "code": 0, - * "data": { - * "query_id": "b52513ce3f0841ca-9cb4a96a268f2dba" - * }, - * "count": 0 + * "msg": "OK", + * "code": 0, + * "data": { + * "query_id": "b52513ce3f0841ca-9cb4a96a268f2dba" + * }, + * "count": 0 * } */ @RestController diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ExtraBasepathAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ExtraBasepathAction.java index 581bbe3e4b..e6c7af71e2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ExtraBasepathAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ExtraBasepathAction.java @@ -70,5 +70,3 @@ public class ExtraBasepathAction { } } } - - diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetDdlStmtAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetDdlStmtAction.java index ce6d93ac20..fc64544803 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetDdlStmtAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetDdlStmtAction.java @@ -28,7 +28,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; @@ -37,7 +36,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLoadInfoAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLoadInfoAction.java index 2213034cfe..7e939cbd8c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLoadInfoAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLoadInfoAction.java @@ -25,14 +25,13 @@ import org.apache.doris.load.Load; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; +import com.google.common.base.Strings; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.view.RedirectView; -import com.google.common.base.Strings; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -113,4 +112,3 @@ public class GetLoadInfoAction extends RestBaseController { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java index 609b896d98..9c97f2ee90 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java @@ -25,7 +25,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.codehaus.jackson.map.ObjectMapper; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -35,7 +34,6 @@ import java.io.File; import java.io.IOException; import java.util.Map; import java.util.Set; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetSmallFileAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetSmallFileAction.java index 38a1f883f9..8ba719cf31 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetSmallFileAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetSmallFileAction.java @@ -22,7 +22,6 @@ import org.apache.doris.common.util.SmallFileMgr; import org.apache.doris.httpv2.entity.ResponseEntityBuilder; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import java.io.IOException; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetStreamLoadState.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetStreamLoadState.java index 208008a97d..8041d0a18f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetStreamLoadState.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetStreamLoadState.java @@ -23,7 +23,6 @@ import org.apache.doris.common.MetaNotFoundException; import org.apache.doris.httpv2.entity.ResponseEntityBuilder; import com.google.common.base.Strings; - import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java index ebdda12926..bf1cb562c4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java @@ -33,7 +33,7 @@ import org.apache.doris.system.SystemInfoService; import org.apache.doris.thrift.TNetworkAddress; import com.google.common.base.Strings; - +import io.netty.handler.codec.http.HttpHeaderNames; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.http.ResponseEntity; @@ -43,10 +43,9 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.view.RedirectView; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import io.netty.handler.codec.http.HttpHeaderNames; -import java.util.List; @RestController public class LoadAction extends RestBaseController { diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaInfoAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaInfoAction.java index e00d54ddc3..1e4d4e686e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaInfoAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaInfoAction.java @@ -37,22 +37,21 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.system.SystemInfoService; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.Collections; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * And meta info like databases, tables and schema @@ -71,14 +70,14 @@ public class MetaInfoAction extends RestBaseController { /** * Get all databases * { - * "msg": "success", - * "code": 0, - * "data": [ - * "default_cluster:db1", - * "default_cluster:doris_audit_db__", - * "default_cluster:information_schema" - * ], - * "count": 0 + * "msg": "success", + * "code": 0, + * "data": [ + * "default_cluster:db1", + * "default_cluster:doris_audit_db__", + * "default_cluster:information_schema" + * ], + * "count": 0 * } */ @RequestMapping(path = "/api/meta/" + NAMESPACES + "/{" + NS_KEY + "}/" + DATABASES, @@ -118,13 +117,13 @@ public class MetaInfoAction extends RestBaseController { /** Get all tables of a database * { - * "msg": "success", - * "code": 0, - * "data": [ - * "tbl1", - * "tbl2" - * ], - * "count": 0 + * "msg": "success", + * "code": 0, + * "data": [ + * "tbl1", + * "tbl2" + * ], + * "count": 0 * } */ @@ -166,40 +165,40 @@ public class MetaInfoAction extends RestBaseController { /** Get schema of a table * { - * "msg": "success", - * "code": 0, - * "data": { - * "tbl1": { - * "schema": [{ - * "Field": "k1", - * "Type": "INT", - * "Null": "Yes", - * "Extra": "", - * "Default": null, - * "Key": "true" - * }, { - * "Field": "k2", - * "Type": "INT", - * "Null": "Yes", - * "Extra": "", - * "Default": null, - * "Key": "true" - * }], - * "is_base": true - * }, - * "r1": { - * "schema": [{ - * "Field": "k1", - * "Type": "INT", - * "Null": "Yes", - * "Extra": "", - * "Default": null, - * "Key": "true" - * }], - * "is_base": false - * } - * }, - * "count": 0 + * "msg": "success", + * "code": 0, + * "data": { + * "tbl1": { + * "schema": [{ + * "Field": "k1", + * "Type": "INT", + * "Null": "Yes", + * "Extra": "", + * "Default": null, + * "Key": "true" + * }, { + * "Field": "k2", + * "Type": "INT", + * "Null": "Yes", + * "Extra": "", + * "Default": null, + * "Key": "true" + * }], + * "is_base": true + * }, + * "r1": { + * "schema": [{ + * "Field": "k1", + * "Type": "INT", + * "Null": "Yes", + * "Extra": "", + * "Default": null, + * "Key": "true" + * }], + * "is_base": false + * } + * }, + * "count": 0 * } */ @RequestMapping(path = "/api/meta/" + NAMESPACES + "/{" + NS_KEY + "}/" + DATABASES + "/{" + DB_KEY + "}/" + TABLES diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaReplayerCheckAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaReplayerCheckAction.java index 5b413a58ba..ba180f466c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaReplayerCheckAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaReplayerCheckAction.java @@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetricsAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetricsAction.java index 2be3d1199d..9158f04db4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetricsAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetricsAction.java @@ -24,12 +24,10 @@ import org.apache.doris.metric.PrometheusMetricVisitor; import org.apache.doris.metric.SimpleCoreMetricVisitor; import com.google.common.base.Strings; - import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.io.IOException; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MultiAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MultiAction.java index 86983901d8..1b755f18bf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MultiAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MultiAction.java @@ -27,7 +27,6 @@ import org.apache.doris.service.ExecuteEnv; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -36,7 +35,6 @@ import org.springframework.web.servlet.view.RedirectView; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -257,4 +255,3 @@ public class MultiAction extends RestBaseController { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java index 66993297c7..e5679e32ca 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java @@ -24,7 +24,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; @@ -32,12 +31,11 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; // This class is a RESTFUL interface to get query profile. -// It will be used in query monitor to collect profiles. +// It will be used in query monitor to collect profiles. // Usage: // wget http://fe_host:fe_http_port/api/profile?query_id=123456 @RestController diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/QueryDetailAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/QueryDetailAction.java index 5d674f2e89..508f8aade7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/QueryDetailAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/QueryDetailAction.java @@ -25,7 +25,6 @@ import org.apache.doris.qe.QueryDetailQueue; import com.google.common.base.Strings; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; @@ -34,7 +33,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -63,4 +61,3 @@ public class QueryDetailAction extends RestBaseController { return ResponseEntityBuilder.ok(result); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java index 5a8c7aa1b7..a0af9a1b8e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java @@ -28,7 +28,6 @@ import org.apache.doris.thrift.TNetworkAddress; import com.google.common.base.Preconditions; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.servlet.view.RedirectView; @@ -39,7 +38,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.OutputStream; import java.net.URI; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RowCountAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RowCountAction.java index eb9102a339..b9dfa1d1ec 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RowCountAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RowCountAction.java @@ -31,16 +31,15 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; +import com.google.common.base.Strings; +import com.google.common.collect.Maps; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.google.common.base.Strings; -import com.google.common.collect.Maps; - +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Map; /* * calc row count from replica to table diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java index 014efcf904..3590c88988 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java @@ -17,9 +17,6 @@ package org.apache.doris.httpv2.rest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; import org.apache.doris.common.ConfigBase; import org.apache.doris.common.DdlException; import org.apache.doris.httpv2.entity.ResponseEntityBuilder; @@ -30,7 +27,9 @@ import com.clearspring.analytics.util.Lists; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; - +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; @@ -41,7 +40,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java index f4c7ac7ad4..6f440068d5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java @@ -14,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.httpv2.rest; import org.apache.doris.catalog.Catalog; @@ -35,7 +36,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Maps; - import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -51,7 +51,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StmtExecutionAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StmtExecutionAction.java index ea6a9df6e8..d4f787132c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StmtExecutionAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StmtExecutionAction.java @@ -24,6 +24,9 @@ import org.apache.doris.httpv2.util.StatementSubmitter; import org.apache.doris.qe.ConnectContext; import org.apache.doris.system.SystemInfoService; +import com.google.common.base.Strings; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.PathVariable; @@ -32,15 +35,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.google.common.base.Strings; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Type; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * For execute stmt via http diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StorageTypeCheckAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StorageTypeCheckAction.java index 3845a2ec2b..6cdaf140cb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StorageTypeCheckAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StorageTypeCheckAction.java @@ -29,17 +29,16 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.thrift.TStorageType; +import com.google.common.base.Strings; +import com.google.common.collect.Maps; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.google.common.base.Strings; -import com.google.common.collect.Maps; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; @RestController public class StorageTypeCheckAction extends RestBaseController { diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java index 1fe8a2aa41..6afa9dfd82 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java @@ -49,7 +49,7 @@ import org.apache.doris.thrift.TTabletVersionInfo; import org.apache.doris.thrift.TUniqueId; import com.google.common.base.Strings; - +import io.netty.handler.codec.http.HttpResponseStatus; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; @@ -70,8 +70,6 @@ import java.util.UUID; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import io.netty.handler.codec.http.HttpResponseStatus; - /** * This class responsible for parse the sql and generate the query plan fragment for a (only one) table{@see OlapTable} * the related tablet maybe pruned by query planer according the `where` predicate. diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableRowCountAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableRowCountAction.java index a473bc0234..356aa8224f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableRowCountAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableRowCountAction.java @@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableSchemaAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableSchemaAction.java index 159c72f056..dc3b2c24dc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableSchemaAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableSchemaAction.java @@ -41,7 +41,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java index 61b7f807c3..b2aa3bf934 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java @@ -25,6 +25,8 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.system.SystemInfoService; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.PathVariable; @@ -34,15 +36,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.google.common.base.Preconditions; -import com.google.common.base.Strings; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Upload file @@ -307,4 +306,3 @@ public class UploadAction extends RestBaseController { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/ClusterAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/ClusterAction.java index 9b4af46de9..3bf2aa1909 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/ClusterAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/ClusterAction.java @@ -26,7 +26,6 @@ import org.apache.doris.qe.ConnectContext; import org.apache.doris.system.Frontend; import com.google.common.collect.Maps; - import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -34,7 +33,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; import java.util.stream.Collectors; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,13 +45,13 @@ public class ClusterAction extends RestBaseController { // Returns mysql and http connection information for the cluster. // { - // "mysql":[ - // "" - // ], - // "http":[ - // "" - // ] - // } + // "mysql":[ + // "" + // ], + // "http":[ + // "" + // ] + // } @RequestMapping(path = "/cluster_info/conn_info", method = RequestMethod.GET) public Object clusterInfo(HttpServletRequest request, HttpServletResponse response) { executeCheckPassword(request, response); diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/HttpUtils.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/HttpUtils.java index 90e2c2289c..68adb4b6ac 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/HttpUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/HttpUtils.java @@ -25,7 +25,6 @@ import org.apache.doris.persist.gson.GsonUtils; import org.apache.doris.system.Frontend; import com.google.gson.reflect.TypeToken; - import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/NodeAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/NodeAction.java index fb823979fd..b5b4a0a693 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/NodeAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/NodeAction.java @@ -44,7 +44,8 @@ import com.google.common.collect.Maps; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; - +import lombok.Getter; +import lombok.Setter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestBody; @@ -61,13 +62,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; import java.util.stream.Collectors; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import lombok.Getter; -import lombok.Setter; - /* * Used to return all node information, configuration information and modify node config. */ @@ -129,14 +126,14 @@ public class NodeAction extends RestBaseController { } // { - // "column_names": [ - // "" - // ], - // "rows": [ - // [ - // "" - // ] - // ] + // "column_names": [ + // "" + // ], + // "rows": [ + // [ + // "" + // ] + // ] // } private Object fetchNodeInfo(HttpServletRequest request, HttpServletResponse response, String procPath) throws AnalysisException { @@ -168,13 +165,13 @@ public class NodeAction extends RestBaseController { // Return fe and be all configuration names. // { - // "frontend": [ - // "" - // ], - // "backend": [ - // "" - // ] - // } + // "frontend": [ + // "" + // ], + // "backend": [ + // "" + // ] + // } @RequestMapping(path = "/configuration_name", method = RequestMethod.GET) public Object configurationName(HttpServletRequest request, HttpServletResponse response) { executeCheckPassword(request, response); @@ -207,13 +204,13 @@ public class NodeAction extends RestBaseController { // Return all fe and be nodes. // { - // "frontend": [ - // "host:httpPort" - // ], - // "backend": [ - // "host:httpPort"" - // ] - // } + // "frontend": [ + // "host:httpPort" + // ], + // "backend": [ + // "host:httpPort"" + // ] + // } @RequestMapping(path = "/node_list", method = RequestMethod.GET) public Object nodeList(HttpServletRequest request, HttpServletResponse response) { executeCheckPassword(request, response); @@ -271,38 +268,38 @@ public class NodeAction extends RestBaseController { // // for fe: // { - // "column_names": [ - // "配置项", - // "节点", - // "节点类型", - // "配置类型", - // "仅master", - // "配置值", - // "可修改" - // ], - // "rows": [ - // [ - // "" - // ] - // ] - // } + // "column_names": [ + // "配置项", + // "节点", + // "节点类型", + // "配置类型", + // "仅master", + // "配置值", + // "可修改" + // ], + // "rows": [ + // [ + // "" + // ] + // ] + // } // // for be: // { - // "column_names": [ - // "配置项", - // "节点", - // "节点类型", - // "配置类型", - // "配置值", - // "可修改" - // ], - // "rows": [ - // [ - // "" - // ] - // ] - // } + // "column_names": [ + // "配置项", + // "节点", + // "节点类型", + // "配置类型", + // "配置值", + // "可修改" + // ], + // "rows": [ + // [ + // "" + // ] + // ] + // } @RequestMapping(path = "/configuration_info", method = RequestMethod.POST) public Object configurationInfo(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "type") String type, @@ -457,27 +454,27 @@ public class NodeAction extends RestBaseController { // Modify fe configuration. // // request body: - //{ - // "config_name":{ - // "node":[ - // "" - // ], - // "value":"", - // "persist":"" - // } - //} + // { + // "config_name":{ + // "node":[ + // "" + // ], + // "value":"", + // "persist":"" + // } + // } // // return data: // { - // "failed":[ - // { - // "config_name":"", - // "value"="", - // "node":"", - // "err_info":"" - // } - // ] - // } + // "failed":[ + // { + // "config_name":"", + // "value"="", + // "node":"", + // "err_info":"" + // } + // ] + // } @RequestMapping(path = "/set_config/fe", method = RequestMethod.POST) public Object setConfigFe(HttpServletRequest request, HttpServletResponse response, @RequestBody Map requestBody) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/QueryProfileAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/QueryProfileAction.java index 56abc91487..5816c218cb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/QueryProfileAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/QueryProfileAction.java @@ -37,7 +37,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.PathVariable; @@ -52,7 +51,6 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.stream.Collectors; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -242,13 +240,13 @@ public class QueryProfileAction extends RestBaseController { // Returns the fragments and instances for the specified query id. // [ - // { - // "fragment_id":"", - // "time":"", - // "instance_id":[ - // "" - // ] - // } + // { + // "fragment_id":"", + // "time":"", + // "instance_id":[ + // "" + // ] + // } // ] @RequestMapping(path = "/profile/fragments/{query_id}", method = RequestMethod.GET) public Object fragments(HttpServletRequest request, HttpServletResponse response, diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ImportAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ImportAction.java index 98748cbba8..a52362c451 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ImportAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ImportAction.java @@ -25,7 +25,8 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder; import org.apache.doris.thrift.TBrokerFileStatus; import com.google.common.collect.Lists; - +import lombok.Getter; +import lombok.Setter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestBody; @@ -36,13 +37,9 @@ import org.springframework.web.bind.annotation.RestController; import java.io.IOException; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import lombok.Getter; -import lombok.Setter; - @RestController @RequestMapping("/rest/v2") public class ImportAction { diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java index 7f06bd1dc8..dd2b283f05 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java @@ -38,7 +38,8 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import lombok.Getter; +import lombok.Setter; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -47,13 +48,9 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Collections; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import lombok.Getter; -import lombok.Setter; - /** * And meta info like databases, tables and schema */ @@ -71,14 +68,14 @@ public class MetaInfoActionV2 extends RestBaseController { /** * Get all databases * { - * "msg": "success", - * "code": 0, - * "data": [ - * "default_cluster:db1", - * "default_cluster:doris_audit_db__", - * "default_cluster:information_schema" - * ], - * "count": 0 + * "msg": "success", + * "code": 0, + * "data": [ + * "default_cluster:db1", + * "default_cluster:doris_audit_db__", + * "default_cluster:information_schema" + * ], + * "count": 0 * } */ @RequestMapping(path = "/api/meta/" + NAMESPACES + "/{" + NS_KEY + "}/" + DATABASES, @@ -118,13 +115,13 @@ public class MetaInfoActionV2 extends RestBaseController { /** Get all tables of a database * { - * "msg": "success", - * "code": 0, - * "data": [ - * "tbl1", - * "tbl2" - * ], - * "count": 0 + * "msg": "success", + * "code": 0, + * "data": [ + * "tbl1", + * "tbl2" + * ], + * "count": 0 * } */ diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/StatisticAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/StatisticAction.java index 13a2f08bd4..3b8b7f7353 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/StatisticAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/StatisticAction.java @@ -23,20 +23,18 @@ import org.apache.doris.httpv2.rest.RestBaseController; import org.apache.doris.system.Backend; import org.apache.doris.system.SystemInfoService; +import com.google.common.collect.Maps; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.google.common.collect.Maps; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import java.util.List; import java.util.Map; import java.util.Objects; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("/rest/v2") diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/HttpUtil.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/HttpUtil.java index a2554b51be..8def076535 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/HttpUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/HttpUtil.java @@ -18,19 +18,17 @@ package org.apache.doris.httpv2.util; import com.google.common.base.Strings; +import org.springframework.http.HttpHeaders; import java.io.BufferedReader; import java.io.IOException; - import javax.servlet.http.HttpServletRequest; -import static org.springframework.http.HttpHeaders.CONNECTION; - public class HttpUtil { public static boolean isKeepAlive(HttpServletRequest request) { - if (!request.getHeader(CONNECTION).equals("close") && + if (!request.getHeader(HttpHeaders.CONNECTION).equals("close") && (request.getProtocol().equals("") || - request.getHeader(CONNECTION).equals("keep-alive"))) { + request.getHeader(HttpHeaders.CONNECTION).equals("keep-alive"))) { return true; } return false; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/LoadSubmitter.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/LoadSubmitter.java index 31aeba813d..6544c9a434 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/LoadSubmitter.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/LoadSubmitter.java @@ -29,7 +29,6 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.base.Strings; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/StatementSubmitter.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/StatementSubmitter.java index e0ec9cb51e..16a8b086ff 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/StatementSubmitter.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/StatementSubmitter.java @@ -32,11 +32,10 @@ import org.apache.doris.common.ThreadPoolManager; import org.apache.doris.common.util.SqlParserUtils; import org.apache.doris.qe.ConnectContext; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.StringReader; import java.sql.Connection; @@ -235,4 +234,3 @@ public class StatementSubmitter { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/TmpFileMgr.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/TmpFileMgr.java index 1b527ebfb5..e7f718f6c7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/TmpFileMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/TmpFileMgr.java @@ -22,7 +22,6 @@ import org.apache.doris.common.util.Util; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.multipart.MultipartFile; @@ -304,4 +303,3 @@ public class TmpFileMgr { } } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/Journal.java b/fe/fe-core/src/main/java/org/apache/doris/journal/Journal.java index 4e3b485b8e..bff5d72c7b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/Journal.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/Journal.java @@ -23,39 +23,39 @@ import java.io.IOException; import java.util.List; public interface Journal { - + // Open the journal environment public void open(); - + // Roll Edit file or database public void rollJournal(); - - // Get the newest journal id + + // Get the newest journal id public long getMaxJournalId(); - + // Get the oldest journal id public long getMinJournalId(); - + // Close the environment public void close(); - + // Get the journal which id = journalId public JournalEntity read(long journalId); - + // Get all the journals whose id: fromKey <= id <= toKey // toKey = -1 means toKey = Long.Max_Value public JournalCursor read(long fromKey, long toKey); // Write a journal and sync to disk public void write(short op, Writable writable) throws IOException; - + // Delete journals whose max id is less than deleteToJournalId public void deleteJournals(long deleteJournalToId); - + // Current db's min journal id - 1 public long getFinalizedJournalId(); - + // Get all the dbs' name public List getDatabaseNames(); - + } diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/JournalCursor.java b/fe/fe-core/src/main/java/org/apache/doris/journal/JournalCursor.java index 64f63dd1c9..94058ad688 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/JournalCursor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/JournalCursor.java @@ -19,10 +19,10 @@ package org.apache.doris.journal; // This class is like JDBC ResultSet. public interface JournalCursor { - + // Return the next journal. return null when there is no more journals public JournalEntity next(); - + public void close(); - + } diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java b/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java index df62b168e3..8d138e51e9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/JournalEntity.java @@ -97,7 +97,6 @@ import org.apache.doris.system.Frontend; import org.apache.doris.transaction.TransactionState; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -663,4 +662,3 @@ public class JournalEntity implements Writable { Preconditions.checkState(isRead); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBDebugger.java b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBDebugger.java index e4b4c78f29..cbaf1d7757 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBDebugger.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBDebugger.java @@ -38,7 +38,6 @@ import com.sleepycat.je.Environment; import com.sleepycat.je.EnvironmentConfig; import com.sleepycat.je.LockMode; import com.sleepycat.je.OperationStatus; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java index 6e454b8fa9..c4d7559c6a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java @@ -33,17 +33,16 @@ import com.sleepycat.je.Durability.SyncPolicy; import com.sleepycat.je.EnvironmentConfig; import com.sleepycat.je.EnvironmentFailureException; import com.sleepycat.je.rep.InsufficientLogException; -import com.sleepycat.je.rep.RollbackException; import com.sleepycat.je.rep.NetworkRestore; import com.sleepycat.je.rep.NetworkRestoreConfig; import com.sleepycat.je.rep.NoConsistencyRequiredPolicy; import com.sleepycat.je.rep.NodeType; import com.sleepycat.je.rep.ReplicatedEnvironment; import com.sleepycat.je.rep.ReplicationConfig; +import com.sleepycat.je.rep.RollbackException; import com.sleepycat.je.rep.StateChangeListener; import com.sleepycat.je.rep.util.DbResetRepGroup; import com.sleepycat.je.rep.util.ReplicationGroupAdmin; - import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -58,15 +57,15 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantReadWriteLock; -/* this class contains the reference to bdb environment. - * including all the opened databases and the replicationGroupAdmin. +/* this class contains the reference to bdb environment. + * including all the opened databases and the replicationGroupAdmin. * we can get the information of this bdb group through the API of replicationGroupAdmin */ public class BDBEnvironment { private static final Logger LOG = LogManager.getLogger(BDBEnvironment.class); private static final int RETRY_TIME = 3; private static final int MEMORY_CACHE_PERCENT = 20; - + public static final String PALO_JOURNAL_GROUP = "PALO_JOURNAL_GROUP"; private ReplicatedEnvironment replicatedEnvironment; @@ -77,7 +76,7 @@ public class BDBEnvironment { private ReplicationGroupAdmin replicationGroupAdmin = null; private ReentrantReadWriteLock lock; private List openedDatabases; - + public BDBEnvironment() { openedDatabases = new ArrayList(); this.lock = new ReentrantReadWriteLock(true); @@ -86,7 +85,7 @@ public class BDBEnvironment { // The setup() method opens the environment and database public void setup(File envHome, String selfNodeName, String selfNodeHostPort, String helperHostPort, boolean isElectable) { - + // Almost never used, just in case the master can not restart if (Config.metadata_failure_recovery.equals("true")) { if (!isElectable) { @@ -128,11 +127,11 @@ public class BDBEnvironment { environmentConfig.setCachePercent(MEMORY_CACHE_PERCENT); environmentConfig.setLockTimeout(Config.bdbje_lock_timeout_second, TimeUnit.SECONDS); if (isElectable) { - Durability durability = new Durability(getSyncPolicy(Config.master_sync_policy), + Durability durability = new Durability(getSyncPolicy(Config.master_sync_policy), getSyncPolicy(Config.replica_sync_policy), getAckPolicy(Config.replica_ack_policy)); environmentConfig.setDurability(durability); } - + // set database config dbConfig = new DatabaseConfig(); dbConfig.setTransactional(true); @@ -149,11 +148,11 @@ public class BDBEnvironment { try { // open the environment replicatedEnvironment = new ReplicatedEnvironment(envHome, replicationConfig, environmentConfig); - + // get replicationGroupAdmin object. Set adminNodes = new HashSet(); // 1. add helper node - InetSocketAddress helper = new InetSocketAddress(helperHostPort.split(":")[0], + InetSocketAddress helper = new InetSocketAddress(helperHostPort.split(":")[0], Integer.parseInt(helperHostPort.split(":")[1])); adminNodes.add(helper); LOG.info("add helper[{}] as ReplicationGroupAdmin", helperHostPort); @@ -166,15 +165,15 @@ public class BDBEnvironment { } replicationGroupAdmin = new ReplicationGroupAdmin(PALO_JOURNAL_GROUP, adminNodes); - + // get a BDBHA object and pass the reference to Catalog HAProtocol protocol = new BDBHA(this, selfNodeName); Catalog.getCurrentCatalog().setHaProtocol(protocol); - + // start state change listener StateChangeListener listener = new BDBStateChangeListener(); replicatedEnvironment.setStateChangeListener(listener); - + // open epochDB. the first parameter null means auto-commit epochDB = replicatedEnvironment.openDatabase(null, "epochDB", dbConfig); break; @@ -201,11 +200,11 @@ public class BDBEnvironment { } } } - + public ReplicationGroupAdmin getReplicationGroupAdmin() { return this.replicationGroupAdmin; } - + public void setNewReplicationGroupAdmin(Set newHelperNodes) { this.replicationGroupAdmin = new ReplicationGroupAdmin(PALO_JOURNAL_GROUP, newHelperNodes); } @@ -219,7 +218,7 @@ public class BDBEnvironment { public ReplicatedEnvironment getReplicatedEnvironment() { return replicatedEnvironment; } - + // return the database reference with the given name // also try to close previous opened database. public Database openDatabase(String dbName) { @@ -240,17 +239,17 @@ public class BDBEnvironment { * In the case when 3 FE (1 master and 2 followers) start at same time, * We may catch com.sleepycat.je.rep.DatabasePreemptedException which said that * "Database xx has been forcibly closed in order to apply a replicated remove operation." - * + * * Because when Master FE finished to save image, it try to remove old journals, * and also remove the databases these old journals belongs to. * So after Master removed the database from replicatedEnvironment, * call db.getDatabaseName() will throw DatabasePreemptedException, * because it has already been destroyed. - * + * * The reason why Master can safely remove a database is because it knows that all * non-master FE have already load the journal ahead of this database. So remove the * database is safe. - * + * * Here we just try to close the useless database(which may be removed by Master), * so even we catch the exception, just ignore it is OK. */ @@ -277,7 +276,7 @@ public class BDBEnvironment { } return db; } - + // close and remove the database whose name is dbName public void removeDatabase(String dbName) { lock.writeLock().lock(); @@ -309,7 +308,7 @@ public class BDBEnvironment { lock.writeLock().unlock(); } } - + // get journal db names and sort the names public List getDatabaseNames() { List ret = new ArrayList(); @@ -340,7 +339,7 @@ public class BDBEnvironment { return null; } } - + if (names != null) { for (String name : names) { if (StringUtils.isNumeric(name)) { @@ -350,7 +349,7 @@ public class BDBEnvironment { } } } - + Collections.sort(ret); return ret; } @@ -366,7 +365,7 @@ public class BDBEnvironment { } } openedDatabases.clear(); - + if (epochDB != null) { try { epochDB.close(); @@ -386,7 +385,7 @@ public class BDBEnvironment { } } } - + // Close environment public void closeReplicatedEnvironment() { if (replicatedEnvironment != null) { @@ -431,7 +430,7 @@ public class BDBEnvironment { // default value is WRITE_NO_SYNC return Durability.SyncPolicy.WRITE_NO_SYNC; } - + private ReplicaAckPolicy getAckPolicy(String policy) { if (policy.equalsIgnoreCase("ALL")) { return Durability.ReplicaAckPolicy.ALL; @@ -442,5 +441,5 @@ public class BDBEnvironment { // default value is SIMPLE_MAJORITY return Durability.ReplicaAckPolicy.SIMPLE_MAJORITY; } - + } diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJEJournal.java b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJEJournal.java index e4b4ac6bdc..686867eec6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJEJournal.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJEJournal.java @@ -38,7 +38,6 @@ import com.sleepycat.je.rep.InsufficientLogException; import com.sleepycat.je.rep.NetworkRestore; import com.sleepycat.je.rep.NetworkRestoreConfig; import com.sleepycat.je.rep.RollbackException; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -49,7 +48,7 @@ import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -/* +/* * This is the bdb implementation of Journal interface. * First, we open() this journal, then read from or write to the bdb environment * We can also get journal id information by calling get***Id functions. @@ -60,21 +59,21 @@ public class BDBJEJournal implements Journal { public static final Logger LOG = LogManager.getLogger(BDBJEJournal.class); private static final int OUTPUT_BUFFER_INIT_SIZE = 128; private static final int RETRY_TIME = 3; - + private String environmentPath = null; private String selfNodeName; private String selfNodeHostPort; - + private BDBEnvironment bdbEnvironment = null; private Database currentJournalDB; // the next journal's id. start from 1. private AtomicLong nextJournalId = new AtomicLong(1); - + public BDBJEJournal(String nodeName) { initBDBEnv(nodeName); } - - /* + + /* * Initialize bdb environment. * node name is ip_port (the port is edit_log_port) */ @@ -97,7 +96,7 @@ public class BDBJEJournal implements Journal { if (currentJournalDB.count() == 0) { return; } - + long newName = nextJournalId.get(); String currentDbName = currentJournalDB.getDatabaseName(); long currentName = Long.parseLong(currentDbName); @@ -194,19 +193,19 @@ public class BDBJEJournal implements Journal { break; } } - + if (dbName == null) { return null; } - + JournalEntity ret = null; Long key = new Long(journalId); DatabaseEntry theKey = new DatabaseEntry(); TupleBinding myBinding = TupleBinding.getPrimitiveBinding(Long.class); myBinding.objectToEntry(key, theKey); - + DatabaseEntry theData = new DatabaseEntry(); - + Database database = bdbEnvironment.openDatabase(dbName); try { // null means perform the operation without transaction protection. @@ -235,7 +234,7 @@ public class BDBJEJournal implements Journal { public JournalCursor read(long fromKey, long toKey) { return BDBJournalCursor.getJournalCursor(bdbEnvironment, fromKey, toKey); } - + @Override public long getMaxJournalId() { long ret = -1; @@ -249,13 +248,13 @@ public class BDBJEJournal implements Journal { if (dbNames.size() == 0) { return ret; } - + int index = dbNames.size() - 1; String dbName = dbNames.get(index).toString(); long dbNumberName = dbNames.get(index); Database database = bdbEnvironment.openDatabase(dbName); ret = dbNumberName + database.count() - 1; - + return ret; } @@ -272,14 +271,14 @@ public class BDBJEJournal implements Journal { if (dbNames.size() == 0) { return ret; } - + String dbName = dbNames.get(0).toString(); Database database = bdbEnvironment.openDatabase(dbName); // The database is empty if (database.count() == 0) { return ret; } - + return dbNames.get(0); } @@ -307,13 +306,13 @@ public class BDBJEJournal implements Journal { System.exit(-1); } } - + // Open a new journal database or get last existing one as current journal database List dbNames = null; for (int i = 0; i < RETRY_TIME; i++) { try { dbNames = getDatabaseNames(); - + if (dbNames == null) { LOG.error("fail to get dbNames while open bdbje journal. will exit"); System.exit(-1); @@ -372,7 +371,7 @@ public class BDBJEJournal implements Journal { } msg += ", deleteToJournalId is " + deleteToJournalId; LOG.info(msg); - + for (int i = 1; i < dbNames.size(); i++) { if (deleteToJournalId >= dbNames.get(i)) { long name = dbNames.get(i - 1); @@ -386,7 +385,7 @@ public class BDBJEJournal implements Journal { } } } - + @Override public long getFinalizedJournalId() { List dbNames = getDatabaseNames(); @@ -394,20 +393,20 @@ public class BDBJEJournal implements Journal { LOG.error("database name is null."); return 0; } - + String msg = "database names: "; for (long name : dbNames) { msg += name + " "; } LOG.info(msg); - + if (dbNames.size() < 2) { return 0; } - + return dbNames.get(dbNames.size() - 1) - 1; } - + @Override public List getDatabaseNames() { if (bdbEnvironment == null) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJournalCursor.java b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJournalCursor.java index d8faf73126..919b9af7ca 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJournalCursor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJournalCursor.java @@ -25,7 +25,6 @@ import com.sleepycat.je.Database; import com.sleepycat.je.DatabaseEntry; import com.sleepycat.je.LockMode; import com.sleepycat.je.OperationStatus; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -35,7 +34,7 @@ import java.util.List; public class BDBJournalCursor implements JournalCursor { private static final Logger LOG = LogManager.getLogger(BDBJournalCursor.class); - + private long toKey; private long currentKey; private BDBEnvironment environment; @@ -43,7 +42,7 @@ public class BDBJournalCursor implements JournalCursor { private Database database; private int nextDbPositionIndex; private final int maxTryTime = 3; - + public static BDBJournalCursor getJournalCursor(BDBEnvironment env, long fromKey, long toKey) { if (toKey < fromKey || fromKey < 0) { System.out.println("Invalid key range!"); @@ -68,7 +67,7 @@ public class BDBJournalCursor implements JournalCursor { throw new NullPointerException("dbNames is null."); } this.nextDbPositionIndex = 0; - + // find the db which may contain the fromKey String dbName = null; for (long db : dbNames) { @@ -79,14 +78,14 @@ public class BDBJournalCursor implements JournalCursor { break; } } - + if (dbName == null) { LOG.error("Can not find the key:{}, fail to get journal cursor. will exit.", fromKey); System.exit(-1); } this.database = env.openDatabase(dbName); } - + @Override public JournalEntity next() { JournalEntity ret = null; @@ -97,7 +96,7 @@ public class BDBJournalCursor implements JournalCursor { DatabaseEntry theKey = new DatabaseEntry(); TupleBinding myBinding = TupleBinding.getPrimitiveBinding(Long.class); myBinding.objectToEntry(key, theKey); - + DatabaseEntry theData = new DatabaseEntry(); // if current db does not contain any more data, then we go to search the next db try { @@ -152,6 +151,6 @@ public class BDBJournalCursor implements JournalCursor { @Override public void close() { - + } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBTool.java b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBTool.java index 02c055043a..45be10aa57 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBTool.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBTool.java @@ -33,7 +33,6 @@ import com.sleepycat.je.Environment; import com.sleepycat.je.EnvironmentConfig; import com.sleepycat.je.LockMode; import com.sleepycat.je.OperationStatus; - import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -101,7 +100,7 @@ public class BDBTool { System.err.println("Not a valid from key: " + fromKeyStr); return false; } - + // set end key Long endKey = fromKey + db.count() - 1; if (options.hasEndKey()) { @@ -112,13 +111,13 @@ public class BDBTool { return false; } } - + if (fromKey > endKey) { System.err.println("from key should less than or equal to end key[" + fromKey + " vs. " + endKey + "]"); return false; } - + // meta version MetaContext metaContext = new MetaContext(); metaContext.setMetaVersion(options.getMetaVersion()); diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/Timestamp.java b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/Timestamp.java index 9dce5c0e8d..b66b51509a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/Timestamp.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/Timestamp.java @@ -26,11 +26,11 @@ import java.io.IOException; // Write this class to bdb periodically public class Timestamp implements Writable { private long timestamp; - + public Timestamp() { timestamp = System.currentTimeMillis(); } - + public long getTimestamp() { return this.timestamp; } @@ -43,7 +43,7 @@ public class Timestamp implements Writable { public void readFields(DataInput in) throws IOException { timestamp = in.readLong(); } - + public String toString() { return "" + timestamp; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/local/LocalJournal.java b/fe/fe-core/src/main/java/org/apache/doris/journal/local/LocalJournal.java index d0a9cee944..e656955dba 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/local/LocalJournal.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/local/LocalJournal.java @@ -35,12 +35,12 @@ import java.util.concurrent.atomic.AtomicLong; public class LocalJournal implements Journal { private static final Logger LOG = LogManager.getLogger(LocalJournal.class); - + private EditLogOutputStream outputStream = null; private AtomicLong journalId = new AtomicLong(1); private String imageDir; private File currentEditFile; - + public LocalJournal(String imageDir) { this.imageDir = imageDir; } @@ -52,7 +52,7 @@ public class LocalJournal implements Journal { Storage storage = new Storage(imageDir); this.journalId.set(getCurrentJournalId(storage.getEditsFileSequenceNumbers())); - + long id = journalId.get(); if (id == storage.getEditsSeq()) { this.currentEditFile = storage.getEditsFile(id); @@ -112,7 +112,7 @@ public class LocalJournal implements Journal { LOG.error(e); } } - + @Override public JournalEntity read(long journalId) { return null; @@ -164,18 +164,18 @@ public class LocalJournal implements Journal { } return 0; } - + private long getCurrentJournalId(List editFileNames) { if (editFileNames.size() == 0) { return 1; } - + long ret = editFileNames.get(editFileNames.size() - 1); JournalCursor cursor = read(ret, -1); while (cursor.next() != null) { ret++; } - + return ret; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/local/LocalJournalCursor.java b/fe/fe-core/src/main/java/org/apache/doris/journal/local/LocalJournalCursor.java index bbda622e5f..ffef5bb74e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/local/LocalJournalCursor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/local/LocalJournalCursor.java @@ -376,4 +376,3 @@ public final class LocalJournalCursor implements JournalCursor { } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapAuthenticate.java b/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapAuthenticate.java index 076e1f3853..1f40bb3b80 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapAuthenticate.java +++ b/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapAuthenticate.java @@ -28,7 +28,6 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapClient.java b/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapClient.java index 306106f473..7c1f26f9de 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapClient.java +++ b/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapClient.java @@ -25,7 +25,7 @@ import org.apache.doris.common.util.SymmetricEncryption; import org.apache.doris.persist.LdapInfo; import com.google.common.collect.Lists; - +import lombok.Data; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.ldap.core.DirContextOperations; @@ -39,8 +39,6 @@ import org.springframework.ldap.transaction.compensating.manager.TransactionAwar import java.util.List; -import lombok.Data; - // This class is used to connect to the LDAP service. public class LdapClient { private static final Logger LOG = LogManager.getLogger(LdapClient.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapPrivsChecker.java b/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapPrivsChecker.java index f13257bfb0..5b4fa42a35 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapPrivsChecker.java +++ b/fe/fe-core/src/main/java/org/apache/doris/ldap/LdapPrivsChecker.java @@ -17,7 +17,6 @@ package org.apache.doris.ldap; -import com.google.common.collect.Maps; import org.apache.doris.analysis.ResourcePattern; import org.apache.doris.analysis.TablePattern; import org.apache.doris.analysis.UserIdentity; @@ -30,7 +29,9 @@ import org.apache.doris.mysql.privilege.PaloRole; import org.apache.doris.mysql.privilege.PrivBitSet; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; + import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/BrokerFileGroup.java b/fe/fe-core/src/main/java/org/apache/doris/load/BrokerFileGroup.java index 0e4c77479a..cc41ab22ff 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/BrokerFileGroup.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/BrokerFileGroup.java @@ -17,11 +17,11 @@ package org.apache.doris.load; -import org.apache.doris.analysis.Separator; import org.apache.doris.analysis.DataDescription; import org.apache.doris.analysis.Expr; import org.apache.doris.analysis.ImportColumnDesc; import org.apache.doris.analysis.PartitionNames; +import org.apache.doris.analysis.Separator; import org.apache.doris.catalog.AggregateType; import org.apache.doris.catalog.BrokerTable; import org.apache.doris.catalog.Column; @@ -35,20 +35,19 @@ import org.apache.doris.catalog.Partition; import org.apache.doris.catalog.Table; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.DdlException; +import org.apache.doris.common.FeConstants; import org.apache.doris.common.Pair; import org.apache.doris.common.UserException; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; -import org.apache.doris.common.FeConstants; import org.apache.doris.load.loadv2.LoadTask; import org.apache.doris.thrift.TNetworkAddress; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.DataInput; import java.io.DataOutput; @@ -567,7 +566,7 @@ public class BrokerFileGroup implements Writable { } srcTableId = in.readLong(); isLoadFromTable = in.readBoolean(); - + // There are no columnExprList in the previous load job which is created before function is supported. // The columnExprList could not be analyzed without origin stmt in the previous load job. // So, the columnExprList need to be merged in here. diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/BrokerFileGroupAggInfo.java b/fe/fe-core/src/main/java/org/apache/doris/load/BrokerFileGroupAggInfo.java index f693fb902f..1ae077ec3d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/BrokerFileGroupAggInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/BrokerFileGroupAggInfo.java @@ -23,7 +23,6 @@ import org.apache.doris.common.io.Writable; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -41,13 +40,13 @@ import java.util.stream.Collectors; * When the table name and specified partitions in the two DataDescriptors are same, * the BrokerFileGroup information corresponding to the two DataDescriptors will be aggregated together. * eg1: - * + * * DATA INFILE("hdfs://hdfs_host:hdfs_port/input/file1") * INTO TABLE `tbl1` * PARTITION (p1, p2) - * + * * and - * + * * DATA INFILE("hdfs://hdfs_host:hdfs_port/input/file2") * INTO TABLE `tbl1` * PARTITION (p1, p2) @@ -55,65 +54,65 @@ import java.util.stream.Collectors; * will be aggregated together, because they have same table name and specified partitions * => * FileGroupAggKey(tbl1, [p1, p2]) => List(file1, file2); - * + * * eg2: - * + * * DATA INFILE("hdfs://hdfs_host:hdfs_port/input/file1") * INTO TABLE `tbl1` * PARTITION (p1) - * + * * and - * + * * DATA INFILE("hdfs://hdfs_host:hdfs_port/input/file2") * INTO TABLE `tbl1` * PARTITION (p2) - * + * * will NOT be aggregated together, because they have same table name but different specified partitions * FileGroupAggKey(tbl1, [p1]) => List(file1); * FileGroupAggKey(tbl1, [p2]) => List(file2); - * + * * eg3: - * + * * DATA INFILE("hdfs://hdfs_host:hdfs_port/input/file1") * INTO TABLE `tbl1` * PARTITION (p1, p2) - * + * * and - * + * * DATA INFILE("hdfs://hdfs_host:hdfs_port/input/file2") * INTO TABLE `tbl1` * PARTITION (p2, p3) - * + * * will throw an Exception, because there is an overlap partition(p2) between 2 data descriptions. And we * currently not allow this. You can equal the data descriptions like this: - * + * * DATA INFILE("hdfs://hdfs_host:hdfs_port/input/file1") * INTO TABLE `tbl1` * PARTITION (p1) - * + * * and - * + * * DATA INFILE("hdfs://hdfs_host:hdfs_port/input/file2") * INTO TABLE `tbl1` - * PARTITION (p3) - * + * PARTITION (p3) + * * and - * + * * DATA INFILE("hdfs://hdfs_host:hdfs_port/input/file1") * INTO TABLE `tbl1` - * PARTITION (p2) - * + * PARTITION (p2) + * * and - * + * * DATA INFILE("hdfs://hdfs_host:hdfs_port/input/file2") * INTO TABLE `tbl1` * PARTITION (p2) - * + * * they will be aggregate like: * FileGroupAggKey(tbl1, [p1]) => List(file1); * FileGroupAggKey(tbl1, [p3]) => List(file2); * FileGroupAggKey(tbl1, [p2]) => List(file1, file2); - * + * * Although this transformation can be done automatically by system, but it change the "max_filter_ratio". * So we have to let user decide what to do. */ @@ -182,7 +181,7 @@ public class BrokerFileGroupAggInfo implements Writable { && tableIdToPartitionIds.get(fileGroup.getTableId()).stream().anyMatch(id -> fileGroup.getPartitionIds().contains(id))) { throw new DdlException("There are overlapping partitions of same table in data description of load job stmt"); } - + fileGroupList = Lists.newArrayList(); aggKeyToFileGroups.put(fileGroupAggKey, fileGroupList); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/BrokerLoadErrorHub.java b/fe/fe-core/src/main/java/org/apache/doris/load/BrokerLoadErrorHub.java index 3d37a866b7..87018eb17d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/BrokerLoadErrorHub.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/BrokerLoadErrorHub.java @@ -107,7 +107,7 @@ public class BrokerLoadErrorHub extends LoadErrorHub { @Override public List fetchLoadError(long jobId) { List result = Lists.newArrayList(); - final String hint = "Find detail load error info on '" + final String hint = "Find detail load error info on '" + brokerParam.path + "' with file name showed in 'SHOW LOAD' stmt"; ErrorMsg errorMsg = new ErrorMsg(0, hint); result.add(errorMsg); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/DeleteHandler.java b/fe/fe-core/src/main/java/org/apache/doris/load/DeleteHandler.java index 50a3cc9fd3..9a9e13c9ad 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/DeleteHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/DeleteHandler.java @@ -80,7 +80,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/DeleteJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/DeleteJob.java index 09747df7b9..b462d31cfa 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/DeleteJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/DeleteJob.java @@ -30,7 +30,6 @@ import org.apache.doris.transaction.TransactionState; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/DppConfig.java b/fe/fe-core/src/main/java/org/apache/doris/load/DppConfig.java index bb13f62895..96ebc24f76 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/DppConfig.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/DppConfig.java @@ -373,7 +373,7 @@ public class DppConfig implements Writable { } else { out.writeBoolean(false); } - + if (priority == null) { priority = TPriority.NORMAL; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/DppScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/load/DppScheduler.java index d9042d0278..daadefadb7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/DppScheduler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/DppScheduler.java @@ -32,7 +32,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; - import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -53,7 +52,7 @@ import java.util.concurrent.ConcurrentMap; public class DppScheduler { private static final Logger LOG = LogManager.getLogger(DppScheduler.class); - + private static final String HADOOP_CLIENT = PaloFe.DORIS_HOME_DIR + Config.dpp_hadoop_client_path; private static final String DPP_OUTPUT_DIR = "export"; private static final String JOB_CONFIG_DIR = PaloFe.DORIS_HOME_DIR + "/temp/job_conf"; @@ -74,7 +73,7 @@ public class DppScheduler { + "-partitioner com.baidu.sos.mapred.lib.MapIntPartitioner " + "-cacheArchive %s/dpp/x86_64-scm-linux-gnu.tar.gz#tc " + "-cacheArchive %s/dpp/pypy.tar.gz#pypy " - + "-cacheArchive %s/dpp/palo_dpp_mr.tar.gz#mapred " + + "-cacheArchive %s/dpp/palo_dpp_mr.tar.gz#mapred " + "-numReduceTasks %d -file \"%s\" "; private static final String HADOOP_STATUS_CMD = "%s job %s -status %s"; private static final String HADOOP_KILL_CMD = "%s job %s -kill %s"; @@ -90,7 +89,7 @@ public class DppScheduler { private String hadoopConfig; private String applicationsPath; - + public DppScheduler(DppConfig dppConfig) { hadoopConfig = getHadoopConfigsStr(dppConfig.getHadoopConfigs()); applicationsPath = dppConfig.getFsDefaultName() + dppConfig.getApplicationsPath(); @@ -103,7 +102,7 @@ public class DppScheduler { } return String.format("-D %s", StringUtils.join(configs, " -D ")); } - + public EtlSubmitResult submitEtlJob(long jobId, String loadLabel, String clusterName, String dbName, Map jobConf, int retry) { String etlJobId = null; @@ -129,7 +128,7 @@ public class DppScheduler { } } } - + // create job config file String configDirPath = JOB_CONFIG_DIR + "/" + jobId; File configDir = new File(configDirPath); @@ -178,7 +177,7 @@ public class DppScheduler { // create input path Set inputPaths = getInputPaths(jobConf); String inputPath = StringUtils.join(inputPaths, " -input "); - + // reduce num int reduceNumByInputSize = 0; try { @@ -251,7 +250,7 @@ public class DppScheduler { } } } - + if (etlJobId == null) { status.setStatusCode(TStatusCode.CANCELLED); } @@ -349,7 +348,7 @@ public class DppScheduler { } } } - + private Set getInputPaths(Map jobConf) { Set inputPaths = new HashSet(); Map tables = (Map) jobConf.get("tables"); @@ -362,7 +361,7 @@ public class DppScheduler { } return inputPaths; } - + private int calcReduceNumByInputSize(Set inputPaths) throws InputSizeInvalidException { String[] envp = { "LC_ALL=" + Config.locale }; int reduceNum = 0; @@ -401,7 +400,7 @@ public class DppScheduler { } return reduceNum; } - + private int calcReduceNumByTablet(Map jobConf) { int reduceNum = 0; Map tables = (Map) jobConf.get("tables"); @@ -415,12 +414,12 @@ public class DppScheduler { // key range List rangeList = (List) view.get("key_ranges"); reduceNum += rangeList.size(); - } + } } } return reduceNum; } - + public EtlStatus getEtlJobStatus(String etlJobId) { EtlStatus status = new EtlStatus(); status.setState(TEtlState.RUNNING); @@ -501,7 +500,7 @@ public class DppScheduler { LOG.info("hadoop dir does not exist. dir: {}", outputPath); return null; } - + // check outputPath + DPP_OUTPUT_DIR exist hadoopTestCmd = String.format(HADOOP_TEST_CMD, HADOOP_CLIENT, hadoopConfig, "-d", fileDir); LOG.info(hadoopTestCmd); @@ -533,21 +532,21 @@ public class DppScheduler { } return fileMap; } - + public void killEtlJob(String etlJobId) { String[] envp = { "LC_ALL=" + Config.locale }; String hadoopKillCmd = String.format(HADOOP_KILL_CMD, HADOOP_CLIENT, hadoopConfig, etlJobId); LOG.info(hadoopKillCmd); Util.executeCommand(hadoopKillCmd, envp); } - + public void deleteEtlOutputPath(String outputPath) { String[] envp = { "LC_ALL=" + Config.locale }; String hadoopRmCmd = String.format(HADOOP_RMR_CMD, HADOOP_CLIENT, hadoopConfig, outputPath); LOG.info(hadoopRmCmd); Util.executeCommand(hadoopRmCmd, envp); } - + public static String getEtlOutputPath(String fsDefaultName, String outputPath, long dbId, String loadLabel, String etlOutputDir) { return String.format(ETL_OUTPUT_PATH, fsDefaultName, outputPath, dbId, loadLabel, etlOutputDir); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/EtlJobInfo.java b/fe/fe-core/src/main/java/org/apache/doris/load/EtlJobInfo.java index c31d94f7f4..c799d6b337 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/EtlJobInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/EtlJobInfo.java @@ -29,7 +29,7 @@ public class EtlJobInfo implements Writable { public EtlJobInfo() { jobStatus = new EtlStatus(); } - + public EtlStatus getJobStatus() { return jobStatus; } @@ -51,7 +51,7 @@ public class EtlJobInfo implements Writable { public void readFields(DataInput in) throws IOException { jobStatus.readFields(in); } - + @Override public boolean equals(Object obj) { return true; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/EtlStatus.java b/fe/fe-core/src/main/java/org/apache/doris/load/EtlStatus.java index bc01f43c32..9eca621a58 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/EtlStatus.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/EtlStatus.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; public class EtlStatus implements Writable { public static final String DEFAULT_TRACKING_URL = FeConstants.null_string; - + private TEtlState state; private String trackingUrl; private Map stats; @@ -162,7 +162,7 @@ public class EtlStatus implements Writable { public void write(DataOutput out) throws IOException { Text.writeString(out, state.name()); Text.writeString(out, trackingUrl); - + int statsCount = (stats == null) ? 0 : stats.size(); out.writeInt(statsCount); for (Map.Entry entry : stats.entrySet()) { @@ -195,18 +195,18 @@ public class EtlStatus implements Writable { counters.put(key, value); } } - + public boolean equals(Object obj) { if (obj == this) { return true; } - + if (!(obj instanceof EtlStatus)) { return false; } - + EtlStatus etlTaskStatus = (EtlStatus) obj; - + // Check stats if (etlTaskStatus.stats == null) { return false; @@ -223,7 +223,7 @@ public class EtlStatus implements Writable { return false; } } - + // Check counters if (etlTaskStatus.counters == null) { return false; @@ -240,7 +240,7 @@ public class EtlStatus implements Writable { return false; } } - + return state.equals(etlTaskStatus.state) && trackingUrl.equals(etlTaskStatus.trackingUrl); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/ExportChecker.java b/fe/fe-core/src/main/java/org/apache/doris/load/ExportChecker.java index 4ee88ce9e8..78b8b0b0d9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/ExportChecker.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/ExportChecker.java @@ -27,7 +27,6 @@ import org.apache.doris.task.MasterTask; import org.apache.doris.task.MasterTaskExecutor; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java index c25ea9cd00..7149db0320 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java @@ -45,6 +45,7 @@ import org.apache.doris.catalog.Table; import org.apache.doris.catalog.Type; import org.apache.doris.common.Config; import org.apache.doris.common.DdlException; +import org.apache.doris.common.FeConstants; import org.apache.doris.common.Pair; import org.apache.doris.common.Status; import org.apache.doris.common.UserException; @@ -52,7 +53,6 @@ import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.common.util.SqlParserUtils; import org.apache.doris.common.util.TimeUtils; -import org.apache.doris.common.FeConstants; import org.apache.doris.planner.DataPartition; import org.apache.doris.planner.ExportSink; import org.apache.doris.planner.MysqlScanNode; @@ -84,7 +84,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -258,7 +257,7 @@ public class ExportJob implements Writable { plan(); } - + private String genNames() { String names = ""; for (SlotDescriptor slot : exportTupleDesc.getSlots()) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java b/fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java index 59a3b3c74e..32c2fcf552 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java @@ -37,7 +37,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/FailMsg.java b/fe/fe-core/src/main/java/org/apache/doris/load/FailMsg.java index 91a4015dc3..d54ab92d85 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/FailMsg.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/FailMsg.java @@ -35,7 +35,7 @@ public class FailMsg implements Writable { UNKNOWN, TXN_UNKNOWN // cancelled because txn status is unknown } - + private CancelType cancelType; private String msg = ""; @@ -46,7 +46,7 @@ public class FailMsg implements Writable { public FailMsg(CancelType cancelType) { this.cancelType = cancelType; } - + public FailMsg(CancelType cancelType, String msg) { this.cancelType = cancelType; this.msg = msg; @@ -81,18 +81,18 @@ public class FailMsg implements Writable { cancelType = CancelType.valueOf(Text.readString(in)); msg = Text.readString(in); } - + public boolean equals(Object obj) { if (obj == this) { return true; } - + if (!(obj instanceof FailMsg)) { return false; } - + FailMsg failMsg = (FailMsg) obj; - + return cancelType.equals(failMsg.cancelType) && msg.equals(failMsg.msg); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/HadoopEtlJobInfo.java b/fe/fe-core/src/main/java/org/apache/doris/load/HadoopEtlJobInfo.java index 02533a200b..9f64f7cdc1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/HadoopEtlJobInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/HadoopEtlJobInfo.java @@ -96,7 +96,7 @@ public class HadoopEtlJobInfo extends EtlJobInfo { dppConfig.readFields(in); } } - + @Override public boolean equals(Object obj) { if (!super.equals(obj)) { @@ -106,11 +106,11 @@ public class HadoopEtlJobInfo extends EtlJobInfo { if (obj == this) { return true; } - + if (!(obj instanceof HadoopEtlJobInfo)) { return false; } - + HadoopEtlJobInfo jobInfo = (HadoopEtlJobInfo) obj; if (dppConfig != jobInfo.dppConfig) { @@ -122,7 +122,7 @@ public class HadoopEtlJobInfo extends EtlJobInfo { return false; } } - + return cluster.equals(jobInfo.cluster) && etlJobId.equals(jobInfo.etlJobId) && etlOutputDir.equals(jobInfo.etlOutputDir); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/Load.java b/fe/fe-core/src/main/java/org/apache/doris/load/Load.java index ea381977e2..2b151c0452 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/Load.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/Load.java @@ -106,7 +106,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.gson.Gson; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/LoadChecker.java b/fe/fe-core/src/main/java/org/apache/doris/load/LoadChecker.java index 0ee4fd2854..4f14b63365 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/LoadChecker.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/LoadChecker.java @@ -53,7 +53,6 @@ import org.apache.doris.transaction.TransactionStatus; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -78,7 +77,7 @@ public class LoadChecker extends MasterDaemon { super("load checker " + jobState.name().toLowerCase(), intervalMs); this.jobState = jobState; } - + /** * init dpp config and load checker threads executors * @param intervalMs @@ -88,7 +87,7 @@ public class LoadChecker extends MasterDaemon { checkers.put(JobState.ETL, new LoadChecker(JobState.ETL, intervalMs)); checkers.put(JobState.LOADING, new LoadChecker(JobState.LOADING, intervalMs)); checkers.put(JobState.QUORUM_FINISHED, new LoadChecker(JobState.QUORUM_FINISHED, intervalMs)); - + Map pendingPriorityMap = Maps.newHashMap(); pendingPriorityMap.put(TPriority.NORMAL, new MasterTaskExecutor("load_pending_thread_num_normal_priority", Config.load_pending_thread_num_normal_priority, true)); @@ -101,7 +100,7 @@ public class LoadChecker extends MasterDaemon { etlPriorityMap.put(TPriority.HIGH, new MasterTaskExecutor("load_etl_thread_num_high_priority", Config.load_etl_thread_num_high_priority, true)); executors.put(JobState.ETL, etlPriorityMap); } - + /** * start all load checker threads */ @@ -115,7 +114,7 @@ public class LoadChecker extends MasterDaemon { } } } - + @Override protected void runAfterCatalogReady() { LOG.debug("start check load jobs. job state: {}", jobState.name()); @@ -208,7 +207,7 @@ public class LoadChecker extends MasterDaemon { } } } - + private void runLoadingJobs() { List loadingJobs = Catalog.getCurrentCatalog().getLoadInstance().getLoadJobs(JobState.LOADING); for (LoadJob job : loadingJobs) { @@ -220,7 +219,7 @@ public class LoadChecker extends MasterDaemon { } } } - + private void runOneLoadingJob(LoadJob job) { // check timeout Load load = Catalog.getCurrentCatalog().getLoadInstance(); @@ -265,7 +264,7 @@ public class LoadChecker extends MasterDaemon { return; } if (state.getTransactionStatus() == TransactionStatus.ABORTED) { - load.cancelLoadJob(job, CancelType.LOAD_RUN_FAIL, + load.cancelLoadJob(job, CancelType.LOAD_RUN_FAIL, "job is aborted in transaction manager [" + state + "]"); return; } else if (state.getTransactionStatus() == TransactionStatus.COMMITTED) { @@ -279,7 +278,7 @@ public class LoadChecker extends MasterDaemon { } return; } - + if (checkTimeout(job)) { load.cancelLoadJob(job, CancelType.TIMEOUT, "loading timeout to cancel"); return; @@ -290,7 +289,7 @@ public class LoadChecker extends MasterDaemon { load.cancelLoadJob(job, CancelType.LOAD_RUN_FAIL, "submit push tasks fail"); return; } - + // yiguolei: for real time load we use full finished replicas Set fullTablets = job.getFullTablets(); if (state.isRunning()) { @@ -298,8 +297,8 @@ public class LoadChecker extends MasterDaemon { } else { job.setProgress(100); } - - long stragglerTimeout = job.isSyncDeleteJob() ? job.getDeleteJobTimeout() / 2 + + long stragglerTimeout = job.isSyncDeleteJob() ? job.getDeleteJobTimeout() / 2 : Config.load_straggler_wait_second * 1000; Set unfinishedTablets = Sets.newHashSet(); unfinishedTablets.addAll(jobTotalTablets); @@ -351,7 +350,7 @@ public class LoadChecker extends MasterDaemon { } catch (TabletQuorumFailedException e) { // wait the upper application retry } catch (UserException e) { - LOG.warn("errors while commit transaction [{}], cancel the job {}, reason is {}", + LOG.warn("errors while commit transaction [{}], cancel the job {}, reason is {}", transactionState.getTransactionId(), job, e); load.cancelLoadJob(job, CancelType.UNKNOWN, transactionState.getReason()); } finally { @@ -377,7 +376,7 @@ public class LoadChecker extends MasterDaemon { TableLoadInfo tableLoadInfo = tableEntry.getValue(); // check if the job is submit during rollup boolean autoLoadToTwoTablet = true; - + for (Entry partitionEntry : tableLoadInfo.getIdToPartitionLoadInfo().entrySet()) { long partitionId = partitionEntry.getKey(); PartitionLoadInfo partitionLoadInfo = partitionEntry.getValue(); @@ -390,16 +389,16 @@ public class LoadChecker extends MasterDaemon { Partition partition = table.getPartition(partitionId); if (partition == null) { LOG.warn("partition does not exist. id: {}", partitionId); - // if partition is + // if partition is return null; } - + short replicationNum = table.getPartitionInfo().getReplicaAllocation(partition.getId()).getTotalReplicaNum(); // check all indices (base + roll up (not include ROLLUP state index)) List indices = partition.getMaterializedIndices(IndexExtState.ALL); for (MaterializedIndex index : indices) { long indexId = index.getId(); - + // 1. the load job's etl is started before rollup finished // 2. rollup job comes into finishing state, add rollup index to catalog // 3. load job's etl finished, begin to load @@ -413,18 +412,18 @@ public class LoadChecker extends MasterDaemon { // new process, just continue continue; } - + // add to jobTotalTablets first. for (Tablet tablet : index.getTablets()) { // the job is submitted before rollup finished and try to finish after rollup finished // then the job's tablet load info does not contain the new rollup index's tablet // not deal with this case because the finished replica will include new rollup index's replica - // and check it at commit time + // and check it at commit time if (tabletLoadInfos.containsKey(tablet.getId())) { jobTotalTablets.add(tablet.getId()); } } - + int schemaHash = tableLoadInfo.getIndexSchemaHash(indexId); short quorumNum = (short) (replicationNum / 2 + 1); for (Tablet tablet : index.getTablets()) { @@ -447,7 +446,7 @@ public class LoadChecker extends MasterDaemon { if (job.isSyncDeleteJob()) { type = TPushType.DELETE; } - + // add task to batchTask Set allReplicas = new HashSet(); Set finishedReplicas = new HashSet(); @@ -463,9 +462,9 @@ public class LoadChecker extends MasterDaemon { tabletId, replicaId, schemaHash, -1, filePath, fileSize, 0, job.getId(), type, job.getConditions(), - needDecompress, job.getPriority(), - TTaskType.REALTIME_PUSH, - job.getTransactionId(), + needDecompress, job.getPriority(), + TTaskType.REALTIME_PUSH, + job.getTransactionId(), Catalog.getCurrentGlobalTransactionMgr().getTransactionIDGenerator().getNextTransactionId()); pushTask.setIsSchemaChanging(autoLoadToTwoTablet); if (AgentTaskQueue.addTask(pushTask)) { @@ -507,7 +506,7 @@ public class LoadChecker extends MasterDaemon { } return jobTotalTablets; } - + private void runQuorumFinishedJobs() { List quorumFinishedJobs = Catalog.getCurrentCatalog().getLoadInstance().getLoadJobs( JobState.QUORUM_FINISHED); @@ -520,7 +519,7 @@ public class LoadChecker extends MasterDaemon { } } } - + private void runOneQuorumFinishedJob(LoadJob job) { // if db is null, cancel load job Load load = Catalog.getCurrentCatalog().getLoadInstance(); @@ -541,7 +540,7 @@ public class LoadChecker extends MasterDaemon { if (timeoutSecond == 0) { return false; } - + long deltaSecond = (System.currentTimeMillis() - job.getCreateTimeMs()) / 1000; if (deltaSecond > timeoutSecond) { return true; @@ -549,5 +548,5 @@ public class LoadChecker extends MasterDaemon { return false; } - + } diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/LoadErrorHub.java b/fe/fe-core/src/main/java/org/apache/doris/load/LoadErrorHub.java index ca19114cc8..5d72e10b20 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/LoadErrorHub.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/LoadErrorHub.java @@ -27,7 +27,6 @@ import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/LoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/LoadJob.java index 5943a2d95e..599fd68ec9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/LoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/LoadJob.java @@ -42,7 +42,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -92,7 +91,7 @@ public class LoadJob implements Writable { // progress has two functions at ETL stage: // 1. when progress < 100, it indicates ETL progress // 2. set progress = 100 ONLY when ETL progress is completely done - // + // // when at LOADING stage, use it normally (as real progress) private int progress; @@ -860,7 +859,7 @@ public class LoadJob implements Writable { boolean deleteFlag = false; deleteFlag = in.readBoolean(); - + state = JobState.valueOf(Text.readString(in)); progress = in.readInt(); createTimeMs = in.readLong(); @@ -963,7 +962,7 @@ public class LoadJob implements Writable { } else { Operator op = Operator.valueOf(opStr); String value = Text.readString(in); - BinaryPredicate predicate = new BinaryPredicate(op, new SlotRef(null, key), + BinaryPredicate predicate = new BinaryPredicate(op, new SlotRef(null, key), new StringLiteral(value)); conditions.add(predicate); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/MiniEtlJobInfo.java b/fe/fe-core/src/main/java/org/apache/doris/load/MiniEtlJobInfo.java index c2a0aa2480..91968d1476 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/MiniEtlJobInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/MiniEtlJobInfo.java @@ -29,7 +29,7 @@ public class MiniEtlJobInfo extends EtlJobInfo { private static final int GET_STATUS_INTERVAL_TIMES = 5; // load checker check etl job status times private int checkTimes; - + // etlTaskId -> etlTaskInfo private Map idToEtlTask; @@ -38,7 +38,7 @@ public class MiniEtlJobInfo extends EtlJobInfo { checkTimes = 0; idToEtlTask = Maps.newHashMap(); } - + public boolean needGetTaskStatus() { if (++checkTimes % GET_STATUS_INTERVAL_TIMES == 0) { return true; @@ -49,7 +49,7 @@ public class MiniEtlJobInfo extends EtlJobInfo { public Map getEtlTasks() { return idToEtlTask; } - + public MiniEtlTaskInfo getEtlTask(long taskId) { return idToEtlTask.get(taskId); } @@ -57,7 +57,7 @@ public class MiniEtlJobInfo extends EtlJobInfo { public void setEtlTasks(Map idToEtlTask) { this.idToEtlTask = idToEtlTask; } - + @Override public void write(DataOutput out) throws IOException { super.write(out); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/MiniEtlTaskInfo.java b/fe/fe-core/src/main/java/org/apache/doris/load/MiniEtlTaskInfo.java index 1e32b14cc5..6a8b033a75 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/MiniEtlTaskInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/MiniEtlTaskInfo.java @@ -28,7 +28,7 @@ public class MiniEtlTaskInfo implements Writable { private long backendId; private long tableId; private final EtlStatus taskStatus; - + public MiniEtlTaskInfo() { this(-1L, -1L, -1L); } @@ -55,7 +55,7 @@ public class MiniEtlTaskInfo implements Writable { public EtlStatus getTaskStatus() { return taskStatus; } - + @Override public void write(DataOutput out) throws IOException { out.writeLong(id); @@ -74,19 +74,19 @@ public class MiniEtlTaskInfo implements Writable { if (!super.equals(obj)) { return false; } - + if (obj == this) { return true; } - + if (!(obj instanceof MiniEtlTaskInfo)) { return false; } - + MiniEtlTaskInfo taskInfo = (MiniEtlTaskInfo) obj; - - return id == taskInfo.id - && backendId == taskInfo.backendId + + return id == taskInfo.id + && backendId == taskInfo.backendId && tableId == taskInfo.tableId; } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/MysqlLoadErrorHub.java b/fe/fe-core/src/main/java/org/apache/doris/load/MysqlLoadErrorHub.java index 7a662dcae3..5c3d1b1701 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/MysqlLoadErrorHub.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/MysqlLoadErrorHub.java @@ -26,7 +26,6 @@ import org.apache.doris.thrift.TMysqlErrorHubInfo; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/PartitionLoadInfo.java b/fe/fe-core/src/main/java/org/apache/doris/load/PartitionLoadInfo.java index e3dadfc483..4b7ce8a1f2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/PartitionLoadInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/PartitionLoadInfo.java @@ -39,11 +39,11 @@ public class PartitionLoadInfo implements Writable { this.sources = sources; this.needLoad = true; } - + public void setVersion(long version) { this.version = version; } - + public long getVersion() { return version; } @@ -51,7 +51,7 @@ public class PartitionLoadInfo implements Writable { public List getSources() { return sources; } - + public boolean isNeedLoad() { return needLoad; } @@ -64,7 +64,7 @@ public class PartitionLoadInfo implements Writable { out.writeLong(version); // Versionhash useless just for compatible out.writeLong(0L); - + int count = 0; if (sources == null) { out.writeBoolean(false); @@ -84,7 +84,7 @@ public class PartitionLoadInfo implements Writable { // Versionhash useless just for compatible in.readLong(); int count = 0; - + if (in.readBoolean()) { count = in.readInt(); for (int i = 0; i < count; i++) { @@ -93,7 +93,7 @@ public class PartitionLoadInfo implements Writable { sources.add(source); } } - + needLoad = in.readBoolean(); } @@ -106,13 +106,13 @@ public class PartitionLoadInfo implements Writable { if (obj == this) { return true; } - + if (!(obj instanceof PartitionLoadInfo)) { return false; } - + PartitionLoadInfo info = (PartitionLoadInfo) obj; - + if (sources != info.sources) { if (sources == null || info.sources == null) { return false; @@ -126,10 +126,10 @@ public class PartitionLoadInfo implements Writable { } } } - + return version == info.version && needLoad == info.needLoad; } - + public int hashCode() { int ret = (int) (version); ret ^= sources.size(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/RoutineLoadDesc.java b/fe/fe-core/src/main/java/org/apache/doris/load/RoutineLoadDesc.java index f9053bf3ef..9f55a1d8e3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/RoutineLoadDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/RoutineLoadDesc.java @@ -18,11 +18,11 @@ package org.apache.doris.load; import org.apache.doris.analysis.Analyzer; -import org.apache.doris.analysis.Separator; import org.apache.doris.analysis.Expr; import org.apache.doris.analysis.ImportColumnsStmt; import org.apache.doris.analysis.ImportWhereStmt; import org.apache.doris.analysis.PartitionNames; +import org.apache.doris.analysis.Separator; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; import org.apache.doris.load.loadv2.LoadTask; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/Source.java b/fe/fe-core/src/main/java/org/apache/doris/load/Source.java index 3b26231b09..7115e4c9ce 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/Source.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/Source.java @@ -20,6 +20,7 @@ package org.apache.doris.load; import org.apache.doris.common.Pair; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -34,7 +35,7 @@ import java.util.Map.Entry; public class Source implements Writable { private static final String DEFAULT_COLUMN_SEPARATOR = "\t"; private static final String DEFAULT_LINE_DELIMITER = "\n"; - + private List fileUrls; private List columnNames; private String columnSeparator; @@ -130,7 +131,7 @@ public class Source implements Writable { Text.writeString(out, url); } } - + if (columnNames == null) { out.writeBoolean(false); } else { @@ -141,11 +142,11 @@ public class Source implements Writable { Text.writeString(out, name); } } - + Text.writeString(out, columnSeparator); Text.writeString(out, lineDelimiter); out.writeBoolean(isNegative); - + if (columnToFunction == null) { out.writeBoolean(false); } else { @@ -171,14 +172,14 @@ public class Source implements Writable { } public void readFields(DataInput in) throws IOException { int count = 0; - + if (in.readBoolean()) { count = in.readInt(); for (int i = 0; i < count; i++) { fileUrls.add(Text.readString(in).intern()); } } - + if (in.readBoolean()) { count = in.readInt(); for (int i = 0; i < count; i++) { @@ -189,7 +190,7 @@ public class Source implements Writable { columnSeparator = Text.readString(in).intern(); lineDelimiter = Text.readString(in).intern(); isNegative = in.readBoolean(); - + if (in.readBoolean()) { count = in.readInt(); for (int i = 0; i < count; i++) { @@ -206,18 +207,18 @@ public class Source implements Writable { } } } - + public boolean equals(Object obj) { if (obj == this) { return true; } - + if (!(obj instanceof Source)) { return false; } - + Source source = (Source) obj; - + // Check fileUrls if (fileUrls != source.fileUrls) { if (fileUrls == null || source.fileUrls == null) { @@ -232,7 +233,7 @@ public class Source implements Writable { } } } - + // Check columnNames if (columnNames != source.columnNames) { if (columnNames == null || source.columnNames == null) { @@ -247,7 +248,7 @@ public class Source implements Writable { } } } - + // columnToFunction if (columnToFunction != source.columnToFunction) { if (columnToFunction == null || source.columnToFunction == null) { @@ -266,17 +267,17 @@ public class Source implements Writable { } } } - + return columnSeparator.equals(source.columnSeparator) && lineDelimiter.equals(source.lineDelimiter) && isNegative == source.isNegative; } - + public int hashCode() { if (fileUrls == null || columnNames == null) { return -1; } - + int ret = fileUrls.size() ^ columnNames.size() ^ columnToFunction.size(); ret ^= columnSeparator.length(); ret ^= lineDelimiter.length(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/StreamLoadRecordMgr.java b/fe/fe-core/src/main/java/org/apache/doris/load/StreamLoadRecordMgr.java index 04ffd143f6..a51b8cb077 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/StreamLoadRecordMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/StreamLoadRecordMgr.java @@ -43,7 +43,7 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import com.google.gson.annotations.SerializedName; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -63,8 +63,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Collectors; -import com.google.gson.annotations.SerializedName; - public class StreamLoadRecordMgr extends MasterDaemon { private static final Logger LOG = LogManager.getLogger(StreamLoadRecordMgr.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/TableLoadInfo.java b/fe/fe-core/src/main/java/org/apache/doris/load/TableLoadInfo.java index 4520cf55d8..2486088bb0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/TableLoadInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/TableLoadInfo.java @@ -18,6 +18,7 @@ package org.apache.doris.load; import org.apache.doris.common.io.Writable; + import com.google.common.collect.Maps; import java.io.DataInput; @@ -34,12 +35,12 @@ public class TableLoadInfo implements Writable { public TableLoadInfo() { this(new HashMap()); } - + public TableLoadInfo(Map idToPartitionLoadInfo) { this.idToPartitionLoadInfo = idToPartitionLoadInfo; this.indexIdToSchemaHash = Maps.newHashMap(); } - + public boolean containsIndex(long indexId) { if (indexIdToSchemaHash.containsKey(indexId)) { return true; @@ -50,11 +51,11 @@ public class TableLoadInfo implements Writable { public Map getIdToPartitionLoadInfo() { return idToPartitionLoadInfo; } - + public PartitionLoadInfo getPartitionLoadInfo(long partitionId) { return idToPartitionLoadInfo.get(partitionId); } - + public void addIndexSchemaHash(long indexId, int schemaHash) { indexIdToSchemaHash.put(indexId, schemaHash); } @@ -62,7 +63,7 @@ public class TableLoadInfo implements Writable { public void addAllSchemaHash(Map m) { indexIdToSchemaHash.putAll(m); } - + public int getIndexSchemaHash(long indexId) { if (indexIdToSchemaHash.containsKey(indexId)) { return indexIdToSchemaHash.get(indexId); @@ -78,7 +79,7 @@ public class TableLoadInfo implements Writable { out.writeLong(entry.getKey()); entry.getValue().write(out); } - + count = indexIdToSchemaHash.size(); out.writeInt(count); for (Entry entry : indexIdToSchemaHash.entrySet()) { @@ -86,7 +87,7 @@ public class TableLoadInfo implements Writable { out.writeInt(entry.getValue()); } } - + public void readFields(DataInput in) throws IOException { int count = in.readInt(); for (int i = 0; i < count; i++) { @@ -95,7 +96,7 @@ public class TableLoadInfo implements Writable { value.readFields(in); idToPartitionLoadInfo.put(key, value); } - + count = in.readInt(); for (int i = 0; i < count; i++) { long key = in.readLong(); @@ -114,13 +115,13 @@ public class TableLoadInfo implements Writable { if (obj == this) { return true; } - + if (!(obj instanceof TableLoadInfo)) { return false; } - + TableLoadInfo tableLoadInfo = (TableLoadInfo) obj; - + // check idToPartitionLoadInfo if (idToPartitionLoadInfo != tableLoadInfo.idToPartitionLoadInfo) { if (idToPartitionLoadInfo.size() != tableLoadInfo.idToPartitionLoadInfo.size()) { @@ -151,7 +152,7 @@ public class TableLoadInfo implements Writable { } } } - + return true; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/TabletLoadInfo.java b/fe/fe-core/src/main/java/org/apache/doris/load/TabletLoadInfo.java index a727e3043d..cfca96f5c5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/TabletLoadInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/TabletLoadInfo.java @@ -30,7 +30,7 @@ public class TabletLoadInfo implements Writable { private String filePath; private long fileSize; private Set sentReplicas; - + public TabletLoadInfo() { this("", -1); } @@ -53,11 +53,11 @@ public class TabletLoadInfo implements Writable { sentReplicas.add(replicaId); return true; } - + public boolean isReplicaSent(long replicaId) { return sentReplicas.contains(replicaId); } - + public void write(DataOutput out) throws IOException { if (filePath == null) { out.writeBoolean(false); @@ -77,18 +77,18 @@ public class TabletLoadInfo implements Writable { fileSize = -1; } } - + public boolean equals(Object obj) { if (obj == this) { return true; } - + if (!(obj instanceof TabletLoadInfo)) { return false; } - + TabletLoadInfo info = (TabletLoadInfo) obj; - + if (sentReplicas != info.sentReplicas) { if (sentReplicas == null || info.sentReplicas == null) { return false; @@ -102,16 +102,16 @@ public class TabletLoadInfo implements Writable { } } } - + if (filePath != info.filePath) { if (filePath == null || info.filePath == null) { return false; } } - + return filePath.equals(info.filePath); } - + public int hashCode() { int ret = filePath.length(); return ret; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java index d555e7d693..5e02b6891c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadJob.java @@ -51,11 +51,10 @@ import org.apache.doris.transaction.TransactionState; import org.apache.doris.transaction.TransactionState.TxnCoordinator; import org.apache.doris.transaction.TransactionState.TxnSourceType; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.google.common.base.Joiner; import com.google.common.collect.Lists; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.List; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadPendingTask.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadPendingTask.java index a35df4ab1a..4da6079eac 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadPendingTask.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BrokerLoadPendingTask.java @@ -30,7 +30,6 @@ import org.apache.doris.load.FailMsg; import org.apache.doris.thrift.TBrokerFileStatus; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java index 7009058b94..07e8c6aa35 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java @@ -46,14 +46,13 @@ import org.apache.doris.qe.SqlModeHelper; import org.apache.doris.transaction.TabletCommitInfo; import org.apache.doris.transaction.TransactionState; -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadEtlChecker.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadEtlChecker.java index 20973657ce..545d37a115 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadEtlChecker.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadEtlChecker.java @@ -19,6 +19,7 @@ package org.apache.doris.load.loadv2; import org.apache.doris.common.Config; import org.apache.doris.common.util.MasterDaemon; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java index 28f64f11a7..a39a79195a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java @@ -68,7 +68,6 @@ import com.google.common.collect.Table; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJobScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJobScheduler.java index 30a78c01b0..cf065bb8cf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJobScheduler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJobScheduler.java @@ -26,7 +26,6 @@ import org.apache.doris.common.util.MasterDaemon; import org.apache.doris.load.FailMsg; import com.google.common.collect.Queues; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingChecker.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingChecker.java index e9d8683ccc..06318962b7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingChecker.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingChecker.java @@ -19,6 +19,7 @@ package org.apache.doris.load.loadv2; import org.apache.doris.common.Config; import org.apache.doris.common.util.MasterDaemon; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java index 64e0973c00..4ac2a3550f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java @@ -50,7 +50,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadingTaskPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadingTaskPlanner.java index 903e65ff6d..d74b17f490 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadingTaskPlanner.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadingTaskPlanner.java @@ -45,7 +45,6 @@ import org.apache.doris.thrift.TUniqueId; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/MiniLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/MiniLoadJob.java index 65a9a852f0..2c76672cd0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/MiniLoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/MiniLoadJob.java @@ -36,7 +36,6 @@ import org.apache.doris.transaction.TransactionState.TxnSourceType; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkEtlJobHandler.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkEtlJobHandler.java index f26793ab82..2a3ed1a54f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkEtlJobHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkEtlJobHandler.java @@ -34,19 +34,18 @@ import org.apache.doris.load.loadv2.etl.SparkEtlJob; import org.apache.doris.thrift.TBrokerFileStatus; import org.apache.doris.thrift.TEtlState; -import org.apache.hadoop.yarn.api.records.ApplicationReport; -import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; -import org.apache.hadoop.yarn.api.records.YarnApplicationState; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.spark.launcher.SparkLauncher; - import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; +import org.apache.hadoop.yarn.api.records.ApplicationReport; +import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; +import org.apache.hadoop.yarn.api.records.YarnApplicationState; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.spark.launcher.SparkLauncher; import java.io.File; import java.io.IOException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLauncherMonitor.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLauncherMonitor.java index 9af39c4f3a..5dd171d051 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLauncherMonitor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLauncherMonitor.java @@ -20,7 +20,6 @@ package org.apache.doris.load.loadv2; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.base.Strings; - import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.logging.log4j.LogManager; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadAppHandle.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadAppHandle.java index c732027e16..3620222bbd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadAppHandle.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadAppHandle.java @@ -20,9 +20,9 @@ package org.apache.doris.load.loadv2; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; + import com.google.common.collect.Lists; import com.google.gson.annotations.SerializedName; - import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadJob.java index 17c39b904a..a702a81ab5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadJob.java @@ -93,7 +93,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadPendingTask.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadPendingTask.java index d9f9467a3b..4429f9e059 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadPendingTask.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadPendingTask.java @@ -67,7 +67,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Range; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkRepository.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkRepository.java index ebdf2f8008..6d44e5a3a9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkRepository.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkRepository.java @@ -24,11 +24,11 @@ import org.apache.doris.common.LoadException; import org.apache.doris.common.UserException; import org.apache.doris.common.util.BrokerUtil; import org.apache.doris.thrift.TBrokerFileStatus; + import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkYarnConfigFiles.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkYarnConfigFiles.java index c980d74b0c..5b06853a0a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkYarnConfigFiles.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkYarnConfigFiles.java @@ -19,11 +19,11 @@ package org.apache.doris.load.loadv2; import org.apache.doris.common.Config; import org.apache.doris.common.LoadException; + import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/YarnApplicationReport.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/YarnApplicationReport.java index cd540c280e..e75dcdbe04 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/YarnApplicationReport.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/YarnApplicationReport.java @@ -18,10 +18,10 @@ package org.apache.doris.load.loadv2; import org.apache.doris.common.LoadException; + import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.collect.Maps; - import org.apache.hadoop.yarn.api.records.ApplicationReport; import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.hadoop.yarn.api.records.YarnApplicationState; @@ -38,23 +38,23 @@ import java.util.Map; * Input sample: * ------------------- * Application Report : - * Application-Id : application_1573630236805_6763648 - * Application-Name : doris_label_test - * Application-Type : SPARK-2.4.1 - * User : test - * Queue : test-queue - * Start-Time : 1597654469958 - * Finish-Time : 1597654801939 - * Progress : 100% - * State : FINISHED - * Final-State : SUCCEEDED - * Tracking-URL : 127.0.0.1:8004/history/application_1573630236805_6763648/1 - * RPC Port : 40236 - * AM Host : host-name - * ------------------ + * Application-Id : application_1573630236805_6763648 + * Application-Name : doris_label_test + * Application-Type : SPARK-2.4.1 + * User : test + * Queue : test-queue + * Start-Time : 1597654469958 + * Finish-Time : 1597654801939 + * Progress : 100% + * State : FINISHED + * Final-State : SUCCEEDED + * Tracking-URL : 127.0.0.1:8004/history/application_1573630236805_6763648/1 + * RPC Port : 40236 + * AM Host : host-name + * ------------------ * - * Output: - * ApplicationReport + * Output: + * ApplicationReport */ public class YarnApplicationReport { private static final String APPLICATION_ID = "Application-Id"; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaProgress.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaProgress.java index 8f5f957892..d4ecdcfcc2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaProgress.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaProgress.java @@ -26,7 +26,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaRoutineLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaRoutineLoadJob.java index f85898f10b..8b9da7713d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaRoutineLoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaRoutineLoadJob.java @@ -48,7 +48,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.GsonBuilder; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.parquet.Strings; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaTaskInfo.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaTaskInfo.java index c237fd4b52..e22b42a210 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaTaskInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/KafkaTaskInfo.java @@ -34,7 +34,6 @@ import org.apache.doris.thrift.TUniqueId; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.gson.Gson; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/LoadDataSourceType.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/LoadDataSourceType.java index c446e4568e..0135f176b4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/LoadDataSourceType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/LoadDataSourceType.java @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. - package org.apache.doris.load.routineload; public enum LoadDataSourceType { diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java index f1c22458b8..2c62ef004e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java @@ -74,7 +74,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.GsonBuilder; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -927,7 +926,7 @@ public abstract class RoutineLoadJob extends AbstractTxnStateChangeCallback impl // so we can find this error and step in. return; } - + writeLock(); try { this.jobStatistic.runningTxnIds.remove(txnState.getTransactionId()); @@ -1088,12 +1087,12 @@ public abstract class RoutineLoadJob extends AbstractTxnStateChangeCallback impl if (routineLoadDesc == null) { return; } - + PartitionNames partitionNames = routineLoadDesc.getPartitionNames(); if (partitionNames == null) { return; } - + // check partitions olapTable.readLock(); try { @@ -1124,7 +1123,7 @@ public abstract class RoutineLoadJob extends AbstractTxnStateChangeCallback impl .add("desire_job_state", jobState) .add("msg", reason) .build()); - + checkStateTransform(jobState); switch (jobState) { case RUNNING: @@ -1591,7 +1590,7 @@ public abstract class RoutineLoadJob extends AbstractTxnStateChangeCallback impl this.jobStatistic = RoutineLoadStatistic.read(in); } origStmt = OriginStatement.read(in); - + int size = in.readInt(); for (int i = 0; i < size; i++) { String key = Text.readString(in); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java index 2d6c13adab..fa54894f0f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadManager.java @@ -47,7 +47,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadProgress.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadProgress.java index 224dd54029..bf746a621f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadProgress.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadProgress.java @@ -40,7 +40,7 @@ public abstract class RoutineLoadProgress implements Writable { abstract void update(RLTaskTxnCommitAttachment attachment); abstract String toJsonString(); - + public static RoutineLoadProgress read(DataInput in) throws IOException { RoutineLoadProgress progress = null; LoadDataSourceType type = LoadDataSourceType.valueOf(Text.readString(in)); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadScheduler.java index df15bdc5d6..34b6e2f503 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadScheduler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadScheduler.java @@ -28,7 +28,6 @@ import org.apache.doris.common.util.MasterDaemon; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadTaskInfo.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadTaskInfo.java index 50acd8bd99..ade282f207 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadTaskInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadTaskInfo.java @@ -37,7 +37,6 @@ import org.apache.doris.transaction.TransactionState.TxnSourceType; import org.apache.doris.transaction.TransactionStatus; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -54,7 +53,7 @@ public abstract class RoutineLoadTaskInfo { private static final Logger LOG = LogManager.getLogger(RoutineLoadTaskInfo.class); private RoutineLoadManager routineLoadManager = Catalog.getCurrentCatalog().getRoutineLoadManager(); - + protected UUID id; protected long txnId = -1L; protected long jobId; @@ -88,15 +87,15 @@ public abstract class RoutineLoadTaskInfo { this(id, jobId, clusterName, timeoutMs); this.previousBeId = previousBeId; } - + public UUID getId() { return id; } - + public long getJobId() { return jobId; } - + public String getClusterName() { return clusterName; } @@ -116,7 +115,7 @@ public abstract class RoutineLoadTaskInfo { public long getBeId() { return beId; } - + public long getTxnId() { return txnId; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadTaskScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadTaskScheduler.java index f2f03a666a..ab608393b4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadTaskScheduler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadTaskScheduler.java @@ -39,7 +39,6 @@ import org.apache.doris.thrift.TStatusCode; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.collect.Queues; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -181,7 +180,7 @@ public class RoutineLoadTaskScheduler extends MasterDaemon { try { long startTime = System.currentTimeMillis(); tRoutineLoadTask = routineLoadTaskInfo.createRoutineLoadTask(); - LOG.debug("create routine load task cost(ms): {}, job id: {}", + LOG.debug("create routine load task cost(ms): {}, job id: {}", (System.currentTimeMillis() - startTime), routineLoadTaskInfo.getJobId()); } catch (MetaNotFoundException e) { // this means database or table has been dropped, just stop this routine load job. @@ -205,7 +204,7 @@ public class RoutineLoadTaskScheduler extends MasterDaemon { try { long startTime = System.currentTimeMillis(); submitTask(routineLoadTaskInfo.getBeId(), tRoutineLoadTask); - LOG.debug("send routine load task cost(ms): {}, job id: {}", + LOG.debug("send routine load task cost(ms): {}, job id: {}", (System.currentTimeMillis() - startTime), routineLoadTaskInfo.getJobId()); if (tRoutineLoadTask.isSetKafkaLoadInfo()) { LOG.debug("send kafka routine load task {} with partition offset: {}, job: {}", @@ -264,7 +263,7 @@ public class RoutineLoadTaskScheduler extends MasterDaemon { client = ClientPool.backendPool.borrowObject(address); TStatus tStatus = client.submitRoutineLoadTask(Lists.newArrayList(tTask)); ok = true; - + if (tStatus.getStatusCode() != TStatusCode.OK) { throw new LoadException("failed to submit task. error code: " + tStatus.getStatusCode() + ", msg: " + (tStatus.getErrorMsgsSize() > 0 ? tStatus.getErrorMsgs().get(0) : "NaN")); @@ -303,4 +302,3 @@ public class RoutineLoadTaskScheduler extends MasterDaemon { return true; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/ScheduleRule.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/ScheduleRule.java index c72ee6c3d6..19dfb16284 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/ScheduleRule.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/ScheduleRule.java @@ -14,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.load.routineload; import org.apache.doris.catalog.Catalog; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannel.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannel.java index 66a74ec34a..19f49447a5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannel.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannel.java @@ -24,7 +24,6 @@ import org.apache.doris.common.UserException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import org.apache.thrift.TException; import java.util.List; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJob.java index 266125e481..a7401da9e2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJob.java @@ -35,12 +35,12 @@ import org.apache.doris.common.util.TimeUtils; import org.apache.doris.load.sync.SyncFailMsg.MsgType; import org.apache.doris.load.sync.canal.CanalSyncJob; import org.apache.doris.persist.gson.GsonUtils; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJobManager.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJobManager.java index 5ac5049b91..f010e8c529 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJobManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncJobManager.java @@ -33,7 +33,6 @@ import org.apache.doris.load.sync.canal.CanalSyncJob; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -365,7 +364,7 @@ public class SyncJobManager implements Writable { writeUnlock(); } } - + public void replayUpdateSyncJobState(SyncJob.SyncJobUpdateStateInfo info) { writeLock(); try { diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncChannel.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncChannel.java index 5d0774b54a..f292107cac 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncChannel.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncChannel.java @@ -49,11 +49,9 @@ import org.apache.doris.transaction.TransactionState; import com.alibaba.otter.canal.common.CanalException; import com.alibaba.otter.canal.protocol.CanalEntry; - import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataConsumer.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataConsumer.java index d5737ff70a..1d930a9e34 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataConsumer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataConsumer.java @@ -20,25 +20,23 @@ package org.apache.doris.load.sync.canal; import org.apache.doris.common.Config; import org.apache.doris.common.Status; import org.apache.doris.common.UserException; -import org.apache.doris.load.sync.position.EntryPosition; -import org.apache.doris.load.sync.model.Events; -import org.apache.doris.load.sync.position.PositionMeta; -import org.apache.doris.load.sync.position.PositionRange; import org.apache.doris.load.sync.SyncChannelHandle; import org.apache.doris.load.sync.SyncDataConsumer; import org.apache.doris.load.sync.SyncFailMsg; +import org.apache.doris.load.sync.model.Events; +import org.apache.doris.load.sync.position.EntryPosition; +import org.apache.doris.load.sync.position.PositionMeta; +import org.apache.doris.load.sync.position.PositionRange; import com.alibaba.otter.canal.client.CanalConnector; import com.alibaba.otter.canal.common.CanalException; import com.alibaba.otter.canal.protocol.CanalEntry; import com.alibaba.otter.canal.protocol.Message; - import com.google.common.collect.Maps; import com.google.common.collect.Queues; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; - import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataReceiver.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataReceiver.java index 0c76cc3273..c3ebcbc492 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataReceiver.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataReceiver.java @@ -18,10 +18,12 @@ package org.apache.doris.load.sync.canal; import org.apache.doris.load.sync.SyncDataReceiver; + import com.alibaba.otter.canal.client.CanalConnector; import com.alibaba.otter.canal.protocol.Message; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncJob.java index 3235c2c492..ce4a8c9017 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncJob.java @@ -36,11 +36,9 @@ import org.apache.doris.load.sync.SyncJob; import com.alibaba.otter.canal.client.CanalConnector; import com.alibaba.otter.canal.client.CanalConnectors; - import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.gson.annotations.SerializedName; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalUtils.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalUtils.java index b1a9688995..1bc828718a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalUtils.java @@ -23,9 +23,7 @@ import org.apache.doris.load.sync.position.EntryPosition; import com.alibaba.otter.canal.common.CanalException; import com.alibaba.otter.canal.protocol.CanalEntry; import com.alibaba.otter.canal.protocol.Message; - import com.google.protobuf.InvalidProtocolBufferException; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.SystemUtils; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/SyncCanalClient.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/SyncCanalClient.java index d9e450d8d4..11ef95bebb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/SyncCanalClient.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/SyncCanalClient.java @@ -20,10 +20,8 @@ package org.apache.doris.load.sync.canal; import org.apache.doris.load.sync.SyncChannel; import com.alibaba.otter.canal.client.CanalConnector; - import com.google.common.base.Preconditions; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/EntryPosition.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/EntryPosition.java index f2b708adac..419247f033 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/EntryPosition.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/EntryPosition.java @@ -18,7 +18,6 @@ package org.apache.doris.load.sync.position; import com.alibaba.otter.canal.protocol.CanalEntry; - import com.google.common.base.Strings; public class EntryPosition { diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/update/UpdatePlanner.java b/fe/fe-core/src/main/java/org/apache/doris/load/update/UpdatePlanner.java index a452730a1d..01b1823bfc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/update/UpdatePlanner.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/update/UpdatePlanner.java @@ -17,6 +17,7 @@ package org.apache.doris.load.update; +import org.apache.doris.alter.SchemaChangeHandler; import org.apache.doris.analysis.Analyzer; import org.apache.doris.analysis.BinaryPredicate; import org.apache.doris.analysis.DescriptorTable; @@ -47,8 +48,6 @@ import com.google.common.collect.Maps; import java.util.List; import java.util.Map; -import static org.apache.doris.alter.SchemaChangeHandler.SHADOW_NAME_PRFIX; - public class UpdatePlanner extends Planner { @@ -163,8 +162,8 @@ public class UpdatePlanner extends Planner { for (int i = 0; i < targetTable.getFullSchema().size(); i++) { Column column = targetTable.getFullSchema().get(i); // pay attention to case ignore of column name - String originColumnName = (column.getName().startsWith(SHADOW_NAME_PRFIX) ? - column.getName().substring(SHADOW_NAME_PRFIX.length()) : column.getName()) + String originColumnName = (column.getName().startsWith(SchemaChangeHandler.SHADOW_NAME_PRFIX) ? + column.getName().substring(SchemaChangeHandler.SHADOW_NAME_PRFIX.length()) : column.getName()) .toLowerCase(); Expr setExpr = columnNameToSetExpr.get(originColumnName); SlotDescriptor srcSlotDesc = columnNameToSrcSlotDesc.get(originColumnName); diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/update/UpdateStmtExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/load/update/UpdateStmtExecutor.java index f6a3d49175..779dcb043c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/update/UpdateStmtExecutor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/update/UpdateStmtExecutor.java @@ -51,7 +51,6 @@ import org.apache.doris.transaction.TransactionState.TxnSourceType; import org.apache.doris.transaction.TransactionStatus; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -119,7 +118,7 @@ public class UpdateStmtExecutor { } finally { QeProcessorImpl.INSTANCE.unregisterQuery(queryId); } - + // 4. commit and publish commitAndPublishTxn(); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/master/Checkpoint.java b/fe/fe-core/src/main/java/org/apache/doris/master/Checkpoint.java index 4eda3fb9ef..98ec95c148 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/master/Checkpoint.java +++ b/fe/fe-core/src/main/java/org/apache/doris/master/Checkpoint.java @@ -33,7 +33,6 @@ import org.apache.doris.qe.VariableMgr; import org.apache.doris.system.Frontend; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -45,7 +44,7 @@ import java.util.Iterator; import java.util.List; /** - * Checkpoint daemon is running on master node. handle the checkpoint work for palo. + * Checkpoint daemon is running on master node. handle the checkpoint work for palo. */ public class Checkpoint extends MasterDaemon { public static final Logger LOG = LogManager.getLogger(Checkpoint.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/master/MasterImpl.java b/fe/fe-core/src/main/java/org/apache/doris/master/MasterImpl.java index 9d6107ed76..5cd07f463e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/master/MasterImpl.java +++ b/fe/fe-core/src/main/java/org/apache/doris/master/MasterImpl.java @@ -62,7 +62,6 @@ import org.apache.doris.thrift.TTabletInfo; import org.apache.doris.thrift.TTaskType; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; @@ -80,7 +79,7 @@ public class MasterImpl { public MasterImpl() { reportHandler.start(); } - + public TMasterResult finishTask(TFinishTaskRequest request) { TMasterResult result = new TMasterResult(); TStatus tStatus = new TStatus(TStatusCode.OK); @@ -113,7 +112,7 @@ public class MasterImpl { long backendId = backend.getId(); TTaskType taskType = request.getTaskType(); long signature = request.getSignature(); - + AgentTask task = AgentTaskQueue.getTask(backendId, taskType, signature); if (task == null) { if (taskType != TTaskType.DROP && taskType != TTaskType.RELEASE_SNAPSHOT @@ -144,7 +143,7 @@ public class MasterImpl { } } } - + try { List finishTabletInfos; switch (taskType) { @@ -255,10 +254,10 @@ public class MasterImpl { tabletId, task.getBackendId(), replica.getId()); } } - + // this should be called before 'countDownLatch()' Catalog.getCurrentSystemInfo().updateBackendReportVersion(task.getBackendId(), request.getReportVersion(), task.getDbId(), task.getTableId()); - + createReplicaTask.countDownLatch(task.getBackendId(), task.getSignature()); LOG.debug("finish create replica. tablet id: {}, be: {}, report version: {}", tabletId, task.getBackendId(), request.getReportVersion()); @@ -284,13 +283,13 @@ public class MasterImpl { AgentTaskQueue.removeTask(task.getBackendId(), TTaskType.UPDATE_TABLET_META_INFO, task.getSignature()); } } - + private void finishRealtimePush(AgentTask task, TFinishTaskRequest request) { List finishTabletInfos = request.getFinishTabletInfos(); Preconditions.checkState(finishTabletInfos != null && !finishTabletInfos.isEmpty()); - + PushTask pushTask = (PushTask) task; - + long dbId = pushTask.getDbId(); long backendId = pushTask.getBackendId(); long signature = task.getSignature(); @@ -299,7 +298,7 @@ public class MasterImpl { if (db == null) { AgentTaskQueue.removeTask(backendId, TTaskType.REALTIME_PUSH, signature); return; - } + } long tableId = pushTask.getTableId(); long partitionId = pushTask.getPartitionId(); @@ -310,7 +309,7 @@ public class MasterImpl { // Normal: 1 / / // SchemaChangeHandler 2 same diff // RollupHandler 2 diff diff - // + // // reuse enum 'PartitionState' here as 'push finish type' PartitionState pushState = null; if (finishTabletInfos.size() == 1) { @@ -406,7 +405,7 @@ public class MasterImpl { } } } - + AgentTaskQueue.removeTask(backendId, TTaskType.REALTIME_PUSH, signature); LOG.debug("finish push replica. tabletId: {}, backendId: {}", pushTabletId, backendId); } catch (MetaNotFoundException e) { @@ -430,7 +429,7 @@ public class MasterImpl { throw new MetaNotFoundException("tablet " + tabletId + " does not exist"); } } - + private Replica findRelatedReplica(OlapTable olapTable, Partition partition, long backendId, long tabletId, long indexId) throws MetaNotFoundException { @@ -441,7 +440,7 @@ public class MasterImpl { return null; } MaterializedIndex index = partition.getIndex(indexId); - if (index == null) { + if (index == null) { // In alter job v2 case // alter job is always == null, so that we could remove the condition // if alter job is always null, then could not covert it to a rollup @@ -466,16 +465,16 @@ public class MasterImpl { } Replica replica = tablet.getReplicaByBackendId(backendId); if (replica == null) { - LOG.warn("could not find replica with backend {} in tablet {} in rollup index {} ", + LOG.warn("could not find replica with backend {} in tablet {} in rollup index {} ", backendId, tabletId, indexId); } return replica; } - + private void finishPush(AgentTask task, TFinishTaskRequest request) { List finishTabletInfos = request.getFinishTabletInfos(); Preconditions.checkState(finishTabletInfos != null && !finishTabletInfos.isEmpty()); - + PushTask pushTask = (PushTask) task; // if replica report already update replica version and load checker add new version push task, // we might get new version push task, so check task version first @@ -484,20 +483,20 @@ public class MasterImpl { long taskVersion = pushTask.getVersion(); if (finishVersion != taskVersion) { LOG.debug("finish tablet version is not consistent with task. " - + "finish version: {}, task: {}", + + "finish version: {}, task: {}", finishVersion, pushTask); return; } - + long dbId = pushTask.getDbId(); long backendId = pushTask.getBackendId(); long signature = task.getSignature(); Database db = Catalog.getCurrentCatalog().getDbNullable(dbId); if (db == null) { - AgentTaskQueue.removePushTask(backendId, signature, finishVersion, + AgentTaskQueue.removePushTask(backendId, signature, finishVersion, pushTask.getPushType(), pushTask.getTaskType()); return; - } + } long tableId = pushTask.getTableId(); long partitionId = pushTask.getPartitionId(); @@ -509,7 +508,7 @@ public class MasterImpl { // Normal: 1 / / // SchemaChangeHandler 2 same diff // RollupHandler 2 diff diff - // + // // reuse enum 'PartitionState' here as 'push finish type' PartitionState pushState = null; if (finishTabletInfos.size() == 1) { @@ -568,7 +567,7 @@ public class MasterImpl { if (job == null) { throw new MetaNotFoundException("cannot find load job, job[" + loadJobId + "]"); } - + Preconditions.checkState(!infos.isEmpty()); for (ReplicaPersistInfo info : infos) { job.addReplicaPersistInfos(info); @@ -592,13 +591,13 @@ public class MasterImpl { olapTable.writeUnlock(); } } - + private void finishClearAlterTask(AgentTask task, TFinishTaskRequest request) { ClearAlterTask clearAlterTask = (ClearAlterTask) task; clearAlterTask.setFinished(true); AgentTaskQueue.removeTask(task.getBackendId(), task.getTaskType(), task.getSignature()); } - + private void finishPublishVersion(AgentTask task, TFinishTaskRequest request) { List errorTabletIds = null; if (request.isSetErrorTabletIds()) { @@ -619,11 +618,11 @@ public class MasterImpl { // not remove the task from queue and be will retry return; } - AgentTaskQueue.removeTask(publishVersionTask.getBackendId(), - publishVersionTask.getTaskType(), + AgentTaskQueue.removeTask(publishVersionTask.getBackendId(), + publishVersionTask.getTaskType(), publishVersionTask.getSignature()); } - + private ReplicaPersistInfo updateReplicaInfo(OlapTable olapTable, Partition partition, long backendId, long pushIndexId, long indexId, TTabletInfo tTabletInfo, PartitionState pushState) @@ -735,7 +734,7 @@ public class MasterImpl { AgentTaskQueue.removeTask(task.getBackendId(), TTaskType.MOVE, task.getSignature()); } } - + private void finishRecoverTablet(AgentTask task) { AgentTaskQueue.removeTask(task.getBackendId(), TTaskType.RECOVER_TABLET, task.getSignature()); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/master/MetaHelper.java b/fe/fe-core/src/main/java/org/apache/doris/master/MetaHelper.java index 5071b1f47a..f102fb5a21 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/master/MetaHelper.java +++ b/fe/fe-core/src/main/java/org/apache/doris/master/MetaHelper.java @@ -39,11 +39,11 @@ public class MetaHelper { String metaDir = Catalog.getCurrentCatalog().getImageDir(); return new File(metaDir); } - + public static int getLimit() { return CHECKPOINT_LIMIT_BYTES; } - + // rename the .PART_SUFFIX file to filename public static File complete(String filename, File dir) throws IOException { File file = new File(dir, filename + MetaHelper.PART_SUFFIX); diff --git a/fe/fe-core/src/main/java/org/apache/doris/master/PartitionInMemoryInfoCollector.java b/fe/fe-core/src/main/java/org/apache/doris/master/PartitionInMemoryInfoCollector.java index 8a79f3dcb8..5eebbb6c61 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/master/PartitionInMemoryInfoCollector.java +++ b/fe/fe-core/src/main/java/org/apache/doris/master/PartitionInMemoryInfoCollector.java @@ -17,7 +17,6 @@ package org.apache.doris.master; -import com.google.common.collect.ImmutableSet; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.Database; import org.apache.doris.catalog.OlapTable; @@ -26,6 +25,8 @@ import org.apache.doris.catalog.Table; import org.apache.doris.catalog.TabletInvertedIndex; import org.apache.doris.common.Config; import org.apache.doris.common.util.MasterDaemon; + +import com.google.common.collect.ImmutableSet; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java index d28546d277..49d143aee4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java @@ -80,7 +80,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Queues; import com.google.common.collect.Sets; - import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.tuple.Triple; import org.apache.logging.log4j.LogManager; diff --git a/fe/fe-core/src/main/java/org/apache/doris/metric/JsonMetricVisitor.java b/fe/fe-core/src/main/java/org/apache/doris/metric/JsonMetricVisitor.java index 2463a7a4fa..953745c0d1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/metric/JsonMetricVisitor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/metric/JsonMetricVisitor.java @@ -18,7 +18,9 @@ package org.apache.doris.metric; import org.apache.doris.monitor.jvm.JvmStats; + import com.codahale.metrics.Histogram; + import java.util.List; public class JsonMetricVisitor extends MetricVisitor { @@ -83,4 +85,3 @@ public class JsonMetricVisitor extends MetricVisitor { return; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/metric/MetricLabel.java b/fe/fe-core/src/main/java/org/apache/doris/metric/MetricLabel.java index 6c88fa020b..7a765a61f3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/metric/MetricLabel.java +++ b/fe/fe-core/src/main/java/org/apache/doris/metric/MetricLabel.java @@ -17,7 +17,7 @@ package org.apache.doris.metric; -// palo_fe_job {job="load", type="hadoop", state="total"} +// palo_fe_job {job="load", type="hadoop", state="total"} public class MetricLabel { private String key; private String value; diff --git a/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java b/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java index 0d4de20ca0..318e88ceb9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java @@ -42,7 +42,6 @@ import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; import com.codahale.metrics.MetricRegistry; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -59,7 +58,7 @@ public final class MetricRepo { private static final MetricRegistry METRIC_REGISTER = new MetricRegistry(); public static final DorisMetricRegistry PALO_METRIC_REGISTER = new DorisMetricRegistry(); - + public static volatile boolean isInit = false; public static final SystemMetrics SYSTEM_METRICS = new SystemMetrics(); @@ -540,7 +539,7 @@ public final class MetricRepo { for (Map.Entry entry : histograms.entrySet()) { visitor.visitHistogram(sb, entry.getKey(), entry.getValue()); } - + // node info visitor.getNodeInfo(sb); @@ -556,4 +555,3 @@ public final class MetricRepo { return PALO_METRIC_REGISTER.getPaloMetricsByName(name); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/metric/PrometheusMetricVisitor.java b/fe/fe-core/src/main/java/org/apache/doris/metric/PrometheusMetricVisitor.java index 7c2754059b..3cf0eccaaa 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/metric/PrometheusMetricVisitor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/metric/PrometheusMetricVisitor.java @@ -36,8 +36,8 @@ import java.util.stream.Collectors; /* * Like this: - * # HELP doris_fe_job_load_broker_cost_ms doris_fe_job_load_broker_cost_ms - * # TYPE doris_fe_job_load_broker_cost_ms gauge + * # HELP doris_fe_job_load_broker_cost_ms doris_fe_job_load_broker_cost_ms + * # TYPE doris_fe_job_load_broker_cost_ms gauge * doris_fe_job{job="load", type="mini", state="pending"} 0 */ public class PrometheusMetricVisitor extends MetricVisitor { @@ -212,4 +212,3 @@ public class PrometheusMetricVisitor extends MetricVisitor { return; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/metric/SystemMetrics.java b/fe/fe-core/src/main/java/org/apache/doris/metric/SystemMetrics.java index 8b13ba6b9f..bbe0b654ee 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/metric/SystemMetrics.java +++ b/fe/fe-core/src/main/java/org/apache/doris/metric/SystemMetrics.java @@ -20,7 +20,6 @@ package org.apache.doris.metric; import org.apache.doris.common.FeConstants; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmPauseMonitor.java b/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmPauseMonitor.java index 0bf0b29f20..0b6671aa7e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmPauseMonitor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmPauseMonitor.java @@ -25,7 +25,6 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.log4j.Logger; import java.lang.management.GarbageCollectorMXBean; @@ -317,5 +316,3 @@ public class JvmPauseMonitor { } } - - diff --git a/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmService.java b/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmService.java index 5c69260bb4..a46443925d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmService.java +++ b/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmService.java @@ -25,7 +25,6 @@ import org.apache.doris.monitor.jvm.JvmStats.Mem; import org.apache.doris.monitor.jvm.JvmStats.Threads; import com.google.common.base.Joiner; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -61,18 +60,18 @@ public class JvmService { // 1. jvm stats JvmStats jvmStats = stats(); - + // buffer pool List bufferPools = jvmStats.getBufferPools(); sb.append("JVM Stats: \nBuffer pools:\n"); for (BufferPool bufferPool : bufferPools) { sb.append("\t").append(bufferPool.toString()).append("\n"); } - + // classes Classes classes = jvmStats.getClasses(); sb.append(classes.toString()).append("\n"); - + // gc GarbageCollectors gc = jvmStats.getGc(); GarbageCollector[] gcs = gc.getCollectors(); @@ -80,7 +79,7 @@ public class JvmService { for (GarbageCollector garbageCollector : gcs) { sb.append("\t").append(garbageCollector.toString()); } - + // mem Mem mem = jvmStats.getMem(); sb.append("\nMem: ").append(mem.toString()); @@ -88,15 +87,15 @@ public class JvmService { // threads Threads threads = jvmStats.getThreads(); sb.append("\nThreads: ").append(threads.toString()); - + sb.append("\nUpTime: ").append(jvmStats.getUptime().toString()); sb.append("\nTimestamp: ").append(jvmStats.getTimestamp()); LOG.info(sb.toString()); - + // 2. jvm info JvmInfo jvmInfo = info(); - + sb.append("\nJVM Info: \nboot class path: ").append(jvmInfo.getBootClassPath()); sb.append("\nclass path: ").append(jvmInfo.getClassPath()); sb.append("\nconfigured init heap size: ").append(jvmInfo.getConfiguredInitialHeapSize()); @@ -107,13 +106,13 @@ public class JvmService { sb.append("\nvm name").append(jvmInfo.getVmName()); sb.append("\nvm vendor: ").append(jvmInfo.getVmVendor()); sb.append("\nvm version").append(jvmInfo.getVmVersion()); - + sb.append("\ngcs: ").append(Joiner.on(", ").join(jvmInfo.getGcCollectors())); sb.append("\ninput arguments: ").append(Joiner.on(", ").join(jvmInfo.getInputArguments())); sb.append("\nmem: ").append(jvmInfo.getMem().toString()); sb.append("\nmem pools: ").append(Joiner.on(", ").join(jvmInfo.getMemoryPools())); sb.append("\nsystem props: ").append(jvmInfo.getSystemProperties()); - + return sb.toString(); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmStats.java b/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmStats.java index a298759938..bb5c33dcb8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmStats.java +++ b/fe/fe-core/src/main/java/org/apache/doris/monitor/jvm/JvmStats.java @@ -28,8 +28,8 @@ import java.lang.management.MemoryMXBean; import java.lang.management.MemoryPoolMXBean; import java.lang.management.MemoryUsage; import java.lang.management.RuntimeMXBean; -import java.lang.management.ThreadMXBean; import java.lang.management.ThreadInfo; +import java.lang.management.ThreadMXBean; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlColType.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlColType.java index 4a9b11f2fe..efdbf14a72 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlColType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlColType.java @@ -19,7 +19,7 @@ package org.apache.doris.mysql; // MySQL column type // TYPE codes are defined in the file 'mysql/include/mysql_com.h' enum enum_field_types -// which is also demostrated in +// which is also demostrated in // http://dev.mysql.com/doc/internals/en/com-query-response.html public enum MysqlColType { MYSQL_TYPE_DECIMAL(0, "DECIMAL"), diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlPassword.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlPassword.java index f0641819fd..5d2f277ae7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlPassword.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlPassword.java @@ -22,8 +22,8 @@ import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; import com.google.common.base.Strings; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; @@ -88,7 +88,7 @@ public class MysqlPassword { random.nextBytes(bytes); // NOTE: MySQL challenge string can't contain 0. for (int i = 0; i < len; ++i) { - if ((bytes[i] >= 'a' && bytes[i] <= 'z') + if ((bytes[i] >= 'a' && bytes[i] <= 'z') || (bytes[i] >= 'A' && bytes[i] <='Z')) { } else { bytes[i] = (byte) ('a' + (bytes[i] % 26)); diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlProto.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlProto.java index e3eca83a6a..6c60a1629b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlProto.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlProto.java @@ -34,7 +34,6 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.base.Strings; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlSerializer.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlSerializer.java index a9701e80e4..ce12168b51 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlSerializer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlSerializer.java @@ -17,15 +17,15 @@ package org.apache.doris.mysql; -import java.io.ByteArrayOutputStream; -import java.io.UnsupportedEncodingException; -import java.nio.ByteBuffer; - import org.apache.doris.catalog.Column; import org.apache.doris.catalog.PrimitiveType; import com.google.common.base.Strings; +import java.io.ByteArrayOutputStream; +import java.io.UnsupportedEncodingException; +import java.nio.ByteBuffer; + // used for serialize memory data to byte stream of MySQL protocol public class MysqlSerializer { private ByteArrayOutputStream out; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlServer.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlServer.java index ed1d599978..91352cc48b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlServer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlServer.java @@ -21,6 +21,7 @@ import org.apache.doris.catalog.Catalog; import org.apache.doris.common.ThreadPoolManager; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.ConnectScheduler; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/AcceptListener.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/AcceptListener.java index a7fd4841c9..847cf5eba9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/AcceptListener.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/AcceptListener.java @@ -14,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.mysql.nio; import org.apache.doris.catalog.Catalog; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NConnectContext.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NConnectContext.java index 3de00b578e..a4adf5b65c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NConnectContext.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NConnectContext.java @@ -14,6 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.mysql.nio; import org.apache.doris.qe.ConnectContext; @@ -66,4 +67,3 @@ public class NConnectContext extends ConnectContext { return "[remote ip: " + mysqlChannel.getRemoteIp() + "]"; } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NMysqlChannel.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NMysqlChannel.java index 4260c0b473..44c9c51131 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NMysqlChannel.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NMysqlChannel.java @@ -14,10 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.mysql.nio; import org.apache.doris.mysql.MysqlChannel; import org.apache.doris.qe.ConnectProcessor; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xnio.StreamConnection; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NMysqlServer.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NMysqlServer.java index e55ae84503..a33223edc1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NMysqlServer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/NMysqlServer.java @@ -14,12 +14,14 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.mysql.nio; import org.apache.doris.common.Config; import org.apache.doris.common.ThreadPoolManager; import org.apache.doris.mysql.MysqlServer; import org.apache.doris.qe.ConnectScheduler; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xnio.OptionMap; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/ReadListener.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/ReadListener.java index 724d5fbf2b..f9123cf5df 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/ReadListener.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/nio/ReadListener.java @@ -14,10 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.mysql.nio; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.ConnectProcessor; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xnio.ChannelListener; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java index ecaf43692b..f427d47b1b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java @@ -67,7 +67,7 @@ public class CommonUserProperties implements Writable { String getSqlBlockRules() { return sqlBlockRules; } - + String[] getSqlBlockRulesSplit() { return sqlBlockRulesSplit; } @@ -84,7 +84,7 @@ public class CommonUserProperties implements Writable { this.sqlBlockRules = sqlBlockRules; setSqlBlockRulesSplit(sqlBlockRules); } - + void setSqlBlockRulesSplit(String sqlBlockRules) { // split this.sqlBlockRulesSplit = sqlBlockRules.replace(" ", "").split(","); diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivEntry.java index f36d6793f1..06a37b1942 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivEntry.java @@ -51,9 +51,9 @@ public class DbPrivEntry extends PrivEntry { public static DbPrivEntry create(String host, String db, String user, boolean isDomain, PrivBitSet privs) throws AnalysisException { PatternMatcher hostPattern = PatternMatcher.createMysqlPattern(host, CaseSensibility.HOST.getCaseSensibility()); - + PatternMatcher dbPattern = createDbPatternMatcher(db); - + PatternMatcher userPattern = PatternMatcher.createMysqlPattern(user, CaseSensibility.USER.getCaseSensibility()); if (privs.containsNodePriv() || privs.containsResourcePriv()) { @@ -69,7 +69,7 @@ public class DbPrivEntry extends PrivEntry { if (ClusterNamespace.getNameFromFullName(db).equalsIgnoreCase(InfoSchemaDb.DATABASE_NAME)) { dbCaseSensibility = false; } - + PatternMatcher dbPattern = PatternMatcher.createMysqlPattern(db.equals(ANY_DB) ? "%" : db, dbCaseSensibility); return dbPattern; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/GlobalPrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/GlobalPrivEntry.java index 77770e9a8f..ba74d280b2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/GlobalPrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/GlobalPrivEntry.java @@ -88,9 +88,9 @@ public class GlobalPrivEntry extends PrivEntry { * | localhost | root | ... * | localhost | | ... * +-----------+----------+- - * + * * will be sorted like: - * + * * +-----------+----------+- * | Host | User | ... * +-----------+----------+- @@ -99,7 +99,7 @@ public class GlobalPrivEntry extends PrivEntry { * | % | jeffrey | ... * | % | root | ... * +-----------+----------+- - * + * * https://dev.mysql.com/doc/refman/8.0/en/connection-access.html */ @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PaloAuth.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PaloAuth.java index 023d6df66c..852ba178bf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PaloAuth.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PaloAuth.java @@ -55,7 +55,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -282,7 +281,7 @@ public class PaloAuth implements Writable { } return true; } - + readLock(); try { return userPrivTable.checkPassword(remoteUser, remoteHost, remotePasswd, randomString, currentUser); @@ -1687,4 +1686,3 @@ public class PaloAuth implements Writable { return sb.toString(); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java index d6d3431dbb..906c29b6da 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java @@ -108,7 +108,7 @@ public abstract class PrivEntry implements Comparable, Writable { public PrivBitSet getPrivSet() { return privSet; } - + public void setPrivSet(PrivBitSet privSet) { this.privSet = privSet; } @@ -116,7 +116,7 @@ public abstract class PrivEntry implements Comparable, Writable { public boolean isSetByDomainResolver() { return isSetByDomainResolver; } - + public void setSetByDomainResolver(boolean isSetByDomainResolver) { this.isSetByDomainResolver = isSetByDomainResolver; } @@ -138,7 +138,7 @@ public abstract class PrivEntry implements Comparable, Writable { /* * It's a bit complicated when persisting instance which its class has derived classes. * eg: A (top class) -> B (derived) -> C (derived) - * + * * Write process: * C.write() * | @@ -153,15 +153,15 @@ public abstract class PrivEntry implements Comparable, Writable { * --- write B's self members --- write class name (if not write before) * | * --- write A's self members - * + * * So the final write order is: * 1. C's class name * 2. A's self members * 3. B's self members * 4. C's self members - * + * * In case that class name should only be wrote once, we use isClassNameWrote flag. - * + * * Read process: * static A.read() * | @@ -174,13 +174,13 @@ public abstract class PrivEntry implements Comparable, Writable { * --- read C's self members --- super.readFields() --> A.readFields() * | | * --- read B's self members --- read A's self members - * + * * So the final read order is: * 1. C's class name * 2. A's self members * 3. B's self members * 4. C's self members - * + * * Which is same as Write order. */ public static PrivEntry read(DataInput in) throws IOException { diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java index 7c3b042713..ce2f7738c3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java @@ -25,7 +25,6 @@ import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import com.google.common.collect.Lists; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/RoleManager.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/RoleManager.java index ab486b42e5..38a0683228 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/RoleManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/RoleManager.java @@ -131,7 +131,7 @@ public class RoleManager implements Writable { List info = Lists.newArrayList(); info.add(role.getRoleName()); info.add(Joiner.on(", ").join(role.getUsers())); - + // global boolean hasGlobal = false; for (Map.Entry entry : role.getTblPatternToPrivs().entrySet()) { @@ -158,8 +158,8 @@ public class RoleManager implements Writable { } else { info.add(Joiner.on("; ").join(tmp)); } - - + + // tbl tmp.clear(); for (Map.Entry entry : role.getTblPatternToPrivs().entrySet()) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java index 4feb3a3dbd..f53cfea140 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java @@ -37,7 +37,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.commons.lang.StringUtils; import java.io.DataInput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserPropertyMgr.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserPropertyMgr.java index 21070f7122..2bda17e8a3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserPropertyMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserPropertyMgr.java @@ -31,7 +31,6 @@ import org.apache.doris.thrift.TFetchResourceResult; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -293,4 +292,3 @@ public class UserPropertyMgr implements Writable { resourceVersion = new AtomicLong(in.readLong()); } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/WhiteList.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/WhiteList.java index 17210bb7b9..2ee0f920d6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/WhiteList.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/WhiteList.java @@ -28,7 +28,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/AlterViewInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/AlterViewInfo.java index 8c1f78c646..2037f50c48 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/AlterViewInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/AlterViewInfo.java @@ -17,13 +17,14 @@ package org.apache.doris.persist; -import com.google.common.collect.Lists; -import com.google.gson.annotations.SerializedName; import org.apache.doris.catalog.Column; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; +import com.google.common.collect.Lists; +import com.google.gson.annotations.SerializedName; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/BackendIdsUpdateInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/BackendIdsUpdateInfo.java index 817cbbd334..ac2e0ea9d2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/BackendIdsUpdateInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/BackendIdsUpdateInfo.java @@ -17,17 +17,18 @@ package org.apache.doris.persist; +import org.apache.doris.common.io.Writable; + +import com.google.common.collect.Lists; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.List; -import org.apache.doris.common.io.Writable; -import com.google.common.collect.Lists; - public class BackendIdsUpdateInfo implements Writable { private List backendIds; - + public BackendIdsUpdateInfo() { this.backendIds = Lists.newArrayList(); } @@ -57,6 +58,6 @@ public class BackendIdsUpdateInfo implements Writable { public void setBackendList(List backendList) { this.backendIds = backendList; - } + } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/BatchDropInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/BatchDropInfo.java index b966595793..234456dcc1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/BatchDropInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/BatchDropInfo.java @@ -14,13 +14,15 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.persist; -import com.google.gson.annotations.SerializedName; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; +import com.google.gson.annotations.SerializedName; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/BatchModifyPartitionsInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/BatchModifyPartitionsInfo.java index 86f32ed654..8d79957e88 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/BatchModifyPartitionsInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/BatchModifyPartitionsInfo.java @@ -20,6 +20,7 @@ package org.apache.doris.persist; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; + import com.google.gson.annotations.SerializedName; import java.io.DataInput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/ClusterInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/ClusterInfo.java index 9fb3d6c776..aad46a232f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/ClusterInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/ClusterInfo.java @@ -17,15 +17,16 @@ package org.apache.doris.persist; +import org.apache.doris.common.io.Text; +import org.apache.doris.common.io.Writable; + +import com.google.common.collect.Lists; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.List; -import org.apache.doris.common.io.Text; -import org.apache.doris.common.io.Writable; -import com.google.common.collect.Lists; - public class ClusterInfo implements Writable { private String clusterName; @@ -35,7 +36,7 @@ public class ClusterInfo implements Writable { private String newClusterName; private long newClusterId; private int newInstanceNum; - + private List expandBackendIds = Lists.newArrayList(); public ClusterInfo() { @@ -46,7 +47,7 @@ public class ClusterInfo implements Writable { this.newClusterId = 0L; this.newInstanceNum = 0; } - + public ClusterInfo(String clusterName, long clusterId) { this.clusterName = clusterName; this.clusterId = clusterId; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/CreateTableInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/CreateTableInfo.java index 0befc49c3c..843dfc4b97 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/CreateTableInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/CreateTableInfo.java @@ -18,8 +18,8 @@ package org.apache.doris.persist; import org.apache.doris.catalog.Table; -import org.apache.doris.common.io.Writable; import org.apache.doris.common.io.Text; +import org.apache.doris.common.io.Writable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +33,7 @@ public class CreateTableInfo implements Writable { private String dbName; private Table table; - + public CreateTableInfo() { // for persist } @@ -42,11 +42,11 @@ public class CreateTableInfo implements Writable { this.dbName = dbName; this.table = table; } - + public String getDbName() { return dbName; } - + public Table getTable() { return table; } @@ -59,7 +59,7 @@ public class CreateTableInfo implements Writable { dbName = Text.readString(in); table = Table.read(in); } - + public static CreateTableInfo read(DataInput in) throws IOException { CreateTableInfo createTableInfo = new CreateTableInfo(); createTableInfo.readFields(in); @@ -73,9 +73,9 @@ public class CreateTableInfo implements Writable { if (!(obj instanceof CreateTableInfo)) { return false; } - + CreateTableInfo info = (CreateTableInfo) obj; - + return (dbName.equals(info.dbName)) && (table.equals(info.table)); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/DropDbInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/DropDbInfo.java index d5b5f8e1ab..c5a4a1cc86 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/DropDbInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/DropDbInfo.java @@ -17,11 +17,12 @@ package org.apache.doris.persist; -import com.google.gson.annotations.SerializedName; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; +import com.google.gson.annotations.SerializedName; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/DropInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/DropInfo.java index 318c1efe07..7d93f83fef 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/DropInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/DropInfo.java @@ -26,24 +26,24 @@ import java.io.IOException; public class DropInfo implements Writable { private long dbId; private long tableId; - + private long indexId; private boolean forceDrop = false; public DropInfo() { } - + public DropInfo(long dbId, long tableId, long indexId, boolean forceDrop) { this.dbId = dbId; this.tableId = tableId; this.indexId = indexId; this.forceDrop = forceDrop; } - + public long getDbId() { return this.dbId; } - + public long getTableId() { return this.tableId; } @@ -55,7 +55,7 @@ public class DropInfo implements Writable { public boolean isForceDrop() { return forceDrop; } - + @Override public void write(DataOutput out) throws IOException { out.writeLong(dbId); @@ -86,18 +86,18 @@ public class DropInfo implements Writable { dropInfo.readFields(in); return dropInfo; } - + public boolean equals (Object obj) { if (this == obj) { return true; } - + if (!(obj instanceof DropInfo)) { return false; } - + DropInfo info = (DropInfo) obj; - + return (dbId == info.dbId) && (tableId == info.tableId) && (indexId == info.indexId) && (forceDrop == info.forceDrop); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/DropLinkDbAndUpdateDbInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/DropLinkDbAndUpdateDbInfo.java index 7fabd08fe9..807f9a9c40 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/DropLinkDbAndUpdateDbInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/DropLinkDbAndUpdateDbInfo.java @@ -17,14 +17,14 @@ package org.apache.doris.persist; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - import org.apache.doris.catalog.Database.DbState; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + public class DropLinkDbAndUpdateDbInfo implements Writable { private DbState state; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/DropPartitionInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/DropPartitionInfo.java index dee2f5df83..cbc57dcfbd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/DropPartitionInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/DropPartitionInfo.java @@ -38,7 +38,7 @@ public class DropPartitionInfo implements Writable { private boolean isTempPartition = false; @SerializedName(value = "forceDrop") private boolean forceDrop = false; - + private DropPartitionInfo() { } @@ -49,11 +49,11 @@ public class DropPartitionInfo implements Writable { this.isTempPartition = isTempPartition; this.forceDrop = forceDrop; } - + public Long getDbId() { return dbId; } - + public Long getTableId() { return tableId; } @@ -96,9 +96,9 @@ public class DropPartitionInfo implements Writable { if (!(obj instanceof DropPartitionInfo)) { return false; } - + DropPartitionInfo info = (DropPartitionInfo) obj; - + return (dbId.equals(info.dbId)) && (tableId.equals(info.tableId)) && (partitionName.equals(info.partitionName)) diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogFileOutputStream.java b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogFileOutputStream.java index 0437045488..802eb2c648 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogFileOutputStream.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogFileOutputStream.java @@ -133,9 +133,9 @@ public class EditLogFileOutputStream extends EditLogOutputStream { fc.write(fill, newSize); } } - + File getFile() { return file; } - + } diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogInputStream.java b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogInputStream.java index f63b9e144f..9b926efeb4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogInputStream.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogInputStream.java @@ -23,7 +23,7 @@ import java.io.InputStream; /** * A generic abstract class to support reading edits log data from persistent * storage. - * + * * It should stream bytes from the storage exactly as they were written into the * #{@link EditLogOutputStream}. */ @@ -39,5 +39,5 @@ public abstract class EditLogInputStream extends InputStream { public abstract void close() throws IOException; abstract long length() throws IOException; - + } diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogOutputStream.java b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogOutputStream.java index a07e5bc8a8..95b746e0cb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogOutputStream.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLogOutputStream.java @@ -42,7 +42,7 @@ public abstract class EditLogOutputStream extends OutputStream { /** * Write edits log record into the stream. The record is represented by * operation name and an array of Writable arguments. - * + * * @param op * operation * @param writable @@ -64,7 +64,7 @@ public abstract class EditLogOutputStream extends OutputStream { /** * Flush and sync all data that is ready to be flush * {@link #setReadyToFlush()} into underlying persistent store. - * + * * @throws IOException */ protected abstract void flushAndSync() throws IOException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/GlobalVarPersistInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/GlobalVarPersistInfo.java index 2c5ce674a9..6cc76d54c7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/GlobalVarPersistInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/GlobalVarPersistInfo.java @@ -24,7 +24,6 @@ import org.apache.doris.qe.SessionVariable; import org.apache.doris.qe.VariableMgr; import com.google.common.base.Preconditions; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.simple.JSONObject; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/LinkDbInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/LinkDbInfo.java index fcbb9f38fd..2c7cb57dbd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/LinkDbInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/LinkDbInfo.java @@ -17,13 +17,13 @@ package org.apache.doris.persist; +import org.apache.doris.common.io.Text; +import org.apache.doris.common.io.Writable; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.doris.common.io.Text; -import org.apache.doris.common.io.Writable; - public class LinkDbInfo implements Writable { private String cluster; private String name; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/MetaCleaner.java b/fe/fe-core/src/main/java/org/apache/doris/persist/MetaCleaner.java index dad0f0d0aa..cadd04b7f3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/MetaCleaner.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/MetaCleaner.java @@ -17,8 +17,8 @@ package org.apache.doris.persist; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.File; import java.io.IOException; @@ -78,7 +78,7 @@ public class MetaCleaner { } } } - + private String fileType(File file) throws IOException { String type = null; String filename = file.getName(); @@ -94,14 +94,14 @@ public class MetaCleaner { if (filename.startsWith(Storage.IMAGE)) { type = Storage.IMAGE; } - + if (filename.startsWith(Storage.EDITS)) { type = Storage.EDITS; } } } - + return type; } - + } diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/ModifyTableDefaultDistributionBucketNumOperationLog.java b/fe/fe-core/src/main/java/org/apache/doris/persist/ModifyTableDefaultDistributionBucketNumOperationLog.java index b788900ee7..151f29ea51 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/ModifyTableDefaultDistributionBucketNumOperationLog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/ModifyTableDefaultDistributionBucketNumOperationLog.java @@ -17,11 +17,12 @@ package org.apache.doris.persist; -import com.google.gson.annotations.SerializedName; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; +import com.google.gson.annotations.SerializedName; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/ModifyTablePropertyOperationLog.java b/fe/fe-core/src/main/java/org/apache/doris/persist/ModifyTablePropertyOperationLog.java index 044ded788f..f5a0a5d59d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/ModifyTablePropertyOperationLog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/ModifyTablePropertyOperationLog.java @@ -17,11 +17,12 @@ package org.apache.doris.persist; -import com.google.gson.annotations.SerializedName; import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; +import com.google.gson.annotations.SerializedName; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/PartitionPersistInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/PartitionPersistInfo.java index 208dffc1a5..f740c3ad74 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/PartitionPersistInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/PartitionPersistInfo.java @@ -45,7 +45,7 @@ public class PartitionPersistInfo implements Writable { private ReplicaAllocation replicaAlloc; private boolean isInMemory = false; private boolean isTempPartition = false; - + public PartitionPersistInfo() { } @@ -64,11 +64,11 @@ public class PartitionPersistInfo implements Writable { this.isInMemory = isInMemory; this.isTempPartition = isTempPartition; } - + public Long getDbId() { return dbId; } - + public Long getTableId() { return tableId; } @@ -131,7 +131,7 @@ public class PartitionPersistInfo implements Writable { isInMemory = in.readBoolean(); isTempPartition = in.readBoolean(); } - + public boolean equals(Object obj) { if (this == obj) { return true; @@ -139,9 +139,9 @@ public class PartitionPersistInfo implements Writable { if (!(obj instanceof PartitionPersistInfo)) { return false; } - + PartitionPersistInfo info = (PartitionPersistInfo) obj; - + return dbId.equals(info.dbId) && tableId.equals(info.tableId) && partition.equals(info.partition); diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/RefreshExternalTableInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/RefreshExternalTableInfo.java index a5bfa3bc08..e39c8d0a32 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/RefreshExternalTableInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/RefreshExternalTableInfo.java @@ -17,12 +17,12 @@ package org.apache.doris.persist; -import com.google.gson.annotations.SerializedName; import org.apache.doris.catalog.Column; -import org.apache.doris.common.io.Writable; import org.apache.doris.common.io.Text; - +import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; + +import com.google.gson.annotations.SerializedName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +49,7 @@ public class RefreshExternalTableInfo implements Writable { this.dbName = dbName; this.tableName = tableName; this.newSchema = newSchema; - + } public String getDbName() { @@ -59,7 +59,7 @@ public class RefreshExternalTableInfo implements Writable { public String getTableName() { return tableName; } - + public List getNewSchema() { return newSchema; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/ReplicaPersistInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/ReplicaPersistInfo.java index fb6b733c3b..a49174f5bc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/ReplicaPersistInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/ReplicaPersistInfo.java @@ -24,7 +24,7 @@ import java.io.DataOutput; import java.io.IOException; public class ReplicaPersistInfo implements Writable { - + public enum ReplicaOperationType { ADD(0), CROND_DELETE(1), @@ -46,7 +46,7 @@ public class ReplicaPersistInfo implements Writable { private ReplicaOperationType(int value) { this.value = value; } - + public int getValue() { return value; } @@ -78,7 +78,7 @@ public class ReplicaPersistInfo implements Writable { } } } - + // required private ReplicaOperationType opType; private long dbId; @@ -89,14 +89,14 @@ public class ReplicaPersistInfo implements Writable { private long replicaId; private long backendId; - + private long version; @Deprecated private long versionHash = 0L; private int schemaHash = -1; private long dataSize; private long rowCount; - + private long lastFailedVersion = -1L; @Deprecated private long lastFailedVersionHash = 0L; @@ -110,7 +110,7 @@ public class ReplicaPersistInfo implements Writable { long lastFailedVersion, long lastSuccessVersion) { - return new ReplicaPersistInfo(ReplicaOperationType.ADD, + return new ReplicaPersistInfo(ReplicaOperationType.ADD, dbId, tableId, partitionId, indexId, tabletId, backendId, replicaId, version, schemaHash, dataSize, rowCount, lastFailedVersion, lastSuccessVersion); @@ -123,7 +123,7 @@ public class ReplicaPersistInfo implements Writable { int schemaHash, long dataSize, long rowCount, long lastFailedVersion, long lastSuccessVersion) { - return new ReplicaPersistInfo(ReplicaOperationType.CROND_DELETE, + return new ReplicaPersistInfo(ReplicaOperationType.CROND_DELETE, -1L, -1L, -1L, indexId, tabletId, -1L, replicaId, version, schemaHash, dataSize, rowCount, lastFailedVersion, lastSuccessVersion); @@ -177,12 +177,12 @@ public class ReplicaPersistInfo implements Writable { long lastFailedVersion, long lastSuccessVersion) { - return new ReplicaPersistInfo(ReplicaOperationType.SCHEMA_CHANGE, + return new ReplicaPersistInfo(ReplicaOperationType.SCHEMA_CHANGE, -1L, -1L, partitionId, indexId, tabletId, backendId, -1L, version, schemaHash, dataSize, rowCount, lastFailedVersion, lastSuccessVersion); } - + public static ReplicaPersistInfo createForClearRollupInfo(long dbId, long tableId, long partitionId, long indexId) { return new ReplicaPersistInfo(ReplicaOperationType.CLEAR_ROLLUPINFO, dbId, tableId, partitionId, indexId, -1L, -1L, -1L, -1L, -1, -1L, -1L, -1L, -1L); @@ -214,7 +214,7 @@ public class ReplicaPersistInfo implements Writable { this.schemaHash = schemaHash; this.dataSize = dataSize; this.rowCount = rowCount; - + this.lastFailedVersion = lastFailedVersion; this.lastSuccessVersion = lastSuccessVersion; } @@ -222,7 +222,7 @@ public class ReplicaPersistInfo implements Writable { public ReplicaOperationType getOpType() { return opType; } - + public long getDbId() { return dbId; } @@ -266,11 +266,11 @@ public class ReplicaPersistInfo implements Writable { public long getRowCount() { return rowCount; } - + public long getLastFailedVersion() { return lastFailedVersion; } - + public long getLastSuccessVersion() { return lastSuccessVersion; } @@ -294,7 +294,7 @@ public class ReplicaPersistInfo implements Writable { out.writeLong(versionHash); out.writeLong(dataSize); out.writeLong(rowCount); - + out.writeInt(opType.value); out.writeLong(lastFailedVersion); out.writeLong(lastFailedVersionHash); @@ -305,7 +305,7 @@ public class ReplicaPersistInfo implements Writable { } public void readFields(DataInput in) throws IOException { - + dbId = in.readLong(); tableId = in.readLong(); partitionId = in.readLong(); @@ -334,13 +334,13 @@ public class ReplicaPersistInfo implements Writable { if (obj == this) { return true; } - + if (!(obj instanceof ReplicaPersistInfo)) { return false; } - + ReplicaPersistInfo info = (ReplicaPersistInfo) obj; - + return backendId == info.backendId && replicaId == info.replicaId && tabletId == info.tabletId diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/Storage.java b/fe/fe-core/src/main/java/org/apache/doris/persist/Storage.java index 8eb0336d71..f7e4667ea7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/Storage.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/Storage.java @@ -21,7 +21,6 @@ import org.apache.doris.ha.FrontendNodeType; import com.google.common.base.Preconditions; import com.google.common.base.Strings; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -235,7 +234,7 @@ public class Storage { writePropertiesToFile(properties, ROLE_FILE); } - + private void writePropertiesToFile(Properties properties, String fileName) throws IOException { RandomAccessFile file = new RandomAccessFile(new File(metaDir, fileName), "rws"); FileOutputStream out = null; @@ -320,4 +319,3 @@ public class Storage { } } - diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/StorageInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/StorageInfo.java index db331f46b5..114c31695d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/StorageInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/StorageInfo.java @@ -43,7 +43,7 @@ public class StorageInfo { public void setClusterID(int clusterID) { this.clusterID = clusterID; } - + public long getEditsSeq() { return editsSeq; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java index 5e51b16e58..b7517679e9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java @@ -35,6 +35,7 @@ import org.apache.doris.load.loadv2.LoadJob.LoadJobStateUpdateInfo; import org.apache.doris.load.loadv2.SparkLoadJob.SparkLoadJobStateUpdateInfo; import org.apache.doris.load.sync.SyncJob; import org.apache.doris.load.sync.canal.CanalSyncJob; + import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.HashBasedTable; @@ -62,7 +63,6 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; - import org.apache.commons.lang3.reflect.TypeUtils; import java.io.IOException; @@ -77,14 +77,14 @@ import java.util.concurrent.atomic.AtomicBoolean; /* * Some utilities about Gson. * User should get GSON instance from this class to do the serialization. - * + * * GsonUtils.GSON.toJson(...) * GsonUtils.GSON.fromJson(...) - * + * * More example can be seen in unit test case: "org.apache.doris.common.util.GsonSerializationTest.java". - * + * * For inherited class serialization, see "org.apache.doris.common.util.GsonDerivedClassSerializationTest.java" - * + * * And developers may need to add other serialization adapters for custom complex java classes. * You need implement a class to implements JsonSerializer and JsonDeserializer, and register it to GSON_BUILDER. * See the following "GuavaTableAdapter" and "GuavaMultimapAdapter" for example. @@ -171,17 +171,17 @@ public class GsonUtils { } /* - * + * * The json adapter for Guava Table. * Current support: * 1. HashBasedTable - * + * * The RowKey, ColumnKey and Value classes in Table should also be serializable. - * + * * What is Adapter and Why we should implement it? - * + * * Adapter is mainly used to provide serialization and deserialization methods for some complex classes. - * Complex classes here usually refer to classes that are complex and cannot be modified. + * Complex classes here usually refer to classes that are complex and cannot be modified. * These classes mainly include third-party library classes or some inherited classes. */ private static class GuavaTableAdapter @@ -193,7 +193,7 @@ public class GsonUtils { * "columnKeys": [ "colKey1", "colKey2", ...], * "cells" : [[0, 0, value1], [0, 1, value2], ...] * } - * + * * the [0, 0] .. in cells are the indexes of rowKeys array and columnKeys array. * This serialization method can reduce the size of json string because it * replace the same row key @@ -285,7 +285,7 @@ public class GsonUtils { * 2. HashMultimap * 3. LinkedListMultimap * 4. LinkedHashMultimap - * + * * The key and value classes of multi map should also be json serializable. */ private static class GuavaMultimapAdapter @@ -304,7 +304,7 @@ public class GsonUtils { throw new AssertionError(e); } } - + @Override public JsonElement serialize(Multimap map, Type typeOfSrc, JsonSerializationContext context) { JsonObject jsonObject = new JsonObject(); @@ -315,7 +315,7 @@ public class GsonUtils { jsonObject.add("map", jsonElement); return jsonObject; } - + @Override public Multimap deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/RuntimeTypeAdapterFactory.java b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/RuntimeTypeAdapterFactory.java index c210e868fd..141a446418 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/RuntimeTypeAdapterFactory.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/RuntimeTypeAdapterFactory.java @@ -39,7 +39,7 @@ import java.util.Map; * Adapts values whose runtime type may differ from their declaration type. This * is necessary when a field's type is not the same type that GSON should create * when deserializing that field. For example, consider these types: - * + * *
  * {
  *     @code
@@ -67,7 +67,7 @@ import java.util.Map;
  * 

* Without additional type information, the serialized JSON is ambiguous. Is * the bottom shape in this drawing a rectangle or a diamond? - * + * *

  *    {@code
  *   {
@@ -84,11 +84,11 @@ import java.util.Map;
  *     }
  *   }}
  * 
- * + * * This class addresses this problem by adding type information to the * serialized JSON and honoring that type information when the JSON is * deserialized: - * + * *
  *    {@code
  *   {
@@ -107,7 +107,7 @@ import java.util.Map;
  *     }
  *   }}
  * 
- * + * * Both the type field name ({@code "type"}) and the type labels ({@code * "Rectangle"}) are configurable. * @@ -116,18 +116,18 @@ import java.util.Map; * field * name to the {@link #of} factory method. If you don't supply an explicit type * field name, {@code "type"} will be used. - * + * *
  * {
  *     @code
  *     RuntimeTypeAdapterFactory shapeAdapterFactory = RuntimeTypeAdapterFactory.of(Shape.class, "type");
  * }
  * 
- * + * * Next register all of your subtypes. Every subtype must be explicitly * registered. This protects your application from injection attacks. If you * don't supply an explicit type label, the type's simple name will be used. - * + * *
  *    {@code
  *   shapeAdapterFactory.registerSubtype(Rectangle.class, "Rectangle");
@@ -135,19 +135,19 @@ import java.util.Map;
  *   shapeAdapterFactory.registerSubtype(Diamond.class, "Diamond");
  * }
  * 
- * + * * Finally, register the type adapter factory in your application's GSON * builder: - * + * *
  * {
  *     @code
  *     Gson gson = new GsonBuilder().registerTypeAdapterFactory(shapeAdapterFactory).create();
  * }
  * 
- * + * * Like {@code GsonBuilder}, this API supports chaining: - * + * *
  * {
  *     @code
@@ -159,7 +159,7 @@ import java.util.Map;
  * 

Serialization and deserialization

* In order to serialize and deserialize a polymorphic object, * you must specify the base type explicitly. - * + * *
  * {
  *     @code
@@ -167,9 +167,9 @@ import java.util.Map;
  *     String json = gson.toJson(diamond, Shape.class);
  * }
  * 
- * + * * And then: - * + * *
  * {
  *     @code
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
index 282da5489c..9a24d72303 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
@@ -38,7 +38,6 @@ import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/AnalyticEvalNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/AnalyticEvalNode.java
index 4bac949ac1..1a10f785bd 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/AnalyticEvalNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/AnalyticEvalNode.java
@@ -38,7 +38,6 @@ import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/AnalyticPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/AnalyticPlanner.java
index 2ab2298979..57925d25c4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/AnalyticPlanner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/AnalyticPlanner.java
@@ -44,7 +44,6 @@ import org.apache.doris.thrift.TPartitionType;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/BrokerScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/BrokerScanNode.java
index 6f004f2c9b..2db3b0ea6f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/BrokerScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/BrokerScanNode.java
@@ -34,9 +34,9 @@ import org.apache.doris.catalog.Table;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.Config;
 import org.apache.doris.common.DdlException;
+import org.apache.doris.common.FeConstants;
 import org.apache.doris.common.UserException;
 import org.apache.doris.common.util.BrokerUtil;
-import org.apache.doris.common.FeConstants;
 import org.apache.doris.load.BrokerFileGroup;
 import org.apache.doris.load.Load;
 import org.apache.doris.load.loadv2.LoadTask;
@@ -54,13 +54,12 @@ import org.apache.doris.thrift.TScanRange;
 import org.apache.doris.thrift.TScanRangeLocation;
 import org.apache.doris.thrift.TScanRangeLocations;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -481,7 +480,7 @@ public class BrokerScanNode extends LoadScanNode {
             TBrokerFileStatus fileStatus = fileStatuses.get(i);
             long leftBytes = fileStatus.size - curFileOffset;
             long tmpBytes = curInstanceBytes + leftBytes;
-            //header_type 
+            //header_type
             String header_type = getHeaderType(context.fileGroup.getFileFormat());
             TFileFormatType formatType = formatType(context.fileGroup.getFileFormat(), fileStatus.path);
             List columnsFromPath = BrokerUtil.parseColumnsFromPath(fileStatus.path,
@@ -633,6 +632,3 @@ public class BrokerScanNode extends LoadScanNode {
         return output.toString();
     }
 }
-
-
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ColumnRange.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ColumnRange.java
index a74aa67684..9c7037e649 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/ColumnRange.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ColumnRange.java
@@ -17,14 +17,14 @@
 
 package org.apache.doris.planner;
 
-import java.util.List;
-import java.util.Optional;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
 import com.google.common.collect.TreeRangeSet;
 
+import java.util.List;
+import java.util.Optional;
+
 /**
  * There are two kinds of predicates for a column: `is null` predicate and other predicates that
  * the value of a column is not null, e.g., col=1, col>2, col in (1,2,3), etc.
@@ -103,4 +103,3 @@ public class ColumnRange {
             .toString();
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/CrossJoinNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/CrossJoinNode.java
index 31c668f217..7cb411da8d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/CrossJoinNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/CrossJoinNode.java
@@ -25,11 +25,10 @@ import org.apache.doris.thrift.TExplainLevel;
 import org.apache.doris.thrift.TPlanNode;
 import org.apache.doris.thrift.TPlanNodeType;
 
+import com.google.common.base.MoreObjects;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.google.common.base.MoreObjects;
-
 /**
  * Cross join between left child and right child.
  */
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/DataPartition.java b/fe/fe-core/src/main/java/org/apache/doris/planner/DataPartition.java
index 9bd82fc720..6ae5d60b5f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/DataPartition.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/DataPartition.java
@@ -32,7 +32,6 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -72,7 +71,7 @@ public class DataPartition {
         List list = Expr.trySubstituteList(partitionExprs, smap, analyzer, false);
         partitionExprs = ImmutableList.copyOf(list);
     }
-    
+
     public DataPartition(TPartitionType type) {
         Preconditions.checkState(
           type == TPartitionType.UNPARTITIONED || type == TPartitionType.RANDOM);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/DistributedPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/DistributedPlanner.java
index 4ee3106057..293d00436f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/DistributedPlanner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/DistributedPlanner.java
@@ -44,7 +44,6 @@ import org.apache.doris.thrift.TPartitionType;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/DistributionPruner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/DistributionPruner.java
index 17b35de163..c79cdc4229 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/DistributionPruner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/DistributionPruner.java
@@ -25,4 +25,3 @@ public interface DistributionPruner {
     // return partition after pruning
     public Collection prune() throws AnalysisException;
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/EmptySetNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/EmptySetNode.java
index eef4399088..d00dc12724 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/EmptySetNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/EmptySetNode.java
@@ -17,18 +17,17 @@
 
 package org.apache.doris.planner;
 
-import java.util.ArrayList;
-
 import org.apache.doris.analysis.Analyzer;
 import org.apache.doris.analysis.TupleId;
 import org.apache.doris.thrift.TPlanNode;
 import org.apache.doris.thrift.TPlanNodeType;
 
 import com.google.common.base.Preconditions;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.ArrayList;
+
 /**
  * Node that returns an empty result set. Used for planning query blocks with a constant
  * predicate evaluating to false or a limit 0. The result set will have zero rows, but
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/EsScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/EsScanNode.java
index 96dbdbe934..cad5eeefd0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/EsScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/EsScanNode.java
@@ -41,14 +41,13 @@ import org.apache.doris.thrift.TScanRange;
 import org.apache.doris.thrift.TScanRangeLocation;
 import org.apache.doris.thrift.TScanRangeLocations;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ExceptNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ExceptNode.java
index 4ce760e74a..c1d031931a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/ExceptNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ExceptNode.java
@@ -17,13 +17,13 @@
 
 package org.apache.doris.planner;
 
-import java.util.List;
-
 import org.apache.doris.analysis.Expr;
 import org.apache.doris.analysis.TupleId;
 import org.apache.doris.thrift.TPlanNode;
 import org.apache.doris.thrift.TPlanNodeType;
 
+import java.util.List;
+
 public class ExceptNode extends SetOperationNode {
     protected ExceptNode(PlanNodeId id, TupleId tupleId) {
         super(id, tupleId, "EXCEPT");
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ExchangeNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ExchangeNode.java
index 996e05e184..e9d1e3434a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/ExchangeNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ExchangeNode.java
@@ -35,7 +35,6 @@ import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/HashDistributionPruner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/HashDistributionPruner.java
index c4e67858af..9fc4fa5406 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/HashDistributionPruner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/HashDistributionPruner.java
@@ -26,7 +26,6 @@ import org.apache.doris.common.Config;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -41,11 +40,11 @@ import java.util.Set;
  * For example:
  *      where a = 1 and b in (2,3,4) and c in (5,6,7)
  *      a/b/c are distribution columns
- * 
+ *
  * the config 'max_distribution_pruner_recursion_depth' will limit the max recursion depth of pruning.
  * the recursion depth is calculated by the product of element number of all predicates.
  * The above example's depth is 9(= 1 * 3 * 3)
- * 
+ *
  * If depth is larger than 'max_distribution_pruner_recursion_depth', all buckets will be return without pruning.
  */
 public class HashDistributionPruner implements DistributionPruner {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/HashJoinNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/HashJoinNode.java
index 66fd1c3159..812b7d459d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/HashJoinNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/HashJoinNode.java
@@ -48,7 +48,6 @@ import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -172,7 +171,7 @@ public class HashJoinNode extends PlanNode {
         isColocate = colocate;
         colocateReason = reason;
     }
-    
+
     /**
      * Calculate the slots output after going through the hash table in the hash join node.
      * The most essential difference between 'hashOutputSlots' and 'outputSlots' is that
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/HiveScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/HiveScanNode.java
index c18533d302..980701e6ca 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/HiveScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/HiveScanNode.java
@@ -31,6 +31,8 @@ import org.apache.doris.load.BrokerFileGroup;
 import org.apache.doris.thrift.TBrokerFileStatus;
 import org.apache.doris.thrift.TExplainLevel;
 
+import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
 import org.apache.hadoop.hive.metastore.api.Table;
 import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
@@ -39,9 +41,6 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/IcebergScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/IcebergScanNode.java
index 5c7dd1fad0..6bdda5272e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/IcebergScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/IcebergScanNode.java
@@ -29,12 +29,11 @@ import org.apache.doris.load.BrokerFileGroup;
 import org.apache.doris.thrift.TBrokerFileStatus;
 import org.apache.doris.thrift.TExplainLevel;
 
+import com.google.common.collect.Lists;
 import org.apache.iceberg.expressions.Expression;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.google.common.collect.Lists;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/IntersectNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/IntersectNode.java
index ffe16e1537..b6a4e676cb 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/IntersectNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/IntersectNode.java
@@ -17,13 +17,13 @@
 
 package org.apache.doris.planner;
 
-import java.util.List;
-
 import org.apache.doris.analysis.Expr;
 import org.apache.doris.analysis.TupleId;
 import org.apache.doris.thrift.TPlanNode;
 import org.apache.doris.thrift.TPlanNodeType;
 
+import java.util.List;
+
 public class IntersectNode extends SetOperationNode {
     protected IntersectNode(PlanNodeId id, TupleId tupleId) {
         super(id, tupleId, "INTERSECT");
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/JoinCostEvaluation.java b/fe/fe-core/src/main/java/org/apache/doris/planner/JoinCostEvaluation.java
index e0b918d95a..9a7dd84c77 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/JoinCostEvaluation.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/JoinCostEvaluation.java
@@ -18,6 +18,7 @@
 package org.apache.doris.planner;
 
 import org.apache.doris.qe.ConnectContext;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ListPartitionPruner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ListPartitionPruner.java
index a9eba85214..7e90bd9fb5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/ListPartitionPruner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ListPartitionPruner.java
@@ -24,6 +24,7 @@ import org.apache.doris.catalog.PartitionItem;
 import org.apache.doris.catalog.PartitionKey;
 import org.apache.doris.catalog.Type;
 import org.apache.doris.common.AnalysisException;
+
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
@@ -169,8 +170,8 @@ public class ListPartitionPruner implements PartitionPruner {
         InPredicate inPredicate = filter.getInPredicate();
         if (null == inPredicate || inPredicate.getChildren().size() * complex > 100) {
             // case: where k1 = 1;
-            if (filter.lowerBoundInclusive && filter.upperBoundInclusive 
-                    && filter.lowerBound != null && filter.upperBound != null 
+            if (filter.lowerBoundInclusive && filter.upperBoundInclusive
+                    && filter.lowerBound != null && filter.upperBound != null
                     && 0 == filter.lowerBound.compareLiteral(filter.upperBound)) {
                 minKey.pushColumn(filter.lowerBound, keyColumn.getDataType());
                 maxKey.pushColumn(filter.upperBound, keyColumn.getDataType());
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/LoadScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/LoadScanNode.java
index 82299e2ea6..9ca69c819c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/LoadScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/LoadScanNode.java
@@ -220,4 +220,3 @@ public abstract class LoadScanNode extends ScanNode {
         planNode.setBrokerScanNode(brokerScanNode);
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/MaterializedViewSelector.java b/fe/fe-core/src/main/java/org/apache/doris/planner/MaterializedViewSelector.java
index ef30f9135e..bc8963681b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/MaterializedViewSelector.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/MaterializedViewSelector.java
@@ -40,7 +40,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -535,5 +534,3 @@ public class MaterializedViewSelector {
         }
     }
 }
-
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/MysqlScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/MysqlScanNode.java
index 9235b1fc75..d022edcf78 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/MysqlScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/MysqlScanNode.java
@@ -32,12 +32,11 @@ import org.apache.doris.thrift.TPlanNode;
 import org.apache.doris.thrift.TPlanNodeType;
 import org.apache.doris.thrift.TScanRangeLocations;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Lists;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcScanNode.java
index 1f32b9e938..1a5c0c0573 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcScanNode.java
@@ -34,12 +34,11 @@ import org.apache.doris.thrift.TPlanNode;
 import org.apache.doris.thrift.TPlanNodeType;
 import org.apache.doris.thrift.TScanRangeLocations;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Lists;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -142,7 +141,7 @@ public class OdbcScanNode extends ScanNode {
         if (shouldPushDownLimit() && (odbcType == TOdbcTableType.MYSQL || odbcType == TOdbcTableType.POSTGRESQL || odbcType == TOdbcTableType.MONGODB) ) {
             sql.append(" LIMIT " + limit);
         }
-        
+
         return sql.toString();
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
index 5b721fc943..cbaf45368b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
@@ -73,7 +73,6 @@ import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -612,7 +611,7 @@ public class OlapScanNode extends ScanNode {
         // Step2: select best rollup
         long start = System.currentTimeMillis();
         if (olapTable.getKeysType() == KeysType.DUP_KEYS) {
-            //This function is compatible with the INDEX selection logic of ROLLUP, 
+            //This function is compatible with the INDEX selection logic of ROLLUP,
             //so the Duplicate table here returns base index directly
             //and the selection logic of materialized view is selected in "MaterializedViewSelector"
             selectedIndexId = olapTable.getBaseIndexId();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java
index 7a5f0bc60f..8bdd82ecef 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java
@@ -66,7 +66,6 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Range;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -337,7 +336,7 @@ public class OlapTableSink extends DataSink {
                 }
             }
         }
-        
+
         // check if disk capacity reach limit
         // this is for load process, so use high water mark to check
         Status st = Catalog.getCurrentSystemInfo().checkExceedDiskCapacityLimit(allBePathsMap, true);
@@ -358,4 +357,3 @@ public class OlapTableSink extends DataSink {
     }
 
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/PartitionColumnFilter.java b/fe/fe-core/src/main/java/org/apache/doris/planner/PartitionColumnFilter.java
index 32f762283b..14841443a6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/PartitionColumnFilter.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/PartitionColumnFilter.java
@@ -27,7 +27,6 @@ import org.apache.doris.common.AnalysisException;
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/PartitionPrunerV2Base.java b/fe/fe-core/src/main/java/org/apache/doris/planner/PartitionPrunerV2Base.java
index 017d556450..0101d71337 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/PartitionPrunerV2Base.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/PartitionPrunerV2Base.java
@@ -17,13 +17,10 @@
 
 package org.apache.doris.planner;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import org.apache.doris.catalog.Column;
+import org.apache.doris.catalog.PartitionItem;
+import org.apache.doris.catalog.PartitionKey;
+import org.apache.doris.common.AnalysisException;
 
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Lists;
@@ -31,10 +28,13 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeMap;
 
-import org.apache.doris.catalog.Column;
-import org.apache.doris.catalog.PartitionItem;
-import org.apache.doris.catalog.PartitionKey;
-import org.apache.doris.common.AnalysisException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public abstract class PartitionPrunerV2Base implements PartitionPruner {
     protected final Map idToPartitionItem;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragment.java b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragment.java
index 1a5bc3843d..4703f0827c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragment.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragment.java
@@ -33,7 +33,6 @@ import org.apache.doris.thrift.TPlanFragment;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -119,7 +118,7 @@ public class PlanFragment extends TreeNode {
     private DataPartition outputPartition;
 
     // Whether query statistics is sent with every batch. In order to get the query
-    // statistics correctly when query contains limit, it is necessary to send query 
+    // statistics correctly when query contains limit, it is necessary to send query
     // statistics with every batch, or only in close.
     private boolean transferQueryStatisticsWithEveryBatch;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNode.java
index 13ac58c40f..d254e096c6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNode.java
@@ -47,7 +47,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -398,7 +397,7 @@ abstract public class PlanNode extends TreeNode {
     public void transferConjuncts(PlanNode recipient) {
         recipient.vconjunct = vconjunct;
         vconjunct = null;
-        
+
         recipient.conjuncts.addAll(conjuncts);
         conjuncts.clear();
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/Planner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/Planner.java
index a5a88ee17a..720032df67 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/Planner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/Planner.java
@@ -45,7 +45,6 @@ import org.apache.doris.thrift.TRuntimeFilterMode;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -217,7 +216,7 @@ public class Planner {
          */
         analyzer.getDescTbl().computeMemLayout();
         singleNodePlan.finalize(analyzer);
-        
+
         if (queryOptions.num_nodes == 1) {
             // single-node execution; we're almost done
             singleNodePlan = addUnassignedConjuncts(analyzer, singleNodePlan);
@@ -240,7 +239,7 @@ public class Planner {
             RuntimeFilterGenerator.generateRuntimeFilters(analyzer, rootFragment.getPlanRoot());
         }
 
-	    if (statement instanceof InsertStmt && !analyzer.getContext().isTxnModel()) {
+        if (statement instanceof InsertStmt && !analyzer.getContext().isTxnModel()) {
             InsertStmt insertStmt = (InsertStmt) statement;
             rootFragment = distributedPlanner.createInsertFragment(rootFragment, insertStmt, fragments);
             rootFragment.setSink(insertStmt.getDataSink());
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ProjectPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ProjectPlanner.java
index 0537190a2b..094091fd22 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/ProjectPlanner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ProjectPlanner.java
@@ -24,7 +24,6 @@ import org.apache.doris.common.NotImplementedException;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/RangePartitionPruner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/RangePartitionPruner.java
index 8568599732..c61d312e91 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/RangePartitionPruner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/RangePartitionPruner.java
@@ -32,7 +32,6 @@ import com.google.common.collect.Range;
 import com.google.common.collect.RangeMap;
 import com.google.common.collect.Sets;
 import com.google.common.collect.TreeRangeMap;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/RepeatNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/RepeatNode.java
index b70b374c00..dab99a0f4d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/RepeatNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/RepeatNode.java
@@ -37,7 +37,6 @@ import org.apache.doris.thrift.TRepeatNode;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ResultFileSink.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ResultFileSink.java
index 918ae64b66..bfca278792 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/ResultFileSink.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ResultFileSink.java
@@ -17,10 +17,10 @@
 
 package org.apache.doris.planner;
 
-import org.apache.doris.common.FeConstants;
 import org.apache.doris.analysis.OutFileClause;
 import org.apache.doris.analysis.StorageBackend;
 import org.apache.doris.analysis.TupleId;
+import org.apache.doris.common.FeConstants;
 import org.apache.doris.thrift.TDataSink;
 import org.apache.doris.thrift.TDataSinkType;
 import org.apache.doris.thrift.TExplainLevel;
@@ -52,7 +52,7 @@ public class ResultFileSink extends DataSink {
                 outFileClause.getBrokerDesc().getStorageType();
     }
 
-    //gen header names 
+    //gen header names
     private String genNames(ArrayList headerNames, String columnSeparator, String lineDelimiter) {
         String names = "";
         for (String name : headerNames) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/RollupSelector.java b/fe/fe-core/src/main/java/org/apache/doris/planner/RollupSelector.java
index 04fb5d98d7..00871f1d33 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/RollupSelector.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/RollupSelector.java
@@ -35,7 +35,6 @@ import org.apache.doris.qe.ConnectContext;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -64,7 +63,7 @@ public final class RollupSelector {
             Collection partitionIds, List conjuncts, boolean isPreAggregation)
             throws UserException {
         Preconditions.checkArgument(partitionIds != null , "Paritition can't be null.");
-        
+
         ConnectContext connectContext = ConnectContext.get();
         if (connectContext != null && connectContext.getSessionVariable().isUseV2Rollup()) {
             // if user set `use_v2_rollup` variable to true, and there is a segment v2 rollup,
@@ -192,7 +191,7 @@ public final class RollupSelector {
             for (Column col : table.getSchemaByIndexId(index.getId())) {
                 if (equivalenceColumns.contains(col.getName())) {
                     prefixMatchCount++;
-                } else if (unequivalenceColumns.contains(col.getName())) { 
+                } else if (unequivalenceColumns.contains(col.getName())) {
                     // Unequivalence predicate's columns can match only first column in rollup.
                     prefixMatchCount++;
                     break;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilter.java b/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilter.java
index 29b3f9e1bc..45c90d3025 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilter.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilter.java
@@ -34,7 +34,6 @@ import org.apache.doris.thrift.TRuntimeFilterType;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterGenerator.java
index 66fec98c11..b6872c9ecf 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterGenerator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterGenerator.java
@@ -34,7 +34,6 @@ import org.apache.doris.thrift.TRuntimeFilterType;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ScanNode.java
index a891f7616f..41f3ad0b77 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/ScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ScanNode.java
@@ -20,9 +20,6 @@
 
 package org.apache.doris.planner;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Range;
-
 import org.apache.doris.analysis.Analyzer;
 import org.apache.doris.analysis.BinaryPredicate;
 import org.apache.doris.analysis.CompoundPredicate;
@@ -42,8 +39,9 @@ import org.apache.doris.thrift.TNetworkAddress;
 import org.apache.doris.thrift.TScanRangeLocations;
 
 import com.google.common.base.MoreObjects;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
+import com.google.common.collect.Range;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.glassfish.jersey.internal.guava.Sets;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/SchemaScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/SchemaScanNode.java
index 07152bfd5e..6bea955cd5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/SchemaScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/SchemaScanNode.java
@@ -32,7 +32,6 @@ import org.apache.doris.thrift.TSchemaScanNode;
 import org.apache.doris.thrift.TUserIdentity;
 
 import com.google.common.base.MoreObjects;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/SetOperationNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/SetOperationNode.java
index 67ef3b5bf9..a378635b2c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/SetOperationNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/SetOperationNode.java
@@ -36,16 +36,14 @@ import org.apache.doris.thrift.TUnionNode;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-
 import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Node that merges the results of its child plans, Normally, this is done by
  * materializing the corresponding result exprs into a new tuple. However, if
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
index a78435a3dd..b02b0ad5af 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
@@ -70,7 +70,6 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -1358,7 +1357,7 @@ public class SingleNodePlanner {
                 }
                 unionNode.setTblRefIds(Lists.newArrayList(inlineViewRef.getId()));
                 unionNode.addConstExprList(selectStmt.getBaseTblResultExprs());
-                //set outputSmap to substitute literal in outputExpr 
+                //set outputSmap to substitute literal in outputExpr
                 unionNode.setOutputSmap(inlineViewRef.getSmap());
                 unionNode.init(analyzer);
                 return unionNode;
@@ -1683,7 +1682,7 @@ public class SingleNodePlanner {
 
         switch (tblRef.getTable().getType()) {
             case OLAP:
-                OlapScanNode olapNode = new OlapScanNode(ctx_.getNextNodeId(), tblRef.getDesc(), 
+                OlapScanNode olapNode = new OlapScanNode(ctx_.getNextNodeId(), tblRef.getDesc(),
                         "OlapScanNode");
                 olapNode.setForceOpenPreAgg(tblRef.isForcePreAggOpened());
                 scanNode = olapNode;
@@ -2012,7 +2011,7 @@ public class SingleNodePlanner {
         List conjuncts = analyzer.getUnassignedConjuncts(setOperationStmt.getTupleId().asList());
         // TODO chenhao
         // Because Conjuncts can't be assigned to UnionNode and Palo's fe can't evaluate conjuncts,
-        // it needs to add SelectNode as UnionNode's parent, when UnionStmt's Ops contains constant 
+        // it needs to add SelectNode as UnionNode's parent, when UnionStmt's Ops contains constant
         // Select.
         boolean hasConstantOp = false;
         if (!setOperationStmt.hasAnalyticExprs()) {
@@ -2288,7 +2287,7 @@ public class SingleNodePlanner {
     }
 
     private void pushDownPredicatesPastSort(Analyzer analyzer, SelectStmt stmt) throws AnalysisException {
-        // TODO chenhao, remove isEvaluateOrderBy when SubQuery's default limit is removed. 
+        // TODO chenhao, remove isEvaluateOrderBy when SubQuery's default limit is removed.
         if (stmt.evaluateOrderBy() || stmt.getLimit() >= 0 || stmt.getOffset() > 0 || stmt.getSortInfo() == null) {
             return;
         }
@@ -2369,7 +2368,7 @@ public class SingleNodePlanner {
                 // if grouping set is given and column is not in all grouping set list
                 // we cannot push the predicate since the column value can be null
                 if (stmt.getGroupByClause() == null) {
-                    //group by clause may be null when distinct grouping. 
+                    //group by clause may be null when distinct grouping.
                     //eg: select distinct c from ( select distinct c from table) t where c > 1;
                     continue;
                 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/SortNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/SortNode.java
index 7605754342..4da0fff5b1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/SortNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/SortNode.java
@@ -39,7 +39,6 @@ import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java
index c87be30d27..521d8e2343 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java
@@ -33,8 +33,8 @@ import org.apache.doris.catalog.Partition;
 import org.apache.doris.catalog.PartitionInfo;
 import org.apache.doris.catalog.PartitionItem;
 import org.apache.doris.catalog.PartitionType;
-import org.apache.doris.common.Config;
 import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Config;
 import org.apache.doris.common.DdlException;
 import org.apache.doris.common.ErrorCode;
 import org.apache.doris.common.ErrorReport;
@@ -54,11 +54,10 @@ import org.apache.doris.thrift.TScanRangeLocations;
 import org.apache.doris.thrift.TScanRangeParams;
 import org.apache.doris.thrift.TUniqueId;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadScanNode.java
index 65a265d9c5..74131db12e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadScanNode.java
@@ -39,11 +39,10 @@ import org.apache.doris.thrift.TScanRange;
 import org.apache.doris.thrift.TScanRangeLocations;
 import org.apache.doris.thrift.TUniqueId;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.nio.charset.Charset;
 import java.util.List;
@@ -89,7 +88,7 @@ public class StreamLoadScanNode extends LoadScanNode {
 
         this.analyzer = analyzer;
         brokerScanRange = new TBrokerScanRange();
-        
+
         deleteCondition = taskInfo.getDeleteCondition();
         mergeType = taskInfo.getMergeType();
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/TableFunctionNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/TableFunctionNode.java
index 9d17836aa0..25be95fd2e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/TableFunctionNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/TableFunctionNode.java
@@ -180,4 +180,3 @@ public class TableFunctionNode extends PlanNode {
         }
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/UnionNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/UnionNode.java
index 08947ca3c4..01573c100c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/UnionNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/UnionNode.java
@@ -20,13 +20,13 @@
 
 package org.apache.doris.planner;
 
-import java.util.List;
-
 import org.apache.doris.analysis.Expr;
 import org.apache.doris.analysis.TupleId;
 import org.apache.doris.thrift.TPlanNode;
 import org.apache.doris.thrift.TPlanNodeType;
 
+import java.util.List;
+
 public class UnionNode extends SetOperationNode {
     protected UnionNode(PlanNodeId id, TupleId tupleId) {
         super(id, tupleId, "UNION");
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
index 4a2e9074fa..e2f85d2ac3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
@@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy;
 /*
  * AuditEvent contains all information about audit log info.
  * It should be created by AuditEventBuilder. For example:
- * 
+ *
  *      AuditEvent event = new AuditEventBuilder()
  *          .setEventType(AFTER_QUERY)
  *          .setClientIp(xxx)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/DynamicPluginLoader.java b/fe/fe-core/src/main/java/org/apache/doris/plugin/DynamicPluginLoader.java
index cfb2c25d77..d8d8d0e5a1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/DynamicPluginLoader.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/DynamicPluginLoader.java
@@ -152,7 +152,7 @@ public class DynamicPluginLoader extends PluginLoader {
     /**
      * reload plugin if plugin has already been installed, else will re-install.
      * Notice that this method will create a new instance of plugin.
-     * 
+     *
      * @throws PluginException
      */
     public void reload() throws IOException, UserException {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginContext.java b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginContext.java
index fb061aa57b..73e949a2dd 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginContext.java
@@ -44,4 +44,3 @@ public class PluginContext {
         return feIdentity;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginInfo.java b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginInfo.java
index 57e6799683..ac95556a96 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginInfo.java
@@ -22,10 +22,9 @@ import org.apache.doris.common.io.Writable;
 import org.apache.doris.common.util.DigitalVersion;
 import org.apache.doris.persist.gson.GsonUtils;
 
-import com.google.common.collect.Maps;
 import com.google.common.base.Strings;
+import com.google.common.collect.Maps;
 import com.google.gson.annotations.SerializedName;
-
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginLoader.java b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginLoader.java
index a304b4c8f7..89188ad95c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginLoader.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginLoader.java
@@ -137,4 +137,3 @@ public abstract class PluginLoader {
         return Objects.hash(pluginInfo);
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginMgr.java b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginMgr.java
index 3e53fe7f30..412b59fbff 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginMgr.java
@@ -32,7 +32,6 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -122,16 +121,16 @@ public class PluginMgr implements Writable {
             if (checkDynamicPluginNameExist(info.getName())) {
                 throw new UserException("plugin " + info.getName() + " has already been installed.");
             }
-            
+
             // install plugin
             pluginLoader.install();
             pluginLoader.setStatus(PluginStatus.INSTALLED);
-            
+
             if (!addDynamicPluginNameIfAbsent(info.getName())) {
                 throw new UserException("plugin " + info.getName() + " has already been installed.");
             }
             plugins[info.getTypeId()].put(info.getName(), pluginLoader);
-            
+
             Catalog.getCurrentCatalog().getEditLog().logInstallPlugin(info);
             LOG.info("install plugin {}", info.getName());
             return info;
@@ -281,7 +280,7 @@ public class PluginMgr implements Writable {
                     // plugin may not be loaded successfully
                     LOG.warn("failed to get plugin info for plugin: {}", entry.getKey(), e);
                 }
-                
+
                 r.add(entry.getKey());
                 r.add(pi != null ? pi.getType().name() : "UNKNOWN");
                 r.add(pi != null ? pi.getDescription() : "UNKNOWN");
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginZip.java b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginZip.java
index 5abc3f9c92..ad8bf11daa 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginZip.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginZip.java
@@ -23,7 +23,6 @@ import org.apache.doris.common.util.Util;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/AbstractResultSetMetaData.java b/fe/fe-core/src/main/java/org/apache/doris/qe/AbstractResultSetMetaData.java
index 4789fce821..f93e51a206 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/AbstractResultSetMetaData.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/AbstractResultSetMetaData.java
@@ -17,9 +17,10 @@
 
 package org.apache.doris.qe;
 
-import com.google.common.base.Preconditions;
 import org.apache.doris.catalog.Column;
 
+import com.google.common.base.Preconditions;
+
 import java.util.List;
 
 public class AbstractResultSetMetaData implements ResultSetMetaData {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditEventProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditEventProcessor.java
index 64c1609216..455d6913e9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditEventProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditEventProcessor.java
@@ -24,7 +24,6 @@ import org.apache.doris.plugin.PluginInfo.PluginType;
 import org.apache.doris.plugin.PluginMgr;
 
 import com.google.common.collect.Queues;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -34,7 +33,7 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * Class for processing all audit events.
- * It will receive audit events and handle them to all AUDIT type plugins. 
+ * It will receive audit events and handle them to all AUDIT type plugins.
  */
 public class AuditEventProcessor {
     private static final Logger LOG = LogManager.getLogger(AuditEventProcessor.class);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogBuilder.java
index 818e116911..0b07b5e2e0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogBuilder.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogBuilder.java
@@ -29,11 +29,10 @@ import org.apache.doris.plugin.PluginInfo;
 import org.apache.doris.plugin.PluginInfo.PluginType;
 import org.apache.doris.plugin.PluginMgr;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.lang.reflect.Field;
 import java.util.Map;
@@ -60,7 +59,7 @@ public class AuditLogBuilder extends Plugin implements AuditPlugin {
 
     public AuditLogBuilder() {
         pluginInfo = new PluginInfo(PluginMgr.BUILTIN_PLUGIN_PREFIX + "AuditLogBuilder", PluginType.AUDIT,
-                "builtin audit logger", DigitalVersion.fromString("0.12.0"), 
+                "builtin audit logger", DigitalVersion.fromString("0.12.0"),
                 DigitalVersion.fromString("1.8.31"), AuditLogBuilder.class.getName(), null, null);
         loadAnnotationSet = Sets.newHashSet(LOAD_ANNONATION_NAMES);
         streamLoadAnnotationSet = Sets.newHashSet(STREAM_LOAD_ANNONATION_NAMES);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
index 48b30906ce..e0f6e1b043 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
@@ -37,7 +37,6 @@ import org.apache.doris.transaction.TransactionStatus;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
index f8507e73ae..d495578b75 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
@@ -54,7 +54,6 @@ import org.apache.doris.thrift.TUniqueId;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java
index babad8a172..7e75afdf22 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java
@@ -28,7 +28,6 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
index 458dd99e5c..017187e47b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
@@ -98,7 +98,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Sets;
-
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -2287,6 +2286,3 @@ public class Coordinator {
         }
     }
 }
-
-
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
index 9a0e817bbc..e52226efd7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
@@ -19,7 +19,6 @@ package org.apache.doris.qe;
 
 import org.apache.doris.common.Version;
 import org.apache.doris.common.util.TimeUtils;
-
 import org.apache.doris.mysql.MysqlHandshakePacket;
 
 import com.google.common.collect.Lists;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/HelpModule.java b/fe/fe-core/src/main/java/org/apache/doris/qe/HelpModule.java
index e774180ffd..bb2e6ed4de 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/HelpModule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/HelpModule.java
@@ -25,7 +25,6 @@ import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -72,8 +71,8 @@ public class HelpModule {
     private ImmutableMap.Builder topicBuilder;
 
     private static final String HELP_ZIP_FILE_NAME = "help-resource.zip";
-    private static final long HELP_ZIP_CHECK_INTERVAL_MS = 10 * 60 * 1000L; 
-    
+    private static final long HELP_ZIP_CHECK_INTERVAL_MS = 10 * 60 * 1000L;
+
     private static Charset CHARSET_UTF_8;
 
     static {
@@ -87,10 +86,10 @@ public class HelpModule {
 
     private static long lastModifyTime = 0L;
     private static long lastCheckTime = 0L;
-    private boolean isloaded = false; 
+    private boolean isloaded = false;
     private static String zipFilePath;
     private static ReentrantLock lock = new ReentrantLock();
-    
+
     // Files in zip is not recursive, so we only need to traverse it
     public void setUpByZip(String path) throws IOException, UserException {
         initBuild();
@@ -111,7 +110,7 @@ public class HelpModule {
                         lines.add(line);
                     }
                     reader.close();
-                    
+
                     // note that we only need basename
                     String parentPathStr = null;
                     Path pathObj = Paths.get(entry.getName());
@@ -133,20 +132,20 @@ public class HelpModule {
         build();
         isloaded = true;
     }
-    
+
     // process dirs in zip file
     private void setUpDirInZip(String pathInZip) {
         Path pathObj = Paths.get(pathInZip);
-        // Note: we only need 'basename' here, which is the farthest element from the root in the 
+        // Note: we only need 'basename' here, which is the farthest element from the root in the
         // directory hierarchy.
-        String pathStr = pathObj.getFileName().toString(); 
+        String pathStr = pathObj.getFileName().toString();
         String parentPathStr = null;
         if (pathObj.getParent() != null) {
             parentPathStr = pathObj.getParent().getFileName().toString();
         }
         updateCategory(parentPathStr, pathStr);
     }
-    
+
     // for test only
     public void setUp(String path) throws UserException, IOException {
         File root = new File(path);
@@ -271,23 +270,23 @@ public class HelpModule {
         }
         zipFilePath = helpResource.getPath();
         setUpByZip(zipFilePath);
-        
+
         long now = System.currentTimeMillis();
         lastCheckTime = now;
         lastModifyTime = now;
     }
-    
+
     public boolean needReloadZipFile(String zipPath) throws UserException {
         if (!isloaded) {
             return false;
         }
-        
+
         long now = System.currentTimeMillis();
         if ((now - lastCheckTime) < HELP_ZIP_CHECK_INTERVAL_MS) {
             return false;
         }
         lastCheckTime = now;
-        
+
         // check zip file's last modify time
         File file = new File(zipPath);
         if (!file.exists()) {
@@ -301,8 +300,8 @@ public class HelpModule {
             return true;
         }
     }
-    
-    // Every query will begin at this method, so we add check logic here to check 
+
+    // Every query will begin at this method, so we add check logic here to check
     // whether need reload ZipFile
     public static HelpModule getInstance() {
         if (instance == null) {
@@ -312,9 +311,9 @@ public class HelpModule {
                 }
             }
         }
-        
+
         try {
-            // If one thread is reloading zip-file, the other thread use old instance. 
+            // If one thread is reloading zip-file, the other thread use old instance.
             if (instance.needReloadZipFile(zipFilePath)) {
                 if (lock.tryLock()) {
                     LOG.info("reload help zip file: " + zipFilePath);
@@ -332,7 +331,7 @@ public class HelpModule {
         } catch (UserException e) {
             LOG.warn("Failed to reload help zip file: " + zipFilePath, e);
         }
-        
+
         return instance;
     }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/HelpObjectLoader.java b/fe/fe-core/src/main/java/org/apache/doris/qe/HelpObjectLoader.java
index dcf5933089..c263a3659f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/HelpObjectLoader.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/HelpObjectLoader.java
@@ -22,7 +22,6 @@ import org.apache.doris.common.UserException;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -57,7 +56,7 @@ public abstract class HelpObjectLoader {
         }
         return topics;
     }
-    
+
     // Load all Topics
     public List loadAll(String path) throws IOException, UserException {
         if (Strings.isNullOrEmpty(path)) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/HelpTopic.java b/fe/fe-core/src/main/java/org/apache/doris/qe/HelpTopic.java
index fa0c76b9a2..85c24baf53 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/HelpTopic.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/HelpTopic.java
@@ -103,4 +103,3 @@ public class HelpTopic implements HelpObjectIface {
         return "name: " + name + ", desc: " + description;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/JournalObservable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/JournalObservable.java
index 9e7ad75488..f9fda4a1e2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/JournalObservable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/JournalObservable.java
@@ -21,7 +21,6 @@ import org.apache.doris.common.DdlException;
 
 import com.google.common.collect.Multiset;
 import com.google.common.collect.TreeMultiset;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -50,7 +49,7 @@ public class JournalObservable {
     public void waitOn(Long expectedJournalVersion, int timeoutMs) throws DdlException {
         LOG.info("waiting for the observer to replay journal to {} with timeout: {} ms",
                  expectedJournalVersion, timeoutMs);
-  
+
         JournalObserver observer = new JournalObserver(expectedJournalVersion);
         addObserver(observer);
         try {
@@ -59,7 +58,7 @@ public class JournalObservable {
             deleteObserver(observer);
         }
     }
-    
+
     // return min pos which is bigger than value
     public static int upperBound(Object[] array, int size, Long value) {
         int left = 0;
@@ -76,9 +75,9 @@ public class JournalObservable {
             return 0;
         }
         Long rightValue = ((JournalObserver) array[right]).getTargetJournalVersion();
-        return value >= rightValue ? right + 1  : right;  
+        return value >= rightValue ? right + 1  : right;
     }
-    
+
     public void notifyObservers(Long journalId) {
         Object[] arrLocal;
         int size;
@@ -86,7 +85,7 @@ public class JournalObservable {
             size = obs.size();
             arrLocal = obs.toArray();
         }
-        
+
         int pos = upperBound(arrLocal, size, journalId);
         LOG.debug("notify observers: journal: {}, pos: {}, size: {}, obs: {}", journalId, pos, size, obs);
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/JournalObserver.java b/fe/fe-core/src/main/java/org/apache/doris/qe/JournalObserver.java
index 6e7d0fa050..a3326a0479 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/JournalObserver.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/JournalObserver.java
@@ -35,13 +35,13 @@ public class JournalObserver implements Comparable {
     private Long id;
     private Long targetJournalVersion;
     private CountDownLatch latch;
-    
+
     public JournalObserver(Long targetJournalVersion) {
         this.id = idGen.getAndIncrement();
         this.targetJournalVersion = targetJournalVersion;
         this.latch = new CountDownLatch(1);
     }
-    
+
     public void update() {
         latch.countDown();
     }
@@ -49,15 +49,15 @@ public class JournalObserver implements Comparable {
     public Long getTargetJournalVersion() {
         return targetJournalVersion;
     }
-    
+
     /*
      * We are waiting for this FE to replay journal to 'expectedJournalVersion' using JournalObserver.
      * Each time a journal is replayed, JournalObserver will be notified and check if the replayed
      * journal version >= 'expectedJournalVersion'. If satisfy, latch is counted down.
-     * But this is not a atomic operation, the replayed journal version may already larger than expected 
-     * version before waiting the latch. 
+     * But this is not a atomic operation, the replayed journal version may already larger than expected
+     * version before waiting the latch.
      * So, we wait for the latch with a small timeout in a loop until the total timeout, to avoid
-     * waiting unnecessary long time. 
+     * waiting unnecessary long time.
      */
     public void waitForReplay(int timeoutMs) throws DdlException {
         long leftTimeoutMs = timeoutMs;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
index 36b86f2588..04a2961312 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
@@ -62,7 +62,7 @@ public class MasterOpExecutor {
         LOG.info("forwarding to master get result max journal id: {}", result.maxJournalId);
         ctx.getCatalog().getJournalObservable().waitOn(result.maxJournalId, waitTimeoutMs);
     }
-    
+
     // Send request to Master
     private void forward() throws Exception {
         if (!ctx.getCatalog().isReady()) {
@@ -105,7 +105,7 @@ public class MasterOpExecutor {
         try {
             result = client.forward(params);
             isReturnToPool = true;
-        } catch (TTransportException e) { 
+        } catch (TTransportException e) {
             boolean ok = ClientPool.frontendPool.reopen(client, thriftTimeoutMs);
             if (!ok) {
                 throw e;
@@ -141,7 +141,7 @@ public class MasterOpExecutor {
         }
     }
 
-    
+
     public ShowResultSet getProxyResultSet() {
         if (result == null) {
             return null;
@@ -152,9 +152,8 @@ public class MasterOpExecutor {
             return null;
         }
     }
-    
+
     public void setResult(TMasterOpResult result) {
         this.result = result;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterTxnExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterTxnExecutor.java
index 917c4cc307..67efb64fb7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterTxnExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterTxnExecutor.java
@@ -138,4 +138,3 @@ public class MasterTxnExecutor {
         }
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/MultiLoadMgr.java b/fe/fe-core/src/main/java/org/apache/doris/qe/MultiLoadMgr.java
index 606d68e6c6..e6b6af986e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/MultiLoadMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MultiLoadMgr.java
@@ -51,7 +51,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Streams;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -268,7 +267,7 @@ public class MultiLoadMgr {
         }
 
         public void addFile(String subLabel, String table, List> files,
-                            TNetworkAddress fileAddr, 
+                            TNetworkAddress fileAddr,
                             Map properties,
                             long timestamp) throws DdlException {
 
@@ -541,4 +540,3 @@ public class MultiLoadMgr {
         }
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/OriginStatement.java b/fe/fe-core/src/main/java/org/apache/doris/qe/OriginStatement.java
index c943d84a96..eca952f807 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/OriginStatement.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/OriginStatement.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 
 /*
  * This class represents an origin statement
- * in multiple statements. 
+ * in multiple statements.
  */
 public class OriginStatement implements Writable {
     // the origin stmt from client. this may includes more than one statement.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java b/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
index e3c9feabad..2c8ccc3ee1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
@@ -31,7 +31,6 @@ import org.apache.doris.thrift.TUniqueId;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -206,7 +205,7 @@ public final class QeProcessorImpl implements QeProcessor {
         private final String sql;
         private final long startExecTime;
 
-        // from Export, Pull load, Insert 
+        // from Export, Pull load, Insert
         public QueryInfo(Coordinator coord) {
             this(null, null, coord);
         }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/QeService.java b/fe/fe-core/src/main/java/org/apache/doris/qe/QeService.java
index 2be37ab9d2..90dd240c1f 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/QeService.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/QeService.java
@@ -74,4 +74,3 @@ public class QeService {
     }
 
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryDetail.java b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryDetail.java
index 998c1e3821..0f5bc2c707 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryDetail.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryDetail.java
@@ -22,16 +22,16 @@ public class QueryDetail {
         RUNNING,
         FINISHED,
         FAILED,
-        CANCELLED 
+        CANCELLED
     };
 
     // When query received, FE will construct a QueryDetail
     // object. This object will set queryId, startTime, sql
-    // fields. As well state is be set as RUNNING. 
+    // fields. As well state is be set as RUNNING.
     // After query finished, endTime and latency will
     // be set and state will be updated to be FINISHED/FAILED/CANCELLED
     // according to the query execution results.
-    // So, one query will be inserted into as a item and 
+    // So, one query will be inserted into as a item and
     // be updated upon finished. To indicate the two event,
     // a extra field named eventTime is added.
     private long eventTime;
@@ -94,7 +94,7 @@ public class QueryDetail {
     public long getEndTime() {
         return endTime;
     }
-     
+
     public void setLatency(long latency) {
         this.latency = latency;
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryDetailQueue.java b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryDetailQueue.java
index 223db7bd79..b71884541a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryDetailQueue.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryDetailQueue.java
@@ -19,6 +19,7 @@ package org.apache.doris.qe;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -62,7 +63,7 @@ public class QueryDetailQueue {
                 results.add(queryDetail);
             }
         }
-        return results; 
+        return results;
     }
 
 };
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStateException.java b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStateException.java
index 0496c05d60..e4efa4513a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStateException.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStateException.java
@@ -17,10 +17,11 @@
 
 package org.apache.doris.qe;
 
-import com.google.common.base.Strings;
 import org.apache.doris.common.UserException;
 import org.apache.doris.qe.QueryState.MysqlStateType;
 
+import com.google.common.base.Strings;
+
 public class QueryStateException extends UserException {
     private QueryState queryState;
     public QueryStateException(MysqlStateType stateType, String msg) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
index afe95c512d..fdc2fd964f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
@@ -20,6 +20,7 @@ package org.apache.doris.qe;
 import org.apache.doris.common.util.RuntimeProfile;
 import org.apache.doris.thrift.TNetworkAddress;
 import org.apache.doris.thrift.TUniqueId;
+
 import com.google.common.collect.Lists;
 
 import java.util.List;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ResultReceiver.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ResultReceiver.java
index 7978ebc2be..5168475a7f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ResultReceiver.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ResultReceiver.java
@@ -66,7 +66,7 @@ public class ResultReceiver {
                         .setFinstId(finstId)
                         .setRespInAttachment(false)
                         .build();
-                
+
                 currentThread = Thread.currentThread();
                 Future future = BackendServiceProxy.getInstance().fetchDataAsync(address, request);
                 InternalService.PFetchDataResult pResult = null;
@@ -90,8 +90,8 @@ public class ResultReceiver {
                 if (code != TStatusCode.OK) {
                     status.setPstatus(pResult.getStatus());
                     return null;
-                } 
- 
+                }
+
                 rowBatch.setQueryStatistics(pResult.getQueryStatistics());
 
                 if (packetIdx != pResult.getPacketSeq()) {
@@ -99,7 +99,7 @@ public class ResultReceiver {
                     status.setRpcStatus("receive error packet");
                     return null;
                 }
-    
+
                 packetIdx++;
                 isDone = pResult.getEos();
 
@@ -138,7 +138,7 @@ public class ResultReceiver {
                 currentThread = null;
             }
         }
-        
+
         if (isCancel) {
             status.setStatus(Status.CANCELLED);
         }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/RuntimeFilterTypeHelper.java b/fe/fe-core/src/main/java/org/apache/doris/qe/RuntimeFilterTypeHelper.java
index 12dea2cb6e..e02bb6200c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/RuntimeFilterTypeHelper.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/RuntimeFilterTypeHelper.java
@@ -25,7 +25,6 @@ import org.apache.doris.thrift.TRuntimeFilterType;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Maps;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index 8bc47eac47..c6caa2cb3d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -165,7 +165,7 @@ public class SessionVariable implements Serializable, Writable {
     public static final String ENABLE_VECTORIZED_ENGINE = "enable_vectorized_engine";
 
     public static final String CPU_RESOURCE_LIMIT = "cpu_resource_limit";
-    
+
     public static final String ENABLE_PARALLEL_OUTFILE = "enable_parallel_outfile";
 
     public static final String ENABLE_LATERAL_VIEW = "enable_lateral_view";
@@ -221,19 +221,19 @@ public class SessionVariable implements Serializable, Writable {
     // this is used to make c3p0 library happy
     @VariableMgr.VarAttr(name = TX_ISOLATION)
     public String txIsolation = "REPEATABLE-READ";
-    
+
     // this is used to make mysql client happy
     @VariableMgr.VarAttr(name = TX_READ_ONLY)
     public boolean txReadonly = false;
-    
+
     // this is used to make mysql client happy
     @VariableMgr.VarAttr(name = TRANSACTION_READ_ONLY)
     public boolean transactionReadonly = false;
-    
+
     // this is used to make mysql client happy
     @VariableMgr.VarAttr(name = TRANSACTION_ISOLATION)
     public String transactionIsolation = "REPEATABLE-READ";
-    
+
     // this is used to make c3p0 library happy
     @VariableMgr.VarAttr(name = CHARACTER_SET_CLIENT)
     public String charsetClient = "utf8";
@@ -438,7 +438,7 @@ public class SessionVariable implements Serializable, Writable {
     // Default value is 1Gto
     @VariableMgr.VarAttr(name = AUTO_BROADCAST_JOIN_THRESHOLD)
     public double autoBroadcastJoinThreshold = 0.8;
-  
+
     @VariableMgr.VarAttr(name = ENABLE_PROJECTION)
     private boolean enableProjection = false;
 
@@ -482,7 +482,7 @@ public class SessionVariable implements Serializable, Writable {
     public boolean isAutoCommit() {
         return autoCommit;
     }
-    
+
     public boolean isTxReadonly() {
         return txReadonly;
     }
@@ -490,11 +490,11 @@ public class SessionVariable implements Serializable, Writable {
     public boolean isTransactionReadonly() {
         return transactionReadonly;
     }
-    
+
     public String getTransactionIsolation() {
         return transactionIsolation;
     }
-    
+
     public String getTxIsolation() {
         return txIsolation;
     }
@@ -1121,4 +1121,3 @@ public class SessionVariable implements Serializable, Writable {
         }
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SetExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SetExecutor.java
index 32db27f924..5039b7a11b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SetExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SetExecutor.java
@@ -17,9 +17,9 @@
 
 package org.apache.doris.qe;
 
+import org.apache.doris.analysis.SetLdapPassVar;
 import org.apache.doris.analysis.SetNamesVar;
 import org.apache.doris.analysis.SetPassVar;
-import org.apache.doris.analysis.SetLdapPassVar;
 import org.apache.doris.analysis.SetStmt;
 import org.apache.doris.analysis.SetTransaction;
 import org.apache.doris.analysis.SetVar;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
index f04cfe31f4..f7f3d9815e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
@@ -172,7 +172,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.apache.commons.lang3.tuple.Triple;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -1359,7 +1358,7 @@ public class ShowExecutor {
         ProcNodeInterface procNodeI = showStmt.getNode();
         Preconditions.checkNotNull(procNodeI);
         List> rows;
-        //Only SchemaChangeProc support where/order by/limit syntax 
+        //Only SchemaChangeProc support where/order by/limit syntax
         if (procNodeI instanceof SchemaChangeProcDir) {
             rows = ((SchemaChangeProcDir) procNodeI).fetchResultByFilter(showStmt.getFilterMap(),
                     showStmt.getOrderPairs(), showStmt.getLimitElement()).getRows();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSet.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSet.java
index f19e8980d0..ccd0b8cfa2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSet.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSet.java
@@ -17,7 +17,6 @@
 
 package org.apache.doris.qe;
 
-import com.google.common.collect.Lists;
 import org.apache.doris.catalog.Column;
 import org.apache.doris.catalog.PrimitiveType;
 import org.apache.doris.catalog.ScalarType;
@@ -26,6 +25,8 @@ import org.apache.doris.thrift.TColumnDefinition;
 import org.apache.doris.thrift.TShowResultSet;
 import org.apache.doris.thrift.TShowResultSetMetaData;
 
+import com.google.common.collect.Lists;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -61,7 +62,7 @@ public class ShowResultSet extends AbstractResultSet {
                     definition.getName(), definition.getOriginType().toColumnTypeThrift())
             );
         }
-         
+
         set.resultRows = Lists.newArrayList();
         for (int i = 0; i < resultRows.size(); i ++) {
             ArrayList list = Lists.newArrayList();
@@ -69,7 +70,7 @@ public class ShowResultSet extends AbstractResultSet {
                 list.add(resultRows.get(i).get(j) == null ? FeConstants.null_string : resultRows.get(i).get(j));
             }
             set.resultRows.add(list);
-        }    
+        }
         return set;
     }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSetMetaData.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSetMetaData.java
index 8eeddea61b..988828e06e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSetMetaData.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowResultSetMetaData.java
@@ -20,9 +20,10 @@ package org.apache.doris.qe;
 // Meta data to describe result set of show statement.
 // Because ResultSetMetaData is complicated, redefine it.
 
-import com.google.common.collect.Lists;
 import org.apache.doris.catalog.Column;
 
+import com.google.common.collect.Lists;
+
 import java.util.List;
 
 public class ShowResultSetMetaData extends AbstractResultSetMetaData {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SimpleScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SimpleScheduler.java
index 1031a55c34..cba43888db 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SimpleScheduler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SimpleScheduler.java
@@ -30,7 +30,6 @@ import org.apache.doris.thrift.TScanRangeLocation;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -199,11 +198,11 @@ public class SimpleScheduler {
     public static boolean isAvailable(Backend backend) {
         return (backend != null && backend.isQueryAvailable() && !blacklistBackends.containsKey(backend.getId()));
     }
-    
+
     private static class UpdateBlacklistThread implements Runnable {
         private static final Logger LOG = LogManager.getLogger(UpdateBlacklistThread.class);
         private static Thread thread;
-        
+
         public UpdateBlacklistThread() {
             thread = new Thread(this, "UpdateBlacklistThread");
             thread.setDaemon(true);
@@ -212,7 +211,7 @@ public class SimpleScheduler {
         public void start() {
             thread.start();
         }
- 
+
         @Override
         public void run() {
             LOG.debug("UpdateBlacklistThread is start to run");
@@ -251,7 +250,7 @@ public class SimpleScheduler {
             }
         }
     }
-    
+
     public static TNetworkAddress getHostByCurrentBackend(Map addressToBackendID) {
         int backendSize = addressToBackendID.size();
         if (backendSize == 0) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SqlModeHelper.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SqlModeHelper.java
index 88e501d94f..bf3f2f146d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SqlModeHelper.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SqlModeHelper.java
@@ -18,17 +18,17 @@
 package org.apache.doris.qe;
 
 
+import org.apache.doris.common.DdlException;
+import org.apache.doris.common.ErrorCode;
+import org.apache.doris.common.ErrorReport;
+
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang.StringUtils;
-import org.apache.doris.common.DdlException;
-import org.apache.doris.common.ErrorCode;
-import org.apache.doris.common.ErrorReport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index 057ceb5a89..56f8659c5b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -121,7 +121,7 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-
+import com.google.protobuf.ByteString;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
@@ -140,8 +140,6 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
-import com.google.protobuf.ByteString;
-
 // Do one COM_QUERY process.
 // first: Parse receive byte array to statement struct.
 // second: Do handle function for statement.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java
index 924f923e85..522c6bef0c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java
@@ -32,7 +32,6 @@ import org.apache.doris.persist.GlobalVarPersistInfo;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Lists;
-
 import org.apache.commons.lang.SerializationUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableVarConverters.java b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableVarConverters.java
index 4d88350944..94fa354519 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableVarConverters.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableVarConverters.java
@@ -17,9 +17,10 @@
 
 package org.apache.doris.qe;
 
-import com.google.common.collect.Maps;
 import org.apache.doris.common.DdlException;
 
+import com.google.common.collect.Maps;
+
 import java.util.Map;
 
 /**
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/Cache.java b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/Cache.java
index 6d80556a0d..2efd805fa8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/Cache.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/Cache.java
@@ -23,6 +23,7 @@ import org.apache.doris.common.Status;
 import org.apache.doris.proto.InternalService;
 import org.apache.doris.qe.RowBatch;
 import org.apache.doris.thrift.TUniqueId;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheAnalyzer.java b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheAnalyzer.java
index 480650e4e8..99bb658c67 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheAnalyzer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheAnalyzer.java
@@ -17,7 +17,6 @@
 
 package org.apache.doris.qe.cache;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.doris.analysis.AggregateInfo;
 import org.apache.doris.analysis.BinaryPredicate;
 import org.apache.doris.analysis.CastExpr;
@@ -49,7 +48,7 @@ import org.apache.doris.qe.RowBatch;
 import org.apache.doris.thrift.TUniqueId;
 
 import com.google.common.collect.Lists;
-
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheCoordinator.java b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheCoordinator.java
index dbbb403139..4c73d083c4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheCoordinator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheCoordinator.java
@@ -24,7 +24,6 @@ import org.apache.doris.system.Backend;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheProxy.java b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheProxy.java
index 54438a9db7..63f1ba91c4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheProxy.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheProxy.java
@@ -21,7 +21,6 @@ import org.apache.doris.common.Status;
 import org.apache.doris.proto.InternalService;
 import org.apache.doris.proto.Types;
 
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/PartitionCache.java b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/PartitionCache.java
index 78a4061d4a..b86444a088 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/PartitionCache.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/PartitionCache.java
@@ -34,7 +34,6 @@ import org.apache.doris.qe.RowBatch;
 import org.apache.doris.thrift.TUniqueId;
 
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -185,7 +184,7 @@ public class PartitionCache extends Cache {
 
     /**
      * Rewrite the query scope of partition key in the where condition
-     * origin expr : where eventdate>="2020-01-12" and eventdate<="2020-01-15" 
+     * origin expr : where eventdate>="2020-01-12" and eventdate<="2020-01-15"
      * rewrite expr : where eventdate>="2020-01-14" and eventdate<="2020-01-15"
      */
     private Expr rewriteWhereClause(Expr expr, CompoundPredicate predicate,
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/PartitionRange.java b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/PartitionRange.java
index 7c06252ae0..5a4ab07485 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/PartitionRange.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/PartitionRange.java
@@ -17,29 +17,27 @@
 
 package org.apache.doris.qe.cache;
 
-import org.apache.doris.analysis.CompoundPredicate;
 import org.apache.doris.analysis.BinaryPredicate;
+import org.apache.doris.analysis.CompoundPredicate;
 import org.apache.doris.analysis.DateLiteral;
-import org.apache.doris.analysis.InPredicate;
-import org.apache.doris.analysis.PartitionValue;
 import org.apache.doris.analysis.Expr;
-import org.apache.doris.analysis.LiteralExpr;
+import org.apache.doris.analysis.InPredicate;
 import org.apache.doris.analysis.IntLiteral;
-import org.apache.doris.catalog.OlapTable;
-import org.apache.doris.catalog.PartitionItem;
-import org.apache.doris.catalog.RangePartitionInfo;
+import org.apache.doris.analysis.LiteralExpr;
+import org.apache.doris.analysis.PartitionValue;
 import org.apache.doris.catalog.Column;
+import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Partition;
+import org.apache.doris.catalog.PartitionItem;
 import org.apache.doris.catalog.PartitionKey;
+import org.apache.doris.catalog.RangePartitionInfo;
 import org.apache.doris.catalog.RangePartitionItem;
 import org.apache.doris.catalog.Type;
+import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.Config;
 import org.apache.doris.planner.PartitionColumnFilter;
 
-import org.apache.doris.common.AnalysisException;
-
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/RowBatchBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/RowBatchBuilder.java
index ba7946eda2..5dc82d0e6a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/RowBatchBuilder.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/RowBatchBuilder.java
@@ -25,7 +25,6 @@ import org.apache.doris.qe.RowBatch;
 
 import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -184,4 +183,3 @@ public class RowBatchBuilder {
         return updateRequest;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/resource/Tag.java b/fe/fe-core/src/main/java/org/apache/doris/resource/Tag.java
index 0155480130..88e939183a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/resource/Tag.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/resource/Tag.java
@@ -34,18 +34,18 @@ import java.util.Objects;
  * A Tag consists of type and value.
  * Tag type and value are both case insensitive, and represented in lower case.
  * Tag is printed as { "type": "value" }
- * 
- * Type is mainly used to categorize a tag. For example, users can customize a certain type of tag. 
+ *
+ * Type is mainly used to categorize a tag. For example, users can customize a certain type of tag.
  * And these tags all use the same type. So user can quickly find this type of tags by the type.
  * Doris reserves several built-in types:
  *     ROLE: the role of resource, such as FRONTEND, BACKEND, BROKER
  *     FUNCTION: the function of a tag, such as STORAGE, COMPUTATION
  *     LOCATION: A type of tags representing location information.
- *     
+ *
  * Value is customized. And Doris also reserves several built-in values for built-in types:
  *     FRONTEND, BACKEND, BROKER of type ROLE.
  *     REMOTE_STORAGE, STORAGE, COMPUTATION for type FUNCTION.
- * 
+ *
  * A Tag is immutable once it being created.
  */
 public class Tag implements Writable {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/resource/TagManager.java b/fe/fe-core/src/main/java/org/apache/doris/resource/TagManager.java
index 41bef76cce..9e8181cc74 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/resource/TagManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/resource/TagManager.java
@@ -36,7 +36,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 /*
  * TagManager maintains 2 indexes:
  *      one is from tag to resource.
- *      one is from resource to tags 
+ *      one is from resource to tags
  * The caller can get a set of resources based on a given set of Tags
  */
 public class TagManager implements Writable {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/ExtractCommonFactorsRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/ExtractCommonFactorsRule.java
index 161ac3e6ed..406d545178 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/ExtractCommonFactorsRule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/ExtractCommonFactorsRule.java
@@ -33,7 +33,6 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
 import com.google.common.collect.TreeRangeSet;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/FEFunctions.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/FEFunctions.java
index 0bcbfb6e72..d9932ff27f 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/FEFunctions.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/FEFunctions.java
@@ -31,13 +31,13 @@ import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.InvalidFormatException;
 import org.apache.doris.common.util.TimeUtils;
 import org.apache.doris.qe.GlobalVariable;
+
+import com.google.common.base.Preconditions;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDateTime;
 
-import com.google.common.base.Preconditions;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
@@ -493,8 +493,8 @@ public class FEFunctions {
 
     @FEFunction(name = "divide", argTypes = { "DOUBLE", "DOUBLE" }, returnType = "DOUBLE")
     public static FloatLiteral divideDouble(LiteralExpr first, LiteralExpr second) throws AnalysisException {
-        if (second.getDoubleValue() == 0.0) {	
-            return null;	
+        if (second.getDoubleValue() == 0.0) {
+            return null;
         }
         double result = first.getDoubleValue() / second.getDoubleValue();
         return new FloatLiteral(result, Type.DOUBLE);
@@ -504,8 +504,8 @@ public class FEFunctions {
     public static DecimalLiteral divideDecimalV2(LiteralExpr first, LiteralExpr second) throws AnalysisException {
         BigDecimal left = new BigDecimal(first.getStringValue());
         BigDecimal right = new BigDecimal(second.getStringValue());
-        if (right.compareTo(BigDecimal.ZERO) == 0) {	
-            return null;	
+        if (right.compareTo(BigDecimal.ZERO) == 0) {
+            return null;
         }
         BigDecimal result = left.divide(right);
         return new DecimalLiteral(result);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/FoldConstantsRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/FoldConstantsRule.java
index fb8412cc81..563a3433b5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/FoldConstantsRule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/FoldConstantsRule.java
@@ -50,7 +50,6 @@ import org.apache.doris.thrift.TQueryGlobals;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicates;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -363,7 +362,7 @@ public class FoldConstantsRule implements ExprRewriteRule {
 
             TFoldConstantParams tParams = new TFoldConstantParams(map, queryGlobals);
             tParams.setVecExec(VectorizedUtil.isVectorized());
-            
+
             Future future = BackendServiceProxy.getInstance().foldConstantExpr(brpcAddress, tParams);
             InternalService.PConstantExprResult result = future.get(5, TimeUnit.SECONDS);
 
@@ -395,4 +394,3 @@ public class FoldConstantsRule implements ExprRewriteRule {
         return resultMap;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/InferFiltersRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/InferFiltersRule.java
index 3ccd390144..17be70c6e4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/InferFiltersRule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/InferFiltersRule.java
@@ -31,7 +31,6 @@ import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.Pair;
 
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -39,8 +38,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * The function of this rule is to derive a new predicate based on the current predicate.
@@ -64,10 +63,10 @@ public class InferFiltersRule implements ExprRewriteRule {
         if (expr == null) {
             return null;
         }
-        
+
         if (!analyzer.enableInferPredicate() || clauseType == ExprRewriter.ClauseType.OTHER_CLAUSE) {
             return expr;
-        } 
+        }
 
         // slotEqSlotExpr: Record existing and infer equivalent connections
         List slotEqSlotExpr = analyzer.getOnSlotEqSlotExpr();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/CountDistinctToBitmap.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/CountDistinctToBitmap.java
index c0331fc329..8a02b8ae7f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/CountDistinctToBitmap.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/CountDistinctToBitmap.java
@@ -30,10 +30,10 @@ import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Table;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.rewrite.ExprRewriteRule;
+import org.apache.doris.rewrite.ExprRewriter;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-import org.apache.doris.rewrite.ExprRewriter;
 
 import java.util.List;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/CountFieldToSum.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/CountFieldToSum.java
index ec3ce7e670..6068f1bdd7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/CountFieldToSum.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/CountFieldToSum.java
@@ -29,10 +29,10 @@ import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Table;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.rewrite.ExprRewriteRule;
+import org.apache.doris.rewrite.ExprRewriter;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-import org.apache.doris.rewrite.ExprRewriter;
 
 import java.util.List;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/HLLHashToSlotRefRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/HLLHashToSlotRefRule.java
index 529538eb33..e1540a4c91 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/HLLHashToSlotRefRule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/HLLHashToSlotRefRule.java
@@ -30,10 +30,10 @@ import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Table;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.rewrite.ExprRewriteRule;
+import org.apache.doris.rewrite.ExprRewriter;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-import org.apache.doris.rewrite.ExprRewriter;
 
 import java.util.List;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/NDVToHll.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/NDVToHll.java
index b6e77ae840..355b591c42 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/NDVToHll.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/NDVToHll.java
@@ -29,10 +29,10 @@ import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Table;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.rewrite.ExprRewriteRule;
+import org.apache.doris.rewrite.ExprRewriter;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-import org.apache.doris.rewrite.ExprRewriter;
 
 import java.util.List;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/ToBitmapToSlotRefRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/ToBitmapToSlotRefRule.java
index d1bcf61c55..95495cd6d4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/ToBitmapToSlotRefRule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/mvrewrite/ToBitmapToSlotRefRule.java
@@ -31,10 +31,10 @@ import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Table;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.rewrite.ExprRewriteRule;
+import org.apache.doris.rewrite.ExprRewriter;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-import org.apache.doris.rewrite.ExprRewriter;
 
 import java.util.List;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rpc/BackendServiceClient.java b/fe/fe-core/src/main/java/org/apache/doris/rpc/BackendServiceClient.java
index 73309047d7..eae4c19531 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rpc/BackendServiceClient.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rpc/BackendServiceClient.java
@@ -22,15 +22,14 @@ import org.apache.doris.proto.InternalService;
 import org.apache.doris.proto.PBackendServiceGrpc;
 import org.apache.doris.thrift.TNetworkAddress;
 
+import io.grpc.ManagedChannel;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import io.grpc.ManagedChannel;
-import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
-
 public class BackendServiceClient {
     public static final Logger LOG = LogManager.getLogger(BackendServiceClient.class);
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rpc/BackendServiceProxy.java b/fe/fe-core/src/main/java/org/apache/doris/rpc/BackendServiceProxy.java
index cbf43cac1e..f1ad320dce 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rpc/BackendServiceProxy.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rpc/BackendServiceProxy.java
@@ -27,7 +27,6 @@ import org.apache.doris.thrift.TUniqueId;
 
 import com.google.common.collect.Maps;
 import com.google.protobuf.ByteString;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rpc/RpcException.java b/fe/fe-core/src/main/java/org/apache/doris/rpc/RpcException.java
index d65802633b..c5d30a3a83 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rpc/RpcException.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rpc/RpcException.java
@@ -36,4 +36,3 @@ public class RpcException extends Exception {
         return super.getMessage() + ", host: " + host;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/FeServer.java b/fe/fe-core/src/main/java/org/apache/doris/service/FeServer.java
index fb2b005241..0c64799a3c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FeServer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FeServer.java
@@ -31,7 +31,7 @@ import java.io.IOException;
  */
 public class FeServer {
     private static final Logger LOG = LogManager.getLogger(FeServer.class);
-    
+
     private int port;
     private ThriftServer server;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendOptions.java b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendOptions.java
index ca3f933d79..857073bb6b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendOptions.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendOptions.java
@@ -23,7 +23,6 @@ import org.apache.doris.common.util.NetUtils;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-
 import org.apache.commons.validator.routines.InetAddressValidator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -124,4 +123,3 @@ public class FrontendOptions {
     }
 
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index 56d0cfd1fd..c04d15214a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -121,7 +121,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
@@ -133,8 +132,6 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static org.apache.doris.thrift.TStatusCode.NOT_IMPLEMENTED_ERROR;
-
 // Frontend service used to serve all request for this frontend through
 // thrift protocol
 public class FrontendServiceImpl implements FrontendService.Iface {
@@ -643,7 +640,7 @@ public class FrontendServiceImpl implements FrontendService.Iface {
             case "STREAMING_MINI_LOAD":
                 break;
             default:
-                status.setStatusCode(NOT_IMPLEMENTED_ERROR);
+                status.setStatusCode(TStatusCode.NOT_IMPLEMENTED_ERROR);
                 break;
         }
         return result;
@@ -1196,5 +1193,3 @@ public class FrontendServiceImpl implements FrontendService.Iface {
     }
 
 }
-
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/BaseStatsDerive.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/BaseStatsDerive.java
index ccb58e9287..0e1301903d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/BaseStatsDerive.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/BaseStatsDerive.java
@@ -17,12 +17,13 @@
 
 package org.apache.doris.statistics;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
 import org.apache.doris.analysis.Expr;
 import org.apache.doris.analysis.SlotId;
 import org.apache.doris.common.UserException;
 import org.apache.doris.planner.PlanNode;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/OlapScanStatsDerive.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/OlapScanStatsDerive.java
index ff514aa55e..e91a6ddc5f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/OlapScanStatsDerive.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/OlapScanStatsDerive.java
@@ -17,7 +17,6 @@
 
 package org.apache.doris.statistics;
 
-import com.google.common.base.Preconditions;
 import org.apache.doris.analysis.SlotDescriptor;
 import org.apache.doris.analysis.SlotId;
 import org.apache.doris.catalog.Catalog;
@@ -26,6 +25,8 @@ import org.apache.doris.common.UserException;
 import org.apache.doris.planner.OlapScanNode;
 import org.apache.doris.planner.PlanNode;
 
+import com.google.common.base.Preconditions;
+
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJob.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJob.java
index 224ef91883..2b77221d70 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJob.java
@@ -25,7 +25,6 @@ import org.apache.doris.common.DdlException;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJobManager.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJobManager.java
index 6a1e16fcd9..3ca41ef10d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJobManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJobManager.java
@@ -29,7 +29,6 @@ import org.apache.doris.common.ErrorReport;
 import org.apache.doris.common.UserException;
 
 import com.google.common.collect.Maps;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJobScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJobScheduler.java
index d09da09de8..f78d5ef56b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJobScheduler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsJobScheduler.java
@@ -29,7 +29,6 @@ import org.apache.doris.common.DdlException;
 import org.apache.doris.common.util.MasterDaemon;
 
 import com.google.common.collect.Queues;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -265,4 +264,3 @@ public class StatisticsJobScheduler extends MasterDaemon {
         return statsGranularityDesc;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsManager.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsManager.java
index 0fea564740..a49e41833f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsManager.java
@@ -33,7 +33,6 @@ import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsTaskScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsTaskScheduler.java
index 0edfa82047..378b2cd811 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsTaskScheduler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsTaskScheduler.java
@@ -31,7 +31,6 @@ import org.apache.doris.statistics.StatsCategoryDesc.StatsCategory;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Queues;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsCategoryDesc.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsCategoryDesc.java
index 0691eaa970..1de8d80913 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsCategoryDesc.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsCategoryDesc.java
@@ -60,4 +60,3 @@ public class StatsCategoryDesc {
         this.columnName = columnName;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsDeriveResult.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsDeriveResult.java
index b9b0d8024e..2bf0a53f81 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsDeriveResult.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsDeriveResult.java
@@ -17,9 +17,10 @@
 
 package org.apache.doris.statistics;
 
-import com.google.common.collect.Maps;
 import org.apache.doris.analysis.SlotId;
 
+import com.google.common.collect.Maps;
+
 import java.util.Map;
 
 // This structure is maintained in each operator to store the statistical information results obtained by the operator.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsGranularityDesc.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsGranularityDesc.java
index 54790d964e..30aff6a66c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsGranularityDesc.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/StatsGranularityDesc.java
@@ -61,4 +61,3 @@ public class StatsGranularityDesc {
         this.tabletId = tabletId;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/Backend.java b/fe/fe-core/src/main/java/org/apache/doris/system/Backend.java
index 8024886e95..374a6ccee2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/Backend.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/Backend.java
@@ -34,7 +34,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.annotations.SerializedName;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -719,4 +718,3 @@ public class Backend implements Writable {
         return tag;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/BackendHbResponse.java b/fe/fe-core/src/main/java/org/apache/doris/system/BackendHbResponse.java
index 1818c017b6..cd93dd1cfc 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/BackendHbResponse.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/BackendHbResponse.java
@@ -104,7 +104,7 @@ public class BackendHbResponse extends HeartbeatResponse implements Writable {
         httpPort = in.readInt();
         brpcPort = in.readInt();
     }
-	
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/Diagnoser.java b/fe/fe-core/src/main/java/org/apache/doris/system/Diagnoser.java
index 24048ac251..4d1c873d57 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/Diagnoser.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/Diagnoser.java
@@ -29,7 +29,6 @@ import org.apache.doris.catalog.TabletMeta;
 import org.apache.doris.common.Config;
 
 import com.google.common.collect.Lists;
-
 import org.json.simple.JSONObject;
 
 import java.util.List;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/Frontend.java b/fe/fe-core/src/main/java/org/apache/doris/system/Frontend.java
index 39b62c3a1d..bcad0012c4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/Frontend.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/Frontend.java
@@ -32,7 +32,7 @@ public class Frontend implements Writable {
     private String host;
     private int editLogPort;
     private String version;
-    
+
     private int queryPort;
     private int rpcPort;
 
@@ -44,7 +44,7 @@ public class Frontend implements Writable {
 
     public Frontend() {
     }
-    
+
     public Frontend(FrontendNodeType role, String nodeName, String host, int editLogPort) {
         this.role = role;
         this.nodeName = nodeName;
@@ -55,7 +55,7 @@ public class Frontend implements Writable {
     public FrontendNodeType getRole() {
         return this.role;
     }
-    
+
     public String getHost() {
         return this.host;
     }
@@ -63,7 +63,7 @@ public class Frontend implements Writable {
     public String getVersion() {
         return version;
     }
-    
+
     public String getNodeName() {
         return nodeName;
     }
@@ -79,7 +79,7 @@ public class Frontend implements Writable {
     public boolean isAlive() {
         return isAlive;
     }
-    
+
     public int getEditLogPort() {
         return this.editLogPort;
     }
@@ -142,13 +142,13 @@ public class Frontend implements Writable {
         editLogPort = in.readInt();
         nodeName = Text.readString(in);
     }
-    
+
     public static Frontend read(DataInput in) throws IOException {
         Frontend frontend = new Frontend();
         frontend.readFields(in);
         return frontend;
     }
-    
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatFlags.java b/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatFlags.java
index a74ea444b3..d702845d07 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatFlags.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatFlags.java
@@ -28,23 +28,23 @@ import org.apache.logging.log4j.Logger;
 // Now the flag is represented by 64-bit long type, each bit can be used to control
 // one behavior. The first bit is used for set default rowset type to beta flag.
 public class HeartbeatFlags {
-	private static final Logger LOG = LogManager.getLogger(HeartbeatFlags.class);
+    private static final Logger LOG = LogManager.getLogger(HeartbeatFlags.class);
 
-	public static boolean isValidRowsetType(String rowsetType) {
-		return "alpha".equalsIgnoreCase(rowsetType) || "beta".equalsIgnoreCase(rowsetType);
-	}
+    public static boolean isValidRowsetType(String rowsetType) {
+        return "alpha".equalsIgnoreCase(rowsetType) || "beta".equalsIgnoreCase(rowsetType);
+    }
 
-	public long getHeartbeatFlags() {
-		long heartbeatFlags = 0;
-		// If user set default rowset type to ALPHA, then convert it to beta, because 
-		// alpha rowset will be removed
-		if ("beta".equalsIgnoreCase(GlobalVariable.defaultRowsetType) 
-				|| "alpha".equalsIgnoreCase(GlobalVariable.defaultRowsetType)) {
-			heartbeatFlags |= HeartbeatServiceConstants.IS_SET_DEFAULT_ROWSET_TO_BETA_BIT;
-		} else {
-			throw new IllegalArgumentException("unknown DEFAULT_ROWSET_TYPE in global variable");
-		}
+    public long getHeartbeatFlags() {
+        long heartbeatFlags = 0;
+        // If user set default rowset type to ALPHA, then convert it to beta, because
+        // alpha rowset will be removed
+        if ("beta".equalsIgnoreCase(GlobalVariable.defaultRowsetType)
+                || "alpha".equalsIgnoreCase(GlobalVariable.defaultRowsetType)) {
+            heartbeatFlags |= HeartbeatServiceConstants.IS_SET_DEFAULT_ROWSET_TO_BETA_BIT;
+        } else {
+            throw new IllegalArgumentException("unknown DEFAULT_ROWSET_TYPE in global variable");
+        }
 
-		return heartbeatFlags;
-	}
+        return heartbeatFlags;
+    }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java b/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java
index 25037f8276..d7fdaba7cd 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java
@@ -48,7 +48,6 @@ import org.apache.doris.thrift.TStatusCode;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -99,7 +98,7 @@ public class HeartbeatMgr extends MasterDaemon {
     @Override
     protected void runAfterCatalogReady() {
         List> hbResponses = Lists.newArrayList();
-        
+
         // send backend heartbeat
         for (Backend backend : nodeMgr.getIdToBackend().values()) {
             BackendHeartbeatHandler handler = new BackendHeartbeatHandler(backend);
@@ -380,4 +379,3 @@ public class HeartbeatMgr extends MasterDaemon {
     }
 
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java b/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
index 82571cd3d8..d2af2c2704 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
@@ -44,7 +44,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
-
 import org.apache.commons.validator.routines.InetAddressValidator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -103,7 +102,7 @@ public class SystemInfoService {
     /**
      * @param hostPortPairs : backend's host and port
      * @param isFree : if true the backend is not owned by any cluster
-     * @param destCluster : if not null or empty backend will be added to destCluster 
+     * @param destCluster : if not null or empty backend will be added to destCluster
      * @throws DdlException
      */
     public void addBackends(List> hostPortPairs,
@@ -1175,5 +1174,3 @@ public class SystemInfoService {
         return bes.stream().filter(b -> b.getTag().equals(tag)).collect(Collectors.toList());
     }
 }
-
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/AgentBatchTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/AgentBatchTask.java
index d9f7d20c35..bd7380839c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/AgentBatchTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/AgentBatchTask.java
@@ -46,7 +46,6 @@ import org.apache.doris.thrift.TUpdateTabletMetaInfoReq;
 import org.apache.doris.thrift.TUploadReq;
 
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -56,7 +55,7 @@ import java.util.List;
 import java.util.Map;
 
 /*
- * This class group tasks by backend 
+ * This class group tasks by backend
  */
 public class AgentBatchTask implements Runnable {
     private static final Logger LOG = LogManager.getLogger(AgentBatchTask.class);
@@ -95,7 +94,7 @@ public class AgentBatchTask implements Runnable {
         }
         return tasks;
     }
-    
+
     public int getTaskNum() {
         int num = 0;
         for (List tasks : backendIdToTasks.values()) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/AgentClient.java b/fe/fe-core/src/main/java/org/apache/doris/task/AgentClient.java
index 22dce44c3c..4eb52dea1d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/AgentClient.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/AgentClient.java
@@ -23,12 +23,12 @@ import org.apache.doris.thrift.BackendService;
 import org.apache.doris.thrift.TAgentResult;
 import org.apache.doris.thrift.TAgentServiceVersion;
 import org.apache.doris.thrift.TCheckStorageFormatResult;
-import org.apache.doris.thrift.TMiniLoadEtlStatusRequest;
-import org.apache.doris.thrift.TMiniLoadEtlStatusResult;
-import org.apache.doris.thrift.TMiniLoadEtlTaskRequest;
 import org.apache.doris.thrift.TDeleteEtlFilesRequest;
 import org.apache.doris.thrift.TExportStatusResult;
 import org.apache.doris.thrift.TExportTaskRequest;
+import org.apache.doris.thrift.TMiniLoadEtlStatusRequest;
+import org.apache.doris.thrift.TMiniLoadEtlStatusResult;
+import org.apache.doris.thrift.TMiniLoadEtlTaskRequest;
 import org.apache.doris.thrift.TNetworkAddress;
 import org.apache.doris.thrift.TSnapshotRequest;
 import org.apache.doris.thrift.TStatus;
@@ -42,7 +42,7 @@ public class AgentClient {
 
     private String host;
     private int port;
-    
+
     private BackendService.Client client;
     private TNetworkAddress address;
     private boolean ok;
@@ -51,7 +51,7 @@ public class AgentClient {
         this.host = host;
         this.port = port;
     }
-    
+
     public TAgentResult submitEtlTask(TMiniLoadEtlTaskRequest request) {
         TAgentResult result = null;
         LOG.debug("submit etl task. request: {}", request);
@@ -67,7 +67,7 @@ public class AgentClient {
         }
         return result;
     }
-    
+
     public TAgentResult makeSnapshot(TSnapshotRequest request) {
         TAgentResult result = null;
         LOG.debug("submit make snapshot task. request: {}", request);
@@ -83,7 +83,7 @@ public class AgentClient {
         }
         return result;
     }
-    
+
     public TAgentResult releaseSnapshot(String snapshotPath) {
         TAgentResult result = null;
         LOG.debug("submit release snapshot task. snapshotPath: {}", snapshotPath);
@@ -99,7 +99,7 @@ public class AgentClient {
         }
         return result;
     }
-    
+
     public Status submitExportTask(TExportTaskRequest request) {
         Status result = Status.CANCELLED;
         LOG.debug("submit export task. request: {}", request);
@@ -115,10 +115,10 @@ public class AgentClient {
         }
         return result;
     }
-    
+
     public TMiniLoadEtlStatusResult getEtlStatus(long jobId, long taskId) {
         TMiniLoadEtlStatusResult result = null;
-        TMiniLoadEtlStatusRequest request = new TMiniLoadEtlStatusRequest(TAgentServiceVersion.V1, 
+        TMiniLoadEtlStatusRequest request = new TMiniLoadEtlStatusRequest(TAgentServiceVersion.V1,
                 new TUniqueId(jobId, taskId));
         LOG.debug("get mini load etl task status. request: {}", request);
         try {
@@ -133,7 +133,7 @@ public class AgentClient {
         }
         return result;
     }
-    
+
     public TExportStatusResult getExportStatus(long jobId, long taskId) {
         TExportStatusResult result = null;
         TUniqueId request = new TUniqueId(jobId, taskId);
@@ -150,7 +150,7 @@ public class AgentClient {
         }
         return result;
     }
-    
+
     public Status eraseExportTask(long jobId, long taskId) {
         Status result = Status.CANCELLED;
         TUniqueId request = new TUniqueId(jobId, taskId);
@@ -184,7 +184,7 @@ public class AgentClient {
     }
 
     public void deleteEtlFiles(long dbId, long jobId, String dbName, String label) {
-        TDeleteEtlFilesRequest request = new TDeleteEtlFilesRequest(TAgentServiceVersion.V1, 
+        TDeleteEtlFilesRequest request = new TDeleteEtlFilesRequest(TAgentServiceVersion.V1,
                 new TUniqueId(dbId, jobId), dbName, label);
         LOG.debug("delete etl files. request: {}", request);
         try {
@@ -198,14 +198,14 @@ public class AgentClient {
             returnClient();
         }
     }
-    
+
     private void borrowClient() throws Exception {
         // create agent client
         ok = false;
         address = new TNetworkAddress(host, port);
         client = ClientPool.backendPool.borrowObject(address);
     }
-    
+
     private void returnClient() {
         if (ok) {
             ClientPool.backendPool.returnObject(address, client);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/AgentTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/AgentTask.java
index 77d38073ff..abef257c55 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/AgentTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/AgentTask.java
@@ -59,7 +59,7 @@ public abstract class AgentTask {
         this.failedTimes = 0;
         this.createTime = createTime;
     }
-    
+
     public AgentTask(TResourceInfo resourceInfo, long backendId, TTaskType taskType,
             long dbId, long tableId, long partitionId, long indexId, long tabletId) {
         this(resourceInfo, backendId, taskType, dbId, tableId, partitionId, indexId, tabletId, tabletId, -1);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/AgentTaskExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/task/AgentTaskExecutor.java
index a206bb309a..28e19dc490 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/AgentTaskExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/AgentTaskExecutor.java
@@ -29,7 +29,7 @@ public class AgentTaskExecutor {
     public AgentTaskExecutor() {
 
     }
-    
+
     public static void submit(AgentBatchTask task) {
         if (task == null) {
             return;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/AgentTaskQueue.java b/fe/fe-core/src/main/java/org/apache/doris/task/AgentTaskQueue.java
index 241c9a8216..6406fbc18c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/AgentTaskQueue.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/AgentTaskQueue.java
@@ -24,7 +24,6 @@ import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Table;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -50,7 +49,7 @@ public class AgentTaskQueue {
             addTask(task);
         }
     }
- 
+
     public static synchronized boolean addTask(AgentTask task) {
         long backendId = task.getBackendId();
         TTaskType type = task.getTaskType();
@@ -60,7 +59,7 @@ public class AgentTaskQueue {
             signatureMap = Maps.newHashMap();
             tasks.put(backendId, type, signatureMap);
         }
-        
+
         long signature = task.getSignature();
         if (signatureMap.containsKey(signature)) {
             return false;
@@ -74,7 +73,7 @@ public class AgentTaskQueue {
         }
         return true;
     }
-    
+
     // remove all task in AgentBatchTask.
     // the caller should make sure all tasks in AgentBatchTask is type of 'type'
     public static synchronized void removeBatchTask(AgentBatchTask batchTask, TTaskType type) {
@@ -96,7 +95,7 @@ public class AgentTaskQueue {
         LOG.debug("remove task: type[{}], backend[{}], signature[{}]", type, backendId, signature);
         --taskNum;
     }
-    
+
     /*
      * we cannot define a push task with only 'backendId', 'signature' and 'TTaskType'
      * add version and TPushType to help
@@ -139,7 +138,7 @@ public class AgentTaskQueue {
         Map signatureMap = tasks.get(backendId, type);
         return signatureMap.get(signature);
     }
-    
+
     // this is just for unit test
     public static synchronized List getTask(TTaskType type) {
         List res = Lists.newArrayList();
@@ -160,7 +159,7 @@ public class AgentTaskQueue {
         if (!tasks.containsRow(backendId)) {
             return diffTasks;
         }
-        
+
         Map> backendAllTasks = tasks.row(backendId);
         for (Map.Entry> entry : backendAllTasks.entrySet()) {
             TTaskType taskType = entry.getKey();
@@ -169,7 +168,7 @@ public class AgentTaskQueue {
             if (runningTasks.containsKey(taskType)) {
                 excludeSignatures = runningTasks.get(taskType);
             }
-            
+
             for (Map.Entry taskEntry : tasks.entrySet()) {
                 long signature = taskEntry.getKey();
                 AgentTask task = taskEntry.getValue();
@@ -270,4 +269,3 @@ public class AgentTaskQueue {
         return tasks;
     }
 }
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/AlterReplicaTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/AlterReplicaTask.java
index 47614d55a1..f25b01d2f1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/AlterReplicaTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/AlterReplicaTask.java
@@ -17,7 +17,6 @@
 
 package org.apache.doris.task;
 
-import com.google.common.collect.Lists;
 import org.apache.doris.alter.AlterJobV2;
 import org.apache.doris.analysis.Expr;
 import org.apache.doris.analysis.SlotRef;
@@ -25,6 +24,8 @@ import org.apache.doris.thrift.TAlterMaterializedViewParam;
 import org.apache.doris.thrift.TAlterTabletReqV2;
 import org.apache.doris.thrift.TTaskType;
 
+import com.google.common.collect.Lists;
+
 import java.util.List;
 import java.util.Map;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/ClearTransactionTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/ClearTransactionTask.java
index 6f07898293..3272880085 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/ClearTransactionTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/ClearTransactionTask.java
@@ -33,7 +33,7 @@ public class ClearTransactionTask extends AgentTask {
         this.partitionIds = partitionIds;
         this.isFinished = false;
     }
-    
+
     public TClearTransactionTaskRequest toThrift() {
         TClearTransactionTaskRequest clearTransactionTaskRequest = new TClearTransactionTaskRequest(
             transactionId, partitionIds);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/CloneTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/CloneTask.java
index 67c8872839..8ef9d8eca0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/CloneTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/CloneTask.java
@@ -37,7 +37,7 @@ public class CloneTask extends AgentTask {
 
     private long srcPathHash = -1;
     private long destPathHash = -1;
-    
+
     private int timeoutS;
 
     private int taskVersion = VERSION_1;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/CreateReplicaTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/CreateReplicaTask.java
index 7ecf25979d..7c80728823 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/CreateReplicaTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/CreateReplicaTask.java
@@ -76,10 +76,10 @@ public class CreateReplicaTask extends AgentTask {
     // if base tablet id is set, BE will create the replica on same disk as this base tablet
     private long baseTabletId = -1;
     private int baseSchemaHash = -1;
-    
+
     // V2 is beta rowset, v1 is alpha rowset
     // TODO should unify the naming of v1(alpha rowset), v2(beta rowset), it is very confused to read code
-    private TStorageFormat storageFormat = TStorageFormat.V2;	
+    private TStorageFormat storageFormat = TStorageFormat.V2;
 
     // true if this task is created by recover request(See comment of Config.recover_with_empty_tablet)
     private boolean isRecoverTask = false;
@@ -189,7 +189,7 @@ public class CreateReplicaTask extends AgentTask {
     }
 
     public void setStorageFormat(TStorageFormat storageFormat) {
-    	this.storageFormat = storageFormat;
+        this.storageFormat = storageFormat;
     }
 
     public TCreateTabletReq toThrift() {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/DropReplicaTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/DropReplicaTask.java
index cddbe118f3..41c3291dca 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/DropReplicaTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/DropReplicaTask.java
@@ -27,7 +27,7 @@ public class DropReplicaTask extends AgentTask {
         super(null, backendId, TTaskType.DROP, -1L, -1L, -1L, -1L, tabletId);
         this.schemaHash = schemaHash;
     }
-    
+
     public TDropTabletReq toThrift() {
         TDropTabletReq request = new TDropTabletReq(tabletId);
         if (this.schemaHash != -1) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/ExportExportingTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/ExportExportingTask.java
index f3c3c105ba..65c90f92ee 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/ExportExportingTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/ExportExportingTask.java
@@ -44,7 +44,6 @@ import org.apache.doris.thrift.TStatusCode;
 import org.apache.doris.thrift.TUniqueId;
 
 import com.google.common.collect.Lists;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
@@ -205,7 +204,7 @@ public class ExportExportingTask extends MasterTask {
             onTimeout();
             return;
         }
-        
+
         try {
             coord.setTimeout(leftTimeSecond);
             coord.exec();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/ExportPendingTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/ExportPendingTask.java
index 6b7e1f1ff6..8f0bee66a5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/ExportPendingTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/ExportPendingTask.java
@@ -84,7 +84,7 @@ public class ExportPendingTask extends MasterTask {
             return;
         }
     }
-    
+
     private Status makeSnapshots() {
         List tabletLocations = job.getTabletLocations();
         if (tabletLocations == null) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/HadoopLoadEtlTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/HadoopLoadEtlTask.java
index 0f19d2ed89..f5697b3e9f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/HadoopLoadEtlTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/HadoopLoadEtlTask.java
@@ -23,10 +23,10 @@ import org.apache.doris.load.DppConfig;
 import org.apache.doris.load.DppScheduler;
 import org.apache.doris.load.EtlStatus;
 import org.apache.doris.load.LoadJob;
-import com.google.common.collect.Maps;
 
-import org.apache.logging.log4j.Logger;
+import com.google.common.collect.Maps;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.Map;
 
@@ -46,12 +46,12 @@ public class HadoopLoadEtlTask extends LoadEtlTask {
         DppScheduler dppScheduler = new DppScheduler(job.getHadoopDppConfig());
         EtlStatus status = dppScheduler.getEtlJobStatus(job.getHadoopEtlJobId());
         LOG.info("job status: {}. job: {}", status, job.toString());
-        
+
         // update load job etl status
         job.setEtlJobStatus(status);
         return true;
     }
-    
+
     @Override
     protected void processEtlRunning() throws LoadException {
         Map stats = job.getEtlJobStatus().getStats();
@@ -63,16 +63,16 @@ public class HadoopLoadEtlTask extends LoadEtlTask {
             if (progress >= 100) {
                 // hadoop job status result:
                 // [map() completion] and [reduce() completion] are not accurate,
-                // etl job state must be depend on [job state] 
+                // etl job state must be depend on [job state]
                 progress = 99;
             }
             job.setProgress(progress);
-            
+
             if (mapProgress >= 1) {
                 isMapCompleted = true;
             }
         }
-        
+
         // check data quality when map complete
         if (isMapCompleted) {
             // [map() completion] is not accurate
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/HadoopLoadPendingTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/HadoopLoadPendingTask.java
index d3beba479a..19fd79b1f4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/HadoopLoadPendingTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/HadoopLoadPendingTask.java
@@ -50,7 +50,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Range;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -79,13 +78,13 @@ public class HadoopLoadPendingTask extends LoadPendingTask {
         Map etlPartitions = createEtlPartitions();
         Preconditions.checkNotNull(etlPartitions);
         taskConf.setEtlPartitions(etlPartitions);
-    
+
         LoadErrorHub.Param info = load.getLoadErrorHubInfo();
         // hadoop load only support mysql load error hub
         if (info != null && info.getType() == HubType.MYSQL_TYPE) {
             taskConf.setHubInfo(new EtlErrorHubInfo(this.job.getId(), info));
         }
-    
+
         etlTaskConf = taskConf.toDppTaskConf();
         Preconditions.checkNotNull(etlTaskConf);
 
@@ -256,7 +255,7 @@ public class HadoopLoadPendingTask extends LoadPendingTask {
                             dppColumn.put("name", column.getName());
                             dppColumn.put("is_key", true);
                             dppColumn.put("is_implicit", true);
-                            columnRefs.add(keySize, dppColumn); 
+                            columnRefs.add(keySize, dppColumn);
                             ++keySize;
                         }
                     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/LoadEtlTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/LoadEtlTask.java
index 43b9a9ced4..dcf6842b67 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/LoadEtlTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/LoadEtlTask.java
@@ -40,7 +40,6 @@ import org.apache.doris.load.TabletLoadInfo;
 import org.apache.doris.thrift.TEtlState;
 
 import com.google.common.collect.Maps;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -75,13 +74,13 @@ public abstract class LoadEtlTask extends MasterTask {
         if (job.getState() != JobState.ETL) {
             return;
         }
-        
+
         // check timeout
         if (LoadChecker.checkTimeout(job)) {
             load.cancelLoadJob(job, CancelType.TIMEOUT, "etl timeout to cancel");
             return;
         }
-        
+
         // check db
         long dbId = job.getDbId();
         db = Catalog.getCurrentCatalog().getDbNullable(dbId);
@@ -131,7 +130,7 @@ public abstract class LoadEtlTask extends MasterTask {
                 break;
         }
     }
-    
+
     private void processEtlFinished() throws LoadException {
         // check data quality when etl finished
         if (!checkDataQuality(job.getMaxFilterRatio())) {
@@ -155,13 +154,13 @@ public abstract class LoadEtlTask extends MasterTask {
     private void tryUpdateLoading() {
         // check job has loading partitions
         Map idToTableLoadInfo = job.getIdToTableLoadInfo();
-        
+
         // new version and version hash
         try {
             for (Entry tableEntry : idToTableLoadInfo.entrySet()) {
                 long tableId = tableEntry.getKey();
                 OlapTable table = (OlapTable) db.getTableOrMetaException(tableId);
-                
+
                 TableLoadInfo tableLoadInfo = tableEntry.getValue();
                 Map idToPartitionLoadInfo = tableLoadInfo.getIdToPartitionLoadInfo();
                 for (Map.Entry entry : idToPartitionLoadInfo.entrySet()) {
@@ -170,7 +169,7 @@ public abstract class LoadEtlTask extends MasterTask {
                     if (!partitionLoadInfo.isNeedLoad()) {
                         continue;
                     }
-                    
+
                     table.readLock();
                     try {
                         Partition partition = table.getPartition(partitionId);
@@ -194,7 +193,7 @@ public abstract class LoadEtlTask extends MasterTask {
             load.cancelLoadJob(job, CancelType.ETL_RUN_FAIL, e.getMessage());
             return;
         }
-        
+
         // update job to loading
         if (load.updateLoadJobState(job, JobState.LOADING)) {
             LOG.info("update job state to loading success. job: {}", job);
@@ -208,7 +207,7 @@ public abstract class LoadEtlTask extends MasterTask {
             }
         }
     }
-    
+
     protected String getPartitionIndexBucketString(String filePath) throws LoadException {
         String fileName = filePath.substring(filePath.lastIndexOf("/") + 1);
         // label.partitionId.indexId.bucket
@@ -216,16 +215,16 @@ public abstract class LoadEtlTask extends MasterTask {
         if (fileNameArr.length != 4) {
             throw new LoadException("etl file name format error, name: " + fileName);
         }
-        
+
         String partitionIndexBucket = fileName.substring(fileName.indexOf(".") + 1);
         return partitionIndexBucket;
     }
-    
+
     protected Map getTabletLoadInfos(Map> filePathMap)
             throws LoadException {
         Map idToTabletLoadInfo = Maps.newHashMap();
         boolean hasLoadFiles = false;
-        
+
         // create tablet load info
         Map idToTableLoadInfo = job.getIdToTableLoadInfo();
         for (Entry tableEntry : idToTableLoadInfo.entrySet()) {
@@ -243,14 +242,14 @@ public abstract class LoadEtlTask extends MasterTask {
                     if (partition == null) {
                         throw new LoadException("partition does not exist. id: " + partitionId);
                     }
-                    
+
                     DistributionInfo distributionInfo = partition.getDistributionInfo();
                     DistributionInfoType distributionType = distributionInfo.getType();
                     if (distributionType != DistributionInfoType.RANDOM
                             && distributionType != DistributionInfoType.HASH) {
                         throw new LoadException("unknown distribution type. type: " + distributionType.name());
                     }
-                    
+
                     // yiguolei: how to deal with filesize == -1?
                     for (MaterializedIndex materializedIndex : partition.getMaterializedIndices(IndexExtState.ALL)) {
                         long indexId = materializedIndex.getId();
@@ -268,7 +267,7 @@ public abstract class LoadEtlTask extends MasterTask {
                                 needLoad = true;
                                 hasLoadFiles = true;
                             }
-                            
+
                             TabletLoadInfo tabletLoadInfo = new TabletLoadInfo(filePath, fileSize);
                             idToTabletLoadInfo.put(tablet.getId(), tabletLoadInfo);
                         }
@@ -281,7 +280,7 @@ public abstract class LoadEtlTask extends MasterTask {
                 table.readUnlock();
             }
         }
-        
+
         // all partitions might have no load data
         if (!hasLoadFiles) {
             throw new LoadException("all partitions have no load data");
@@ -295,7 +294,7 @@ public abstract class LoadEtlTask extends MasterTask {
         if (!counters.containsKey(DPP_NORMAL_ALL) || !counters.containsKey(DPP_ABNORMAL_ALL)) {
             return true;
         }
-        
+
         long normalNum = Long.parseLong(counters.get(DPP_NORMAL_ALL));
         long abnormalNum = Long.parseLong(counters.get(DPP_ABNORMAL_ALL));
         if (abnormalNum > (abnormalNum + normalNum) * maxFilterRatio) {
@@ -304,7 +303,7 @@ public abstract class LoadEtlTask extends MasterTask {
 
         return true;
     }
-    
+
     protected abstract boolean updateJobEtlStatus();
     protected abstract void processEtlRunning() throws LoadException;
     protected abstract Map> getFilePathMap() throws LoadException;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/LoadPendingTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/LoadPendingTask.java
index 0d2f699244..b39f2ddaca 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/LoadPendingTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/LoadPendingTask.java
@@ -32,11 +32,10 @@ import org.apache.doris.transaction.TransactionState.LoadJobSourceType;
 import org.apache.doris.transaction.TransactionState.TxnCoordinator;
 import org.apache.doris.transaction.TransactionState.TxnSourceType;
 
+import com.google.common.base.Joiner;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.google.common.base.Joiner;
-
 import java.util.List;
 import java.util.UUID;
 
@@ -66,7 +65,7 @@ public abstract class LoadPendingTask extends MasterTask {
             load.cancelLoadJob(job, CancelType.TIMEOUT, "pending timeout to cancel");
             return;
         }
-        
+
         // get db
         long dbId = job.getDbId();
         db = Catalog.getCurrentCatalog().getDbNullable(dbId);
@@ -118,7 +117,7 @@ public abstract class LoadPendingTask extends MasterTask {
         load.cancelLoadJob(job, CancelType.ETL_SUBMIT_FAIL, failMsg);
         LOG.warn("submit etl job fail. job: {}", job);
     }
-    
+
     protected abstract void createEtlRequest() throws Exception;
 
     protected abstract EtlSubmitResult submitEtlJob(int retry);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/MasterTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/MasterTask.java
index 6ab92a57b6..f22b09c377 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/MasterTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/MasterTask.java
@@ -17,14 +17,14 @@
 
 package org.apache.doris.task;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public abstract class MasterTask implements Runnable {
     private static final Logger LOG = LogManager.getLogger(MasterTask.class);
 
     protected long signature;
-    
+
     @Override
     public void run() {
         try {
@@ -33,11 +33,11 @@ public abstract class MasterTask implements Runnable {
             LOG.error("task exec error ", e);
         }
     }
-    
+
     public long getSignature() {
         return signature;
     }
-    
+
     /**
      * implement in child
      */
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/MasterTaskExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/task/MasterTaskExecutor.java
index 81a8597fda..8847cffcc0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/MasterTaskExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/MasterTaskExecutor.java
@@ -20,7 +20,6 @@ package org.apache.doris.task;
 import org.apache.doris.common.ThreadPoolManager;
 
 import com.google.common.collect.Maps;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -63,7 +62,7 @@ public class MasterTaskExecutor {
     /**
      * submit task to task executor
      * @param task
-     * @return true if submit success 
+     * @return true if submit success
      *         false if task exists
      */
     public boolean submit(MasterTask task) {
@@ -77,13 +76,13 @@ public class MasterTaskExecutor {
             return true;
         }
     }
-    
+
     public void close() {
         scheduledThreadPool.shutdown();
         executor.shutdown();
         runningTasks.clear();
     }
-    
+
     public int getTaskNum() {
         synchronized (runningTasks) {
             return runningTasks.size();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/PublishVersionTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/PublishVersionTask.java
index 7323bd834f..9c44923e67 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/PublishVersionTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/PublishVersionTask.java
@@ -43,9 +43,9 @@ public class PublishVersionTask extends AgentTask {
         this.errorTablets = new ArrayList();
         this.isFinished = false;
     }
-    
+
     public TPublishVersionRequest toThrift() {
-        TPublishVersionRequest publishVersionRequest = new TPublishVersionRequest(transactionId, 
+        TPublishVersionRequest publishVersionRequest = new TPublishVersionRequest(transactionId,
                 partitionVersionInfos);
         return publishVersionRequest;
     }
@@ -61,7 +61,7 @@ public class PublishVersionTask extends AgentTask {
     public synchronized List getErrorTablets() {
         return errorTablets;
     }
-    
+
     public synchronized void addErrorTablets(List errorTablets) {
         this.errorTablets.clear();
         if (errorTablets == null) {
@@ -69,11 +69,11 @@ public class PublishVersionTask extends AgentTask {
         }
         this.errorTablets.addAll(errorTablets);
     }
-    
+
     public void setIsFinished(boolean isFinished) {
         this.isFinished = isFinished;
     }
-    
+
     public boolean isFinished() {
         return isFinished;
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/PushTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/PushTask.java
index 943f51e552..75c3fb2cee 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/PushTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/PushTask.java
@@ -61,18 +61,18 @@ public class PushTask extends AgentTask {
     private TPriority priority;
     private boolean isSyncDelete;
     private long asyncDeleteJobId;
-    
+
     private long transactionId;
     private boolean isSchemaChanging;
 
     // for load v2 (spark load)
     private TBrokerScanRange tBrokerScanRange;
     private TDescriptorTable tDescriptorTable;
-    
+
     public PushTask(TResourceInfo resourceInfo, long backendId, long dbId, long tableId, long partitionId,
                     long indexId, long tabletId, long replicaId, int schemaHash, long version,
                     String filePath, long fileSize, int timeoutSecond, long loadJobId, TPushType pushType,
-                    List conditions, boolean needDecompress, TPriority priority, TTaskType taskType, 
+                    List conditions, boolean needDecompress, TPriority priority, TTaskType taskType,
                     long transactionId, long signature) {
         super(resourceInfo, backendId, taskType, dbId, tableId, partitionId, indexId, tabletId, signature);
         this.replicaId = replicaId;
@@ -95,12 +95,12 @@ public class PushTask extends AgentTask {
     }
 
     public PushTask(TResourceInfo resourceInfo, long backendId, long dbId, long tableId, long partitionId,
-            long indexId, long tabletId, long replicaId, int schemaHash, long version, 
+            long indexId, long tabletId, long replicaId, int schemaHash, long version,
             String filePath, long fileSize, int timeoutSecond, long loadJobId, TPushType pushType,
             List conditions, boolean needDecompress, TPriority priority) {
-        this(resourceInfo, backendId, dbId, tableId, partitionId, indexId, 
-             tabletId, replicaId, schemaHash, version, filePath, 
-             fileSize, timeoutSecond, loadJobId, pushType, conditions, needDecompress, 
+        this(resourceInfo, backendId, dbId, tableId, partitionId, indexId,
+             tabletId, replicaId, schemaHash, version, filePath,
+             fileSize, timeoutSecond, loadJobId, pushType, conditions, needDecompress,
              priority, TTaskType.PUSH, -1, tableId);
     }
 
@@ -185,7 +185,7 @@ public class PushTask extends AgentTask {
 
         return request;
     }
-    
+
     public void setCountDownLatch(MarkedCountDownLatch latch) {
         this.latch = latch;
     }
@@ -202,11 +202,11 @@ public class PushTask extends AgentTask {
     public long getReplicaId() {
         return replicaId;
     }
-    
+
     public int getSchemaHash() {
         return schemaHash;
     }
-    
+
     public long getVersion() {
         return version;
     }
@@ -214,7 +214,7 @@ public class PushTask extends AgentTask {
     public long getLoadJobId() {
         return loadJobId;
     }
-    
+
     public TPushType getPushType() {
         return pushType;
     }
@@ -242,7 +242,7 @@ public class PushTask extends AgentTask {
     public long getTransactionId() {
         return transactionId;
     }
-    
+
     public void setIsSchemaChanging(boolean isSchemaChanging) {
         this.isSchemaChanging = isSchemaChanging;
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/StreamLoadTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/StreamLoadTask.java
index c3b96d8575..2a1ab7f08b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/StreamLoadTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/StreamLoadTask.java
@@ -35,11 +35,10 @@ import org.apache.doris.thrift.TFileType;
 import org.apache.doris.thrift.TStreamLoadPutRequest;
 import org.apache.doris.thrift.TUniqueId;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.StringReader;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/UpdateTabletMetaInfoTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/UpdateTabletMetaInfoTask.java
index e2cec179f0..97770d0556 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/UpdateTabletMetaInfoTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/UpdateTabletMetaInfoTask.java
@@ -29,7 +29,6 @@ import org.apache.doris.thrift.TTaskType;
 import org.apache.doris.thrift.TUpdateTabletMetaInfoReq;
 
 import com.google.common.collect.Lists;
-
 import org.apache.commons.lang3.tuple.Triple;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/AbortTransactionException.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/AbortTransactionException.java
index 01dfaea9e9..5ebe92bbd5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/AbortTransactionException.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/AbortTransactionException.java
@@ -19,15 +19,15 @@ package org.apache.doris.transaction;
 
 
 public class AbortTransactionException extends TransactionException {
-    
+
     public AbortTransactionException(String msg) {
         super(msg);
     }
-    
+
     public AbortTransactionException(String msg, Throwable e) {
         super(msg, e);
     }
-    
+
     public AbortTransactionException(String msg, long transactionId) {
         super(msg, transactionId);
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
index bf530c5ef4..1101d31996 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
@@ -59,7 +59,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/DbUsedDataQuotaInfoCollector.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/DbUsedDataQuotaInfoCollector.java
index 22b9a270ba..5086068803 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/DbUsedDataQuotaInfoCollector.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/DbUsedDataQuotaInfoCollector.java
@@ -22,6 +22,7 @@ import org.apache.doris.catalog.Database;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.Config;
 import org.apache.doris.common.util.MasterDaemon;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
index 9161eb525e..bd42ea5471 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
@@ -41,7 +41,6 @@ import org.apache.doris.transaction.TransactionState.TxnCoordinator;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.StopWatch;
 import org.apache.logging.log4j.LogManager;
@@ -394,7 +393,7 @@ public class GlobalTransactionMgr implements Writable {
     }
 
     // for replay idToTransactionState
-    // check point also run transaction cleaner, the cleaner maybe concurrently modify id to 
+    // check point also run transaction cleaner, the cleaner maybe concurrently modify id to
     public void replayUpsertTransactionState(TransactionState transactionState) throws MetaNotFoundException {
         try {
             DatabaseTransactionMgr dbTransactionMgr = getDatabaseTransactionMgr(transactionState.getDbId());
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/PartitionCommitInfo.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/PartitionCommitInfo.java
index cf0739359f..8a206a172d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/PartitionCommitInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/PartitionCommitInfo.java
@@ -37,7 +37,7 @@ public class PartitionCommitInfo implements Writable {
     private long versionTime;
 
     public PartitionCommitInfo() {
-        
+
     }
 
     public PartitionCommitInfo(long partitionId, long version, long visibleTime) {
@@ -65,7 +65,7 @@ public class PartitionCommitInfo implements Writable {
     public long getVersion() {
         return version;
     }
-    
+
     public long getVersionTime() {
         return versionTime;
     }
@@ -77,7 +77,7 @@ public class PartitionCommitInfo implements Writable {
     public void setVersionTime(long versionTime) {
         this.versionTime = versionTime;
     }
-    
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder("partitionid=");
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/PublishVersionDaemon.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/PublishVersionDaemon.java
index 7b592742f1..c44366f1d1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/PublishVersionDaemon.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/PublishVersionDaemon.java
@@ -37,7 +37,6 @@ import org.apache.doris.thrift.TTaskType;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -47,13 +46,13 @@ import java.util.Map;
 import java.util.Set;
 
 public class PublishVersionDaemon extends MasterDaemon {
-    
+
     private static final Logger LOG = LogManager.getLogger(PublishVersionDaemon.class);
-    
+
     public PublishVersionDaemon() {
         super("PUBLISH_VERSION", Config.publish_version_interval_ms);
     }
-    
+
     @Override
     protected void runAfterCatalogReady() {
         try {
@@ -71,7 +70,7 @@ public class PublishVersionDaemon extends MasterDaemon {
         }
         return true;
     }
-    
+
     private void publishVersion() {
         GlobalTransactionMgr globalTransactionMgr = Catalog.getCurrentGlobalTransactionMgr();
         List readyTransactionStates = globalTransactionMgr.getReadyToPublishTransactions();
@@ -100,12 +99,12 @@ public class PublishVersionDaemon extends MasterDaemon {
             }
             List partitionVersionInfos = new ArrayList<>(partitionCommitInfos.size());
             for (PartitionCommitInfo commitInfo : partitionCommitInfos) {
-                TPartitionVersionInfo versionInfo = new TPartitionVersionInfo(commitInfo.getPartitionId(), 
+                TPartitionVersionInfo versionInfo = new TPartitionVersionInfo(commitInfo.getPartitionId(),
                         commitInfo.getVersion(), 0);
                 partitionVersionInfos.add(versionInfo);
                 if (LOG.isDebugEnabled()) {
-                    LOG.debug("try to publish version info partitionid [{}], version [{}]", 
-                            commitInfo.getPartitionId(), 
+                    LOG.debug("try to publish version info partitionid [{}], version [{}]",
+                            commitInfo.getPartitionId(),
                             commitInfo.getVersion());
                 }
             }
@@ -136,7 +135,7 @@ public class PublishVersionDaemon extends MasterDaemon {
         if (!batchTask.getAllTasks().isEmpty()) {
             AgentTaskExecutor.submit(batchTask);
         }
-        
+
         TabletInvertedIndex tabletInvertedIndex = Catalog.getCurrentInvertedIndex();
         // try to finish the transaction, if failed just retry in next loop
         for (TransactionState transactionState : readyTransactionStates) {
@@ -162,7 +161,7 @@ public class PublishVersionDaemon extends MasterDaemon {
                             if (replica != null) {
                                 publishErrorReplicaIds.add(replica.getId());
                             } else {
-                                LOG.info("could not find related replica with tabletid={}, backendid={}", 
+                                LOG.info("could not find related replica with tabletid={}, backendid={}",
                                         tabletId, publishVersionTask.getBackendId());
                             }
                         }
@@ -229,7 +228,7 @@ public class PublishVersionDaemon extends MasterDaemon {
                 // all publish tasks are finished, try to finish this txn.
                 shouldFinishTxn = true;
             }
-            
+
             if (shouldFinishTxn) {
                 try {
                     // one transaction exception should not affect other transaction
@@ -238,7 +237,7 @@ public class PublishVersionDaemon extends MasterDaemon {
                     LOG.warn("error happens when finish transaction {}", transactionState.getTransactionId(), e);
                 }
                 if (transactionState.getTransactionStatus() != TransactionStatus.VISIBLE) {
-                    // if finish transaction state failed, then update publish version time, should check 
+                    // if finish transaction state failed, then update publish version time, should check
                     // to finish after some interval
                     transactionState.updateSendTaskTime();
                     LOG.debug("publish version for transaction {} failed, has {} error replicas during publish",
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/TableCommitInfo.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/TableCommitInfo.java
index e59206ad57..fcd73a9ce6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/TableCommitInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/TableCommitInfo.java
@@ -27,14 +27,14 @@ import java.io.IOException;
 import java.util.Map;
 
 public class TableCommitInfo implements Writable {
-    
+
     private long tableId;
     private Map idToPartitionCommitInfo;
 
     public TableCommitInfo() {
-        
+
     }
-    
+
     public TableCommitInfo(long tableId) {
         this.tableId = tableId;
         idToPartitionCommitInfo = Maps.newHashMap();
@@ -74,15 +74,15 @@ public class TableCommitInfo implements Writable {
     public Map getIdToPartitionCommitInfo() {
         return idToPartitionCommitInfo;
     }
-    
+
     public void addPartitionCommitInfo(PartitionCommitInfo info) {
         this.idToPartitionCommitInfo.put(info.getPartitionId(), info);
     }
-    
+
     public void removePartition(long partitionId) {
         this.idToPartitionCommitInfo.remove(partitionId);
     }
-    
+
     public PartitionCommitInfo getPartitionCommitInfo(long partitionId) {
         return this.idToPartitionCommitInfo.get(partitionId);
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionCommitFailedException.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionCommitFailedException.java
index 2478cf9a8f..43b52ef0f6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionCommitFailedException.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionCommitFailedException.java
@@ -19,7 +19,7 @@ package org.apache.doris.transaction;
 
 
 public class TransactionCommitFailedException extends TransactionException {
-    
+
     private static final long serialVersionUID = -2528170792631761535L;
 
     public TransactionCommitFailedException(String msg) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionException.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionException.java
index fe450c3039..cab8927d49 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionException.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionException.java
@@ -20,17 +20,17 @@ package org.apache.doris.transaction;
 import org.apache.doris.common.UserException;
 
 public class TransactionException extends UserException {
-    
+
     private long transactionId = -1;
 
     public TransactionException(String msg) {
         super(msg);
     }
-    
+
     public TransactionException(String msg, Throwable e) {
         super(msg, e);
     }
-    
+
     public TransactionException(String msg, long transactionId) {
         super(msg);
         this.transactionId = transactionId;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionIdGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionIdGenerator.java
index 6f741ce30d..dedf679f8c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionIdGenerator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionIdGenerator.java
@@ -17,30 +17,30 @@
 
 package org.apache.doris.transaction;
 
+import org.apache.doris.persist.EditLog;
+
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.doris.persist.EditLog;
-
 public class TransactionIdGenerator {
 
     public static final long NEXT_ID_INIT_VALUE = 1;
     private static final int BATCH_ID_INTERVAL = 1000;
-    
+
     private long nextId = NEXT_ID_INIT_VALUE;
     // has to set it to an invalid value, then it will be logged when id is firstly increment
     private long batchEndId = 0;
-    
+
     private EditLog editLog;
-    
+
     public TransactionIdGenerator() {
     }
-    
+
     public void setEditLog(EditLog editLog) {
         this.editLog = editLog;
     }
-    
+
     // performance is more quickly
     public synchronized long getNextTransactionId() {
         if (nextId < batchEndId) {
@@ -60,7 +60,7 @@ public class TransactionIdGenerator {
             nextId = id;
         }
     }
-    
+
     // this two function used to read snapshot or write snapshot
     public void write(DataOutput out) throws IOException {
         out.writeLong(batchEndId);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionState.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionState.java
index d18727fba6..7139077b6a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionState.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionState.java
@@ -33,7 +33,6 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionStatus.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionStatus.java
index 31287d17d9..99781f0cf5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionStatus.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionStatus.java
@@ -24,17 +24,17 @@ public enum TransactionStatus {
     VISIBLE(3),
     ABORTED(4),
     PRECOMMITTED(5);
-    
+
     private final int flag;
-    
+
     private TransactionStatus(int flag) {
         this.flag = flag;
     }
-    
+
     public int value() {
         return flag;
     }
-    
+
     public static TransactionStatus valueOf(int flag) {
         switch (flag) {
             case 0:
@@ -53,7 +53,7 @@ public enum TransactionStatus {
                 return null;
         }
     }
-    
+
     public boolean isFinalStatus() {
         return this == TransactionStatus.VISIBLE || this == TransactionStatus.ABORTED;
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/TxnStateCallbackFactory.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/TxnStateCallbackFactory.java
index b9d80bd192..5d910580a6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/transaction/TxnStateCallbackFactory.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/TxnStateCallbackFactory.java
@@ -18,7 +18,6 @@
 package org.apache.doris.transaction;
 
 import com.google.common.collect.Maps;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java b/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
index dc4c5c9f89..6cf2d0cb9a 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
@@ -47,7 +47,6 @@ import org.apache.doris.utframe.UtFrameUtils;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/alter/BatchRollupJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/alter/BatchRollupJobTest.java
index 61384768ea..08d09c076c 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/alter/BatchRollupJobTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/alter/BatchRollupJobTest.java
@@ -32,7 +32,6 @@ import org.apache.doris.utframe.UtFrameUtils;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/alter/MaterializedViewHandlerTest.java b/fe/fe-core/src/test/java/org/apache/doris/alter/MaterializedViewHandlerTest.java
index b852d64785..d941ff6043 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/alter/MaterializedViewHandlerTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/alter/MaterializedViewHandlerTest.java
@@ -32,16 +32,14 @@ import org.apache.doris.common.jmockit.Deencapsulation;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
+import mockit.Expectations;
+import mockit.Injectable;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
 import java.util.Set;
 
-import mockit.Expectations;
-import mockit.Injectable;
-
 public class MaterializedViewHandlerTest {
     @Test
     public void testDifferentBaseTable(@Injectable CreateMaterializedViewStmt createMaterializedViewStmt,
diff --git a/fe/fe-core/src/test/java/org/apache/doris/alter/RollupJobV2Test.java b/fe/fe-core/src/test/java/org/apache/doris/alter/RollupJobV2Test.java
index 6e6b18536b..cd582d684b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/alter/RollupJobV2Test.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/alter/RollupJobV2Test.java
@@ -17,8 +17,6 @@
 
 package org.apache.doris.alter;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.doris.alter.AlterJobV2.JobState;
 import org.apache.doris.analysis.AccessTestUtil;
 import org.apache.doris.analysis.AddRollupClause;
@@ -63,7 +61,10 @@ import org.apache.doris.transaction.FakeTransactionIDGenerator;
 import org.apache.doris.transaction.GlobalTransactionMgr;
 
 import com.google.common.collect.Lists;
-
+import mockit.Expectations;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -80,11 +81,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import mockit.Expectations;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
-
 public class RollupJobV2Test {
     private static String fileName = "./RollupJobV2Test";
 
@@ -253,9 +249,9 @@ public class RollupJobV2Test {
         RollupJobV2 rollupJob = (RollupJobV2) alterJobsV2.values().stream().findAny().get();
 
         MaterializedIndex baseIndex = testPartition.getBaseIndex();
-        assertEquals(MaterializedIndex.IndexState.NORMAL, baseIndex.getState());
-        assertEquals(Partition.PartitionState.NORMAL, testPartition.getState());
-        assertEquals(OlapTableState.ROLLUP, olapTable.getState());
+        Assert.assertEquals(MaterializedIndex.IndexState.NORMAL, baseIndex.getState());
+        Assert.assertEquals(Partition.PartitionState.NORMAL, testPartition.getState());
+        Assert.assertEquals(OlapTableState.ROLLUP, olapTable.getState());
 
         Tablet baseTablet = baseIndex.getTablets().get(0);
         List replicas = baseTablet.getReplicas();
@@ -263,15 +259,15 @@ public class RollupJobV2Test {
         Replica replica2 = replicas.get(1);
         Replica replica3 = replicas.get(2);
 
-        assertEquals(CatalogTestUtil.testStartVersion, replica1.getVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica2.getVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion());
-        assertEquals(-1, replica1.getLastFailedVersion());
-        assertEquals(-1, replica2.getLastFailedVersion());
-        assertEquals(-1, replica3.getLastFailedVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica1.getLastSuccessVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica2.getLastSuccessVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica3.getLastSuccessVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica1.getVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica2.getVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion());
+        Assert.assertEquals(-1, replica1.getLastFailedVersion());
+        Assert.assertEquals(-1, replica2.getLastFailedVersion());
+        Assert.assertEquals(-1, replica3.getLastFailedVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica1.getLastSuccessVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica2.getLastSuccessVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica3.getLastSuccessVersion());
 
         // runPendingJob
         replica1.setState(Replica.ReplicaState.DECOMMISSION);
@@ -322,7 +318,7 @@ public class RollupJobV2Test {
         File file = new File(fileName);
         file.createNewFile();
         DataOutputStream out = new DataOutputStream(new FileOutputStream(file));
-        
+
         short keysCount = 1;
         List columns = Lists.newArrayList();
         String mvColumnName = CreateMaterializedViewStmt.MATERIALIZED_VIEW_NAME_PREFIX + "to_bitmap_" + "c1";
diff --git a/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeHandlerTest.java b/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeHandlerTest.java
index 688d68e68d..48973f1871 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeHandlerTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeHandlerTest.java
@@ -25,12 +25,10 @@ import org.apache.doris.common.jmockit.Deencapsulation;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-
-import org.junit.Assert;
-import org.junit.Test;
-
 import mockit.Expectations;
 import mockit.Injectable;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class SchemaChangeHandlerTest {
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java b/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java
index df76df694e..cbc6993733 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java
@@ -17,8 +17,6 @@
 
 package org.apache.doris.alter;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.doris.alter.AlterJobV2.JobState;
 import org.apache.doris.analysis.AccessTestUtil;
 import org.apache.doris.analysis.AddColumnClause;
@@ -65,7 +63,6 @@ import org.apache.doris.transaction.FakeTransactionIDGenerator;
 import org.apache.doris.transaction.GlobalTransactionMgr;
 
 import com.google.common.collect.Maps;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -160,9 +157,9 @@ public class SchemaChangeJobV2Test {
         SchemaChangeJobV2 schemaChangeJob = (SchemaChangeJobV2) alterJobsV2.values().stream().findAny().get();
 
         MaterializedIndex baseIndex = testPartition.getBaseIndex();
-        assertEquals(IndexState.NORMAL, baseIndex.getState());
-        assertEquals(PartitionState.NORMAL, testPartition.getState());
-        assertEquals(OlapTableState.SCHEMA_CHANGE, olapTable.getState());
+        Assert.assertEquals(IndexState.NORMAL, baseIndex.getState());
+        Assert.assertEquals(PartitionState.NORMAL, testPartition.getState());
+        Assert.assertEquals(OlapTableState.SCHEMA_CHANGE, olapTable.getState());
 
         Tablet baseTablet = baseIndex.getTablets().get(0);
         List replicas = baseTablet.getReplicas();
@@ -170,15 +167,15 @@ public class SchemaChangeJobV2Test {
         Replica replica2 = replicas.get(1);
         Replica replica3 = replicas.get(2);
 
-        assertEquals(CatalogTestUtil.testStartVersion, replica1.getVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica2.getVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion());
-        assertEquals(-1, replica1.getLastFailedVersion());
-        assertEquals(-1, replica2.getLastFailedVersion());
-        assertEquals(-1, replica3.getLastFailedVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica1.getLastSuccessVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica2.getLastSuccessVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica3.getLastSuccessVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica1.getVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica2.getVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion());
+        Assert.assertEquals(-1, replica1.getLastFailedVersion());
+        Assert.assertEquals(-1, replica2.getLastFailedVersion());
+        Assert.assertEquals(-1, replica3.getLastFailedVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica1.getLastSuccessVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica2.getLastSuccessVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica3.getLastSuccessVersion());
 
         // runPendingJob
         schemaChangeHandler.runAfterCatalogReady();
@@ -236,9 +233,9 @@ public class SchemaChangeJobV2Test {
         SchemaChangeJobV2 schemaChangeJob = (SchemaChangeJobV2) alterJobsV2.values().stream().findAny().get();
 
         MaterializedIndex baseIndex = testPartition.getBaseIndex();
-        assertEquals(IndexState.NORMAL, baseIndex.getState());
-        assertEquals(PartitionState.NORMAL, testPartition.getState());
-        assertEquals(OlapTableState.SCHEMA_CHANGE, olapTable.getState());
+        Assert.assertEquals(IndexState.NORMAL, baseIndex.getState());
+        Assert.assertEquals(PartitionState.NORMAL, testPartition.getState());
+        Assert.assertEquals(OlapTableState.SCHEMA_CHANGE, olapTable.getState());
 
         Tablet baseTablet = baseIndex.getTablets().get(0);
         List replicas = baseTablet.getReplicas();
@@ -246,15 +243,15 @@ public class SchemaChangeJobV2Test {
         Replica replica2 = replicas.get(1);
         Replica replica3 = replicas.get(2);
 
-        assertEquals(CatalogTestUtil.testStartVersion, replica1.getVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica2.getVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion());
-        assertEquals(-1, replica1.getLastFailedVersion());
-        assertEquals(-1, replica2.getLastFailedVersion());
-        assertEquals(-1, replica3.getLastFailedVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica1.getLastSuccessVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica2.getLastSuccessVersion());
-        assertEquals(CatalogTestUtil.testStartVersion, replica3.getLastSuccessVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica1.getVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica2.getVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion());
+        Assert.assertEquals(-1, replica1.getLastFailedVersion());
+        Assert.assertEquals(-1, replica2.getLastFailedVersion());
+        Assert.assertEquals(-1, replica3.getLastFailedVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica1.getLastSuccessVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica2.getLastSuccessVersion());
+        Assert.assertEquals(CatalogTestUtil.testStartVersion, replica3.getLastSuccessVersion());
 
         // runPendingJob
         replica1.setState(Replica.ReplicaState.DECOMMISSION);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AccessTestUtil.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AccessTestUtil.java
index 61587052df..6869e504c6 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AccessTestUtil.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AccessTestUtil.java
@@ -17,7 +17,6 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
 import org.apache.doris.catalog.BrokerMgr;
 import org.apache.doris.catalog.Catalog;
 import org.apache.doris.catalog.Column;
@@ -44,7 +43,7 @@ import org.apache.doris.thrift.TStorageType;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
+import mockit.Expectations;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -56,7 +55,7 @@ public class AccessTestUtil {
         SystemInfoService clusterInfo = new SystemInfoService();
         return clusterInfo;
     }
-    
+
     public static PaloAuth fetchAdminAccess() {
         PaloAuth auth = new PaloAuth();
         try {
@@ -521,4 +520,3 @@ public class AccessTestUtil {
         return analyzer;
     }
 }
-
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnClauseTest.java
index f9663401fd..8fabe62850 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnClauseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnClauseTest.java
@@ -17,18 +17,18 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
-import mockit.Mocked;
+import org.apache.doris.catalog.AggregateType;
 import org.apache.doris.catalog.Column;
 import org.apache.doris.catalog.PrimitiveType;
 import org.apache.doris.catalog.ScalarType;
+import org.apache.doris.common.AnalysisException;
+
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.apache.doris.catalog.AggregateType;
-import org.apache.doris.common.AnalysisException;
-
 public class AddColumnClauseTest {
     private static Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnsClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnsClauseTest.java
index da1c1d5244..53ce6a81cc 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnsClauseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnsClauseTest.java
@@ -23,7 +23,6 @@ import org.apache.doris.catalog.ScalarType;
 import org.apache.doris.common.AnalysisException;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AddRollupClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddRollupClauseTest.java
index cab0572ad3..c4218e929b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AddRollupClauseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddRollupClauseTest.java
@@ -20,7 +20,6 @@ package org.apache.doris.analysis;
 import org.apache.doris.common.AnalysisException;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -70,7 +69,7 @@ public class AddRollupClauseTest {
 
     @Test(expected = AnalysisException.class)
     public void testDupCol() throws AnalysisException {
-        AddRollupClause clause = new AddRollupClause("testRollup", 
+        AddRollupClause clause = new AddRollupClause("testRollup",
                                         Lists.newArrayList("col1", "col1"), null, null, null);
         clause.analyze(analyzer);
         Assert.fail("No exception throws.");
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminCancelRebalanceDiskStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminCancelRebalanceDiskStmtTest.java
index 8e92567adf..afd27b54a8 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminCancelRebalanceDiskStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminCancelRebalanceDiskStmtTest.java
@@ -26,15 +26,13 @@ import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.Lists;
-
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.List;
 
-import mockit.Mocked;
-
 public class AdminCancelRebalanceDiskStmtTest {
 
     private static Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminRebalanceDiskStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminRebalanceDiskStmtTest.java
index e83693ceda..814f408d11 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminRebalanceDiskStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminRebalanceDiskStmtTest.java
@@ -26,16 +26,13 @@ import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.Lists;
-
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-//import java.util.ArrayList;
 import java.util.List;
 
-import mockit.Mocked;
-
 public class AdminRebalanceDiskStmtTest {
 
     private static Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminSetConfigStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminSetConfigStmtTest.java
index f3c232e59a..ab484d85bb 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminSetConfigStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminSetConfigStmtTest.java
@@ -22,11 +22,9 @@ import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.DdlException;
 import org.apache.doris.utframe.TestWithFeService;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 public class AdminSetConfigStmtTest extends TestWithFeService {
     @Test
     public void testNormal() throws Exception {
@@ -39,18 +37,18 @@ public class AdminSetConfigStmtTest extends TestWithFeService {
     public void testUnknownConfig() throws Exception {
         String stmt = "admin set frontend config(\"unknown_config\" = \"unknown\");";
         AdminSetConfigStmt adminSetConfigStmt = (AdminSetConfigStmt) parseAndAnalyzeStmt(stmt);
-        DdlException exception = assertThrows(DdlException.class,
+        DdlException exception = Assertions.assertThrows(DdlException.class,
             () -> Catalog.getCurrentCatalog().setConfig(adminSetConfigStmt));
-        assertEquals("errCode = 2, detailMessage = Config 'unknown_config' does not exist",
+        Assertions.assertEquals("errCode = 2, detailMessage = Config 'unknown_config' does not exist",
             exception.getMessage());
     }
 
     @Test
     public void testEmptyConfig() {
         AnalysisException exception =
-            assertThrows(AnalysisException.class,
-                () -> parseAndAnalyzeStmt("admin set frontend config;"));
-        assertEquals("errCode = 2, detailMessage = config parameter size is not equal to 1",
+                Assertions.assertThrows(AnalysisException.class,
+                        () -> parseAndAnalyzeStmt("admin set frontend config;"));
+        Assertions.assertEquals("errCode = 2, detailMessage = config parameter size is not equal to 1",
             exception.getMessage());
     }
 }
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterClusterStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterClusterStmtTest.java
index c8298825be..e631cb22b6 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterClusterStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterClusterStmtTest.java
@@ -24,6 +24,7 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,8 +32,6 @@ import org.junit.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-import mockit.Mocked;
-
 public class AlterClusterStmtTest {
 
     private static Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterDatabaseQuotaStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterDatabaseQuotaStmtTest.java
index 590bc51ea2..73a7ed6cce 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterDatabaseQuotaStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterDatabaseQuotaStmtTest.java
@@ -17,16 +17,15 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
-import mockit.Mocked;
-
-import org.apache.doris.common.AnalysisException;
 import org.apache.doris.analysis.AlterDatabaseQuotaStmt.QuotaType;
+import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.UserException;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -57,7 +56,7 @@ public class AlterDatabaseQuotaStmtTest {
             }
         };
     }
-    
+
     private void testAlterDatabaseDataQuotaStmt(String dbName, String quotaQuantity, long quotaSize)
             throws AnalysisException, UserException {
         AlterDatabaseQuotaStmt stmt = new AlterDatabaseQuotaStmt(dbName, QuotaType.DATA, quotaQuantity);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterRoutineLoadStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterRoutineLoadStmtTest.java
index 0af88cd169..6edfda9548 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterRoutineLoadStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterRoutineLoadStmtTest.java
@@ -25,16 +25,14 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.Maps;
-
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Map;
 
-import mockit.Expectations;
-import mockit.Mocked;
-
 /*
  * Author: Chenmingyu
  * Date: Jul 20, 2020
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterSqlBlockRuleStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterSqlBlockRuleStmtTest.java
index 19de580c76..8a0f209514 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterSqlBlockRuleStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterSqlBlockRuleStmtTest.java
@@ -25,6 +25,7 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -32,8 +33,6 @@ import org.junit.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-import mockit.Mocked;
-
 public class AlterSqlBlockRuleStmtTest {
 
     private Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java
index 2fb013f7b0..3872c286ce 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java
@@ -17,8 +17,6 @@
 
 package org.apache.doris.analysis;
 
-import com.google.common.collect.Maps;
-import mockit.Expectations;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.UserException;
 import org.apache.doris.mysql.privilege.PaloAuth;
@@ -26,7 +24,9 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.Lists;
-
+import com.google.common.collect.Maps;
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -34,8 +34,6 @@ import org.junit.Test;
 import java.util.List;
 import java.util.Map;
 
-import mockit.Mocked;
-
 public class AlterTableStmtTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/BackendStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/BackendStmtTest.java
index 2ea5326da8..990c463423 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/BackendStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/BackendStmtTest.java
@@ -20,7 +20,6 @@ package org.apache.doris.analysis;
 import org.apache.doris.common.AnalysisException;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/BackupTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/BackupTest.java
index fdd42738d5..5f4c5019e7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/BackupTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/BackupTest.java
@@ -17,12 +17,13 @@
 
 package org.apache.doris.analysis;
 
+import org.apache.doris.catalog.Catalog;
+import org.apache.doris.qe.ConnectContext;
+
 import com.google.common.collect.Lists;
 import mockit.Mock;
 import mockit.MockUp;
 import mockit.Mocked;
-import org.apache.doris.catalog.Catalog;
-import org.apache.doris.qe.ConnectContext;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/BetweenPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/BetweenPredicateTest.java
index 4ee5c213a6..66873d5996 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/BetweenPredicateTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/BetweenPredicateTest.java
@@ -19,11 +19,10 @@ package org.apache.doris.analysis;
 
 import org.apache.doris.common.AnalysisException;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import mockit.Injectable;
 import mockit.Mocked;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class BetweenPredicateTest {
     @Mocked Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/BinaryPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/BinaryPredicateTest.java
index 436724d62b..e1c7d3ec99 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/BinaryPredicateTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/BinaryPredicateTest.java
@@ -25,7 +25,6 @@ import org.apache.doris.common.jmockit.Deencapsulation;
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
-
 import mockit.Expectations;
 import mockit.Injectable;
 import mockit.Mocked;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelAlterStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelAlterStmtTest.java
index 9fdc95d8b2..7a84f5a2ea 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelAlterStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelAlterStmtTest.java
@@ -18,9 +18,6 @@
 package org.apache.doris.analysis;
 
 
-import mockit.Expectations;
-import mockit.Mock;
-import mockit.MockUp;
 import org.apache.doris.analysis.ShowAlterStmt.AlterType;
 import org.apache.doris.catalog.Catalog;
 import org.apache.doris.catalog.FakeCatalog;
@@ -28,6 +25,9 @@ import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.UserException;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Expectations;
+import mockit.Mock;
+import mockit.MockUp;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelLoadStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelLoadStmtTest.java
index a3b68fe0c1..4ed21d7ae2 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelLoadStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CancelLoadStmtTest.java
@@ -17,13 +17,12 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
-
 import org.apache.doris.catalog.Catalog;
 import org.apache.doris.catalog.FakeCatalog;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.UserException;
 
+import mockit.Expectations;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CaseExprTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CaseExprTest.java
index 0d991b77c4..c768be5030 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CaseExprTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CaseExprTest.java
@@ -6,7 +6,7 @@
 // "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
+//   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
 // software distributed under the License is distributed on an
@@ -14,18 +14,17 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-//
 
 package org.apache.doris.analysis;
 
-import java.util.List;
-
 import com.clearspring.analytics.util.Lists;
 import mockit.Expectations;
 import mockit.Injectable;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.List;
+
 public class CaseExprTest {
 
     @Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateClusterStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateClusterStmtTest.java
index c31c687cd0..bd19be7f07 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateClusterStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateClusterStmtTest.java
@@ -24,6 +24,7 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,8 +32,6 @@ import org.junit.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-import mockit.Mocked;
-
 public class CreateClusterStmtTest {
 
     private static Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateDataSyncJobStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateDataSyncJobStmtTest.java
index 3fa047767a..17c9ef140b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateDataSyncJobStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateDataSyncJobStmtTest.java
@@ -30,7 +30,9 @@ import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
+import mockit.Expectations;
+import mockit.Injectable;
+import mockit.Mocked;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.Assert;
@@ -40,10 +42,6 @@ import org.junit.Test;
 import java.util.List;
 import java.util.Map;
 
-import mockit.Expectations;
-import mockit.Injectable;
-import mockit.Mocked;
-
 public class CreateDataSyncJobStmtTest {
     private static final Logger LOG = LogManager.getLogger(CreateDataSyncJobStmtTest.class);
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateDbStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateDbStmtTest.java
index 32ff7d9df0..cdd0d233a1 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateDbStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateDbStmtTest.java
@@ -23,12 +23,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateIndexClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateIndexClauseTest.java
index f7c3105cca..40031486d0 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateIndexClauseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateIndexClauseTest.java
@@ -20,7 +20,6 @@ package org.apache.doris.analysis;
 import org.apache.doris.common.AnalysisException;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateMaterializedViewStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateMaterializedViewStmtTest.java
index 50932d5d7d..40329776d7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateMaterializedViewStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateMaterializedViewStmtTest.java
@@ -32,7 +32,9 @@ import org.apache.doris.common.jmockit.Deencapsulation;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.Lists;
-
+import mockit.Expectations;
+import mockit.Injectable;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,10 +42,6 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import mockit.Expectations;
-import mockit.Injectable;
-import mockit.Mocked;
-
 public class CreateMaterializedViewStmtTest {
 
     @Mocked
@@ -1279,4 +1277,3 @@ public class CreateMaterializedViewStmtTest {
         Assert.assertEquals(5, ((ScalarType)mvColumnItem3.getType()).getLength());
     }
 }
-
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateRoutineLoadStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateRoutineLoadStmtTest.java
index 8b55b5f0a4..125cfc8ba1 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateRoutineLoadStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateRoutineLoadStmtTest.java
@@ -29,7 +29,11 @@ import org.apache.doris.qe.SessionVariable;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
+import mockit.Expectations;
+import mockit.Injectable;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,12 +44,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import mockit.Expectations;
-import mockit.Injectable;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
-
 public class CreateRoutineLoadStmtTest {
 
     private static final Logger LOG = LoggerFactory.getLogger(CreateRoutineLoadStmtTest.class);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateSqlBlockRuleStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateSqlBlockRuleStmtTest.java
index 84750da093..379ebd327a 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateSqlBlockRuleStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateSqlBlockRuleStmtTest.java
@@ -25,6 +25,7 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -32,8 +33,6 @@ import org.junit.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-import mockit.Mocked;
-
 public class CreateSqlBlockRuleStmtTest {
 
     private Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java
index c5f226b063..f59ad88f2f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java
@@ -17,7 +17,6 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
 import org.apache.doris.catalog.AggregateType;
 import org.apache.doris.catalog.KeysType;
 import org.apache.doris.catalog.PrimitiveType;
@@ -29,7 +28,8 @@ import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.Lists;
-
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -42,11 +42,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import mockit.Mocked;
-
 public class CreateTableStmtTest {
     private static final Logger LOG = LoggerFactory.getLogger(CreateTableStmtTest.class);
-    
+
     // used to get default db
     private TableName tblName;
     private TableName tblNameNoDb;
@@ -55,7 +53,7 @@ public class CreateTableStmtTest {
     private List colsName;
     private List invalidColsName;
     private Analyzer analyzer;
-    
+
     @Mocked
     private PaloAuth auth;
     @Mocked
@@ -93,7 +91,7 @@ public class CreateTableStmtTest {
         MockedAuth.mockedAuth(auth);
         MockedAuth.mockedConnectContext(ctx, "root", "192.168.1.1");
     }
-    
+
     @Test
     public void testNormal() throws UserException, AnalysisException {
         CreateTableStmt stmt = new CreateTableStmt(false, false, tblName, cols, "olap",
@@ -131,7 +129,7 @@ public class CreateTableStmtTest {
         Assert.assertNull(stmt.getProperties());
         Assert.assertTrue(stmt.toSql().contains("rollup( `index1` (`col1`, `col2`) FROM `table1`, `index2` (`col2`, `col3`) FROM `table1`)"));
     }
-    
+
     @Test
     public void testDefaultDbNormal() throws UserException {
         CreateTableStmt stmt = new CreateTableStmt(false, false, tblNameNoDb, cols, "olap",
@@ -143,7 +141,7 @@ public class CreateTableStmtTest {
         Assert.assertNull(stmt.getPartitionDesc());
         Assert.assertNull(stmt.getProperties());
     }
-    
+
     @Test(expected = AnalysisException.class)
     public void testNoDb(@Mocked Analyzer noDbAnalyzer) throws UserException, AnalysisException {
         // make default db return empty;
@@ -163,7 +161,7 @@ public class CreateTableStmtTest {
                 new RandomDistributionDesc(10), null, null, "");
         stmt.analyze(noDbAnalyzer);
     }
-    
+
     @Test(expected = AnalysisException.class)
     public void testEmptyCol() throws UserException, AnalysisException {
         // make default db return empty;
@@ -173,7 +171,7 @@ public class CreateTableStmtTest {
                 new RandomDistributionDesc(10), null, null, "");
         stmt.analyze(analyzer);
     }
-    
+
     @Test(expected = AnalysisException.class)
     public void testDupCol() throws UserException, AnalysisException {
         // make default db return empty;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateUserStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateUserStmtTest.java
index 40a372291f..ec202c95c7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateUserStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateUserStmtTest.java
@@ -23,13 +23,12 @@ import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.qe.ConnectContext;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import mockit.Expectations;
 import mockit.Injectable;
 import mockit.Mocked;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class CreateUserStmtTest {
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DataDescriptionTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DataDescriptionTest.java
index dee1b0f319..8609f69d5f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DataDescriptionTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DataDescriptionTest.java
@@ -31,7 +31,9 @@ import org.apache.doris.system.SystemInfoService;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
+import mockit.Expectations;
+import mockit.Injectable;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,10 +41,6 @@ import org.junit.Test;
 import java.util.List;
 import java.util.Map;
 
-import mockit.Expectations;
-import mockit.Injectable;
-import mockit.Mocked;
-
 public class DataDescriptionTest {
 
     @Mocked
@@ -151,12 +149,12 @@ public class DataDescriptionTest {
                                                   null, null, null, false, null);
         desc.analyze("testDb");
         Assert.assertEquals("APPEND DATA INFILE ('abc.txt') INTO TABLE testTable PARTITIONS (p1, p2)", desc.toString());
-        
+
         // alignment_timestamp func
         List params = Lists.newArrayList();
         params.add(new StringLiteral("day"));
         params.add(new SlotRef(null, "k2"));
-        BinaryPredicate predicate = new BinaryPredicate(Operator.EQ, new SlotRef(null, "k1"), 
+        BinaryPredicate predicate = new BinaryPredicate(Operator.EQ, new SlotRef(null, "k1"),
                 new FunctionCallExpr("alignment_timestamp", params));
         desc = new DataDescription("testTable", new PartitionNames(false, Lists.newArrayList("p1", "p2")),
                                                   Lists.newArrayList("abc.txt"),
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DecimalLiteralTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DecimalLiteralTest.java
index af153dcda8..4d4f0f3c24 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DecimalLiteralTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DecimalLiteralTest.java
@@ -18,9 +18,9 @@
 package org.apache.doris.analysis;
 
 import org.apache.doris.catalog.PrimitiveType;
-
 import org.apache.doris.catalog.Type;
 import org.apache.doris.common.AnalysisException;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -33,7 +33,7 @@ public class DecimalLiteralTest {
     public void testHashValue() throws AnalysisException {
         BigDecimal decimal = new BigDecimal("-123456789123456789.123456789");
         DecimalLiteral literal = new DecimalLiteral(decimal);
-        
+
         ByteBuffer buffer = literal.getHashValue(PrimitiveType.DECIMALV2);
         long longValue = buffer.getLong();
         int fracValue = buffer.getInt();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DeleteStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DeleteStmtTest.java
index 9530ca686a..4dffa5eed2 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DeleteStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DeleteStmtTest.java
@@ -24,16 +24,14 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import com.google.common.collect.Lists;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.Lists;
-
 import java.util.List;
 
-import mockit.Mocked;
-
 public class DeleteStmtTest {
 
     Analyzer analyzer;
@@ -140,7 +138,7 @@ public class DeleteStmtTest {
         } catch (UserException e) {
             Assert.assertTrue(e.getMessage().contains("Left expr of binary predicate should be column name"));
         }
-        
+
         // case 6 partition is null
         binaryPredicate = new BinaryPredicate(Operator.EQ, new SlotRef(null, "k1"), new StringLiteral("abc"));
         compoundPredicate = new CompoundPredicate(org.apache.doris.analysis.CompoundPredicate.Operator.AND,
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DescribeStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DescribeStmtTest.java
index 41f32d2553..25f3e75daf 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DescribeStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DescribeStmtTest.java
@@ -21,14 +21,13 @@ import org.apache.doris.catalog.Catalog;
 import org.apache.doris.common.UserException;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mock;
+import mockit.MockUp;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import mockit.Mock;
-import mockit.MockUp;
-
 public class DescribeStmtTest {
     private Analyzer analyzer;
     private Catalog catalog;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropClusterStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropClusterStmtTest.java
index e076662f89..98ca1d9502 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropClusterStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropClusterStmtTest.java
@@ -17,7 +17,6 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.Config;
 import org.apache.doris.common.UserException;
@@ -25,12 +24,12 @@ import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class DropClusterStmtTest {
 
     private static Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropDbStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropDbStmtTest.java
index 9580ca7e70..b726bc30a6 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropDbStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropDbStmtTest.java
@@ -23,12 +23,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class DropDbStmtTest {
     Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropMaterializedViewStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropMaterializedViewStmtTest.java
index faf39f2255..629286dba2 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropMaterializedViewStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropMaterializedViewStmtTest.java
@@ -22,12 +22,11 @@ import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.qe.ConnectContext;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import mockit.Expectations;
 import mockit.Injectable;
 import mockit.Mocked;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class DropMaterializedViewStmtTest {
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropTableStmtTest.java
index c3392d19fd..7204d4b3b9 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropTableStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropTableStmtTest.java
@@ -17,19 +17,18 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.UserException;
 import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class DropTableStmtTest {
     private TableName tbl;
     private TableName noDbTbl;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropUserStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropUserStmtTest.java
index 9f872038f6..7c994c2f5d 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropUserStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropUserStmtTest.java
@@ -23,15 +23,14 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class DropUserStmtTest {
     private Analyzer analyzer;
-    
+
     @Mocked
     private PaloAuth auth;
     @Mocked
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ExprTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ExprTest.java
index 7904b92485..c8fcd9793c 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ExprTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ExprTest.java
@@ -23,18 +23,17 @@ import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.jmockit.Deencapsulation;
 
 import com.google.common.collect.Maps;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import mockit.Expectations;
 import mockit.Injectable;
 import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 public class ExprTest {
 
     @Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/GrantStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/GrantStmtTest.java
index ee2e7d8e8a..2386a9667f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/GrantStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/GrantStmtTest.java
@@ -17,7 +17,6 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
 import org.apache.doris.catalog.AccessPrivilege;
 import org.apache.doris.catalog.Catalog;
 import org.apache.doris.common.AnalysisException;
@@ -27,15 +26,14 @@ import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.Lists;
-
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.List;
 
-import mockit.Mocked;
-
 public class GrantStmtTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/GroupByClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/GroupByClauseTest.java
index 67f2dc518e..017c3e9bff 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/GroupByClauseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/GroupByClauseTest.java
@@ -21,7 +21,6 @@ import org.apache.doris.common.AnalysisException;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/InPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/InPredicateTest.java
index 7ce6f9b737..3b688f9069 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/InPredicateTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/InPredicateTest.java
@@ -19,12 +19,12 @@ package org.apache.doris.analysis;
 
 import org.apache.doris.common.AnalysisException;
 
-import java.util.List;
-
 import com.clearspring.analytics.util.Lists;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.List;
+
 public class InPredicateTest {
 
     /*
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/IndexDefTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/IndexDefTest.java
index 6a0e8bee84..5f18742cb9 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/IndexDefTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/IndexDefTest.java
@@ -20,7 +20,6 @@ package org.apache.doris.analysis;
 import org.apache.doris.common.AnalysisException;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/InsertStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/InsertStmtTest.java
index 9cab5b42c3..9f4907cd7a 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/InsertStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/InsertStmtTest.java
@@ -31,12 +31,6 @@ import org.apache.doris.utframe.DorisAssert;
 import org.apache.doris.utframe.UtFrameUtils;
 
 import com.google.common.collect.Lists;
-
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
 import mockit.Expectations;
 import mockit.Injectable;
 import org.junit.AfterClass;
@@ -44,6 +38,11 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 public class InsertStmtTest {
     private static String runningDir = "fe/mocked/DemoTest/" + UUID.randomUUID().toString() + "/";
     private static DorisAssert dorisAssert;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/InstallPluginStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/InstallPluginStmtTest.java
index 264c0b76ac..23f29167c8 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/InstallPluginStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/InstallPluginStmtTest.java
@@ -17,13 +17,14 @@
 
 package org.apache.doris.analysis;
 
-import com.google.common.collect.Maps;
-import mockit.Expectations;
-import mockit.Mocked;
 import org.apache.doris.common.UserException;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.qe.ConnectContext;
+
+import com.google.common.collect.Maps;
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateTest.java
index 3ff261b698..bcb0431931 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateTest.java
@@ -5,9 +5,9 @@
 // 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
@@ -17,8 +17,9 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Mocked;
 import org.apache.doris.common.AnalysisException;
+
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -35,7 +36,7 @@ public class IsNullPredicateTest {
         } catch (AnalysisException e) {
             Assert.fail();
         }
-        
+
         IsNullPredicate isNotNullPredicate = new IsNullPredicate(new NullLiteral(), true);
 
         try {
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/LabelNameTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/LabelNameTest.java
index 7c595a8b39..d093a341f6 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/LabelNameTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/LabelNameTest.java
@@ -17,10 +17,10 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
-import mockit.Mocked;
 import org.apache.doris.common.AnalysisException;
 
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/LinkDbStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/LinkDbStmtTest.java
index 853c4abb1d..fbf993dc81 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/LinkDbStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/LinkDbStmtTest.java
@@ -24,12 +24,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class LinkDbStmtTest {
 
     private static Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/LoadStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/LoadStmtTest.java
index 4d078f5f5c..2d2a5c2518 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/LoadStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/LoadStmtTest.java
@@ -32,19 +32,17 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.qe.ConnectContext;
 import org.apache.doris.task.LoadTaskInfo;
 
+import com.google.common.collect.Lists;
+import mockit.Expectations;
+import mockit.Injectable;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.Lists;
-
 import java.io.StringReader;
 import java.util.List;
 
-import mockit.Expectations;
-import mockit.Injectable;
-import mockit.Mocked;
-
 public class LoadStmtTest {
     private List dataDescriptions;
     private Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnBitmapUnionPatternTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnBitmapUnionPatternTest.java
index 5bf10bcaa0..a893f4c0a5 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnBitmapUnionPatternTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnBitmapUnionPatternTest.java
@@ -24,15 +24,13 @@ import org.apache.doris.catalog.Type;
 import org.apache.doris.common.jmockit.Deencapsulation;
 
 import com.google.common.collect.Lists;
-
+import mockit.Expectations;
+import mockit.Injectable;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
 
-import mockit.Expectations;
-import mockit.Injectable;
-
 public class MVColumnBitmapUnionPatternTest {
 
     @Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnHLLUnionPatternTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnHLLUnionPatternTest.java
index 5f364f44a9..1ce612ea0b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnHLLUnionPatternTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnHLLUnionPatternTest.java
@@ -24,15 +24,13 @@ import org.apache.doris.catalog.Type;
 import org.apache.doris.common.jmockit.Deencapsulation;
 
 import com.google.common.collect.Lists;
-
+import mockit.Expectations;
+import mockit.Injectable;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
 
-import mockit.Expectations;
-import mockit.Injectable;
-
 public class MVColumnHLLUnionPatternTest {
 
     @Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnOneChildPatternTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnOneChildPatternTest.java
index f4c60491e4..a11bc2aa77 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnOneChildPatternTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/MVColumnOneChildPatternTest.java
@@ -23,15 +23,13 @@ import org.apache.doris.catalog.FunctionSet;
 import org.apache.doris.common.jmockit.Deencapsulation;
 
 import com.google.common.collect.Lists;
-
+import mockit.Expectations;
+import mockit.Injectable;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
 
-import mockit.Expectations;
-import mockit.Injectable;
-
 public class MVColumnOneChildPatternTest {
 
     @Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/MigrateDbStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/MigrateDbStmtTest.java
index 1b7f60e705..d88146e335 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/MigrateDbStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/MigrateDbStmtTest.java
@@ -24,12 +24,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class MigrateDbStmtTest {
 
     private static Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ModifyColumnClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ModifyColumnClauseTest.java
index 7f344089aa..cf184d8e80 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ModifyColumnClauseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ModifyColumnClauseTest.java
@@ -17,16 +17,16 @@
 
 package org.apache.doris.analysis;
 
+import org.apache.doris.catalog.Column;
+import org.apache.doris.catalog.PrimitiveType;
+import org.apache.doris.common.AnalysisException;
+
 import mockit.Expectations;
 import mockit.Mocked;
-import org.apache.doris.catalog.PrimitiveType;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.apache.doris.catalog.Column;
-import org.apache.doris.common.AnalysisException;
-
 public class ModifyColumnClauseTest {
     private static Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/OutFileClauseFunctionTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/OutFileClauseFunctionTest.java
index 7f7410ee22..c4bfabd20d 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/OutFileClauseFunctionTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/OutFileClauseFunctionTest.java
@@ -25,14 +25,14 @@ import org.apache.doris.qe.ConnectContext;
 import org.apache.doris.thrift.TFileFormatType;
 import org.apache.doris.utframe.UtFrameUtils;
 
-import java.io.File;
-import java.util.UUID;
-
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.File;
+import java.util.UUID;
+
 public class OutFileClauseFunctionTest {
 
     private static String baseDir = "fe";
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/PartitionKeyDescTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/PartitionKeyDescTest.java
index ffc8eeffb2..9012429b14 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/PartitionKeyDescTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/PartitionKeyDescTest.java
@@ -20,7 +20,6 @@ package org.apache.doris.analysis;
 import org.apache.doris.common.DdlException;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/QueryStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/QueryStmtTest.java
index e66b9df549..ba57dc2abc 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/QueryStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/QueryStmtTest.java
@@ -28,7 +28,6 @@ import org.apache.doris.utframe.DorisAssert;
 import org.apache.doris.utframe.UtFrameUtils;
 
 import com.google.common.collect.Lists;
-
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/RangeCompareTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/RangeCompareTest.java
index bd3b3061bf..95631b203f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/RangeCompareTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/RangeCompareTest.java
@@ -24,12 +24,11 @@ import com.google.common.collect.BoundType;
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
 import com.google.common.collect.TreeRangeSet;
-
-import java.util.Set;
-
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.Set;
+
 public class RangeCompareTest {
 
     /*
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ReorderColumnsClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ReorderColumnsClauseTest.java
index e8cd35c242..15cef3bce6 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ReorderColumnsClauseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ReorderColumnsClauseTest.java
@@ -20,7 +20,6 @@ package org.apache.doris.analysis;
 import org.apache.doris.common.AnalysisException;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ResourceDescTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ResourceDescTest.java
index 717524ba29..8c7f0431fa 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ResourceDescTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ResourceDescTest.java
@@ -25,11 +25,11 @@ import org.apache.doris.common.DdlException;
 import org.apache.doris.load.EtlJobType;
 
 import com.google.common.collect.Maps;
-import org.junit.Assert;
-import org.junit.Test;
 import mockit.Expectations;
 import mockit.Injectable;
 import mockit.Mocked;
+import org.junit.Assert;
+import org.junit.Test;
 
 import java.util.Map;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/RoutineLoadDataSourcePropertiesTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/RoutineLoadDataSourcePropertiesTest.java
index 0acdf0431b..8929204556 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/RoutineLoadDataSourcePropertiesTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/RoutineLoadDataSourcePropertiesTest.java
@@ -24,7 +24,6 @@ import org.apache.doris.common.util.TimeUtils;
 import org.apache.doris.load.routineload.KafkaProgress;
 
 import com.google.common.collect.Maps;
-
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
index ecb5800cea..4699a85792 100755
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
@@ -28,7 +28,8 @@ import org.apache.doris.utframe.UtFrameUtils;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
+import mockit.Mock;
+import mockit.MockUp;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -40,9 +41,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import mockit.Mock;
-import mockit.MockUp;
-
 public class SelectStmtTest {
     private static String runningDir = "fe/mocked/DemoTest/" + UUID.randomUUID().toString() + "/";
     private static DorisAssert dorisAssert;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/SetOperationStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/SetOperationStmtTest.java
index c4eb5204b5..8949d2703c 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/SetOperationStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/SetOperationStmtTest.java
@@ -22,14 +22,13 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.StringReader;
 
-import mockit.Mocked;
-
 public class SetOperationStmtTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/SetPassVarTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/SetPassVarTest.java
index 5018f10c56..6e12fbf23b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/SetPassVarTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/SetPassVarTest.java
@@ -23,12 +23,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class SetPassVarTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/SetStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/SetStmtTest.java
index 6d8f826d8b..2b2eed78cd 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/SetStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/SetStmtTest.java
@@ -24,15 +24,13 @@ import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.Lists;
-
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.List;
 
-import mockit.Mocked;
-
 public class SetStmtTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/SetUserPropertyStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/SetUserPropertyStmtTest.java
index 7c0bcab017..16ebf06c42 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/SetUserPropertyStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/SetUserPropertyStmtTest.java
@@ -24,15 +24,13 @@ import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.Lists;
-
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.List;
 
-import mockit.Mocked;
-
 public class SetUserPropertyStmtTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/SetVarTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/SetVarTest.java
index fa39087d47..48c0fef3b7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/SetVarTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/SetVarTest.java
@@ -23,12 +23,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class SetVarTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowAlterStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowAlterStmtTest.java
index b45b9213e3..11f7f55ee0 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowAlterStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowAlterStmtTest.java
@@ -17,15 +17,15 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
 import org.apache.doris.analysis.BinaryPredicate.Operator;
 import org.apache.doris.catalog.Catalog;
 import org.apache.doris.catalog.FakeCatalog;
-import org.apache.doris.qe.ConnectContext;
-import org.apache.doris.system.SystemInfoService;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.UserException;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.system.SystemInfoService;
 
+import mockit.Expectations;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -73,7 +73,7 @@ public class ShowAlterStmtTest {
         stmt.analyzeSyntax(analyzer);
         Assert.assertEquals("SHOW ALTER TABLE COLUMN FROM `testDb`", stmt.toString());
     }
-    
+
     @Test
     public void testAlterStmt2() throws UserException, AnalysisException {
         SlotRef slotRef = new SlotRef(null, "TableName");
@@ -85,7 +85,7 @@ public class ShowAlterStmtTest {
         Assert.assertEquals("SHOW ALTER TABLE COLUMN FROM `testDb` WHERE `TableName` = \'abc\' LIMIT 1, 2",
                 stmt.toString());
     }
-    
+
     @Test
     public void testAlterStmt3() throws UserException, AnalysisException {
         SlotRef slotRef = new SlotRef(null, "CreateTime");
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateDbStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateDbStmtTest.java
index b407d26d8b..00d672c64d 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateDbStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateDbStmtTest.java
@@ -23,12 +23,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class ShowCreateDbStmtTest {
 
     @Mocked
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateTableStmtTest.java
index 78dee03f19..286e4de3af 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateTableStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateTableStmtTest.java
@@ -22,12 +22,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class ShowCreateTableStmtTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDataStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDataStmtTest.java
index 325eaf9002..840c569005 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDataStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDataStmtTest.java
@@ -28,13 +28,12 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.qe.ConnectContext;
 import org.apache.doris.system.SystemInfoService;
 
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Expectations;
-import mockit.Mocked;
-
 import java.util.Arrays;
 
 public class ShowDataStmtTest {
@@ -56,7 +55,7 @@ public class ShowDataStmtTest {
     public void setUp() throws UserException {
         auth = new PaloAuth();
 
-        
+
 
         new Expectations() {
             {
@@ -111,7 +110,7 @@ public class ShowDataStmtTest {
                 result = "192.168.1.1";
             }
         };
-        
+
 
         new Expectations() {
             {
@@ -128,7 +127,7 @@ public class ShowDataStmtTest {
                 result = true;
             }
         };
-        
+
         AccessTestUtil.fetchAdminAccess();
     }
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDbIdStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDbIdStmtTest.java
index 887e8504eb..06e70deb7b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDbIdStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDbIdStmtTest.java
@@ -17,12 +17,13 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Mocked;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.UserException;
 import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
+
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDbStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDbStmtTest.java
index 551a5b738c..9a2da0f12f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDbStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowDbStmtTest.java
@@ -17,12 +17,12 @@
 
 package org.apache.doris.analysis;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.UserException;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 public class ShowDbStmtTest {
     @Test
     public void testNormal() throws UserException, AnalysisException  {
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowEncryptKeysStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowEncryptKeysStmtTest.java
index 7051b58504..7fa4be1e6e 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowEncryptKeysStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowEncryptKeysStmtTest.java
@@ -17,14 +17,15 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
-import mockit.Mocked;
 import org.apache.doris.catalog.Catalog;
 import org.apache.doris.catalog.FakeCatalog;
 import org.apache.doris.common.UserException;
 import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
+
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowExportStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowExportStmtTest.java
index b86f3a2845..7ad3b283c8 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowExportStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowExportStmtTest.java
@@ -21,6 +21,7 @@ import org.apache.doris.analysis.BinaryPredicate.Operator;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.ExceptionChecker;
 import org.apache.doris.common.UserException;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowFunctionsStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowFunctionsStmtTest.java
index fe061e36ed..bd5195b6b3 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowFunctionsStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowFunctionsStmtTest.java
@@ -17,8 +17,6 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
-import mockit.Mocked;
 import org.apache.doris.catalog.Catalog;
 import org.apache.doris.catalog.FakeCatalog;
 import org.apache.doris.common.AnalysisException;
@@ -26,6 +24,9 @@ import org.apache.doris.common.UserException;
 import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
+
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowIndexStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowIndexStmtTest.java
index 2d2c12f72f..8b14a27130 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowIndexStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowIndexStmtTest.java
@@ -23,12 +23,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class ShowIndexStmtTest {
 
     private static Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowLoadStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowLoadStmtTest.java
index a22b48d310..c41f5e160d 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowLoadStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowLoadStmtTest.java
@@ -25,12 +25,11 @@ import org.apache.doris.common.ExceptionChecker;
 import org.apache.doris.common.UserException;
 import org.apache.doris.system.SystemInfoService;
 
+import mockit.Expectations;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Expectations;
-
 public class ShowLoadStmtTest {
     private Analyzer analyzer;
     private Catalog catalog;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowPartitionIdStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowPartitionIdStmtTest.java
index 5374b0910d..da5a526592 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowPartitionIdStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowPartitionIdStmtTest.java
@@ -17,17 +17,17 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Mocked;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.UserException;
 import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
+
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.UserException;
-
 public class ShowPartitionIdStmtTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowPartitionsStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowPartitionsStmtTest.java
index 3965066eeb..4af3be7daa 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowPartitionsStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowPartitionsStmtTest.java
@@ -17,12 +17,13 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Expectations;
-import mockit.Mocked;
 import org.apache.doris.catalog.Catalog;
 import org.apache.doris.catalog.FakeCatalog;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.UserException;
+
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableCreationStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableCreationStmtTest.java
index fa45a10888..266109bdbd 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableCreationStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableCreationStmtTest.java
@@ -17,11 +17,12 @@
 
 package org.apache.doris.analysis;
 
-import mockit.Mocked;
 import org.apache.doris.common.UserException;
 import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
+
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableIdStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableIdStmtTest.java
index ba8651e9b2..cd8d9be4b8 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableIdStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableIdStmtTest.java
@@ -23,10 +23,10 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import mockit.Mocked;
 
 public class ShowTableIdStmtTest {
     private Analyzer analyzer;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableStmtTest.java
index 89c7336610..2b92a56a77 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowTableStmtTest.java
@@ -22,12 +22,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class ShowTableStmtTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowUserPropertyStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowUserPropertyStmtTest.java
index ec0fb082c7..fa134f4847 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowUserPropertyStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowUserPropertyStmtTest.java
@@ -23,12 +23,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class ShowUserPropertyStmtTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowVariablesStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowVariablesStmtTest.java
index da8d3004c3..50bf1903ac 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowVariablesStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowVariablesStmtTest.java
@@ -17,9 +17,7 @@
 
 package org.apache.doris.analysis;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class ShowVariablesStmtTest {
@@ -27,20 +25,20 @@ public class ShowVariablesStmtTest {
     public void testNormal() {
         ShowVariablesStmt stmt = new ShowVariablesStmt(null, null);
         stmt.analyze(null);
-        assertEquals("SHOW DEFAULT VARIABLES", stmt.toString());
-        assertEquals(2, stmt.getMetaData().getColumnCount());
-        assertEquals("Variable_name", stmt.getMetaData().getColumn(0).getName());
-        assertEquals("Value", stmt.getMetaData().getColumn(1).getName());
-        assertNull(stmt.getPattern());
-        assertEquals(SetType.DEFAULT, stmt.getType());
+        Assert.assertEquals("SHOW DEFAULT VARIABLES", stmt.toString());
+        Assert.assertEquals(2, stmt.getMetaData().getColumnCount());
+        Assert.assertEquals("Variable_name", stmt.getMetaData().getColumn(0).getName());
+        Assert.assertEquals("Value", stmt.getMetaData().getColumn(1).getName());
+        Assert.assertNull(stmt.getPattern());
+        Assert.assertEquals(SetType.DEFAULT, stmt.getType());
 
         stmt = new ShowVariablesStmt(SetType.GLOBAL, "abc");
         stmt.analyze(null);
-        assertEquals("SHOW GLOBAL VARIABLES LIKE 'abc'", stmt.toString());
-        assertEquals(2, stmt.getMetaData().getColumnCount());
-        assertEquals("Variable_name", stmt.getMetaData().getColumn(0).getName());
-        assertEquals("Value", stmt.getMetaData().getColumn(1).getName());
-        assertEquals("abc", stmt.getPattern());
-        assertEquals(SetType.GLOBAL, stmt.getType());
+        Assert.assertEquals("SHOW GLOBAL VARIABLES LIKE 'abc'", stmt.toString());
+        Assert.assertEquals(2, stmt.getMetaData().getColumnCount());
+        Assert.assertEquals("Variable_name", stmt.getMetaData().getColumn(0).getName());
+        Assert.assertEquals("Value", stmt.getMetaData().getColumn(1).getName());
+        Assert.assertEquals("abc", stmt.getPattern());
+        Assert.assertEquals(SetType.GLOBAL, stmt.getType());
     }
 }
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowViewStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowViewStmtTest.java
index ffa2d9f6a8..cbf3315f80 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowViewStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowViewStmtTest.java
@@ -27,7 +27,6 @@ import org.apache.doris.utframe.UtFrameUtils;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/TupleIsNullPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/TupleIsNullPredicateTest.java
index 113bbb1f7d..4fc39ebf8a 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/TupleIsNullPredicateTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/TupleIsNullPredicateTest.java
@@ -18,7 +18,6 @@
 package org.apache.doris.analysis;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/UpdateStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/UpdateStmtTest.java
index 06880215ac..47da2382c0 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/UpdateStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/UpdateStmtTest.java
@@ -19,14 +19,14 @@ package org.apache.doris.analysis;
 
 import org.apache.doris.common.UserException;
 
-import java.util.List;
-
 import com.clearspring.analytics.util.Lists;
 import mockit.Expectations;
 import mockit.Injectable;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.List;
+
 public class UpdateStmtTest {
 
     @Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/UseStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/UseStmtTest.java
index 06693af6b2..841cfe4909 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/UseStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/UseStmtTest.java
@@ -23,12 +23,11 @@ import org.apache.doris.mysql.privilege.MockedAuth;
 import org.apache.doris.mysql.privilege.PaloAuth;
 import org.apache.doris.qe.ConnectContext;
 
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import mockit.Mocked;
-
 public class UseStmtTest {
     private Analyzer analyzer;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/VirtualSlotRefTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/VirtualSlotRefTest.java
index c505316556..2676411b89 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/VirtualSlotRefTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/VirtualSlotRefTest.java
@@ -18,11 +18,10 @@
 package org.apache.doris.analysis;
 
 import org.apache.doris.catalog.Type;
+import org.apache.doris.common.AnalysisException;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-
-import org.apache.doris.common.AnalysisException;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/backup/BackupHandlerTest.java b/fe/fe-core/src/test/java/org/apache/doris/backup/BackupHandlerTest.java
index 73f4a7465f..ae1ec2bc0e 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/BackupHandlerTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/BackupHandlerTest.java
@@ -51,6 +51,15 @@ import org.apache.doris.thrift.TStatusCode;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import mockit.Delegate;
+import mockit.Expectations;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -66,16 +75,6 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
-import mockit.Delegate;
-import mockit.Expectations;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 public class BackupHandlerTest {
 
     private BackupHandler handler;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/backup/BackupJobInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/backup/BackupJobInfoTest.java
index eeec431b1e..c791a07b96 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/BackupJobInfoTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/BackupJobInfoTest.java
@@ -17,6 +17,11 @@
 
 package org.apache.doris.backup;
 
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -26,11 +31,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 public class BackupJobInfoTest {
 
     private static String fileName = "job_info.txt";
diff --git a/fe/fe-core/src/test/java/org/apache/doris/backup/BackupJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/backup/BackupJobTest.java
index bb5c71f15f..1056117a3b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/BackupJobTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/BackupJobTest.java
@@ -45,7 +45,11 @@ import org.apache.doris.thrift.TTaskType;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
+import mockit.Delegate;
+import mockit.Expectations;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
@@ -62,12 +66,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import mockit.Delegate;
-import mockit.Expectations;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
-
 public class BackupJobTest {
 
     private BackupJob job;
@@ -125,7 +123,7 @@ public class BackupJobTest {
         File backupDir = new File(BackupHandler.BACKUP_ROOT_DIR.toString());
         backupDir.mkdirs();
     }
-    
+
     @AfterClass
     public static void end() throws IOException {
         Config.tmp_dir = "./";
@@ -212,7 +210,7 @@ public class BackupJobTest {
         job.run();
         Assert.assertEquals(Status.OK, job.getStatus());
         Assert.assertEquals(BackupJobState.SNAPSHOTING, job.getState());
-        
+
         BackupMeta backupMeta = job.getBackupMeta();
         Assert.assertEquals(1, backupMeta.getTables().size());
         OlapTable backupTbl = (OlapTable) backupMeta.getTable(UnitTestUtil.TABLE_NAME);
@@ -224,12 +222,12 @@ public class BackupJobTest {
         AgentTask task = AgentTaskQueue.getTask(backendId, TTaskType.MAKE_SNAPSHOT, tabletId);
         Assert.assertTrue(task instanceof SnapshotTask);
         SnapshotTask snapshotTask = (SnapshotTask) task;
-        
+
         // 2. snapshoting
         job.run();
         Assert.assertEquals(Status.OK, job.getStatus());
         Assert.assertEquals(BackupJobState.SNAPSHOTING, job.getState());
-        
+
         // 3. snapshot finished
         String snapshotPath = "/path/to/snapshot";
         List snapshotFiles = Lists.newArrayList();
@@ -256,7 +254,7 @@ public class BackupJobTest {
         task = AgentTaskQueue.getTask(backendId, TTaskType.UPLOAD, id.get() - 1);
         Assert.assertTrue(task instanceof UploadTask);
         UploadTask upTask = (UploadTask) task;
-        
+
         Assert.assertEquals(job.getJobId(), upTask.getJobId());
         Map srcToDest = upTask.getSrcToDestPath();
         Assert.assertEquals(1, srcToDest.size());
diff --git a/fe/fe-core/src/test/java/org/apache/doris/backup/BrokerStorageTest.java b/fe/fe-core/src/test/java/org/apache/doris/backup/BrokerStorageTest.java
index 5e6863fb3f..43f34f75e7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/BrokerStorageTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/BrokerStorageTest.java
@@ -24,6 +24,11 @@ import org.apache.doris.common.jmockit.Deencapsulation;
 import org.apache.doris.thrift.TNetworkAddress;
 import org.apache.doris.thrift.TPaloBrokerService;
 
+import mockit.Expectations;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
+import mockit.Tested;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
 import org.apache.thrift.TServiceClient;
@@ -49,12 +54,6 @@ import java.util.Map;
 import java.util.Random;
 import java.util.UUID;
 
-import mockit.Expectations;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
-import mockit.Tested;
-
 @Ignore
 public class BrokerStorageTest {
     private static String basePath;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/backup/CatalogMocker.java b/fe/fe-core/src/test/java/org/apache/doris/backup/CatalogMocker.java
index d4cf23d3f5..157e9d18f0 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/CatalogMocker.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/CatalogMocker.java
@@ -62,12 +62,11 @@ import org.apache.doris.thrift.TStorageType;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Range;
+import mockit.Expectations;
 
 import java.util.List;
 import java.util.Map;
 
-import mockit.Expectations;
-
 public class CatalogMocker {
     // user
     public static final String ROOTUSER = "root";
@@ -83,7 +82,7 @@ public class CatalogMocker {
     // db
     public static final String TEST_DB_NAME = "test_db";
     public static final long TEST_DB_ID = 20000;
-    
+
     // single partition olap table
     public static final String TEST_TBL_NAME = "test_tbl";
     public static final long TEST_TBL_ID = 30000;
@@ -104,7 +103,7 @@ public class CatalogMocker {
     public static final String MYSQL_PWD = "mysql-pwd";
     public static final String MYSQL_DB = "mysql-db";
     public static final String MYSQL_TBL = "mysql-tbl";
-    
+
     // partition olap table with a rollup
     public static final String TEST_TBL2_NAME = "test_tbl2";
     public static final long TEST_TBL2_ID = 30002;
@@ -290,7 +289,7 @@ public class CatalogMocker {
         Partition partition2 =
                 new Partition(TEST_PARTITION2_ID, TEST_PARTITION2_NAME, baseIndexP2, distributionInfo2);
         RangePartitionInfo rangePartitionInfo = new RangePartitionInfo(Lists.newArrayList(TEST_TBL_BASE_SCHEMA.get(0)));
-        
+
         PartitionKey rangeP1Lower =
                 PartitionKey.createInfinityPartitionKey(Lists.newArrayList(TEST_TBL_BASE_SCHEMA.get(0)), false);
         PartitionKey rangeP1Upper =
@@ -361,11 +360,11 @@ public class CatalogMocker {
         Replica replica9 = new Replica(TEST_REPLICA9_ID, BACKEND1_ID, 0, ReplicaState.NORMAL);
         Replica replica10 = new Replica(TEST_REPLICA10_ID, BACKEND2_ID, 0, ReplicaState.NORMAL);
         Replica replica11 = new Replica(TEST_REPLICA11_ID, BACKEND3_ID, 0, ReplicaState.NORMAL);
-        
+
         rollupTabletP1.addReplica(replica9);
         rollupTabletP1.addReplica(replica10);
         rollupTabletP1.addReplica(replica11);
-        
+
         partition1.createRollupIndex(rollupIndexP1);
 
         // rollup index p2
diff --git a/fe/fe-core/src/test/java/org/apache/doris/backup/PartitionNameTest.java b/fe/fe-core/src/test/java/org/apache/doris/backup/PartitionNameTest.java
index de4d869ef1..5020c22eb6 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/PartitionNameTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/PartitionNameTest.java
@@ -21,7 +21,6 @@ import org.apache.doris.analysis.PartitionName;
 import org.apache.doris.common.AnalysisException;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/backup/RepositoryTest.java b/fe/fe-core/src/test/java/org/apache/doris/backup/RepositoryTest.java
index f750ee6daa..373d9f12b7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/RepositoryTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/RepositoryTest.java
@@ -24,13 +24,17 @@ import org.apache.doris.catalog.FsBroker;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.service.FrontendOptions;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import mockit.Delegate;
+import mockit.Expectations;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -45,12 +49,6 @@ import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
 
-import mockit.Delegate;
-import mockit.Expectations;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
-
 
 public class RepositoryTest {
 
@@ -170,7 +168,7 @@ public class RepositoryTest {
                 result = Status.OK;
             }
         };
-        
+
         repo = new Repository(10000, "repo", false, location, storage);
         Assert.assertTrue(repo.ping());
         Assert.assertTrue(repo.getErrorMsg() == null);
@@ -331,15 +329,15 @@ public class RepositoryTest {
             repo.write(out);
             out.flush();
             out.close();
-            
+
             DataInputStream in = new DataInputStream(new FileInputStream(file));
             Repository newRepo = Repository.read(in);
             in.close();
-            
+
             Assert.assertEquals(repo.getName(), newRepo.getName());
             Assert.assertEquals(repo.getId(), newRepo.getId());
             Assert.assertEquals(repo.getLocation(), newRepo.getLocation());
-            
+
         } catch (IOException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreFileMappingTest.java b/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreFileMappingTest.java
index c0caedd43a..dc3483ec0d 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreFileMappingTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreFileMappingTest.java
@@ -19,11 +19,10 @@ package org.apache.doris.backup;
 
 import org.apache.doris.backup.RestoreFileMapping.IdChain;
 
+import junit.framework.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import junit.framework.Assert;
-
 public class RestoreFileMappingTest {
 
     private RestoreFileMapping fileMapping = new RestoreFileMapping();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreJobTest.java
index aaab4b3155..71ad6827ea 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreJobTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreJobTest.java
@@ -42,7 +42,12 @@ import org.apache.doris.thrift.TStorageMedium;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
+import mockit.Delegate;
+import mockit.Expectations;
+import mockit.Injectable;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -50,12 +55,6 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.zip.Adler32;
-import mockit.Delegate;
-import mockit.Expectations;
-import mockit.Injectable;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
 
 public class RestoreJobTest {
 
@@ -123,25 +122,25 @@ public class RestoreJobTest {
                 catalog.getDbNullable(anyLong);
                 minTimes = 0;
                 result = db;
-        
+
                 Catalog.getCurrentCatalogJournalVersion();
                 minTimes = 0;
                 result = FeConstants.meta_version;
-        
+
                 catalog.getNextId();
                 minTimes = 0;
                 result = id.getAndIncrement();
-        
+
                 catalog.getEditLog();
                 minTimes = 0;
                 result = editLog;
-        
+
                 Catalog.getCurrentSystemInfo();
                 minTimes = 0;
                 result = systemInfoService;
             }
         };
-        
+
         new Expectations() {
             {
                 systemInfoService.selectBackendIdsForReplicaCreation((ReplicaAllocation) any,
@@ -159,7 +158,7 @@ public class RestoreJobTest {
                 };
             }
         };
-        
+
         new Expectations() {
             {
                 editLog.logBackupJob((BackupJob) any);
@@ -171,7 +170,7 @@ public class RestoreJobTest {
                 };
             }
         };
-        
+
         new Expectations() {
             {
                 repo.upload(anyString, anyString);
@@ -189,7 +188,7 @@ public class RestoreJobTest {
                 };
             }
         };
-        
+
         new MockUp() {
             @Mock
             boolean await(long timeout, TimeUnit unit) {
@@ -204,23 +203,23 @@ public class RestoreJobTest {
         jobInfo.dbName = CatalogMocker.TEST_DB_NAME;
         jobInfo.name = label;
         jobInfo.success = true;
-        
+
         expectedRestoreTbl = (OlapTable) db.getTableNullable(CatalogMocker.TEST_TBL2_ID);
         BackupOlapTableInfo tblInfo = new BackupOlapTableInfo();
         tblInfo.id = CatalogMocker.TEST_TBL2_ID;
         jobInfo.backupOlapTableObjects.put(CatalogMocker.TEST_TBL2_NAME, tblInfo);
-        
+
         for (Partition partition : expectedRestoreTbl.getPartitions()) {
             BackupPartitionInfo partInfo = new BackupPartitionInfo();
             partInfo.id = partition.getId();
             tblInfo.partitions.put(partition.getName(), partInfo);
-            
+
             for (MaterializedIndex index : partition.getMaterializedIndices(IndexExtState.VISIBLE)) {
                 BackupIndexInfo idxInfo = new BackupIndexInfo();
                 idxInfo.id = index.getId();
                 idxInfo.schemaHash = expectedRestoreTbl.getSchemaHashByIndexId(index.getId());
                 partInfo.indexes.put(expectedRestoreTbl.getIndexNameById(index.getId()), idxInfo);
-                
+
                 for (Tablet tablet : index.getTablets()) {
                     List files = Lists.newArrayList(tablet.getId() + ".dat",
                             tablet.getId()+ ".idx",  tablet.getId()+".hdr");
@@ -229,13 +228,13 @@ public class RestoreJobTest {
                 }
             }
         }
-        
+
         // drop this table, cause we want to try restoring this table
         db.dropTable(expectedRestoreTbl.getName());
 
         job = new RestoreJob(label, "2018-01-01 01:01:01", db.getId(), db.getFullName(),
                 jobInfo, false, new ReplicaAllocation((short) 3), 100000, -1, catalog, repo.getId());
-        
+
         List tbls = Lists.newArrayList();
         List resources = Lists.newArrayList();
         tbls.add(expectedRestoreTbl);
@@ -264,4 +263,3 @@ public class RestoreJobTest {
     }
 
 }
-
diff --git a/fe/fe-core/src/test/java/org/apache/doris/bdb/BDBToolTest.java b/fe/fe-core/src/test/java/org/apache/doris/bdb/BDBToolTest.java
index 6ca5142625..b3f8e54187 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/bdb/BDBToolTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/bdb/BDBToolTest.java
@@ -32,7 +32,6 @@ import com.sleepycat.je.DatabaseException;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.EnvironmentConfig;
 import com.sleepycat.je.OperationStatus;
-
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -134,7 +133,7 @@ public class BDBToolTest {
         BDBTool tool = new BDBTool(path, options);
         Assert.assertTrue(tool.run());
     }
-    
+
     @Test
     public void testDbStat() {
         // wrong db name
diff --git a/fe/fe-core/src/test/java/org/apache/doris/blockrule/SqlBlockRuleMgrTest.java b/fe/fe-core/src/test/java/org/apache/doris/blockrule/SqlBlockRuleMgrTest.java
index 021b97f0f5..885829059b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/blockrule/SqlBlockRuleMgrTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/blockrule/SqlBlockRuleMgrTest.java
@@ -53,21 +53,21 @@ import java.util.UUID;
 public class SqlBlockRuleMgrTest {
 
     private static String runningDir = "fe/mocked/SqlBlockRuleMgrTest/" + UUID.randomUUID().toString() + "/";
-    
+
     private static ConnectContext connectContext;
-    
+
     @BeforeClass
     public static void beforeClass() throws Exception {
         UtFrameUtils.createDorisCluster(runningDir);
-        
+
         // create connect context
         connectContext = UtFrameUtils.createDefaultCtx();
-        
+
         // create database
         String createDbStmtStr = "create database test;";
         CreateDbStmt createDbStmt = (CreateDbStmt) UtFrameUtils.parseAndAnalyzeStmt(createDbStmtStr, connectContext);
         Catalog.getCurrentCatalog().createDb(createDbStmt);
-        
+
         MetricRepo.init();
         createTable("create table test.table1\n" +
                 "(k1 int, k2 int) distributed by hash(k1) buckets 1\n" +
@@ -88,20 +88,20 @@ public class SqlBlockRuleMgrTest {
                 "PROPERTIES (\n" +
                 "\"replication_num\" = \"1\"\n" +
                 ");");
-        
+
     }
-    
+
     @AfterClass
     public static void tearDown() {
         File file = new File(runningDir);
         file.delete();
     }
-    
+
     private static void createTable(String sql) throws Exception {
         CreateTableStmt createTableStmt = (CreateTableStmt) UtFrameUtils.parseAndAnalyzeStmt(sql, connectContext);
         Catalog.getCurrentCatalog().createTable(createTableStmt);
     }
-    
+
     @Test
     public void testUserMatchSql() throws Exception {
         String sql = "select * from table1 limit 10";
@@ -116,7 +116,7 @@ public class SqlBlockRuleMgrTest {
         ExceptionChecker.expectThrowsWithMsg(AnalysisException.class, "sql match hash sql block rule: " + sqlRule.getName(),
                 () -> mgr.matchSql(sql, sqlHash, "root"));
     }
-    
+
     @Test
     public void testGlobalMatchSql() throws AnalysisException {
         String sql = "select * from test_table1 limit 10";
@@ -127,7 +127,7 @@ public class SqlBlockRuleMgrTest {
         ExceptionChecker.expectThrowsWithMsg(AnalysisException.class, "sql match hash sql block rule: " + sqlRule.getName(),
                 () -> mgr.matchSql(sql, sqlHash, "test"));
     }
-    
+
     @Test
     public void testRegexMatchSql() throws AnalysisException {
         String sql = "select * from test_table1 tt1 join test_table2 tt2 on tt1.testId=tt2.testId limit 5";
@@ -138,7 +138,7 @@ public class SqlBlockRuleMgrTest {
         ExceptionChecker.expectThrowsWithMsg(AnalysisException.class, "sql match regex sql block rule: " + sqlRule.getName(),
                 () -> mgr.matchSql(sqlRule, sql, sqlHash));
     }
-    
+
     @Test
     public void testHashMatchSql() throws AnalysisException {
         String sql = "select * from test_table1 tt1 join test_table2 tt2 on tt1.testId=tt2.testId limit 5";
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/AdminStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/AdminStmtTest.java
index 363795ed32..8a0c170a90 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/AdminStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/AdminStmtTest.java
@@ -26,7 +26,6 @@ import org.apache.doris.persist.SetReplicaStatusOperationLog;
 import org.apache.doris.utframe.TestWithFeService;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 
@@ -92,7 +91,7 @@ public class AdminStmtTest extends TestWithFeService {
         replica = Catalog.getCurrentInvertedIndex().getReplica(tabletId, backendId);
         Assert.assertFalse(replica.isBad());
     }
-    
+
     @Test
     public void testSetReplicaStatusOperationLog() throws IOException, AnalysisException {
         String fileName = "./SetReplicaStatusOperationLog";
@@ -101,20 +100,20 @@ public class AdminStmtTest extends TestWithFeService {
             File file = new File(fileName);
             file.createNewFile();
             DataOutputStream out = new DataOutputStream(new FileOutputStream(file));
-            
+
             SetReplicaStatusOperationLog log = new SetReplicaStatusOperationLog(10000, 100001, ReplicaStatus.BAD);
             log.write(out);
             out.flush();
             out.close();
-            
+
             // 2. Read objects from file
             DataInputStream in = new DataInputStream(new FileInputStream(file));
-            
+
             SetReplicaStatusOperationLog readLog = SetReplicaStatusOperationLog.read(in);
             Assert.assertEquals(log.getBackendId(), readLog.getBackendId());
             Assert.assertEquals(log.getTabletId(), readLog.getTabletId());
             Assert.assertEquals(log.getReplicaStatus(), readLog.getReplicaStatus());
-            
+
             in.close();
         } finally {
             File file = new File(fileName);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/BackendTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/BackendTest.java
index 460d8d6b87..9187ebe09b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/BackendTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/BackendTest.java
@@ -24,7 +24,6 @@ import org.apache.doris.thrift.TDisk;
 import org.apache.doris.thrift.TStorageMedium;
 
 import com.google.common.collect.ImmutableMap;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTest.java
index c9956d073b..330794f713 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTest.java
@@ -24,6 +24,7 @@ import org.apache.doris.load.Load;
 import org.apache.doris.load.LoadJob;
 import org.apache.doris.meta.MetaContext;
 
+import mockit.Expectations;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,7 +38,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Random;
-import mockit.Expectations;
 
 public class CatalogTest {
 
@@ -66,7 +66,7 @@ public class CatalogTest {
             }
         }
     }
-    
+
     public void addFiles(int image, int edit, String metaDir) {
         File imageFile = new File(metaDir + "image." + image);
         try {
@@ -74,7 +74,7 @@ public class CatalogTest {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        
+
         for (int i = 1; i <= edit; i++) {
             File editFile = new File(metaDir + "edits." + i);
             try {
@@ -83,14 +83,14 @@ public class CatalogTest {
                 e.printStackTrace();
             }
         }
-        
+
         File current = new File(metaDir + "edits");
         try {
             current.createNewFile();
         } catch (IOException e) {
             e.printStackTrace();
         }
-        
+
         File version = new File(metaDir + "VERSION");
         try {
             version.createNewFile();
@@ -105,7 +105,7 @@ public class CatalogTest {
             e.printStackTrace();
         }
     }
-    
+
     public void deleteDir(String metaDir) {
         File dir = new File(metaDir);
         if (dir.exists()) {
@@ -115,11 +115,11 @@ public class CatalogTest {
                     file.delete();
                 }
             }
-            
+
             dir.delete();
         }
     }
-    
+
     @Test
     public void testSaveLoadHeader() throws Exception {
         String dir = "testLoadHeader";
@@ -137,16 +137,16 @@ public class CatalogTest {
         catalog.clear();
         catalog = null;
         dos.close();
-        
+
         DataInputStream dis = new DataInputStream(new BufferedInputStream(new FileInputStream(file)));
         catalog = Catalog.getCurrentCatalog();
         long checksum2 = catalog.loadHeader(dis, MetaHeader.EMPTY_HEADER ,0);
         Assert.assertEquals(checksum1, checksum2);
         dis.close();
-        
+
         deleteDir(dir);
     }
-    
+
     @Test
     public void testSaveLoadJob() throws Exception {
         String dir = "testLoadLoadJob";
@@ -167,7 +167,7 @@ public class CatalogTest {
         catalog.clear();
         catalog = null;
         dos.close();
-        
+
         catalog = Catalog.getCurrentCatalog();
 
         Field field2 = catalog.getClass().getDeclaredField("load");
@@ -180,7 +180,7 @@ public class CatalogTest {
         LoadJob job2 = catalog.getLoadInstance().getLoadJob(-1);
         Assert.assertTrue(job1.equals(job2));
         dis.close();
-        
+
         deleteDir(dir);
     }
 }
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTestUtil.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTestUtil.java
index e950d4f512..f4b7177c43 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTestUtil.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTestUtil.java
@@ -230,7 +230,7 @@ public class CatalogTestUtil {
         Database db = new Database(dbId, testDb1);
         db.createTable(table);
         db.setClusterName(SystemInfoService.DEFAULT_CLUSTER);
-        
+
         // add a es table to catalog
         try {
             createEsTable(db);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableIndexTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableIndexTest.java
index e03024c2fb..8fb69d0e56 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableIndexTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableIndexTest.java
@@ -22,7 +22,6 @@ import org.apache.doris.common.FeMetaVersion;
 import org.apache.doris.meta.MetaContext;
 
 import com.google.common.collect.Maps;
-
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableTest.java
index 7a54231139..b5b207b108 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableTest.java
@@ -28,6 +28,8 @@ import org.apache.doris.qe.ConnectContext;
 import org.apache.doris.resource.Tag;
 import org.apache.doris.utframe.UtFrameUtils;
 
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Table;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -37,9 +39,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Table;
-
 import java.io.File;
 import java.util.List;
 import java.util.Map;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnGsonSerializationTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnGsonSerializationTest.java
index c017475ab3..9b0bf33a52 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnGsonSerializationTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnGsonSerializationTest.java
@@ -24,7 +24,6 @@ import org.apache.doris.persist.gson.GsonUtils;
 
 import com.google.common.collect.Lists;
 import com.google.gson.annotations.SerializedName;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -87,7 +86,7 @@ public class ColumnGsonSerializationTest {
 
         Assert.assertEquals(c1, readC1);
     }
-    
+
     @Test
     public void testSerializeColumnList() throws IOException, AnalysisException {
         // 1. Write objects to file
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnStatsTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnStatsTest.java
index 2b79787fac..d3717815dd 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnStatsTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnStatsTest.java
@@ -27,54 +27,54 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 
 public class ColumnStatsTest {
-    
+
     @Test
     public void testSerialization() throws Exception {
         // 1. Write objects to file
         File file = new File("./columnStats");
         file.createNewFile();
         DataOutputStream dos = new DataOutputStream(new FileOutputStream(file));
-        
+
         ColumnStats stats1 = new ColumnStats();
         stats1.write(dos);
-        
+
         ColumnStats stats2 = new ColumnStats();
         stats2.setAvgSerializedSize(1.1f);
         stats2.setNumDistinctValues(100L);
         stats2.setMaxSize(1000L);
         stats2.setNumNulls(10000L);
         stats2.write(dos);
-        
+
         ColumnStats stats3 = new ColumnStats();
         stats3.setAvgSerializedSize(3.3f);
         stats3.setNumDistinctValues(200L);
         stats3.setMaxSize(2000L);
         stats3.setNumNulls(20000L);
         stats3.write(dos);
-        
+
         ColumnStats stats4 = new ColumnStats(stats3);
         stats4.write(dos);
 
         dos.flush();
         dos.close();
-        
+
         // 2. Read objects from file
         DataInputStream dis = new DataInputStream(new FileInputStream(file));
         ColumnStats rStats1 = new ColumnStats();
         rStats1.readFields(dis);
         Assert.assertTrue(rStats1.equals(stats1));
-        
+
         ColumnStats rStats2 = new ColumnStats();
         rStats2.readFields(dis);
         Assert.assertTrue(rStats2.equals(stats2));
-        
+
         ColumnStats rStats3 = ColumnStats.read(dis);
         Assert.assertTrue(rStats3.equals(stats3));
-        
+
         ColumnStats rStats4 = ColumnStats.read(dis);
         Assert.assertTrue(rStats4.equals(stats4));
         Assert.assertTrue(rStats4.equals(stats3));
-        
+
         Assert.assertTrue(rStats3.equals(rStats3));
         Assert.assertFalse(rStats3.equals(this));
         Assert.assertFalse(rStats2.equals(rStats3));
@@ -83,5 +83,5 @@ public class ColumnStatsTest {
         dis.close();
         file.delete();
     }
-    
+
 }
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTest.java
index 799dceb633..d9f7635728 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTest.java
@@ -19,8 +19,8 @@ package org.apache.doris.catalog;
 
 import org.apache.doris.common.DdlException;
 import org.apache.doris.common.FeConstants;
-
 import org.apache.doris.common.jmockit.Deencapsulation;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -32,7 +32,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 
 public class ColumnTest {
-    
+
     private Catalog catalog;
 
     private FakeCatalog fakeCatalog;
@@ -52,18 +52,18 @@ public class ColumnTest {
         File file = new File("./columnTest");
         file.createNewFile();
         DataOutputStream dos = new DataOutputStream(new FileOutputStream(file));
-        
-        Column column1 = new Column("user", 
+
+        Column column1 = new Column("user",
                                 ScalarType.createChar(20), false, AggregateType.SUM, "", "");
         column1.write(dos);
-        Column column2 = new Column("age", 
+        Column column2 = new Column("age",
                                 ScalarType.createType(PrimitiveType.INT), false, AggregateType.REPLACE, "20", "");
         column2.write(dos);
-        
+
         Column column3 = new Column("name", PrimitiveType.BIGINT);
         column3.setIsKey(true);
         column3.write(dos);
-        
+
         Column column4 = new Column("age",
                                 ScalarType.createType(PrimitiveType.INT), false, AggregateType.REPLACE, "20",
                                     "");
@@ -71,7 +71,7 @@ public class ColumnTest {
 
         dos.flush();
         dos.close();
-        
+
         // 2. Read objects from file
         DataInputStream dis = new DataInputStream(new FileInputStream(file));
         Column rColumn1 = Column.read(dis);
@@ -83,7 +83,7 @@ public class ColumnTest {
         Assert.assertEquals(0, rColumn1.getPrecision());
         Assert.assertEquals(20, rColumn1.getStrLen());
         Assert.assertFalse(rColumn1.isAllowNull());
-        
+
         // 3. Test read()
         Column rColumn2 = Column.read(dis);
         Assert.assertEquals("age", rColumn2.getName());
@@ -96,7 +96,7 @@ public class ColumnTest {
 
         Column rColumn4 = Column.read(dis);
         Assert.assertTrue(rColumn4.equals(column4));
-        
+
         Assert.assertEquals(rColumn2.toString(), column2.toString());
         Assert.assertTrue(column1.equals(column1));
         Assert.assertFalse(column1.equals(this));
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java
index 623a672222..1aded1c260 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java
@@ -17,12 +17,6 @@
 
 package org.apache.doris.catalog;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-
 import org.apache.doris.analysis.TypeDef;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.FeConstants;
@@ -31,6 +25,12 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
 public class ColumnTypeTest {
     private FakeCatalog fakeCatalog;
     @Before
@@ -132,7 +132,7 @@ public class ColumnTypeTest {
         TypeDef type = TypeDef.createDecimal(8, 9);
         type.analyze(null);
     }
-    
+
     @Test
     public void testSerialization() throws Exception {
         // 1. Write objects to file
@@ -142,7 +142,7 @@ public class ColumnTypeTest {
 
         ScalarType type1 = Type.NULL;
         ColumnType.write(dos, type1);
-        
+
         ScalarType type2 = ScalarType.createType(PrimitiveType.BIGINT);
         ColumnType.write(dos, type2);
 
@@ -156,17 +156,17 @@ public class ColumnTypeTest {
         DataInputStream dis = new DataInputStream(new FileInputStream(file));
         Type rType1 = ColumnType.read(dis);
         Assert.assertTrue(rType1.equals(type1));
-        
+
         Type rType2 = ColumnType.read(dis);
         Assert.assertTrue(rType2.equals(type2));
-        
+
         Type rType3 = ColumnType.read(dis);
 
         // Change it when remove DecimalV2
         Assert.assertTrue(rType3.equals(type3) || rType3.equals(type4));
 
         Assert.assertFalse(type1.equals(this));
-        
+
         // 3. delete files
         dis.close();
         file.delete();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateFunctionTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateFunctionTest.java
index 7da7f92b8e..41156c5f81 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateFunctionTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateFunctionTest.java
@@ -96,7 +96,7 @@ public class CreateFunctionTest {
                 "\"close_fn\" = \"_ZN9doris_udf11AddUdfCloseEPNS_15FunctionContextENS0_18FunctionStateScopeE\",\n" +
                 "\"object_file\" = \"http://127.0.0.1:8008/libcmy_udf.so\"\n" +
                 ");";
-        
+
         CreateFunctionStmt createFunctionStmt = (CreateFunctionStmt) UtFrameUtils.parseAndAnalyzeStmt(createFuncStr, ctx);
         Catalog.getCurrentCatalog().createFunction(createFunctionStmt);
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableLikeTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableLikeTest.java
index bda5ea67bd..e12e147de3 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableLikeTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableLikeTest.java
@@ -25,13 +25,12 @@ import org.apache.doris.common.ExceptionChecker;
 import org.apache.doris.qe.ConnectContext;
 import org.apache.doris.utframe.UtFrameUtils;
 
+import com.google.common.collect.Lists;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.google.common.collect.Lists;
-
 import java.io.File;
 import java.util.List;
 import java.util.UUID;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/DataPropertyTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/DataPropertyTest.java
index b71f3a8676..1669749cf1 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/DataPropertyTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/DataPropertyTest.java
@@ -19,6 +19,7 @@ package org.apache.doris.catalog;
 
 import org.apache.doris.common.Config;
 import org.apache.doris.thrift.TStorageMedium;
+
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/DatabaseTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/DatabaseTest.java
index 2d594aaccd..e4fca21787 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/DatabaseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/DatabaseTest.java
@@ -28,7 +28,8 @@ import org.apache.doris.persist.EditLog;
 import org.apache.doris.thrift.TStorageType;
 
 import com.google.common.collect.Lists;
-
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,9 +44,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import mockit.Expectations;
-import mockit.Mocked;
-
 public class DatabaseTest {
 
     private Database db;
@@ -166,7 +164,7 @@ public class DatabaseTest {
         MaterializedIndex baseIndex = new MaterializedIndex(10001, IndexState.NORMAL);
         Partition partition = new Partition(20000L, "baseTable", baseIndex, new RandomDistributionInfo(10));
         List baseSchema = new LinkedList();
-        OlapTable table = new OlapTable(2000, "baseTable", baseSchema, KeysType.AGG_KEYS, 
+        OlapTable table = new OlapTable(2000, "baseTable", baseSchema, KeysType.AGG_KEYS,
                                         new SinglePartitionInfo(), new RandomDistributionInfo(10));
         table.addPartition(partition);
 
@@ -202,11 +200,11 @@ public class DatabaseTest {
         File file = new File("./database");
         file.createNewFile();
         DataOutputStream dos = new DataOutputStream(new FileOutputStream(file));
-        
+
         // db1
         Database db1 = new Database();
         db1.write(dos);
-        
+
         // db2
         Database db2 = new Database(2, "db2");
         List columns = new ArrayList();
@@ -215,13 +213,13 @@ public class DatabaseTest {
         columns.add(column2);
         columns.add(new Column("column3",
                         ScalarType.createType(PrimitiveType.SMALLINT), false, AggregateType.SUM, "", ""));
-        columns.add(new Column("column4", 
+        columns.add(new Column("column4",
                         ScalarType.createType(PrimitiveType.INT), false, AggregateType.REPLACE, "", ""));
-        columns.add(new Column("column5", 
+        columns.add(new Column("column5",
                         ScalarType.createType(PrimitiveType.BIGINT), false, AggregateType.REPLACE, "", ""));
-        columns.add(new Column("column6", 
+        columns.add(new Column("column6",
                         ScalarType.createType(PrimitiveType.FLOAT), false, AggregateType.REPLACE, "", ""));
-        columns.add(new Column("column7", 
+        columns.add(new Column("column7",
                         ScalarType.createType(PrimitiveType.DOUBLE), false, AggregateType.REPLACE, "", ""));
         columns.add(new Column("column8", ScalarType.createChar(10), true, null, "", ""));
         columns.add(new Column("column9", ScalarType.createVarchar(10), true, null, "", ""));
@@ -244,21 +242,21 @@ public class DatabaseTest {
         table.addPartition(partition);
         db2.createTable(table);
         db2.write(dos);
-        
+
         dos.flush();
         dos.close();
-        
+
         // 2. Read objects from file
         DataInputStream dis = new DataInputStream(new FileInputStream(file));
-        
+
         Database rDb1 = new Database();
         rDb1.readFields(dis);
         Assert.assertTrue(rDb1.equals(db1));
-        
+
         Database rDb2 = new Database();
         rDb2.readFields(dis);
         Assert.assertTrue(rDb2.equals(db2));
-        
+
         // 3. delete files
         dis.close();
         file.delete();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/DiskInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/DiskInfoTest.java
index 6673012b2d..b3da6aa00f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/DiskInfoTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/DiskInfoTest.java
@@ -21,6 +21,10 @@ import org.apache.doris.analysis.AccessTestUtil;
 import org.apache.doris.common.FeConstants;
 import org.apache.doris.thrift.TStorageMedium;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -28,10 +32,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 public class DiskInfoTest {
 
     private Catalog catalog;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java
index cb1d8f6e07..9626a2d2a7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java
@@ -31,7 +31,6 @@ import org.apache.doris.thrift.TStorageMedium;
 import org.apache.doris.utframe.UtFrameUtils;
 
 import com.clearspring.analytics.util.Lists;
-
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeCatalog.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeCatalog.java
index e5119f38c7..39996da780 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeCatalog.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeCatalog.java
@@ -17,9 +17,10 @@
 
 package org.apache.doris.catalog;
 
+import org.apache.doris.system.SystemInfoService;
+
 import mockit.Mock;
 import mockit.MockUp;
-import org.apache.doris.system.SystemInfoService;
 
 public class FakeCatalog extends MockUp {
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeEditLog.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeEditLog.java
index 266baa7cd4..0a5257bff0 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeEditLog.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeEditLog.java
@@ -28,22 +28,22 @@ import org.apache.doris.persist.TableInfo;
 import org.apache.doris.system.Backend;
 import org.apache.doris.transaction.TransactionState;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import mockit.Mock;
 import mockit.MockUp;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class FakeEditLog extends MockUp {
-    
+
     private Map allTransactionState = new HashMap<>();
-    
+
     @Mock
     public void $init(String nodeName) {
         // do nothing
         System.out.println("abc");
     }
-    
+
     @Mock
     public void logInsertTransactionState(TransactionState transactionState) {
         // do nothing
@@ -57,17 +57,17 @@ public class FakeEditLog extends MockUp {
         System.out.println("delete transaction state is deleted");
         allTransactionState.remove(transactionState.getTransactionId());
     }
-    
+
     @Mock
     public void logSaveNextId(long nextId) {
         // do nothing
     }
-    
+
     @Mock
     public void logCreateCluster(Cluster cluster) {
         // do nothing
     }
-    
+
     @Mock
     public void logOpRoutineLoadJob(RoutineLoadOperation operation) {
     }
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/InfoSchemaDbTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/InfoSchemaDbTest.java
index 797d8822f9..ca33ad0bba 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/InfoSchemaDbTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/InfoSchemaDbTest.java
@@ -18,6 +18,7 @@
 package org.apache.doris.catalog;
 
 import org.apache.doris.common.DdlException;
+
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ListPartitionInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ListPartitionInfoTest.java
index ec481a77a7..44fd9e04f8 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ListPartitionInfoTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ListPartitionInfoTest.java
@@ -24,7 +24,6 @@ import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.DdlException;
 
 import com.google.common.collect.Lists;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexMetaTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexMetaTest.java
index c3841ec81f..f95e573d02 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexMetaTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexMetaTest.java
@@ -29,7 +29,8 @@ import org.apache.doris.thrift.TStorageType;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -43,9 +44,6 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-import mockit.Expectations;
-import mockit.Mocked;
-
 public class MaterializedIndexMetaTest {
 
     private static String fileName = "./MaterializedIndexMetaSerializeTest";
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java
index a04432dbed..2ac7c0a0c7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java
@@ -17,10 +17,14 @@
 
 package org.apache.doris.catalog;
 
-import mockit.Mocked;
 import org.apache.doris.catalog.MaterializedIndex.IndexState;
 import org.apache.doris.common.FeConstants;
 
+import mockit.Mocked;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -29,10 +33,6 @@ import java.io.FileOutputStream;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 public class MaterializedIndexTest {
 
     private MaterializedIndex index;
@@ -75,7 +75,7 @@ public class MaterializedIndexTest {
 
         dos.flush();
         dos.close();
-        
+
         // 2. Read objects from file
         DataInputStream dis = new DataInputStream(new FileInputStream(file));
         MaterializedIndex rIndex = MaterializedIndex.read(dis);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/MetadataViewerTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/MetadataViewerTest.java
index d8694b5c58..04eedec79d 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/MetadataViewerTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/MetadataViewerTest.java
@@ -24,7 +24,8 @@ import org.apache.doris.catalog.Replica.ReplicaStatus;
 import org.apache.doris.system.SystemInfoService;
 
 import com.google.common.collect.Lists;
-
+import mockit.Expectations;
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -34,14 +35,11 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import mockit.Expectations;
-import mockit.Mocked;
-
 public class MetadataViewerTest {
-    
+
     private static Method getTabletStatusMethod;
     private static Method getTabletDistributionMethod;
-    
+
     @Mocked
     private Catalog catalog;
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ModifyBackendTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ModifyBackendTest.java
index 1ded070267..78a613bf61 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ModifyBackendTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ModifyBackendTest.java
@@ -204,4 +204,3 @@ public class ModifyBackendTest {
         Assert.assertTrue(backend.isLoadAvailable());
     }
 }
-
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/MysqlTableTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/MysqlTableTest.java
index 627c5829af..189765b168 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/MysqlTableTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/MysqlTableTest.java
@@ -17,14 +17,13 @@
 
 package org.apache.doris.catalog;
 
-import mockit.Mocked;
 import org.apache.doris.common.DdlException;
 import org.apache.doris.common.FeConstants;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
+import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/OdbcCatalogResourceTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/OdbcCatalogResourceTest.java
index 1ca5ff55f9..851895dd96 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/OdbcCatalogResourceTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/OdbcCatalogResourceTest.java
@@ -1,4 +1,3 @@
-
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/OlapTableTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/OlapTableTest.java
index 2c57fe054d..c60776a488 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/OlapTableTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/OlapTableTest.java
@@ -25,7 +25,8 @@ import org.apache.doris.common.util.UnitTestUtil;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
+import mockit.Mock;
+import mockit.MockUp;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -35,14 +36,11 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-import mockit.Mock;
-import mockit.MockUp;
-
 public class OlapTableTest {
 
     @Test
     public void test() throws IOException {
-        
+
         new MockUp() {
             @Mock
             int getCurrentCatalogJournalVersion() {
@@ -52,7 +50,7 @@ public class OlapTableTest {
 
         Database db = UnitTestUtil.createDb(1, 2, 3, 4, 5, 6, 7);
         List
tables = db.getTables(); - + for (Table table : tables) { if (table.getType() != TableType.OLAP) { continue; @@ -73,7 +71,7 @@ public class OlapTableTest { Table copiedTbl = OlapTable.read(in); System.out.println("copied table id: " + copiedTbl.getId()); } - + } @Test diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/PartitionKeyTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/PartitionKeyTest.java index e6eb4ec0e0..995afd164a 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/PartitionKeyTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/PartitionKeyTest.java @@ -19,6 +19,11 @@ package org.apache.doris.catalog; import org.apache.doris.analysis.PartitionValue; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.FeConstants; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -30,11 +35,6 @@ import java.util.Arrays; import java.util.List; import java.util.TimeZone; -import org.apache.doris.common.FeConstants; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - public class PartitionKeyTest { private static List allColumns; @@ -48,7 +48,7 @@ public class PartitionKeyTest { private static Column charString; private static Column varchar; private static Column bool; - + private Catalog catalog; @BeforeClass @@ -205,10 +205,10 @@ public class PartitionKeyTest { File file = new File("./keyRangePartition"); file.createNewFile(); DataOutputStream dos = new DataOutputStream(new FileOutputStream(file)); - + PartitionKey keyEmpty = new PartitionKey(); keyEmpty.write(dos); - + List keys = new ArrayList(); List columns = new ArrayList(); keys.add(new PartitionValue("100")); @@ -237,18 +237,18 @@ public class PartitionKeyTest { dos.flush(); dos.close(); - + // 2. Read objects from file DataInputStream dis = new DataInputStream(new FileInputStream(file)); PartitionKey rKeyEmpty = PartitionKey.read(dis); Assert.assertTrue(keyEmpty.equals(rKeyEmpty)); - + PartitionKey rKey = new PartitionKey(); - rKey.readFields(dis); + rKey.readFields(dis); Assert.assertTrue(key.equals(rKey)); Assert.assertTrue(key.equals(key)); Assert.assertFalse(key.equals(this)); - + // 3. delete files dis.close(); file.delete(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/RangePartitionInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/RangePartitionInfoTest.java index 4bacd71b60..d45a82e2f3 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/RangePartitionInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/RangePartitionInfoTest.java @@ -25,7 +25,6 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.DdlException; import com.google.common.collect.Lists; - import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaAllocationTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaAllocationTest.java index 85db811db0..900e7ec3da 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaAllocationTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaAllocationTest.java @@ -25,7 +25,6 @@ import org.apache.doris.meta.MetaContext; import org.apache.doris.resource.Tag; import com.google.common.collect.Maps; - import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java index 7790f31885..bb56cf0343 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java @@ -19,6 +19,7 @@ package org.apache.doris.catalog; import org.apache.doris.catalog.Replica.ReplicaState; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -31,22 +32,19 @@ import java.io.FileOutputStream; import java.util.ArrayList; import java.util.List; -import mockit.Mocked; -import static org.junit.Assert.assertEquals; - public class ReplicaTest { - + // replica serialize and deserialize test will use catalog so that it should be mocked @Mocked Catalog catalog; - + private Replica replica; private long replicaId; private long backendId; private long version; private long dataSize; private long rowCount; - + @Before public void setUp() { replicaId = 10000; @@ -56,7 +54,7 @@ public class ReplicaTest { rowCount = 1024; replica = new Replica(replicaId, backendId, version, 0, dataSize, rowCount, ReplicaState.NORMAL, 0, version); } - + @Test public void getMethodTest() { Assert.assertEquals(replicaId, replica.getId()); @@ -86,7 +84,7 @@ public class ReplicaTest { File file = new File("./olapReplicaTest"); file.createNewFile(); DataOutputStream dos = new DataOutputStream(new FileOutputStream(file)); - + List list1 = new ArrayList(); List list2 = new ArrayList(); for (int count = 0; count < 10; ++count) { @@ -95,13 +93,13 @@ public class ReplicaTest { list1.add(olapReplica); olapReplica.write(dos); } - + Replica replica = new Replica(10L, 20L, 0, null); list1.add(replica); replica.write(dos); dos.flush(); dos.close(); - + // 2. Read a object from file DataInputStream dis = new DataInputStream(new FileInputStream(file)); for (int count = 0; count < 10; ++count) { @@ -118,90 +116,89 @@ public class ReplicaTest { Replica olapReplica = new Replica(); olapReplica.readFields(dis); list2.add(olapReplica); - + // 3. Check equal for (int i = 0; i < 11; i++) { Assert.assertTrue(list1.get(i).equals(list2.get(i))); } - + Assert.assertTrue(list1.get(1).equals(list1.get(1))); Assert.assertFalse(list1.get(1).equals(list1)); - + dis.close(); file.delete(); } - + @Test public void testUpdateVersion1() { Replica originalReplica = new Replica(10000, 20000, 3, 0, 100, 78, ReplicaState.NORMAL, 0, 3); // new version is little than original version, it is invalid the version will not update originalReplica.updateVersionInfo(2, 100, 78); - assertEquals(3, originalReplica.getVersion()); + Assert.assertEquals(3, originalReplica.getVersion()); } - + @Test public void testUpdateVersion2() { Replica originalReplica = new Replica(10000, 20000, 3, 0, 100, 78, ReplicaState.NORMAL, 0, 0); originalReplica.updateVersionInfo(3, 100, 78); // if new version >= current version and last success version <= new version, then last success version should be updated - assertEquals(3, originalReplica.getLastSuccessVersion()); - assertEquals(3, originalReplica.getVersion()); + Assert.assertEquals(3, originalReplica.getLastSuccessVersion()); + Assert.assertEquals(3, originalReplica.getVersion()); } - + @Test public void testUpdateVersion3() { // version(3) ---> last failed version (8) ---> last success version(10) Replica originalReplica = new Replica(10000, 20000, 3, 111, 0, 78, ReplicaState.NORMAL, 0, 0); originalReplica.updateLastFailedVersion(8); - assertEquals(3, originalReplica.getLastSuccessVersion()); - assertEquals(3, originalReplica.getVersion()); - assertEquals(8, originalReplica.getLastFailedVersion()); - + Assert.assertEquals(3, originalReplica.getLastSuccessVersion()); + Assert.assertEquals(3, originalReplica.getVersion()); + Assert.assertEquals(8, originalReplica.getLastFailedVersion()); + // update last success version 10 - originalReplica.updateVersionWithFailedInfo(originalReplica.getVersion(), - originalReplica.getLastFailedVersion(), + originalReplica.updateVersionWithFailedInfo(originalReplica.getVersion(), + originalReplica.getLastFailedVersion(), 10); - assertEquals(10, originalReplica.getLastSuccessVersion()); - assertEquals(3, originalReplica.getVersion()); - assertEquals(8, originalReplica.getLastFailedVersion()); - + Assert.assertEquals(10, originalReplica.getLastSuccessVersion()); + Assert.assertEquals(3, originalReplica.getVersion()); + Assert.assertEquals(8, originalReplica.getLastFailedVersion()); + // update version to 8, the last success version and version should be 10 originalReplica.updateVersionInfo(8, 100, 78); - assertEquals(10, originalReplica.getLastSuccessVersion()); - assertEquals(10, originalReplica.getVersion()); - assertEquals(-1, originalReplica.getLastFailedVersion()); - + Assert.assertEquals(10, originalReplica.getLastSuccessVersion()); + Assert.assertEquals(10, originalReplica.getVersion()); + Assert.assertEquals(-1, originalReplica.getLastFailedVersion()); + // update last failed version to 12 originalReplica.updateLastFailedVersion(12); - assertEquals(10, originalReplica.getLastSuccessVersion()); - assertEquals(10, originalReplica.getVersion()); - assertEquals(12, originalReplica.getLastFailedVersion()); - + Assert.assertEquals(10, originalReplica.getLastSuccessVersion()); + Assert.assertEquals(10, originalReplica.getVersion()); + Assert.assertEquals(12, originalReplica.getLastFailedVersion()); + // update last success version to 15 - originalReplica.updateVersionWithFailedInfo(originalReplica.getVersion(), + originalReplica.updateVersionWithFailedInfo(originalReplica.getVersion(), originalReplica.getLastFailedVersion(), 15); - assertEquals(15, originalReplica.getLastSuccessVersion()); - assertEquals(10, originalReplica.getVersion()); - assertEquals(12, originalReplica.getLastFailedVersion()); - + Assert.assertEquals(15, originalReplica.getLastSuccessVersion()); + Assert.assertEquals(10, originalReplica.getVersion()); + Assert.assertEquals(12, originalReplica.getLastFailedVersion()); + // update last failed version to 18 originalReplica.updateLastFailedVersion(18); - assertEquals(10, originalReplica.getLastSuccessVersion()); - assertEquals(10, originalReplica.getVersion()); - assertEquals(18, originalReplica.getLastFailedVersion()); + Assert.assertEquals(10, originalReplica.getLastSuccessVersion()); + Assert.assertEquals(10, originalReplica.getVersion()); + Assert.assertEquals(18, originalReplica.getLastFailedVersion()); // update version to 17 then version and success version is 17 originalReplica.updateVersionInfo(17, 100, 78); - assertEquals(17, originalReplica.getLastSuccessVersion()); - assertEquals(17, originalReplica.getVersion()); - assertEquals(18, originalReplica.getLastFailedVersion()); - + Assert.assertEquals(17, originalReplica.getLastSuccessVersion()); + Assert.assertEquals(17, originalReplica.getVersion()); + Assert.assertEquals(18, originalReplica.getLastFailedVersion()); + // update version to 18, then version and last success version should be 18 and failed version should be -1 originalReplica.updateVersionInfo(18, 100, 78); - assertEquals(18, originalReplica.getLastSuccessVersion()); - assertEquals(18, originalReplica.getVersion()); - assertEquals(-1, originalReplica.getLastFailedVersion()); + Assert.assertEquals(18, originalReplica.getLastSuccessVersion()); + Assert.assertEquals(18, originalReplica.getVersion()); + Assert.assertEquals(-1, originalReplica.getLastFailedVersion()); } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/TableTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/TableTest.java index 95c60b55a1..b3f412d51e 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/TableTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/TableTest.java @@ -26,7 +26,6 @@ import org.apache.doris.common.jmockit.Deencapsulation; import org.apache.doris.thrift.TStorageType; import com.google.common.collect.Lists; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -114,15 +113,15 @@ public class TableTest { Column column2 = new Column("column2", ScalarType.createType(PrimitiveType.TINYINT), false, AggregateType.MIN, "", ""); columns.add(column2); - columns.add(new Column("column3", + columns.add(new Column("column3", ScalarType.createType(PrimitiveType.SMALLINT), false, AggregateType.SUM, "", "")); - columns.add(new Column("column4", + columns.add(new Column("column4", ScalarType.createType(PrimitiveType.INT), false, AggregateType.REPLACE, "", "")); - columns.add(new Column("column5", + columns.add(new Column("column5", ScalarType.createType(PrimitiveType.BIGINT), false, AggregateType.REPLACE, "", "")); - columns.add(new Column("column6", + columns.add(new Column("column6", ScalarType.createType(PrimitiveType.FLOAT), false, AggregateType.REPLACE, "", "")); - columns.add(new Column("column7", + columns.add(new Column("column7", ScalarType.createType(PrimitiveType.DOUBLE), false, AggregateType.REPLACE, "", "")); columns.add(new Column("column8", ScalarType.createChar(10), true, null, "", "")); columns.add(new Column("column9", ScalarType.createVarchar(10), true, null, "", "")); @@ -141,7 +140,7 @@ public class TableTest { table1.write(dos); dos.flush(); dos.close(); - + // 2. Read objects from file DataInputStream dis = new DataInputStream(new FileInputStream(file)); @@ -149,7 +148,7 @@ public class TableTest { Assert.assertTrue(table1.equals(rFamily1)); Assert.assertEquals(table1.getCreateTime(), rFamily1.getCreateTime()); Assert.assertEquals(table1.getIndexMetaByIndexId(2).getKeysType(), KeysType.AGG_KEYS); - + // 3. delete files dis.close(); file.delete(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/TabletTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/TabletTest.java index 91010b41dc..edf4081701 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/TabletTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/TabletTest.java @@ -23,7 +23,8 @@ import org.apache.doris.common.Pair; import org.apache.doris.thrift.TStorageMedium; import com.google.common.collect.Sets; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -34,9 +35,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import mockit.Expectations; -import mockit.Mocked; - public class TabletTest { private Tablet tablet; @@ -49,7 +47,7 @@ public class TabletTest { @Mocked private Catalog catalog; - @Before + @Before public void makeTablet() { invertedIndex = new TabletInvertedIndex(); new Expectations(catalog) { @@ -89,8 +87,8 @@ public class TabletTest { Assert.assertEquals(replica1, tablet.getReplicaByBackendId(replica1.getBackendId())); Assert.assertEquals(replica2, tablet.getReplicaByBackendId(replica2.getBackendId())); Assert.assertEquals(replica3, tablet.getReplicaByBackendId(replica3.getBackendId())); - - + + long newTabletId = 20000; tablet.setTabletId(newTabletId); Assert.assertEquals("tabletId=" + newTabletId, tablet.toString()); @@ -115,7 +113,7 @@ public class TabletTest { tablet.clearReplica(); Assert.assertEquals(0, tablet.getReplicas().size()); } - + @Test public void testSerialization() throws Exception { File file = new File("./olapTabletTest"); @@ -124,18 +122,18 @@ public class TabletTest { tablet.write(dos); dos.flush(); dos.close(); - + // 2. Read a object from file DataInputStream dis = new DataInputStream(new FileInputStream(file)); Tablet rTablet1 = Tablet.read(dis); Assert.assertEquals(1, rTablet1.getId()); Assert.assertEquals(3, rTablet1.getReplicas().size()); Assert.assertEquals(rTablet1.getReplicas().get(0).getVersion(), rTablet1.getReplicas().get(1).getVersion()); - + Assert.assertTrue(rTablet1.equals(tablet)); Assert.assertTrue(rTablet1.equals(rTablet1)); Assert.assertFalse(rTablet1.equals(this)); - + Tablet tablet2 = new Tablet(1); Replica replica1 = new Replica(1L, 1L, 100L, 0, 200000L, 3000L, ReplicaState.NORMAL, 0, 0); Replica replica2 = new Replica(2L, 2L, 100L, 0, 200000L, 3000L, ReplicaState.NORMAL, 0, 0); @@ -145,13 +143,13 @@ public class TabletTest { Assert.assertFalse(tablet2.equals(tablet)); tablet2.addReplica(replica3); Assert.assertTrue(tablet2.equals(tablet)); - + Tablet tablet3 = new Tablet(1); tablet3.addReplica(replica1); tablet3.addReplica(replica2); tablet3.addReplica(new Replica(4L, 4L, 100L, 0, 200000L, 3000L, ReplicaState.NORMAL, 0, 0)); Assert.assertFalse(tablet3.equals(tablet)); - + dis.close(); file.delete(); } diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/TempPartitionTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/TempPartitionTest.java index b4c80e4dee..0a30e175f6 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/TempPartitionTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/TempPartitionTest.java @@ -40,7 +40,6 @@ import org.apache.doris.utframe.UtFrameUtils; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; @@ -135,7 +134,7 @@ public class TempPartitionTest { } return tabletMeta.getPartitionId(); } - + private void getPartitionNameToTabletIdMap(String tbl, boolean isTemp, Map partNameToTabletId) throws Exception { partNameToTabletId.clear(); String showStr = "show " + (isTemp ? "temporary" : "") + " partitions from " + tbl; @@ -275,7 +274,7 @@ public class TempPartitionTest { stmtStr = "alter table db2.tbl2 drop temporary partition tp3;"; alterTable(stmtStr, false); - + Map originPartitionTabletIds2 = Maps.newHashMap(); getPartitionNameToTabletIdMap("db2.tbl2", false, originPartitionTabletIds2); Assert.assertEquals(originPartitionTabletIds2, originPartitionTabletIds); @@ -337,7 +336,7 @@ public class TempPartitionTest { checkTabletExists(tempPartitionTabletIds2.values(), true); checkTabletExists(Lists.newArrayList(originPartitionTabletIds2.get("p3")), true); checkTabletExists(Lists.newArrayList(originPartitionTabletIds2.get("p1"), originPartitionTabletIds2.get("p2")), false); - + String truncateStr = "truncate table db2.tbl2 partition (p3);"; TruncateTableStmt truncateTableStmt = (TruncateTableStmt)UtFrameUtils.parseAndAnalyzeStmt(truncateStr, ctx); Catalog.getCurrentCatalog().truncateTable(truncateTableStmt); @@ -411,7 +410,7 @@ public class TempPartitionTest { tempPartitionTabletIds2 = Maps.newHashMap(); getPartitionNameToTabletIdMap("db2.tbl2", true, tempPartitionTabletIds2); Assert.assertEquals(1, tempPartitionTabletIds2.keySet().size()); - + // for now , we have 3 partitions: tp1, tp2, tp3, 1 temp partition: p1 System.out.println("we have partition tablets: " + originPartitionTabletIds2); System.out.println("we have temp partition tablets: " + tempPartitionTabletIds2); @@ -464,14 +463,14 @@ public class TempPartitionTest { checkTablet("db2.tbl2", "p2", false, 2); checkTablet("db2.tbl2", "tp3", false, 2); - // for now, we have 2 partitions: p2, tp3, [min, 20), [20, 30). 0 temp partition. + // for now, we have 2 partitions: p2, tp3, [min, 20), [20, 30). 0 temp partition. stmtStr = "alter table db2.tbl2 add temporary partition tp4 values less than('20') ('in_memory' = 'true') distributed by hash(k1) buckets 3"; alterTable(stmtStr, true); stmtStr = "alter table db2.tbl2 add temporary partition tp4 values less than('20') ('in_memory' = 'true', 'replication_num' = '2') distributed by hash(k2) buckets 3"; alterTable(stmtStr, true); stmtStr = "alter table db2.tbl2 add temporary partition tp4 values less than('20') ('in_memory' = 'true', 'replication_num' = '1') distributed by hash(k2) buckets 3"; alterTable(stmtStr, false); - + Partition p2 = tbl2.getPartition("p2"); Assert.assertNotNull(p2); Assert.assertFalse(tbl2.getPartitionInfo().getIsInMemory(p2.getId())); @@ -479,7 +478,7 @@ public class TempPartitionTest { stmtStr = "alter table db2.tbl2 replace partition (p2) with temporary partition (tp4)"; alterTable(stmtStr, false); - + // for now, we have 2 partitions: p2, tp3, [min, 20), [20, 30). 0 temp partition. and p2 bucket is 3, 'in_memory' is true. p2 = tbl2.getPartition("p2"); Assert.assertNotNull(p2); @@ -1210,7 +1209,7 @@ public class TempPartitionTest { checkPartitionExist(tbl5, "tp2", true, false); } - + private void testSerializeOlapTable(OlapTable tbl) throws IOException, AnalysisException { // 1. Write objects to file File file = new File(tempPartitionFile); @@ -1239,14 +1238,14 @@ public class TempPartitionTest { File file = new File(tempPartitionFile); file.createNewFile(); DataOutputStream out = new DataOutputStream(new FileOutputStream(file)); - + tempPartitionsInstance.write(out); out.flush(); out.close(); - + // 2. Read objects from file DataInputStream in = new DataInputStream(new FileInputStream(file)); - + TempPartitions readTempPartition = TempPartitions.read(in); List partitions = readTempPartition.getAllPartitions(); Assert.assertEquals(1, partitions.size()); diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/UserPropertyTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/UserPropertyTest.java index 5a7b100ddf..fd6cd023dd 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/UserPropertyTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/UserPropertyTest.java @@ -17,8 +17,6 @@ package org.apache.doris.catalog; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.blockrule.SqlBlockRuleMgr; import org.apache.doris.common.DdlException; import org.apache.doris.common.FeConstants; @@ -28,7 +26,8 @@ import org.apache.doris.load.DppConfig; import org.apache.doris.mysql.privilege.UserProperty; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/clone/ClusterLoadStatisticsTest.java b/fe/fe-core/src/test/java/org/apache/doris/clone/ClusterLoadStatisticsTest.java index 0bbc550464..d4215d2f29 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/clone/ClusterLoadStatisticsTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/clone/ClusterLoadStatisticsTest.java @@ -30,7 +30,6 @@ import org.apache.doris.thrift.TStorageMedium; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -70,11 +69,11 @@ public class ClusterLoadStatisticsTest { diskInfo3.setAvailableCapacityB(490000); diskInfo3.setDataUsedCapacityB(10000); disks.put(diskInfo3.getRootPath(), diskInfo3); - + be1.setDisks(ImmutableMap.copyOf(disks)); be1.setAlive(true); be1.setOwnerClusterName(SystemInfoService.DEFAULT_CLUSTER); - + // be2 be2 = new Backend(10002, "192.168.0.2", 9052); @@ -124,7 +123,7 @@ public class ClusterLoadStatisticsTest { systemInfoService.addBackend(be1); systemInfoService.addBackend(be2); systemInfoService.addBackend(be3); - + // tablet invertedIndex = new TabletInvertedIndex(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/clone/ColocateTableCheckerAndBalancerTest.java b/fe/fe-core/src/test/java/org/apache/doris/clone/ColocateTableCheckerAndBalancerTest.java index b5f00c85ac..c1d4599cd2 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/clone/ColocateTableCheckerAndBalancerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/clone/ColocateTableCheckerAndBalancerTest.java @@ -34,7 +34,9 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - +import mockit.Delegate; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -44,10 +46,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import mockit.Delegate; -import mockit.Expectations; -import mockit.Mocked; - public class ColocateTableCheckerAndBalancerTest { private ColocateTableCheckerAndBalancer balancer = ColocateTableCheckerAndBalancer.getInstance(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/clone/DiskRebalanceTest.java b/fe/fe-core/src/test/java/org/apache/doris/clone/DiskRebalanceTest.java index 1521034253..588c72c840 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/clone/DiskRebalanceTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/clone/DiskRebalanceTest.java @@ -31,9 +31,9 @@ import org.apache.doris.catalog.RangePartitionInfo; import org.apache.doris.catalog.ReplicaAllocation; import org.apache.doris.catalog.Tablet; import org.apache.doris.catalog.TabletInvertedIndex; +import org.apache.doris.clone.TabletScheduler.PathSlot; import org.apache.doris.common.Config; import org.apache.doris.common.FeConstants; -import org.apache.doris.clone.TabletScheduler.PathSlot; import org.apache.doris.resource.Tag; import org.apache.doris.system.Backend; import org.apache.doris.system.SystemInfoService; @@ -44,9 +44,11 @@ import org.apache.doris.thrift.TStorageType; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Lists; -import com.google.common.collect.Table; import com.google.common.collect.Maps; - +import com.google.common.collect.Table; +import mockit.Delegate; +import mockit.Expectations; +import mockit.Mocked; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -62,10 +64,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.LongStream; -import mockit.Delegate; -import mockit.Expectations; -import mockit.Mocked; - public class DiskRebalanceTest { private static final Logger LOG = LogManager.getLogger(DiskRebalanceTest.class); @@ -176,7 +174,7 @@ public class DiskRebalanceTest { RebalancerTestUtil.createTablet(invertedIndex, db, olapTable, "p2", TStorageMedium.HDD, 70000, Lists.newArrayList(10001L, 10002L, 10003L)); - + // case start Configurator.setLevel("org.apache.doris.clone.DiskRebalancer", Level.DEBUG); @@ -256,4 +254,3 @@ public class DiskRebalanceTest { } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/clone/RebalanceTest.java b/fe/fe-core/src/test/java/org/apache/doris/clone/RebalanceTest.java index e94fa8655d..115284f401 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/clone/RebalanceTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/clone/RebalanceTest.java @@ -50,8 +50,11 @@ import org.apache.doris.thrift.TTabletInfo; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Lists; +import com.google.common.collect.MoreCollectors; import com.google.common.collect.Table; - +import mockit.Delegate; +import mockit.Expectations; +import mockit.Mocked; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -67,11 +70,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.LongStream; -import mockit.Delegate; -import mockit.Expectations; -import mockit.Mocked; -import static com.google.common.collect.MoreCollectors.onlyElement; - public class RebalanceTest { private static final Logger LOG = LogManager.getLogger(RebalanceTest.class); @@ -268,8 +266,12 @@ public class RebalanceTest { // tabletScheduler.runAfterCatalogReady(); for (Long tabletId : needCheckTablets) { - TabletSchedCtx tabletSchedCtx = alternativeTablets.stream().filter(ctx -> ctx.getTabletId() == tabletId).collect(onlyElement()); - AgentTask task = tasks.stream().filter(t -> t.getTabletId() == tabletId).collect(onlyElement()); + TabletSchedCtx tabletSchedCtx = alternativeTablets.stream() + .filter(ctx -> ctx.getTabletId() == tabletId) + .collect(MoreCollectors.onlyElement()); + AgentTask task = tasks.stream() + .filter(t -> t.getTabletId() == tabletId) + .collect(MoreCollectors.onlyElement()); LOG.info("try to finish tabletCtx {}", tabletId); try { @@ -294,7 +296,9 @@ public class RebalanceTest { needCheckTablets.forEach(t -> { List replicas = invertedIndex.getReplicasByTabletId(t); Assert.assertEquals(4, replicas.size()); - Replica decommissionedReplica = replicas.stream().filter(r -> r.getState() == Replica.ReplicaState.DECOMMISSION).collect(onlyElement()); + Replica decommissionedReplica = replicas.stream() + .filter(r -> r.getState() == Replica.ReplicaState.DECOMMISSION) + .collect(MoreCollectors.onlyElement()); // expected watermarkTxnId is 111 Assert.assertEquals(111, decommissionedReplica.getWatermarkTxnId()); }); @@ -336,4 +340,3 @@ public class RebalanceTest { } } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java b/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java index 5e02a51ffc..5bd8ef9e08 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java +++ b/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java @@ -17,9 +17,6 @@ package org.apache.doris.clone; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import com.google.common.collect.Lists; import org.apache.doris.catalog.Database; import org.apache.doris.catalog.DiskInfo; import org.apache.doris.catalog.MaterializedIndex; @@ -33,6 +30,10 @@ import org.apache.doris.system.Backend; import org.apache.doris.system.SystemInfoService; import org.apache.doris.thrift.TStorageMedium; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + import java.util.List; import java.util.Map; import java.util.stream.IntStream; diff --git a/fe/fe-core/src/test/java/org/apache/doris/clone/RootPathLoadStatisticTest.java b/fe/fe-core/src/test/java/org/apache/doris/clone/RootPathLoadStatisticTest.java index 9452760d1a..a0d8dd94c0 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/clone/RootPathLoadStatisticTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/clone/RootPathLoadStatisticTest.java @@ -21,7 +21,6 @@ import org.apache.doris.catalog.DiskInfo.DiskState; import org.apache.doris.thrift.TStorageMedium; import com.google.common.collect.Lists; - import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/clone/TabletRepairAndBalanceTest.java b/fe/fe-core/src/test/java/org/apache/doris/clone/TabletRepairAndBalanceTest.java index 71f6e0ffdc..b53ba05c91 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/clone/TabletRepairAndBalanceTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/clone/TabletRepairAndBalanceTest.java @@ -57,7 +57,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Table; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.AfterClass; @@ -570,5 +569,3 @@ public class TabletRepairAndBalanceTest { System.out.println("table " + tbl.getId() + " is stable"); } } - - diff --git a/fe/fe-core/src/test/java/org/apache/doris/clone/TabletReplicaTooSlowTest.java b/fe/fe-core/src/test/java/org/apache/doris/clone/TabletReplicaTooSlowTest.java index bc88fe94ff..10c1ce7002 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/clone/TabletReplicaTooSlowTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/clone/TabletReplicaTooSlowTest.java @@ -38,7 +38,6 @@ import org.apache.doris.utframe.UtFrameUtils; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Table; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.AfterClass; diff --git a/fe/fe-core/src/test/java/org/apache/doris/clone/TabletSchedCtxTest.java b/fe/fe-core/src/test/java/org/apache/doris/clone/TabletSchedCtxTest.java index e9d3119773..d719a432ed 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/clone/TabletSchedCtxTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/clone/TabletSchedCtxTest.java @@ -23,7 +23,6 @@ import org.apache.doris.clone.TabletSchedCtx.Priority; import org.apache.doris.clone.TabletSchedCtx.Type; import com.google.common.collect.Lists; - import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/clone/TwoDimensionalGreedyRebalanceAlgoTest.java b/fe/fe-core/src/test/java/org/apache/doris/clone/TwoDimensionalGreedyRebalanceAlgoTest.java index f36f60184a..103e87b3b4 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/clone/TwoDimensionalGreedyRebalanceAlgoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/clone/TwoDimensionalGreedyRebalanceAlgoTest.java @@ -17,14 +17,15 @@ package org.apache.doris.clone; +import org.apache.doris.catalog.TabletInvertedIndex.PartitionBalanceInfo; +import org.apache.doris.clone.PartitionRebalancer.ClusterBalanceInfo; +import org.apache.doris.clone.TwoDimensionalGreedyRebalanceAlgo.PartitionMove; +import org.apache.doris.common.Pair; + import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import com.google.common.collect.TreeMultimap; -import org.apache.doris.catalog.TabletInvertedIndex.PartitionBalanceInfo; -import org.apache.doris.clone.TwoDimensionalGreedyRebalanceAlgo.PartitionMove; -import org.apache.doris.clone.PartitionRebalancer.ClusterBalanceInfo; -import org.apache.doris.common.Pair; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java b/fe/fe-core/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java index 69ad34bd07..c1904fc3f6 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java @@ -35,7 +35,8 @@ import org.apache.doris.system.Backend; import org.apache.doris.system.SystemInfoService; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -47,9 +48,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import mockit.Expectations; -import mockit.Mocked; - public class SystemInfoServiceTest { @Mocked diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/ExceptionChecker.java b/fe/fe-core/src/test/java/org/apache/doris/common/ExceptionChecker.java index 17fef07ea0..42e7dae87d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/ExceptionChecker.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/ExceptionChecker.java @@ -18,7 +18,6 @@ package org.apache.doris.common; import com.google.common.base.Strings; - import junit.framework.AssertionFailedError; public class ExceptionChecker { diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/MarkDownParserTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/MarkDownParserTest.java index 4cdc61b111..b0c4cfb1c9 100755 --- a/fe/fe-core/src/test/java/org/apache/doris/common/MarkDownParserTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/MarkDownParserTest.java @@ -18,7 +18,6 @@ package org.apache.doris.common; import com.google.common.collect.Lists; - import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/PropertyAnalyzerTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/PropertyAnalyzerTest.java index c741f9aa99..71192c6953 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/PropertyAnalyzerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/PropertyAnalyzerTest.java @@ -33,7 +33,6 @@ import org.apache.doris.thrift.TStorageMedium; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.junit.Assert; import org.junit.Rule; import org.junit.Test; @@ -56,7 +55,7 @@ public class PropertyAnalyzerTest { columns.add(new Column("k2", PrimitiveType.TINYINT)); columns.add(new Column("v1", ScalarType.createType(PrimitiveType.VARCHAR), false, AggregateType.REPLACE, "", "")); - columns.add(new Column("v2", + columns.add(new Column("v2", ScalarType.createType(PrimitiveType.BIGINT), false, AggregateType.SUM, "0", "")); columns.get(0).setIsKey(true); columns.get(1).setIsKey(true); diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/ThreadPoolManagerTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/ThreadPoolManagerTest.java index 5298042f56..c514fb6764 100755 --- a/fe/fe-core/src/test/java/org/apache/doris/common/ThreadPoolManagerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/ThreadPoolManagerTest.java @@ -69,7 +69,7 @@ public class ThreadPoolManagerTest { for (int i = 0; i < 4; i++) { testFixedThreaddPool.submit(task); } - + Assert.assertTrue(testFixedThreaddPool.getActiveCount() <= 2); Assert.assertTrue(testFixedThreaddPool.getQueue().size() > 0); Assert.assertEquals(2, testFixedThreaddPool.getPoolSize()); diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/parquet/ParquetReaderTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/parquet/ParquetReaderTest.java index 6c0896c9a7..fa0ae61c09 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/parquet/ParquetReaderTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/parquet/ParquetReaderTest.java @@ -20,7 +20,6 @@ package org.apache.doris.common.parquet; import org.apache.doris.analysis.BrokerDesc; import com.google.common.collect.Maps; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Ignore; diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/path/PathTrieTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/path/PathTrieTest.java index 196959860f..18b35d4173 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/path/PathTrieTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/path/PathTrieTest.java @@ -17,8 +17,7 @@ package org.apache.doris.common.path; -import static com.google.common.collect.Maps.newHashMap; - +import com.google.common.collect.Maps; import org.junit.Assert; import org.junit.Test; @@ -46,27 +45,27 @@ public class PathTrieTest { Assert.assertEquals(trie.retrieve("a/b/c/d"), null); Assert.assertEquals(trie.retrieve("g/t/x"), "three"); - Map params = newHashMap(); + Map params = Maps.newHashMap(); Assert.assertEquals(trie.retrieve("index1/insert/12", params), "bingo"); Assert.assertEquals(params.size(), 2); Assert.assertEquals(params.get("index"), "index1"); Assert.assertEquals(params.get("docId"), "12"); } - + @Test public void testEmptyPath() { PathTrie trie = new PathTrie<>(); trie.insert("/", "walla"); Assert.assertEquals(trie.retrieve(""), "walla"); } - + @Test public void testDifferentNamesOnDifferentPath() { PathTrie trie = new PathTrie<>(); trie.insert("/a/{type}", "test1"); trie.insert("/b/{name}", "test2"); - Map params = newHashMap(); + Map params = Maps.newHashMap(); Assert.assertEquals(trie.retrieve("/a/test", params), "test1"); Assert.assertEquals(params.get("type"), "test"); @@ -81,7 +80,7 @@ public class PathTrieTest { trie.insert("/a/c/{name}", "test1"); trie.insert("/b/{name}", "test2"); - Map params = newHashMap(); + Map params = Maps.newHashMap(); Assert.assertEquals(trie.retrieve("/a/c/test", params), "test1"); Assert.assertEquals(params.get("name"), "test"); @@ -100,7 +99,7 @@ public class PathTrieTest { trie.insert("{test}/{testB}", "test5"); trie.insert("{test}/x/{testC}", "test6"); - Map params = newHashMap(); + Map params = Maps.newHashMap(); Assert.assertEquals(trie.retrieve("/b", params), "test2"); Assert.assertEquals(trie.retrieve("/b/a", params), "test4"); Assert.assertEquals(trie.retrieve("/v/x", params), "test5"); @@ -113,7 +112,7 @@ public class PathTrieTest { trie.insert("{x}/{y}/{z}", "test1"); trie.insert("{x}/_y/{k}", "test2"); - Map params = newHashMap(); + Map params = Maps.newHashMap(); Assert.assertEquals(trie.retrieve("/a/b/c", params), "test1"); Assert.assertEquals(params.get("x"), "a"); Assert.assertEquals(params.get("y"), "b"); @@ -133,25 +132,24 @@ public class PathTrieTest { trie.insert("/{test}/_endpoint", "test4"); trie.insert("/*/{test}/_endpoint", "test5"); - Map params = newHashMap(); + Map params = Maps.newHashMap(); Assert.assertEquals(trie.retrieve("/x/*", params), "test1"); Assert.assertEquals(params.get("test"), "*"); - params = newHashMap(); + params = Maps.newHashMap(); Assert.assertEquals(trie.retrieve("/b/a", params), "test2"); Assert.assertEquals(params.get("test"), "b"); - params = newHashMap(); + params = Maps.newHashMap(); Assert.assertEquals(trie.retrieve("/*", params), "test3"); Assert.assertEquals(params.get("test"), "*"); - params = newHashMap(); + params = Maps.newHashMap(); Assert.assertEquals(trie.retrieve("/*/_endpoint", params), "test4"); Assert.assertEquals(params.get("test"), "*"); - params = newHashMap(); + params = Maps.newHashMap(); Assert.assertEquals(trie.retrieve("a/*/_endpoint", params), "test5"); Assert.assertEquals(params.get("test"), "*"); } - } diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/proc/BackendProcNodeTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/proc/BackendProcNodeTest.java index 7f8bb89913..359b063bf2 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/proc/BackendProcNodeTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/proc/BackendProcNodeTest.java @@ -17,8 +17,6 @@ package org.apache.doris.common.proc; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.DiskInfo; import org.apache.doris.common.AnalysisException; @@ -28,7 +26,8 @@ import org.apache.doris.system.Backend; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/proc/BackendsProcDirTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/proc/BackendsProcDirTest.java index c79bd90f87..6e0ae4ccb5 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/proc/BackendsProcDirTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/proc/BackendsProcDirTest.java @@ -24,14 +24,13 @@ import org.apache.doris.persist.EditLog; import org.apache.doris.system.Backend; import org.apache.doris.system.SystemInfoService; +import mockit.Expectations; +import mockit.Mocked; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import mockit.Expectations; -import mockit.Mocked; - public class BackendsProcDirTest { private Backend b1; private Backend b2; diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/proc/DbsProcDirTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/proc/DbsProcDirTest.java index 3c66a9e3f2..e9c4d47cdc 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/proc/DbsProcDirTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/proc/DbsProcDirTest.java @@ -23,7 +23,8 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.FeConstants; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -32,9 +33,6 @@ import org.junit.Test; import java.util.Arrays; import java.util.List; -import mockit.Expectations; -import mockit.Mocked; - public class DbsProcDirTest { private Database db1; private Database db2; diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexSchemaProcNodeTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexSchemaProcNodeTest.java index cee6c2cb75..45cbac8388 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexSchemaProcNodeTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexSchemaProcNodeTest.java @@ -26,7 +26,6 @@ import org.apache.doris.catalog.Type; import org.apache.doris.common.AnalysisException; import com.google.common.collect.Lists; - import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/BrokerUtilTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/BrokerUtilTest.java index ae690c598a..928c1374a7 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/BrokerUtilTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/BrokerUtilTest.java @@ -45,7 +45,11 @@ import org.apache.doris.thrift.TPaloBrokerService; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.apache.thrift.TException; import org.junit.Assert; import org.junit.Test; @@ -54,14 +58,6 @@ import java.io.UnsupportedEncodingException; import java.util.Collections; import java.util.List; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - public class BrokerUtilTest { @Test @@ -69,87 +65,87 @@ public class BrokerUtilTest { String path = "/path/to/dir/k1=v1/xxx.csv"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Collections.singletonList("k1")); - assertEquals(1, columns.size()); - assertEquals(Collections.singletonList("v1"), columns); + Assert.assertEquals(1, columns.size()); + Assert.assertEquals(Collections.singletonList("v1"), columns); } catch (UserException e) { - fail(); + Assert.fail(); } path = "/path/to/dir/k1/xxx.csv"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Collections.singletonList("k1")); - fail(); + Assert.fail(); } catch (UserException ignored) { } path = "/path/to/dir/k1=v1/xxx.csv"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Collections.singletonList("k2")); - fail(); + Assert.fail(); } catch (UserException ignored) { } path = "/path/to/dir/k1=v2/k1=v1/xxx.csv"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Collections.singletonList("k1")); - assertEquals(1, columns.size()); - assertEquals(Collections.singletonList("v1"), columns); + Assert.assertEquals(1, columns.size()); + Assert.assertEquals(Collections.singletonList("v1"), columns); } catch (UserException e) { - fail(); + Assert.fail(); } path = "/path/to/dir/k2=v2/k1=v1/xxx.csv"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Lists.newArrayList("k1", "k2")); - assertEquals(2, columns.size()); - assertEquals(Lists.newArrayList("v1", "v2"), columns); + Assert.assertEquals(2, columns.size()); + Assert.assertEquals(Lists.newArrayList("v1", "v2"), columns); } catch (UserException e) { - fail(); + Assert.fail(); } path = "/path/to/dir/k2=v2/a/k1=v1/xxx.csv"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Lists.newArrayList("k1", "k2")); - fail(); + Assert.fail(); } catch (UserException ignored) { } path = "/path/to/dir/k2=v2/k1=v1/xxx.csv"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Lists.newArrayList("k1", "k2", "k3")); - fail(); + Assert.fail(); } catch (UserException ignored) { } path = "/path/to/dir/k2=v2//k1=v1//xxx.csv"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Lists.newArrayList("k1", "k2")); - assertEquals(2, columns.size()); - assertEquals(Lists.newArrayList("v1", "v2"), columns); + Assert.assertEquals(2, columns.size()); + Assert.assertEquals(Lists.newArrayList("v1", "v2"), columns); } catch (UserException e) { - fail(); + Assert.fail(); } path = "/path/to/dir/k2==v2=//k1=v1//xxx.csv"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Lists.newArrayList("k1", "k2")); - assertEquals(2, columns.size()); - assertEquals(Lists.newArrayList("v1", "=v2="), columns); + Assert.assertEquals(2, columns.size()); + Assert.assertEquals(Lists.newArrayList("v1", "=v2="), columns); } catch (UserException e) { - fail(); + Assert.fail(); } path = "/path/to/dir/k2==v2=//k1=v1/"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Lists.newArrayList("k1", "k2")); - fail(); + Assert.fail(); } catch (UserException ignored) { } path = "/path/to/dir/k1=2/a/xxx.csv"; try { List columns = BrokerUtil.parseColumnsFromPath(path, Collections.singletonList("k1")); - fail(); + Assert.fail(); } catch (UserException ignored) { ignored.printStackTrace(); } diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/DebugUtilTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/DebugUtilTest.java index ff78c3840b..0dec8873f1 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/DebugUtilTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/DebugUtilTest.java @@ -17,12 +17,11 @@ package org.apache.doris.common.util; -import org.junit.Assert; - -import org.junit.Test; - import org.apache.doris.common.Pair; +import org.junit.Assert; +import org.junit.Test; + public class DebugUtilTest { @Test public void testGetUint() { @@ -34,50 +33,50 @@ public class DebugUtilTest { result = DebugUtil.getUint(1234567L); Assert.assertEquals(result.first, Double.valueOf(1.234567)); Assert.assertEquals(result.second, "M"); - + result = DebugUtil.getUint(1234L); Assert.assertEquals(result.first, Double.valueOf(1.234)); Assert.assertEquals(result.second, "K"); - + result = DebugUtil.getUint(123L); Assert.assertEquals(result.first, Double.valueOf(123.0)); Assert.assertEquals(result.second, ""); } - + @Test public void testGetPrettyStringMs() { // 6hour1min Assert.assertEquals(DebugUtil.getPrettyStringMs(21660222), "6h1m"); - + // 1min222ms Assert.assertEquals(DebugUtil.getPrettyStringMs(60222), "1m"); - + // 2s222ms Assert.assertEquals(DebugUtil.getPrettyStringMs(2222), "2s222ms"); - + // 22ms - Assert.assertEquals(DebugUtil.getPrettyStringMs(22), "22ms"); + Assert.assertEquals(DebugUtil.getPrettyStringMs(22), "22ms"); } - + @Test public void testGetByteUint() { Pair result; result = DebugUtil.getByteUint(0); Assert.assertEquals(result.first, Double.valueOf(0.0)); Assert.assertEquals(result.second, ""); - + result = DebugUtil.getByteUint(123); // B Assert.assertEquals(result.first, Double.valueOf(123.0)); Assert.assertEquals(result.second, "B"); - + result = DebugUtil.getByteUint(123456); // K Assert.assertEquals(result.first, Double.valueOf(120.5625)); Assert.assertEquals(result.second, "KB"); - + result = DebugUtil.getByteUint(1234567); // M Assert.assertEquals(result.first, Double.valueOf(1.1773748397827148)); Assert.assertEquals(result.second, "MB"); - + result = DebugUtil.getByteUint(1234567890L); // G Assert.assertEquals(result.first, Double.valueOf(1.1497809458523989)); Assert.assertEquals(result.second, "GB"); diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/DynamicPartitionUtilTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/DynamicPartitionUtilTest.java index 8fd2b34407..39ac9122fa 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/DynamicPartitionUtilTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/DynamicPartitionUtilTest.java @@ -23,9 +23,8 @@ import org.apache.doris.catalog.RangePartitionInfo; import org.apache.doris.catalog.Type; import org.apache.doris.common.jmockit.Deencapsulation; -import com.google.common.collect.Maps; - import com.clearspring.analytics.util.Lists; +import com.google.common.collect.Maps; import org.junit.Assert; import org.junit.Test; @@ -73,7 +72,7 @@ public class DynamicPartitionUtilTest { @Test public void testGetPartitionRangeString() throws DateTimeException { // TimeUnit: DAY - + // 1. 2020-05-25, offset -7 DynamicPartitionProperty property = new DynamicPartitionProperty(getDynamProp("DAY", -3, 3, -1, -1)); String res = DynamicPartitionUtil.getPartitionRangeString(property, getZonedDateTimeFromStr("2020-05-25"), -7, diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/ListComparatorTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/ListComparatorTest.java index 3404855d0d..7cbca7a93d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/ListComparatorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/ListComparatorTest.java @@ -88,7 +88,7 @@ public class ListComparatorTest { list2.add(new Long(200)); list2.add("abc"); listCollection.add(list2); - + printCollection(); ListComparator> comparator = new ListComparator<>(new OrderByPair(1, false), diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/ListUtilTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/ListUtilTest.java index 342fc78d9f..9889d09355 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/ListUtilTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/ListUtilTest.java @@ -17,7 +17,6 @@ package org.apache.doris.common.util; -import com.google.common.collect.Lists; import org.apache.doris.analysis.PartitionValue; import org.apache.doris.catalog.Column; import org.apache.doris.catalog.ListPartitionItem; @@ -26,6 +25,8 @@ import org.apache.doris.catalog.PartitionKey; import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.DdlException; + +import com.google.common.collect.Lists; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/MetaLockUtilsTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/MetaLockUtilsTest.java index 7abe5269c4..026d93dc15 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/MetaLockUtilsTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/MetaLockUtilsTest.java @@ -17,10 +17,11 @@ package org.apache.doris.common.util; -import com.google.common.collect.Lists; import org.apache.doris.catalog.Database; import org.apache.doris.catalog.Table; import org.apache.doris.common.MetaNotFoundException; + +import com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/RuntimeProfileTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/RuntimeProfileTest.java index 6ca409c225..d094b7b636 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/RuntimeProfileTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/RuntimeProfileTest.java @@ -25,7 +25,6 @@ import org.apache.doris.thrift.TUnit; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.junit.Assert; import org.junit.Test; @@ -35,7 +34,7 @@ import java.util.HashMap; import java.util.Set; public class RuntimeProfileTest { - + @Test public void testSortChildren() { RuntimeProfile profile = new RuntimeProfile("profile"); @@ -46,8 +45,8 @@ public class RuntimeProfileTest { profile1.getCounterTotalTime().setValue(1); profile2.getCounterTotalTime().setValue(3); profile3.getCounterTotalTime().setValue(2); - profile.addChild(profile1); - profile.addChild(profile2); + profile.addChild(profile1); + profile.addChild(profile2); profile.addChild(profile3); // compare profile.sortChildren(); @@ -55,12 +54,12 @@ public class RuntimeProfileTest { long time0 = profile.getChildList().get(0).first.getCounterTotalTime().getValue(); long time1 = profile.getChildList().get(1).first.getCounterTotalTime().getValue(); long time2 = profile.getChildList().get(2).first.getCounterTotalTime().getValue(); - + Assert.assertEquals(3, time0); Assert.assertEquals(2, time1); Assert.assertEquals(1, time2); } - + @Test public void testInfoStrings() { RuntimeProfile profile = new RuntimeProfile("profileName"); @@ -82,22 +81,22 @@ public class RuntimeProfileTest { tnode.info_strings_display_order = new ArrayList(); tnode.info_strings_display_order.add("key"); tnode.info_strings_display_order.add("key3"); - + profile.update(tprofileTree); Assert.assertEquals(profile.getInfoString("key"), "value2"); Assert.assertEquals(profile.getInfoString("key3"), "value3"); // second update tnode.info_strings.put("key", "value4"); - + profile.update(tprofileTree); Assert.assertEquals(profile.getInfoString("key"), "value4"); - + StringBuilder builder = new StringBuilder(); profile.prettyPrint(builder, ""); - Assert.assertEquals(builder.toString(), + Assert.assertEquals(builder.toString(), "profileName:\n - key: value4\n - key3: value3\n"); } - + @Test public void testCounter() { RuntimeProfile profile = new RuntimeProfile(); @@ -107,14 +106,14 @@ public class RuntimeProfileTest { profile.getCounterMap().get("key").setValue(1); Assert.assertEquals(profile.getCounterMap().get("key").getValue(), 1); } - + @Test public void testUpdate() throws IOException { RuntimeProfile profile = new RuntimeProfile("REAL_ROOT"); /* the profile tree * ROOT(time=5s info[key=value]) * A(time=2s) B(time=1s info[BInfo1=BValu1;BInfo2=BValue2]) - * A_SON(time=10ms counter[counterA1=1; counterA2=2; counterA1Son=3]) + * A_SON(time=10ms counter[counterA1=1; counterA2=2; counterA1Son=3]) */ TRuntimeProfileTree tprofileTree = new TRuntimeProfileTree(); TRuntimeProfileNode tnodeRoot = new TRuntimeProfileNode(); @@ -137,7 +136,7 @@ public class RuntimeProfileTest { tnodeA.counters = Lists.newArrayList(); tnodeB.counters = Lists.newArrayList(); tnodeASon.counters = Lists.newArrayList(); - + tnodeRoot.counters.add(new TCounter("TotalTime", TUnit.TIME_NS, 3000000000L)); tnodeA.counters.add(new TCounter("TotalTime", TUnit.TIME_NS, 1000000000L)); tnodeB.counters.add(new TCounter("TotalTime", TUnit.TIME_NS, 1000000000L)); @@ -146,7 +145,7 @@ public class RuntimeProfileTest { tnodeASon.counters.add(new TCounter("counterA2", TUnit.BYTES, 1234567L)); tnodeASon.counters.add(new TCounter("counterA1Son", TUnit.UNIT, 3)); tnodeASon.child_counters_map = Maps.newHashMap(); - + Set set1 = Sets.newHashSet(); set1.add("counterA1"); set1.add("counterA2"); @@ -168,10 +167,10 @@ public class RuntimeProfileTest { tnodeA.name = "A"; tnodeB.name = "B"; tnodeASon.name = "ASON"; - + profile.update(tprofileTree); StringBuilder builder = new StringBuilder(); profile.computeTimeInProfile(); profile.prettyPrint(builder, ""); - } + } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/SmallFileMgrTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/SmallFileMgrTest.java index 640f290aaa..dbd902f172 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/SmallFileMgrTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/SmallFileMgrTest.java @@ -17,9 +17,6 @@ package org.apache.doris.common.util; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; import org.apache.doris.analysis.CreateFileStmt; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.Database; @@ -28,6 +25,10 @@ import org.apache.doris.common.DdlException; import org.apache.doris.common.jmockit.Deencapsulation; import org.apache.doris.common.util.SmallFileMgr.SmallFile; import org.apache.doris.persist.EditLog; + +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -79,7 +80,7 @@ public class SmallFileMgrTest { result = "http://127.0.0.1:8001/file2"; } }; - + SmallFile smallFile = new SmallFile(1L, "kafka", "file1", 10001L, "ABCD", 12, "12345", true); final SmallFileMgr smallFileMgr = new SmallFileMgr(); new Expectations(smallFileMgr) { @@ -97,13 +98,13 @@ public class SmallFileMgrTest { e.printStackTrace(); Assert.fail(e.getMessage()); } - + Assert.assertTrue(smallFileMgr.containsFile(1L, "kafka", "file1")); SmallFile gotFile = smallFileMgr.getSmallFile(1L, "kafka", "file1", true); Assert.assertEquals(10001L, gotFile.id); gotFile = smallFileMgr.getSmallFile(10001L); Assert.assertEquals(10001L, gotFile.id); - + // 2. test file num limit Config.max_small_file_number = 1; boolean fail = false; @@ -114,7 +115,7 @@ public class SmallFileMgrTest { Assert.assertTrue(e.getMessage().contains("File number exceeds limit")); } Assert.assertTrue(fail); - + // 3. test remove try { smallFileMgr.removeFile(2L, "kafka", "file1", true); diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/TimeUtilsTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/TimeUtilsTest.java index 4290f8149f..5ba3c16657 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/TimeUtilsTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/TimeUtilsTest.java @@ -17,15 +17,15 @@ package org.apache.doris.common.util; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.analysis.DateLiteral; import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.catalog.ScalarType; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.DdlException; import org.apache.doris.common.FeConstants; -import org.apache.doris.common.DdlException; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/UnitTestUtil.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/UnitTestUtil.java index b85d1b20ba..66885b2b4b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/UnitTestUtil.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/UnitTestUtil.java @@ -48,7 +48,6 @@ import org.apache.doris.thrift.TStorageType; import org.apache.doris.thrift.TTabletType; import com.google.common.collect.Maps; - import org.junit.Assert; import java.lang.reflect.Method; @@ -73,7 +72,7 @@ public class UnitTestUtil { Replica replica1 = new Replica(replicaId, backendId, ReplicaState.NORMAL, version, 0); Replica replica2 = new Replica(replicaId + 1, backendId + 1, ReplicaState.NORMAL, version, 0); Replica replica3 = new Replica(replicaId + 2, backendId + 2, ReplicaState.NORMAL, version, 0); - + // tablet Tablet tablet = new Tablet(tabletId); @@ -126,7 +125,7 @@ public class UnitTestUtil { db.createTable(table); return db; } - + public static Backend createBackend(long id, String host, int heartPort, int bePort, int httpPort) { Backend backend = new Backend(id, host, heartPort); backend.updateOnce(bePort, httpPort, 10000); @@ -143,7 +142,7 @@ public class UnitTestUtil { backend.updateDisks(backendDisks); return backend; } - + public static Method getPrivateMethod(Class c, String methodName, Class[] params) { Method method = null; try { @@ -154,7 +153,7 @@ public class UnitTestUtil { } return method; } - + public static Class getInnerClass(Class c, String className) { Class innerClass = null; for (Class tmpClass : c.getDeclaredClasses()) { @@ -165,7 +164,7 @@ public class UnitTestUtil { } return innerClass; } - + public static void initDppConfig() { Map defaultConfigs = Maps.newHashMap(); defaultConfigs.put("hadoop_palo_path", "/user/palo2"); diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/VersionTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/VersionTest.java index 67b6d202f1..df0d7f30cd 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/VersionTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/VersionTest.java @@ -17,10 +17,7 @@ package org.apache.doris.common.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; public class VersionTest { @@ -30,24 +27,24 @@ public class VersionTest { DigitalVersion v = new DigitalVersion(1100000); System.out.println(v); - assertEquals(1, v.major); - assertEquals(10, v.minor); - assertEquals(0, v.revision); + Assert.assertEquals(1, v.major); + Assert.assertEquals(10, v.minor); + Assert.assertEquals(0, v.revision); DigitalVersion s = new DigitalVersion((byte) 50, (byte) 2, (byte) 3); - assertEquals(50020300, s.id); + Assert.assertEquals(50020300, s.id); - assertTrue(s.onOrAfter(v)); - assertFalse(s.before(v)); + Assert.assertTrue(s.onOrAfter(v)); + Assert.assertFalse(s.before(v)); DigitalVersion vs = new DigitalVersion((byte) 1, (byte) 10, (byte) 0); - assertEquals(vs, v); + Assert.assertEquals(vs, v); } @Test public void testFromString() { try { - assertEquals(1060000, DigitalVersion.fromString("1.6.0.123.123").id); + Assert.assertEquals(1060000, DigitalVersion.fromString("1.6.0.123.123").id); } catch (IllegalArgumentException e) { e.printStackTrace(); } @@ -55,22 +52,22 @@ public class VersionTest { try { DigitalVersion.fromString(""); } catch (Exception e) { - assertTrue(e instanceof IllegalArgumentException); - assertTrue(e.getMessage().contains("Illegal empty version")); + Assert.assertTrue(e instanceof IllegalArgumentException); + Assert.assertTrue(e.getMessage().contains("Illegal empty version")); } try { DigitalVersion.fromString("1.6123123.123"); } catch (Exception e) { - assertTrue(e instanceof IllegalArgumentException); - assertTrue(e.getMessage().contains("Illegal version format")); + Assert.assertTrue(e instanceof IllegalArgumentException); + Assert.assertTrue(e.getMessage().contains("Illegal version format")); } try { DigitalVersion.fromString("a.b.c"); } catch (Exception e) { - assertTrue(e instanceof IllegalArgumentException); - assertTrue(e.getMessage().contains("Illegal version format")); + Assert.assertTrue(e instanceof IllegalArgumentException); + Assert.assertTrue(e.getMessage().contains("Illegal version format")); } } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/deploy/AmbariDeployManagerTest.java b/fe/fe-core/src/test/java/org/apache/doris/deploy/AmbariDeployManagerTest.java index 545b28558a..9ada5eaad5 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/deploy/AmbariDeployManagerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/deploy/AmbariDeployManagerTest.java @@ -68,7 +68,7 @@ public class AmbariDeployManagerTest { public void getPropertyFromBlueprintTest() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException { String res = getBlueprint(); - + Field bpF = manager.getClass().getDeclaredField("blueprintJson"); bpF.setAccessible(true); bpF.set(manager, res); diff --git a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsNodeInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsNodeInfoTest.java index f8c488edaa..6192caa5b5 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsNodeInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsNodeInfoTest.java @@ -19,13 +19,12 @@ package org.apache.doris.external.elasticsearch; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.map.ObjectMapper; +import org.junit.Assert; import org.junit.Test; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; - public class EsNodeInfoTest extends EsTestCase{ @Test @@ -37,12 +36,12 @@ public class EsNodeInfoTest extends EsTestCase{ for (Map.Entry> entry : nodesData.entrySet()) { EsNodeInfo node = new EsNodeInfo(entry.getKey(), entry.getValue(), false); if ("node-A".equals(node.getName())) { - assertEquals("10.0.0.1", node.getPublishAddress().hostname); - assertEquals(8200, node.getPublishAddress().port); + Assert.assertEquals("10.0.0.1", node.getPublishAddress().hostname); + Assert.assertEquals(8200, node.getPublishAddress().port); } if ("node-B".equals(node.getName())) { - assertEquals("10.0.0.2", node.getPublishAddress().hostname); - assertEquals(8200, node.getPublishAddress().port); + Assert.assertEquals("10.0.0.2", node.getPublishAddress().hostname); + Assert.assertEquals(8200, node.getPublishAddress().port); } } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsShardPartitionsTest.java b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsShardPartitionsTest.java index 23975a5688..9766a096e2 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsShardPartitionsTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsShardPartitionsTest.java @@ -21,11 +21,9 @@ import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.CatalogTestUtil; import org.apache.doris.catalog.EsTable; +import org.junit.Assert; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - public class EsShardPartitionsTest extends EsTestCase { @Test @@ -36,8 +34,8 @@ public class EsShardPartitionsTest extends EsTestCase { EsShardPartitions esShardPartitions = EsShardPartitions.findShardPartitions("doe", loadJsonFromFile("data/es/test_search_shards.json")); EsTablePartitions esTablePartitions = EsTablePartitions.fromShardPartitions(esTable, esShardPartitions); - assertNotNull(esTablePartitions); - assertEquals(1, esTablePartitions.getUnPartitionedIndexStates().size()); - assertEquals(5, esTablePartitions.getEsShardPartitions("doe").getShardRoutings().size()); + Assert.assertNotNull(esTablePartitions); + Assert.assertEquals(1, esTablePartitions.getUnPartitionedIndexStates().size()); + Assert.assertEquals(5, esTablePartitions.getEsShardPartitions("doe").getShardRoutings().size()); } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/MappingPhaseTest.java b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/MappingPhaseTest.java index d229d7c924..e29613b529 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/MappingPhaseTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/MappingPhaseTest.java @@ -22,18 +22,15 @@ import org.apache.doris.catalog.EsTable; import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.common.ExceptionChecker; +import mockit.Expectations; +import mockit.Injectable; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import java.util.ArrayList; import java.util.List; -import mockit.Expectations; -import mockit.Injectable; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - public class MappingPhaseTest extends EsTestCase { @@ -57,19 +54,19 @@ public class MappingPhaseTest extends EsTestCase { EsTable esTableBefore7X = fakeEsTable("fake", "test", "doc", columns); SearchContext searchContext = new SearchContext(esTableBefore7X); mappingPhase.resolveFields(searchContext, loadJsonFromFile("data/es/test_index_mapping.json")); - assertEquals("k3.keyword", searchContext.fetchFieldsContext().get("k3")); - assertEquals("k3.keyword", searchContext.docValueFieldsContext().get("k3")); - assertEquals("k1", searchContext.docValueFieldsContext().get("k1")); - assertEquals("k2", searchContext.docValueFieldsContext().get("k2")); + Assert.assertEquals("k3.keyword", searchContext.fetchFieldsContext().get("k3")); + Assert.assertEquals("k3.keyword", searchContext.docValueFieldsContext().get("k3")); + Assert.assertEquals("k1", searchContext.docValueFieldsContext().get("k1")); + Assert.assertEquals("k2", searchContext.docValueFieldsContext().get("k2")); // ES version >= 7.0 EsTable esTableAfter7X = fakeEsTable("fake", "test", "_doc", columns); SearchContext searchContext1 = new SearchContext(esTableAfter7X); mappingPhase.resolveFields(searchContext1, loadJsonFromFile("data/es/test_index_mapping_after_7x.json")); - assertEquals("k3.keyword", searchContext1.fetchFieldsContext().get("k3")); - assertEquals("k3.keyword", searchContext1.docValueFieldsContext().get("k3")); - assertEquals("k1", searchContext1.docValueFieldsContext().get("k1")); - assertEquals("k2", searchContext1.docValueFieldsContext().get("k2")); + Assert.assertEquals("k3.keyword", searchContext1.fetchFieldsContext().get("k3")); + Assert.assertEquals("k3.keyword", searchContext1.docValueFieldsContext().get("k3")); + Assert.assertEquals("k1", searchContext1.docValueFieldsContext().get("k1")); + Assert.assertEquals("k2", searchContext1.docValueFieldsContext().get("k2")); } @Test @@ -97,10 +94,10 @@ public class MappingPhaseTest extends EsTestCase { MappingPhase mappingPhase = new MappingPhase(client); ExceptionChecker.expectThrowsNoException(() -> mappingPhase.execute(searchContext1)); ExceptionChecker.expectThrowsNoException(() -> mappingPhase.postProcess(searchContext1)); - assertEquals("k3.keyword", searchContext1.fetchFieldsContext().get("k3")); - assertEquals("k3.keyword", searchContext1.docValueFieldsContext().get("k3")); - assertEquals("k1", searchContext1.docValueFieldsContext().get("k1")); - assertEquals("k2", searchContext1.docValueFieldsContext().get("k2")); + Assert.assertEquals("k3.keyword", searchContext1.fetchFieldsContext().get("k3")); + Assert.assertEquals("k3.keyword", searchContext1.docValueFieldsContext().get("k3")); + Assert.assertEquals("k1", searchContext1.docValueFieldsContext().get("k1")); + Assert.assertEquals("k2", searchContext1.docValueFieldsContext().get("k2")); } @@ -110,7 +107,7 @@ public class MappingPhaseTest extends EsTestCase { EsTable esTableAfter7X = fakeEsTable("fake", "test", "_doc", columns); SearchContext searchContext = new SearchContext(esTableAfter7X); mappingPhase.resolveFields(searchContext, loadJsonFromFile("data/es/test_index_mapping_field_mult_analyzer.json")); - assertFalse(searchContext.docValueFieldsContext().containsKey("k3")); + Assert.assertFalse(searchContext.docValueFieldsContext().containsKey("k3")); } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/PartitionPhaseTest.java b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/PartitionPhaseTest.java index ae858017ed..f174393669 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/PartitionPhaseTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/PartitionPhaseTest.java @@ -22,8 +22,11 @@ import org.apache.doris.catalog.EsTable; import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.common.ExceptionChecker; +import mockit.Expectations; +import mockit.Injectable; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.map.ObjectMapper; +import org.junit.Assert; import org.junit.Test; import java.util.ArrayList; @@ -31,11 +34,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import mockit.Expectations; -import mockit.Injectable; - -import static org.junit.Assert.assertNotNull; - public class PartitionPhaseTest extends EsTestCase { @Test @@ -44,7 +42,7 @@ public class PartitionPhaseTest extends EsTestCase { ExceptionChecker.expectThrowsNoException(() -> esShardPartitions[0] = EsShardPartitions.findShardPartitions("doe", loadJsonFromFile("data/es/test_search_shards.json"))); - assertNotNull(esShardPartitions[0]); + Assert.assertNotNull(esShardPartitions[0]); ObjectMapper mapper = new ObjectMapper(); JsonParser jsonParser = mapper.getJsonFactory().createJsonParser(loadJsonFromFile("data/es/test_nodes_http.json")); Map> nodesData = (Map>) mapper.readValue(jsonParser, Map.class).get("nodes"); @@ -75,6 +73,6 @@ public class PartitionPhaseTest extends EsTestCase { PartitionPhase partitionPhase = new PartitionPhase(client); ExceptionChecker.expectThrowsNoException(() -> partitionPhase.execute(context)); ExceptionChecker.expectThrowsNoException(() -> partitionPhase.postProcess(context)); - assertNotNull(context.tablePartitions()); + Assert.assertNotNull(context.tablePartitions()); } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/QueryBuildersTest.java b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/QueryBuildersTest.java index 46f50b8171..c1511bd206 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/QueryBuildersTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/QueryBuildersTest.java @@ -19,6 +19,9 @@ package org.apache.doris.external.elasticsearch; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.Assert; +import org.junit.Test; + import java.io.IOException; import java.io.StringWriter; import java.math.BigDecimal; @@ -26,10 +29,6 @@ import java.math.BigInteger; import java.util.Arrays; import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; - - -import static org.junit.Assert.assertEquals; /** * Check that internal queries are correctly converted to ES search query (as JSON) @@ -41,52 +40,52 @@ public class QueryBuildersTest { @Test public void testTermQuery() throws Exception { - assertEquals("{\"term\":{\"k\":\"aaaa\"}}", + Assert.assertEquals("{\"term\":{\"k\":\"aaaa\"}}", toJson(QueryBuilders.termQuery("k", "aaaa"))); - assertEquals("{\"term\":{\"aaaa\":\"k\"}}", + Assert.assertEquals("{\"term\":{\"aaaa\":\"k\"}}", toJson(QueryBuilders.termQuery("aaaa", "k"))); - assertEquals("{\"term\":{\"k\":0}}", + Assert.assertEquals("{\"term\":{\"k\":0}}", toJson(QueryBuilders.termQuery("k", (byte) 0))); - assertEquals("{\"term\":{\"k\":123}}", + Assert.assertEquals("{\"term\":{\"k\":123}}", toJson(QueryBuilders.termQuery("k", (long) 123))); - assertEquals("{\"term\":{\"k\":41}}", + Assert.assertEquals("{\"term\":{\"k\":41}}", toJson(QueryBuilders.termQuery("k", (short) 41))); - assertEquals("{\"term\":{\"k\":128}}", + Assert.assertEquals("{\"term\":{\"k\":128}}", toJson(QueryBuilders.termQuery("k", 128))); - assertEquals("{\"term\":{\"k\":42.42}}", + Assert.assertEquals("{\"term\":{\"k\":42.42}}", toJson(QueryBuilders.termQuery("k", 42.42D))); - assertEquals("{\"term\":{\"k\":1.1}}", + Assert.assertEquals("{\"term\":{\"k\":1.1}}", toJson(QueryBuilders.termQuery("k", 1.1F))); - assertEquals("{\"term\":{\"k\":1}}", + Assert.assertEquals("{\"term\":{\"k\":1}}", toJson(QueryBuilders.termQuery("k", new BigDecimal(1)))); - assertEquals("{\"term\":{\"k\":121}}", + Assert.assertEquals("{\"term\":{\"k\":121}}", toJson(QueryBuilders.termQuery("k", new BigInteger("121")))); - assertEquals("{\"term\":{\"k\":true}}", + Assert.assertEquals("{\"term\":{\"k\":true}}", toJson(QueryBuilders.termQuery("k", new AtomicBoolean(true)))); } @Test public void testTermsQuery() throws Exception { - assertEquals("{\"terms\":{\"k\":[]}}", + Assert.assertEquals("{\"terms\":{\"k\":[]}}", toJson(QueryBuilders.termsQuery("k", Collections.emptySet()))); - assertEquals("{\"terms\":{\"k\":[0]}}", + Assert.assertEquals("{\"terms\":{\"k\":[0]}}", toJson(QueryBuilders.termsQuery("k", Collections.singleton(0)))); - assertEquals("{\"terms\":{\"k\":[\"aaa\"]}}", + Assert.assertEquals("{\"terms\":{\"k\":[\"aaa\"]}}", toJson(QueryBuilders.termsQuery("k", Collections.singleton("aaa")))); - assertEquals("{\"terms\":{\"k\":[\"aaa\",\"bbb\",\"ccc\"]}}", + Assert.assertEquals("{\"terms\":{\"k\":[\"aaa\",\"bbb\",\"ccc\"]}}", toJson(QueryBuilders.termsQuery("k", Arrays.asList("aaa", "bbb", "ccc")))); - assertEquals("{\"terms\":{\"k\":[1,2,3]}}", + Assert.assertEquals("{\"terms\":{\"k\":[1,2,3]}}", toJson(QueryBuilders.termsQuery("k", Arrays.asList(1, 2, 3)))); - assertEquals("{\"terms\":{\"k\":[1.1,2.2,3.3]}}", + Assert.assertEquals("{\"terms\":{\"k\":[1.1,2.2,3.3]}}", toJson(QueryBuilders.termsQuery("k", Arrays.asList(1.1f, 2.2f, 3.3f)))); - assertEquals("{\"terms\":{\"k\":[1.1,2.2,3.3]}}", + Assert.assertEquals("{\"terms\":{\"k\":[1.1,2.2,3.3]}}", toJson(QueryBuilders.termsQuery("k", Arrays.asList(1.1d, 2.2d, 3.3d)))); } @@ -95,69 +94,69 @@ public class QueryBuildersTest { QueryBuilders.QueryBuilder q1 = QueryBuilders.boolQuery() .must(QueryBuilders.termQuery("k", "aaa")); - assertEquals("{\"bool\":{\"must\":{\"term\":{\"k\":\"aaa\"}}}}", + Assert.assertEquals("{\"bool\":{\"must\":{\"term\":{\"k\":\"aaa\"}}}}", toJson(q1)); QueryBuilders.QueryBuilder q2 = QueryBuilders.boolQuery() .must(QueryBuilders.termQuery("k1", "aaa")).must(QueryBuilders.termQuery("k2", "bbb")); - assertEquals("{\"bool\":{\"must\":[{\"term\":{\"k1\":\"aaa\"}},{\"term\":{\"k2\":\"bbb\"}}]}}", + Assert.assertEquals("{\"bool\":{\"must\":[{\"term\":{\"k1\":\"aaa\"}},{\"term\":{\"k2\":\"bbb\"}}]}}", toJson(q2)); QueryBuilders.QueryBuilder q3 = QueryBuilders.boolQuery() .mustNot(QueryBuilders.termQuery("k", "fff")); - assertEquals("{\"bool\":{\"must_not\":{\"term\":{\"k\":\"fff\"}}}}", + Assert.assertEquals("{\"bool\":{\"must_not\":{\"term\":{\"k\":\"fff\"}}}}", toJson(q3)); QueryBuilders.QueryBuilder q4 = QueryBuilders.rangeQuery("k1").lt(200).gt(-200); QueryBuilders.QueryBuilder q5 = QueryBuilders.termsQuery("k2", Arrays.asList("aaa", "bbb", "ccc")); QueryBuilders.QueryBuilder q6 = QueryBuilders.boolQuery().must(q4).should(q5); - assertEquals("{\"bool\":{\"must\":{\"range\":{\"k1\":{\"gt\":-200,\"lt\":200}}},\"should\":{\"terms\":{\"k2\":[\"aaa\",\"bbb\",\"ccc\"]}}}}", toJson(q6)); - assertEquals("{\"bool\":{\"filter\":[{\"range\":{\"k1\":{\"gt\":-200,\"lt\":200}}},{\"terms\":{\"k2\":[\"aaa\",\"bbb\",\"ccc\"]}}]}}", toJson(QueryBuilders.boolQuery().filter(q4).filter(q5))); - assertEquals("{\"bool\":{\"filter\":{\"range\":{\"k1\":{\"gt\":-200,\"lt\":200}}},\"must_not\":{\"terms\":{\"k2\":[\"aaa\",\"bbb\",\"ccc\"]}}}}", toJson(QueryBuilders.boolQuery().filter(q4).mustNot(q5))); + Assert.assertEquals("{\"bool\":{\"must\":{\"range\":{\"k1\":{\"gt\":-200,\"lt\":200}}},\"should\":{\"terms\":{\"k2\":[\"aaa\",\"bbb\",\"ccc\"]}}}}", toJson(q6)); + Assert.assertEquals("{\"bool\":{\"filter\":[{\"range\":{\"k1\":{\"gt\":-200,\"lt\":200}}},{\"terms\":{\"k2\":[\"aaa\",\"bbb\",\"ccc\"]}}]}}", toJson(QueryBuilders.boolQuery().filter(q4).filter(q5))); + Assert.assertEquals("{\"bool\":{\"filter\":{\"range\":{\"k1\":{\"gt\":-200,\"lt\":200}}},\"must_not\":{\"terms\":{\"k2\":[\"aaa\",\"bbb\",\"ccc\"]}}}}", toJson(QueryBuilders.boolQuery().filter(q4).mustNot(q5))); } @Test public void testExistsQuery() throws Exception { - assertEquals("{\"exists\":{\"field\":\"k\"}}", + Assert.assertEquals("{\"exists\":{\"field\":\"k\"}}", toJson(QueryBuilders.existsQuery("k"))); } @Test public void testRangeQuery() throws Exception { - assertEquals("{\"range\":{\"k\":{\"lt\":123}}}", + Assert.assertEquals("{\"range\":{\"k\":{\"lt\":123}}}", toJson(QueryBuilders.rangeQuery("k").lt(123))); - assertEquals("{\"range\":{\"k\":{\"gt\":123}}}", + Assert.assertEquals("{\"range\":{\"k\":{\"gt\":123}}}", toJson(QueryBuilders.rangeQuery("k").gt(123))); - assertEquals("{\"range\":{\"k\":{\"gte\":12345678}}}", + Assert.assertEquals("{\"range\":{\"k\":{\"gte\":12345678}}}", toJson(QueryBuilders.rangeQuery("k").gte(12345678))); - assertEquals("{\"range\":{\"k\":{\"lte\":12345678}}}", + Assert.assertEquals("{\"range\":{\"k\":{\"lte\":12345678}}}", toJson(QueryBuilders.rangeQuery("k").lte(12345678))); - assertEquals("{\"range\":{\"k\":{\"gt\":123,\"lt\":345}}}", + Assert.assertEquals("{\"range\":{\"k\":{\"gt\":123,\"lt\":345}}}", toJson(QueryBuilders.rangeQuery("k").gt(123).lt(345))); - assertEquals("{\"range\":{\"k\":{\"gt\":-456.6,\"lt\":12.3}}}", + Assert.assertEquals("{\"range\":{\"k\":{\"gt\":-456.6,\"lt\":12.3}}}", toJson(QueryBuilders.rangeQuery("k").lt(12.3f).gt(-456.6f))); - assertEquals("{\"range\":{\"k\":{\"gt\":6789.33,\"lte\":9999.99}}}", + Assert.assertEquals("{\"range\":{\"k\":{\"gt\":6789.33,\"lte\":9999.99}}}", toJson(QueryBuilders.rangeQuery("k").gt(6789.33f).lte(9999.99f))); - assertEquals("{\"range\":{\"k\":{\"gte\":1,\"lte\":\"zzz\"}}}", + Assert.assertEquals("{\"range\":{\"k\":{\"gte\":1,\"lte\":\"zzz\"}}}", toJson(QueryBuilders.rangeQuery("k").gte(1).lte("zzz"))); - assertEquals("{\"range\":{\"k\":{\"gte\":\"zzz\"}}}", + Assert.assertEquals("{\"range\":{\"k\":{\"gte\":\"zzz\"}}}", toJson(QueryBuilders.rangeQuery("k").gte("zzz"))); - assertEquals("{\"range\":{\"k\":{\"gt\":\"aaa\",\"lt\":\"zzz\"}}}", + Assert.assertEquals("{\"range\":{\"k\":{\"gt\":\"aaa\",\"lt\":\"zzz\"}}}", toJson(QueryBuilders.rangeQuery("k").gt("aaa").lt("zzz"))); } @Test public void testMatchAllQuery() throws IOException { - assertEquals("{\"match_all\":{}}", + Assert.assertEquals("{\"match_all\":{}}", toJson(QueryBuilders.matchAllQuery())); } @Test public void testWildCardQuery() throws IOException { - assertEquals("{\"wildcard\":{\"k1\":\"?aa*\"}}", + Assert.assertEquals("{\"wildcard\":{\"k1\":\"?aa*\"}}", toJson(QueryBuilders.wildcardQuery("k1", "?aa*"))); } diff --git a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/VersionPhaseTest.java b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/VersionPhaseTest.java index 1fb43bec7e..a3228820f2 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/VersionPhaseTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/VersionPhaseTest.java @@ -22,16 +22,14 @@ import org.apache.doris.catalog.EsTable; import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.common.ExceptionChecker; +import mockit.Expectations; +import mockit.Injectable; +import org.junit.Assert; import org.junit.Test; import java.util.ArrayList; import java.util.List; -import mockit.Expectations; -import mockit.Injectable; - -import static org.junit.Assert.assertTrue; - public class VersionPhaseTest extends EsTestCase { @Test @@ -52,7 +50,6 @@ public class VersionPhaseTest extends EsTestCase { VersionPhase versionPhase = new VersionPhase(client); ExceptionChecker.expectThrowsNoException(() -> versionPhase.preProcess(context)); ExceptionChecker.expectThrowsNoException(() -> versionPhase.execute(context)); - assertTrue(context.version().on(EsMajorVersion.V_6_X)); + Assert.assertTrue(context.version().on(EsMajorVersion.V_6_X)); } - } diff --git a/fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java b/fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java index 07aba68c12..768e0e8cc6 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java +++ b/fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java @@ -55,7 +55,14 @@ import org.apache.doris.thrift.TStorageType; import com.google.common.base.Strings; import com.google.common.collect.Lists; - +import junit.framework.AssertionFailedError; +import mockit.Expectations; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; +import okhttp3.Credentials; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -71,15 +78,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import junit.framework.AssertionFailedError; -import mockit.Expectations; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; -import okhttp3.Credentials; -import okhttp3.MediaType; -import okhttp3.OkHttpClient; - abstract public class DorisHttpTestCase { public OkHttpClient networkClient = new OkHttpClient.Builder() diff --git a/fe/fe-core/src/test/java/org/apache/doris/http/HttpAuthManagerTest.java b/fe/fe-core/src/test/java/org/apache/doris/http/HttpAuthManagerTest.java index 59c1199b00..ad41c61160 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/http/HttpAuthManagerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/http/HttpAuthManagerTest.java @@ -17,21 +17,22 @@ package org.apache.doris.http; -import java.util.ArrayList; -import java.util.List; import org.apache.doris.analysis.UserIdentity; - import org.apache.doris.httpv2.HttpAuthManager; + import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + public class HttpAuthManagerTest { @Test public void testNormal() { HttpAuthManager authMgr = HttpAuthManager.getInstance(); - String sessionId = "test_session_id"; + String sessionId = "test_session_id"; String username = "test-user"; HttpAuthManager.SessionValue sessionValue = new HttpAuthManager.SessionValue(); sessionValue.currentUser = UserIdentity.createAnalyzedUserIdentWithIp(username, "%"); @@ -42,7 +43,7 @@ public class HttpAuthManagerTest { System.out.println("username in test: " + authMgr.getSessionValue(sessionIds).currentUser); Assert.assertEquals(username, authMgr.getSessionValue(sessionIds).currentUser.getQualifiedUser()); - + String noExistSession = "no-exist-session-id"; sessionIds.clear(); sessionIds.add (noExistSession); diff --git a/fe/fe-core/src/test/java/org/apache/doris/http/TableQueryPlanActionTest.java b/fe/fe-core/src/test/java/org/apache/doris/http/TableQueryPlanActionTest.java index 397b3c92ca..d8a76fb5ef 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/http/TableQueryPlanActionTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/http/TableQueryPlanActionTest.java @@ -19,6 +19,9 @@ package org.apache.doris.http; import org.apache.doris.thrift.TQueryPlanInfo; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; import org.apache.thrift.TDeserializer; import org.apache.thrift.TException; import org.json.simple.JSONArray; @@ -31,10 +34,6 @@ import org.junit.Test; import java.io.IOException; import java.util.Base64; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; - public class TableQueryPlanActionTest extends DorisHttpTestCase { private static String PATH_URI = "/_query_plan"; diff --git a/fe/fe-core/src/test/java/org/apache/doris/http/TableRowCountActionTest.java b/fe/fe-core/src/test/java/org/apache/doris/http/TableRowCountActionTest.java index 2f8250747f..6bb9e0a9cc 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/http/TableRowCountActionTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/http/TableRowCountActionTest.java @@ -17,6 +17,8 @@ package org.apache.doris.http; +import okhttp3.Request; +import okhttp3.Response; import org.json.simple.JSONObject; import org.json.simple.JSONValue; import org.junit.Assert; @@ -24,9 +26,6 @@ import org.junit.Test; import java.io.IOException; -import okhttp3.Request; -import okhttp3.Response; - public class TableRowCountActionTest extends DorisHttpTestCase { private static final String PATH_URI = "/_count"; diff --git a/fe/fe-core/src/test/java/org/apache/doris/http/TableSchemaActionTest.java b/fe/fe-core/src/test/java/org/apache/doris/http/TableSchemaActionTest.java index e3f6346164..7e2347f61f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/http/TableSchemaActionTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/http/TableSchemaActionTest.java @@ -17,6 +17,8 @@ package org.apache.doris.http; +import okhttp3.Request; +import okhttp3.Response; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; @@ -25,10 +27,6 @@ import org.junit.Test; import java.io.IOException; -import okhttp3.Request; -import okhttp3.Response; -import static org.junit.Assert.assertTrue; - public class TableSchemaActionTest extends DorisHttpTestCase { private static final String QUERY_PLAN_URI = "/_schema"; @@ -41,7 +39,7 @@ public class TableSchemaActionTest extends DorisHttpTestCase { .url(URI + QUERY_PLAN_URI) .build(); Response response = networkClient.newCall(request).execute(); - assertTrue(response.isSuccessful()); + Assert.assertTrue(response.isSuccessful()); String respStr = response.body().string(); Assert.assertNotNull(respStr); JSONObject object = (JSONObject) JSONValue.parse(respStr); diff --git a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapAuthenticateTest.java b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapAuthenticateTest.java index dba4283810..c97f2b7bbb 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapAuthenticateTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapAuthenticateTest.java @@ -17,10 +17,6 @@ package org.apache.doris.ldap; -import com.google.common.collect.Lists; -import mockit.Delegate; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.analysis.UserIdentity; import org.apache.doris.catalog.Catalog; import org.apache.doris.cluster.ClusterNamespace; @@ -28,6 +24,11 @@ import org.apache.doris.common.DdlException; import org.apache.doris.mysql.privilege.PaloAuth; import org.apache.doris.mysql.privilege.PaloRole; import org.apache.doris.qe.ConnectContext; + +import com.google.common.collect.Lists; +import mockit.Delegate; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java index 38685bc9b6..8367e0e2e5 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java @@ -23,7 +23,9 @@ import org.apache.doris.mysql.privilege.PaloAuth; import org.apache.doris.persist.LdapInfo; import com.clearspring.analytics.util.Lists; - +import mockit.Delegate; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -33,10 +35,6 @@ import org.springframework.ldap.query.LdapQuery; import java.util.List; -import mockit.Delegate; -import mockit.Expectations; -import mockit.Mocked; - public class LdapClientTest { private static final String ADMIN_PASSWORD = "admin"; @@ -77,7 +75,7 @@ public class LdapClientTest { LdapConfig.ldap_group_basedn = "ou=group,dc=baidu,dc=com"; LdapConfig.ldap_user_filter = "(&(uid={login}))"; } - + private void mockLdapTemplateSearch(List list) { new Expectations() { { diff --git a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapPrivsCheckerTest.java b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapPrivsCheckerTest.java index 6261b5a7aa..6087ea9ed0 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapPrivsCheckerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapPrivsCheckerTest.java @@ -17,8 +17,6 @@ package org.apache.doris.ldap; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.analysis.ResourcePattern; import org.apache.doris.analysis.TablePattern; import org.apache.doris.analysis.UserIdentity; @@ -29,6 +27,9 @@ import org.apache.doris.mysql.privilege.PaloRole; import org.apache.doris.mysql.privilege.PrivBitSet; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; + +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/DeleteHandlerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/DeleteHandlerTest.java index ba95caa7ad..4b1360c2ce 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/DeleteHandlerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/DeleteHandlerTest.java @@ -52,24 +52,22 @@ import org.apache.doris.transaction.TransactionState; import org.apache.doris.transaction.TransactionStatus; import org.apache.doris.transaction.TxnCommitAttachment; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import mockit.Expectations; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import mockit.Expectations; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; - public class DeleteHandlerTest { private DeleteHandler deleteHandler; diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/DppConfigTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/DppConfigTest.java index 970cb463e4..9dcc6716bd 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/DppConfigTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/DppConfigTest.java @@ -24,7 +24,8 @@ import org.apache.doris.common.FeConstants; import org.apache.doris.common.LoadException; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Test; @@ -35,9 +36,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.util.Map; -import mockit.Expectations; -import mockit.Mocked; - public class DppConfigTest { private FakeCatalog fakeCatalog; diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/DppSchedulerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/DppSchedulerTest.java index 82157efc5c..971748ad57 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/DppSchedulerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/DppSchedulerTest.java @@ -17,14 +17,14 @@ package org.apache.doris.load; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.common.Config; import org.apache.doris.common.util.CommandResult; import org.apache.doris.common.util.UnitTestUtil; import org.apache.doris.common.util.Util; import org.apache.doris.thrift.TEtlState; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -43,7 +43,7 @@ public class DppSchedulerTest { @Mocked private Util util; - + @Before public void setUp() { // mock palo home env @@ -54,7 +54,7 @@ public class DppSchedulerTest { UnitTestUtil.initDppConfig(); dppScheduler = new DppScheduler(Load.dppDefaultConfig); } - + @Ignore @Test public void testCalcReduceNumByInputSize() throws Exception { @@ -71,11 +71,11 @@ public class DppSchedulerTest { result = commandResult; } }; - + // get method Method calcReduceNumByInputSize = UnitTestUtil.getPrivateMethod( DppScheduler.class, "calcReduceNumByInputSize", new Class[] {Set.class}); - + // normal test Set inputPaths = new HashSet(); Config.load_input_size_limit_gb = 0; @@ -94,7 +94,7 @@ public class DppSchedulerTest { } Config.load_input_size_limit_gb = 0; } - + @Test public void testCalcReduceNumByTablet() throws Exception { Map jobConf = new HashMap(); @@ -114,16 +114,16 @@ public class DppSchedulerTest { } view2.put("key_ranges", rangeList); views.put("view2", view2); - + Method calcReduceNumByTablet = UnitTestUtil.getPrivateMethod( DppScheduler.class, "calcReduceNumByTablet", new Class[] {Map.class}); Assert.assertEquals(15, calcReduceNumByTablet.invoke(dppScheduler, new Object[] {jobConf})); } - + @Test public void testGetEtlJobStatus() { - String jobStatus = "Job: job_201501261830_12231\n" - + "file: hdfs://host:54310/system/mapred/job_201501261830_12231/job.xml\n" + String jobStatus = "Job: job_201501261830_12231\n" + + "file: hdfs://host:54310/system/mapred/job_201501261830_12231/job.xml\n" + "tracking URL: http://host:8030/jobdetails.jsp?jobid=job_201501261830_12231\n" + "job state: 1\n" + "map() completion: 0.9036233\n" @@ -147,13 +147,13 @@ public class DppSchedulerTest { result = commandResult; } }; - + EtlStatus status = dppScheduler.getEtlJobStatus("etlJobId"); Assert.assertEquals(TEtlState.RUNNING, status.getState()); Assert.assertEquals("0", status.getCounters().get("dpp.abnorm.ALL")); Assert.assertEquals("0.9036233", status.getStats().get("map() completion")); } - + @Test public void testGetEtlFileList() { String outputPath = "/label_0"; @@ -197,7 +197,7 @@ public class DppSchedulerTest { Assert.assertNotNull(fileMap); Assert.assertTrue(fileMap.isEmpty()); } - + @Test public void testKillEtlJob() { CommandResult commandResult = new CommandResult(); @@ -208,10 +208,10 @@ public class DppSchedulerTest { result = commandResult; } }; - + dppScheduler.killEtlJob("etlJobId"); } - + @Test public void testGetEtlOutputPath() { DppConfig dppConfig = Load.dppDefaultConfig.getCopiedDppConfig(); @@ -225,5 +225,5 @@ public class DppSchedulerTest { + "/" + loadLabel + "/" + etlOutputDir; Assert.assertEquals(expectedPath, actualPath); } - + } diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/EtlJobStatusTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/EtlJobStatusTest.java index 0d5a8be29a..c91abec263 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/EtlJobStatusTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/EtlJobStatusTest.java @@ -69,7 +69,7 @@ public class EtlJobStatusTest { etlJobStatus1.readFields(dis); stats = etlJobStatus1.getStats(); counters = etlJobStatus1.getCounters(); - + Assert.assertEquals(etlJobStatus1.getState().name(), "FINISHED"); for (int count = 0; count < 5; ++count) { String statsKey = "statsKey" + count; @@ -79,10 +79,10 @@ public class EtlJobStatusTest { Assert.assertEquals(stats.get(statsKey), statsValue); Assert.assertEquals(counters.get(countersKey), countersValue); } - + Assert.assertTrue(etlJobStatus.equals(etlJobStatus1)); Assert.assertEquals(trackingUrl, etlJobStatus1.getTrackingUrl()); - + dis.close(); file.delete(); } diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/FailMsgTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/FailMsgTest.java index aa11d82f43..f0c88855ef 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/FailMsgTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/FailMsgTest.java @@ -42,12 +42,12 @@ public class FailMsgTest { DataInputStream dis = new DataInputStream(new FileInputStream(file)); FailMsg failMsg1 = new FailMsg(); failMsg1.readFields(dis); - + Assert.assertEquals(failMsg1.getMsg(), "Job failed"); Assert.assertEquals(failMsg1.getCancelType(), FailMsg.CancelType.ETL_QUALITY_UNSATISFIED); - + Assert.assertTrue(failMsg1.equals(failMsg)); - + dis.close(); file.delete(); } diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/LoadCheckerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/LoadCheckerTest.java index 81686771c0..e2654b9fc4 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/LoadCheckerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/LoadCheckerTest.java @@ -34,13 +34,14 @@ import org.apache.doris.task.AgentTaskQueue; import org.apache.doris.task.MasterTask; import org.apache.doris.task.MasterTaskExecutor; +import com.google.common.collect.Lists; +import mockit.Expectations; +import mockit.Mocked; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.google.common.collect.Lists; - import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; @@ -48,9 +49,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import mockit.Expectations; -import mockit.Mocked; - public class LoadCheckerTest { private long dbId; private long tableId; @@ -68,7 +66,7 @@ public class LoadCheckerTest { @Mocked private Load load; private Database db; - + @Before public void setUp() { dbId = 0L; @@ -77,9 +75,9 @@ public class LoadCheckerTest { indexId = 0L; tabletId = 0L; backendId = 0L; - + label = "test_label"; - + // mock catalog db = UnitTestUtil.createDb(dbId, tableId, partitionId, indexId, tabletId, backendId, 1L); new Expectations() { @@ -114,7 +112,7 @@ public class LoadCheckerTest { public void tearDown() { Config.load_running_job_num_limit = 0; } - + @Test public void testInit() throws Exception { LoadChecker.init(5L); @@ -124,15 +122,15 @@ public class LoadCheckerTest { checkersField.setAccessible(true); Map checkers = (Map) checkersField.get(LoadChecker.class); Assert.assertEquals(4, checkers.size()); - + // verify executors Field executorsField = LoadChecker.class.getDeclaredField("executors"); executorsField.setAccessible(true); - Map executors = + Map executors = (Map) executorsField.get(LoadChecker.class); Assert.assertEquals(2, executors.size()); } - + @Test public void testRunPendingJobs(@Mocked MasterTaskExecutor executor) throws Exception { List pendingJobs = new ArrayList(); @@ -156,7 +154,7 @@ public class LoadCheckerTest { result = true; } }; - + // init LoadChecker.init(5L); @@ -239,7 +237,7 @@ public class LoadCheckerTest { result = true; } }; - + // init LoadChecker.init(5L); @@ -250,7 +248,7 @@ public class LoadCheckerTest { Method runEtlJobs = UnitTestUtil.getPrivateMethod(LoadChecker.class, "runEtlJobs", new Class[] {}); runEtlJobs.invoke(checkers.get(JobState.ETL), new Object[] {}); } - + @Test public void testRunLoadingJobs() throws Exception { List etlJobs = new ArrayList(); @@ -303,7 +301,7 @@ public class LoadCheckerTest { result = load; } }; - + // init LoadChecker.init(5L); @@ -322,14 +320,14 @@ public class LoadCheckerTest { replica.updateVersionInfo(newVersion, 0L, 0L); } } - } + } // verify runLoadingJobs.invoke(checkers.get(JobState.LOADING), new Object[] {}); // clear agent tasks AgentTaskQueue.clearAllTasks(); } - + @Test public void testRunQuorumFinishedJobs() throws Exception { List etlJobs = new ArrayList(); @@ -382,7 +380,7 @@ public class LoadCheckerTest { result = load; } }; - + // init LoadChecker.init(5L); @@ -393,10 +391,10 @@ public class LoadCheckerTest { Method runQuorumFinishedJobs = UnitTestUtil.getPrivateMethod( LoadChecker.class, "runQuorumFinishedJobs", new Class[] {}); runQuorumFinishedJobs.invoke(checkers.get(JobState.QUORUM_FINISHED), new Object[] {}); - + Assert.assertEquals(0, AgentTaskQueue.getTaskNum()); } - + @Test public void testCheckTimeout() { LoadJob job = new LoadJob(label); @@ -406,11 +404,11 @@ public class LoadCheckerTest { // timeout is 0s job.setTimeoutSecond(0); Assert.assertFalse(LoadChecker.checkTimeout(job)); - + // timeout is 1s job.setTimeoutSecond(1); Assert.assertTrue(LoadChecker.checkTimeout(job)); - + // timeout is 10s job.setTimeoutSecond(10); Assert.assertFalse(LoadChecker.checkTimeout(job)); diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/LoadJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/LoadJobTest.java index 6b665ed164..846ea6163b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/LoadJobTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/LoadJobTest.java @@ -56,7 +56,7 @@ public class LoadJobTest { public void setUp() { UnitTestUtil.initDppConfig(); } - + public Source makeSource(int startId, int size) { List files = new ArrayList(size); List columns = new ArrayList(size); @@ -69,7 +69,7 @@ public class LoadJobTest { Source source = new Source(files, columns, "\t", "\n", false); return source; } - + public List makeDeleteConditions(int startId, int size) { List deletions = new ArrayList(); for (int count = startId; count < startId + size; ++count) { @@ -81,7 +81,7 @@ public class LoadJobTest { } return deletions; } - + public LoadJob getLoadJob() { Source source1 = makeSource(0, 10); Source source2 = makeSource(10, 30); @@ -116,15 +116,15 @@ public class LoadJobTest { tabletLoadInfos.put(1L, tabletLoadInfo1); tabletLoadInfos.put(2L, tabletLoadInfo2); tabletLoadInfos.put(3L, tabletLoadInfo3); - + LoadJob loadJob3 = new LoadJob("datalabel-2014-12-5", 1000, 0.1); loadJob3.setIdToTableLoadInfo(idToTableLoadInfo); loadJob3.setIdToTabletLoadInfo(tabletLoadInfos); - + loadJob3.addFullTablet(1); loadJob3.addFullTablet(2); loadJob3.addFullTablet(3); - + loadJob3.addReplicaPersistInfos(ReplicaPersistInfo.createForLoad(1, 1, 1, 1, 1, 1, 0, 1, 1)); loadJob3.addReplicaPersistInfos(ReplicaPersistInfo.createForLoad(2, 2, 2, 2, 2, 2, 0, 2, 2)); loadJob3.addReplicaPersistInfos(ReplicaPersistInfo.createForLoad(3, 3, 3, 3, 3, 3, 0, 3, 3)); @@ -141,7 +141,7 @@ public class LoadJobTest { File file = new File("./loadJobTest" + System.currentTimeMillis()); file.createNewFile(); DataOutputStream dos = new DataOutputStream(new FileOutputStream(file)); - + LoadJob loadJob0 = new LoadJob(); loadJob0.write(dos); @@ -154,7 +154,7 @@ public class LoadJobTest { loadJob1.setProgress(100); loadJob1.setHadoopEtlJobId("etl-job-id"); loadJob1.write(dos); - + LoadJob loadJob3 = getLoadJob(); loadJob3.write(dos); @@ -174,32 +174,32 @@ public class LoadJobTest { Assert.assertTrue(loadJob0.equals(rLoadJob0)); Assert.assertTrue(loadJob1.equals(rLoadJob1)); Assert.assertTrue(loadJob3.equals(rLoadJob3)); - + Assert.assertFalse(loadJob0.equals(rLoadJob1)); - + dis.close(); file.delete(); } - + @Test public void testClear() throws Exception { LoadJob job = getLoadJob(); - + Assert.assertFalse(job.getIdToTableLoadInfo() == null); Assert.assertFalse(job.getIdToTabletLoadInfo() == null); Assert.assertFalse(job.getQuorumTablets() == null); Assert.assertFalse(job.getFullTablets() == null); Assert.assertFalse(job.getReplicaPersistInfos() == null); - + job.clearRedundantInfoForHistoryJob(); - + Assert.assertTrue(job.getIdToTableLoadInfo() == null); Assert.assertTrue(job.getIdToTabletLoadInfo() == null); Assert.assertTrue(job.getQuorumTablets() == null); Assert.assertTrue(job.getFullTablets() == null); Assert.assertTrue(job.getReplicaPersistInfos() == null); } - + @Test public void testEqual() throws Exception { LoadJob job1 = getLoadJob(); @@ -207,25 +207,25 @@ public class LoadJobTest { Thread.sleep(10); LoadJob job3 = getLoadJob(); } - + @Test public void testGetAndSet() throws Exception { LoadJob job = new LoadJob(); job.setId(1); Assert.assertEquals(1, job.getId()); - + job.setDbId(2); Assert.assertEquals(2, job.getDbId()); - + Assert.assertEquals("", job.getLabel()); - + job.setTimeoutSecond(3); Assert.assertEquals(3, job.getTimeoutSecond()); String cluster = Config.dpp_default_cluster; job.setClusterInfo(cluster, Load.clusterToDppConfig.get(cluster)); Assert.assertEquals(cluster, job.getHadoopCluster()); - + job.setState(JobState.CANCELLED); Assert.assertEquals(JobState.CANCELLED, job.getState()); @@ -234,7 +234,7 @@ public class LoadJobTest { job.setEtlStartTimeMs(6); Assert.assertEquals(6, job.getEtlStartTimeMs()); - + job.setEtlFinishTimeMs(7); Assert.assertEquals(7, job.getEtlFinishTimeMs()); diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/PartitionLoadInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/PartitionLoadInfoTest.java index 44eae985f3..51628b54fb 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/PartitionLoadInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/PartitionLoadInfoTest.java @@ -42,7 +42,7 @@ public class PartitionLoadInfoTest { Source source = new Source(files, columns, "\t", "\n", false); return source; } - + @Test public void testSerialization() throws Exception { File file = new File("./partitionLoadInfoTest"); @@ -57,33 +57,33 @@ public class PartitionLoadInfoTest { PartitionLoadInfo partitionLoadInfo = new PartitionLoadInfo(sources); partitionLoadInfo.setVersion(100000); partitionLoadInfo.write(dos); - + PartitionLoadInfo partitionLoadInfo0 = new PartitionLoadInfo(); partitionLoadInfo0.write(dos); - + dos.flush(); dos.close(); DataInputStream dis = new DataInputStream(new FileInputStream(file)); PartitionLoadInfo partitionLoadInfo1 = new PartitionLoadInfo(); partitionLoadInfo1.readFields(dis); - + PartitionLoadInfo rPartitionLoadInfo0 = new PartitionLoadInfo(); rPartitionLoadInfo0.readFields(dis); - + List sources1 = partitionLoadInfo1.getSources(); Assert.assertEquals(partitionLoadInfo1.getVersion(), 100000); Assert.assertEquals(sources1.size(), 2); - Assert.assertEquals(sources1.get(0).getFileUrls().size(), 10); + Assert.assertEquals(sources1.get(0).getFileUrls().size(), 10); Assert.assertEquals(sources1.get(0).getColumnNames().size(), 10); - Assert.assertEquals(sources1.get(1).getFileUrls().size(), 30); + Assert.assertEquals(sources1.get(1).getFileUrls().size(), 30); Assert.assertEquals(sources1.get(1).getColumnNames().size(), 30); - + Assert.assertTrue(partitionLoadInfo1.equals(partitionLoadInfo)); Assert.assertTrue(rPartitionLoadInfo0.equals(partitionLoadInfo0)); Assert.assertFalse(partitionLoadInfo0.equals(partitionLoadInfo1)); - + dis.close(); file.delete(); } diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/SourceTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/SourceTest.java index da84d163b0..352b728cfb 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/SourceTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/SourceTest.java @@ -35,7 +35,7 @@ public class SourceTest { File file = new File("./sourceTest"); file.createNewFile(); DataOutputStream dos = new DataOutputStream(new FileOutputStream(file)); - + Source source0 = new Source(); source0.write(dos); @@ -49,22 +49,22 @@ public class SourceTest { } Source source1 = new Source(files, columns, "\t", "\n", false); source1.write(dos); - + Source source2 = new Source(); source2.setFileUrls(null); source2.setColumnNames(null); source2.write(dos); - + dos.flush(); dos.close(); DataInputStream dis = new DataInputStream(new FileInputStream(file)); Source rSource0 = new Source(); rSource0.readFields(dis); - + Source rSource1 = new Source(); rSource1.readFields(dis); - + Source rSource2 = new Source(); rSource2.readFields(dis); @@ -74,7 +74,7 @@ public class SourceTest { Assert.assertTrue(rSource1.equals(source1)); Assert.assertFalse(rSource2.equals(source2)); Assert.assertFalse(rSource0.equals(source1)); - + rSource2.setFileUrls(null); Assert.assertFalse(rSource2.equals(source2)); rSource2.setColumnNames(null); @@ -82,7 +82,7 @@ public class SourceTest { rSource2.setColumnNames(null); rSource2.setFileUrls(null); Assert.assertTrue(rSource2.equals(source2)); - + dis.close(); file.delete(); } diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java index 3497de9d5e..dcd97936ea 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java @@ -44,7 +44,7 @@ public class TabletLoadInfoTest { TabletLoadInfo tabletLoadInfo0 = new TabletLoadInfo(); tabletLoadInfo0.write(dos); - + TabletLoadInfo tabletLoadInfo = new TabletLoadInfo("hdfs://host:port/dir", 1L); tabletLoadInfo.write(dos); dos.flush(); @@ -53,17 +53,17 @@ public class TabletLoadInfoTest { DataInputStream dis = new DataInputStream(new FileInputStream(file)); TabletLoadInfo rTabletLoadInfo0 = new TabletLoadInfo(); rTabletLoadInfo0.readFields(dis); - + TabletLoadInfo tabletLoadInfo1 = new TabletLoadInfo(); tabletLoadInfo1.readFields(dis); Assert.assertEquals("hdfs://host:port/dir", tabletLoadInfo1.getFilePath()); Assert.assertEquals(1L, tabletLoadInfo1.getFileSize()); - + Assert.assertTrue(tabletLoadInfo1.equals(tabletLoadInfo)); Assert.assertTrue(rTabletLoadInfo0.equals(tabletLoadInfo0)); Assert.assertFalse(rTabletLoadInfo0.equals(tabletLoadInfo1)); - + dis.close(); file.delete(); } diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerFileGroupAggInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerFileGroupAggInfoTest.java index 91ead5b02a..12d03346ce 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerFileGroupAggInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerFileGroupAggInfoTest.java @@ -24,7 +24,6 @@ import org.apache.doris.load.BrokerFileGroupAggInfo; import org.apache.doris.load.BrokerFileGroupAggInfo.FileGroupAggKey; import com.google.common.collect.Lists; - import org.junit.Assert; import org.junit.Test; @@ -41,7 +40,7 @@ public class BrokerFileGroupAggInfoTest { * table 1 -> partition[10] file2 * table 2 -> partition[] file3 * table 3 -> partition[11, 12] file4 - * + * * output: * table 1 -> partition[10] (file1, file2) * table 2 -> partition[] file3 @@ -94,7 +93,7 @@ public class BrokerFileGroupAggInfoTest { * table 1 -> partition[10, 11] file1 * table 1 -> partition[11, 12] file2 * table 2 -> partition[] file3 - * + * * output: * throw exception */ diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerLoadJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerLoadJobTest.java index 21aa0d3ad3..082be4552c 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerLoadJobTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerLoadJobTest.java @@ -52,7 +52,11 @@ import org.apache.doris.transaction.TransactionState; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -65,12 +69,6 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; - public class BrokerLoadJobTest { @BeforeClass diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerLoadPendingTaskTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerLoadPendingTaskTest.java index b1427b5d57..cc5cdc988f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerLoadPendingTaskTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/BrokerLoadPendingTaskTest.java @@ -17,12 +17,6 @@ package org.apache.doris.load.loadv2; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; - import org.apache.doris.analysis.BrokerDesc; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.UserException; @@ -34,7 +28,11 @@ import org.apache.doris.thrift.TBrokerFileStatus; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/ExportMgrTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/ExportMgrTest.java index d72318b596..ba479b75b7 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/ExportMgrTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/ExportMgrTest.java @@ -17,8 +17,6 @@ package org.apache.doris.load.loadv2; -import com.google.common.collect.Maps; -import mockit.Mocked; import org.apache.doris.analysis.BrokerDesc; import org.apache.doris.analysis.LoadStmt; import org.apache.doris.analysis.TableName; @@ -27,6 +25,9 @@ import org.apache.doris.load.ExportJob; import org.apache.doris.load.ExportMgr; import org.apache.doris.mysql.privilege.MockedAuth; import org.apache.doris.mysql.privilege.PaloAuth; + +import com.google.common.collect.Maps; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/InsertLoadJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/InsertLoadJobTest.java index a7f2bb3766..69d844f6d7 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/InsertLoadJobTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/InsertLoadJobTest.java @@ -21,18 +21,17 @@ import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.Database; import org.apache.doris.catalog.Table; import org.apache.doris.common.MetaNotFoundException; - import org.apache.doris.common.jmockit.Deencapsulation; + +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.junit.Assert; import org.junit.Test; import java.util.Optional; import java.util.Set; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; - public class InsertLoadJobTest { @Test diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/LoadJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/LoadJobTest.java index 880965cccf..d466a41b14 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/LoadJobTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/LoadJobTest.java @@ -14,7 +14,6 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// package org.apache.doris.load.loadv2; @@ -39,17 +38,15 @@ import org.apache.doris.transaction.TransactionState; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import java.util.Map; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; - public class LoadJobTest { @BeforeClass @@ -185,4 +182,3 @@ public class LoadJobTest { Assert.assertEquals(0, loadJob.idToTasks.size()); } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/LoadManagerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/LoadManagerTest.java index f014411436..db17f2b5be 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/LoadManagerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/LoadManagerTest.java @@ -30,14 +30,16 @@ import org.apache.doris.common.jmockit.Deencapsulation; import org.apache.doris.load.EtlJobType; import org.apache.doris.meta.MetaContext; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; - import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; @@ -46,10 +48,6 @@ import java.io.FileOutputStream; import java.util.List; import java.util.Map; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; - public class LoadManagerTest { private LoadManager loadManager; private final String fieldName = "idToLoadJob"; diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkEtlJobHandlerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkEtlJobHandlerTest.java index 6965bdee3f..d05d59668a 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkEtlJobHandlerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkEtlJobHandlerTest.java @@ -17,12 +17,6 @@ package org.apache.doris.load.loadv2; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; - import org.apache.doris.analysis.BrokerDesc; import org.apache.doris.catalog.BrokerMgr; import org.apache.doris.catalog.Catalog; @@ -47,14 +41,18 @@ import org.apache.doris.thrift.TEtlState; import org.apache.doris.thrift.TNetworkAddress; import org.apache.doris.thrift.TPaloBrokerService; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.apache.spark.launcher.SparkLauncher; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; - import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkLoadPendingTaskTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkLoadPendingTaskTest.java index 216706b134..b5462289c9 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkLoadPendingTaskTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkLoadPendingTaskTest.java @@ -53,18 +53,16 @@ import org.apache.doris.load.loadv2.etl.EtlJobConfig.EtlTable; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - -import org.junit.Assert; -import org.junit.Test; - -import java.util.List; -import java.util.Map; - import mockit.Expectations; import mockit.Injectable; import mockit.Mock; import mockit.MockUp; import mockit.Mocked; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; +import java.util.Map; public class SparkLoadPendingTaskTest { diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkRepositoryTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkRepositoryTest.java index 5352a5797b..6343e92823 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkRepositoryTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkRepositoryTest.java @@ -17,11 +17,6 @@ package org.apache.doris.load.loadv2; -import mockit.Expectations; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; - import org.apache.doris.analysis.BrokerDesc; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.Config; @@ -29,9 +24,13 @@ import org.apache.doris.common.LoadException; import org.apache.doris.common.UserException; import org.apache.doris.common.util.BrokerUtil; import org.apache.doris.thrift.TBrokerFileStatus; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkYarnConfigFilesTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkYarnConfigFilesTest.java index 9dc497bd02..77e3b0c9fe 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkYarnConfigFilesTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkYarnConfigFilesTest.java @@ -17,12 +17,11 @@ package org.apache.doris.load.loadv2; -import mockit.Mocked; - import org.apache.doris.catalog.Catalog; import org.apache.doris.common.LoadException; -import com.google.common.collect.Maps; +import com.google.common.collect.Maps; +import mockit.Mocked; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/KafkaRoutineLoadJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/KafkaRoutineLoadJobTest.java index 03510dd8dd..deac5298ec 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/KafkaRoutineLoadJobTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/KafkaRoutineLoadJobTest.java @@ -47,7 +47,12 @@ import org.apache.doris.transaction.GlobalTransactionMgr; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; +import mockit.Verifications; import org.apache.kafka.common.PartitionInfo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -61,13 +66,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; -import mockit.Verifications; - public class KafkaRoutineLoadJobTest { private static final Logger LOG = LogManager.getLogger(KafkaRoutineLoadJobTest.class); diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java index 8846515334..4fd5a03080 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadJobTest.java @@ -34,20 +34,18 @@ import org.apache.doris.transaction.TransactionState; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - -import org.apache.kafka.common.PartitionInfo; -import org.junit.Assert; -import org.junit.Test; - -import java.util.List; -import java.util.Map; - import java_cup.runtime.Symbol; import mockit.Expectations; import mockit.Injectable; import mockit.Mock; import mockit.MockUp; import mockit.Mocked; +import org.apache.kafka.common.PartitionInfo; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; +import java.util.Map; public class RoutineLoadJobTest { diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadManagerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadManagerTest.java index bf26a8b4ca..7b20ed28d0 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadManagerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadManagerTest.java @@ -48,7 +48,11 @@ import org.apache.doris.thrift.TResourceInfo; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Assert; @@ -59,12 +63,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; - public class RoutineLoadManagerTest { private static final Logger LOG = LogManager.getLogger(RoutineLoadManagerTest.class); diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadSchedulerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadSchedulerTest.java index a0f725099a..ee49368f02 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadSchedulerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadSchedulerTest.java @@ -33,7 +33,9 @@ import org.apache.doris.thrift.TResourceInfo; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.junit.Assert; import org.junit.Test; @@ -41,10 +43,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; - public class RoutineLoadSchedulerTest { @Mocked diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadTaskSchedulerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadTaskSchedulerTest.java index 2dfbe159f0..5194aa776d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadTaskSchedulerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/routineload/RoutineLoadTaskSchedulerTest.java @@ -33,17 +33,15 @@ import org.apache.doris.transaction.GlobalTransactionMgr; import com.google.common.collect.Maps; import com.google.common.collect.Queues; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.junit.Test; import java.util.Map; import java.util.Queue; import java.util.UUID; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; - public class RoutineLoadTaskSchedulerTest { @Mocked diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/sync/SyncJobManagerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/sync/SyncJobManagerTest.java index e0f740642e..36cad3016b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/sync/SyncJobManagerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/sync/SyncJobManagerTest.java @@ -36,7 +36,9 @@ import org.apache.doris.persist.EditLog; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Assert; @@ -46,10 +48,6 @@ import org.junit.Test; import java.util.List; import java.util.Map; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; - public class SyncJobManagerTest { private static final Logger LOG = LogManager.getLogger(SyncJobManagerTest.class); diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalSyncDataTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalSyncDataTest.java index 3b1b4eddfc..727644a6a3 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalSyncDataTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalSyncDataTest.java @@ -46,7 +46,10 @@ import com.alibaba.otter.canal.protocol.exception.CanalClientException; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Assert; @@ -59,10 +62,6 @@ import java.util.Map; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import mockit.Expectations; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; public class CanalSyncDataTest { private static final Logger LOG = LogManager.getLogger(CanalSyncDataTest.class); diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalSyncJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalSyncJobTest.java index b1c8e0f3fd..4dc7eeb909 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalSyncJobTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalSyncJobTest.java @@ -38,7 +38,11 @@ import org.apache.doris.persist.EditLog; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Assert; @@ -48,12 +52,6 @@ import org.junit.Test; import java.util.List; import java.util.Map; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; - public class CanalSyncJobTest { private static final Logger LOG = LogManager.getLogger(CanalSyncJobTest.class); @@ -393,7 +391,7 @@ public class CanalSyncJobTest { result = "mysqlTbl"; } }; - + try { CanalSyncJob canalSyncJob = new CanalSyncJob(jobId, jobName, dbId); canalSyncJob.setChannelDescriptions(channelDescriptions); diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateManagerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateManagerTest.java index d75f7c1b46..67f1b22f94 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateManagerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateManagerTest.java @@ -22,17 +22,16 @@ import org.apache.doris.common.Config; import org.apache.doris.common.DdlException; import org.apache.doris.common.jmockit.Deencapsulation; -import com.google.common.collect.Maps; - -import java.util.List; -import java.util.Map; - import com.clearspring.analytics.util.Lists; +import com.google.common.collect.Maps; import mockit.Expectations; import mockit.Injectable; import org.junit.Assert; import org.junit.Test; +import java.util.List; +import java.util.Map; + public class UpdateManagerTest { @Test diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateStmtExecutorTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateStmtExecutorTest.java index a6744e53f5..5f5a7e2b39 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateStmtExecutorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateStmtExecutorTest.java @@ -34,8 +34,6 @@ import org.apache.doris.qe.Coordinator; import org.apache.doris.thrift.TUniqueId; import org.apache.doris.transaction.GlobalTransactionMgr; -import java.util.List; - import com.clearspring.analytics.util.Lists; import mockit.Expectations; import mockit.Injectable; @@ -43,6 +41,8 @@ import mockit.Mocked; import org.junit.Assert; import org.junit.Test; +import java.util.List; + public class UpdateStmtExecutorTest { @Test diff --git a/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java b/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java index d75063f2c4..77ba56b79a 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java @@ -19,11 +19,12 @@ package org.apache.doris.metric; import org.apache.doris.common.FeConstants; -import java.util.List; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import java.util.List; + public class MetricsTest { @BeforeClass diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlChannelTest.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlChannelTest.java index 017f15d8d9..17c406579f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlChannelTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlChannelTest.java @@ -17,6 +17,9 @@ package org.apache.doris.mysql; +import mockit.Delegate; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -26,10 +29,6 @@ import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; -import mockit.Delegate; -import mockit.Expectations; -import mockit.Mocked; - public class MysqlChannelTest { int packetId = 0; int readIdx = 0; diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlErrPacketTest.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlErrPacketTest.java index 640fde8240..0a296a324f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlErrPacketTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlErrPacketTest.java @@ -82,4 +82,3 @@ public class MysqlErrPacketTest { } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlOkPacketTest.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlOkPacketTest.java index 58d455a1fd..6cb157ee25 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlOkPacketTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlOkPacketTest.java @@ -63,4 +63,3 @@ public class MysqlOkPacketTest { } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlProtoTest.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlProtoTest.java index 89dcc62300..ff90477279 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlProtoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlProtoTest.java @@ -17,9 +17,6 @@ package org.apache.doris.mysql; -import mockit.Delegate; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.analysis.UserIdentity; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.Database; @@ -32,6 +29,9 @@ import org.apache.doris.mysql.privilege.PaloAuth; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; +import mockit.Delegate; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlServerTest.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlServerTest.java index db7acf079d..00eb1a82ef 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlServerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlServerTest.java @@ -17,12 +17,12 @@ package org.apache.doris.mysql; -import mockit.Delegate; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.ConnectScheduler; +import mockit.Delegate; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java index 91182dc4cf..03ac1073e7 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java @@ -42,7 +42,8 @@ import org.apache.doris.qe.QueryState; import org.apache.doris.system.SystemInfoService; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -51,9 +52,6 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.Set; -import mockit.Expectations; -import mockit.Mocked; - public class AuthTest { private PaloAuth auth; diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/MockedAuth.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/MockedAuth.java index e85735e5ac..06bcd91038 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/MockedAuth.java +++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/MockedAuth.java @@ -17,11 +17,12 @@ package org.apache.doris.mysql.privilege; -import mockit.Expectations; import org.apache.doris.analysis.UserIdentity; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.QueryState; +import mockit.Expectations; + public class MockedAuth { public static void mockedAuth(PaloAuth auth) { diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/SetPasswordTest.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/SetPasswordTest.java index 73877aab85..a8c64b24de 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/SetPasswordTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/SetPasswordTest.java @@ -17,7 +17,6 @@ package org.apache.doris.mysql.privilege; -import mockit.Expectations; import org.apache.doris.analysis.Analyzer; import org.apache.doris.analysis.CreateUserStmt; import org.apache.doris.analysis.SetPassVar; @@ -32,12 +31,12 @@ import org.apache.doris.persist.PrivInfo; import org.apache.doris.qe.ConnectContext; import org.apache.doris.system.SystemInfoService; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import mockit.Mocked; - public class SetPasswordTest { private PaloAuth auth; @@ -85,7 +84,7 @@ public class SetPasswordTest { userIdentity.setIsAnalyzed(); CreateUserStmt stmt = new CreateUserStmt(new UserDesc(userIdentity)); auth.createUser(stmt); - + ConnectContext ctx = new ConnectContext(null); // set password for 'cmy'@'%' UserIdentity currentUser1 = new UserIdentity("default_cluster:cmy", "%"); @@ -131,7 +130,7 @@ public class SetPasswordTest { e.printStackTrace(); Assert.fail(); } - + // set password for cmy2@'192.168.1.1' UserIdentity user2 = new UserIdentity("default_cluster:cmy2", "192.168.1.1"); user2.setIsAnalyzed(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/AlterRoutineLoadOperationLogTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/AlterRoutineLoadOperationLogTest.java index cc92ab44f1..7572cff364 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/AlterRoutineLoadOperationLogTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/AlterRoutineLoadOperationLogTest.java @@ -23,7 +23,6 @@ import org.apache.doris.common.UserException; import org.apache.doris.common.util.TimeUtils; import com.google.common.collect.Maps; - import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/AlterViewInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/AlterViewInfoTest.java index 65e32f111d..8b179c2889 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/AlterViewInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/AlterViewInfoTest.java @@ -17,10 +17,11 @@ package org.apache.doris.persist; -import com.google.common.collect.Lists; import org.apache.doris.catalog.Column; import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.common.AnalysisException; + +import com.google.common.collect.Lists; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java index b828fe01e7..7b5b31818b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java @@ -22,7 +22,6 @@ import org.apache.doris.catalog.ReplicaAllocation; import org.apache.doris.common.AnalysisException; import com.google.common.collect.Lists; - import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/BatchRemoveTransactionOperationTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/BatchRemoveTransactionOperationTest.java index 85532fb177..3f80366baf 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/BatchRemoveTransactionOperationTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/BatchRemoveTransactionOperationTest.java @@ -22,7 +22,6 @@ import org.apache.doris.meta.MetaContext; import com.clearspring.analytics.util.Lists; import com.google.common.collect.Maps; - import org.junit.Assert; import org.junit.Test; @@ -56,7 +55,7 @@ public class BatchRemoveTransactionOperationTest { dos.flush(); dos.close(); - + // 2. Read objects from file DataInputStream dis = new DataInputStream(new FileInputStream(file)); BatchRemoveTransactionsOperation op2 = BatchRemoveTransactionsOperation.read(dis); diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java index 55b1b6c126..a9c655cddd 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java @@ -17,6 +17,28 @@ package org.apache.doris.persist; +import org.apache.doris.catalog.AggregateType; +import org.apache.doris.catalog.Catalog; +import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.FakeCatalog; +import org.apache.doris.catalog.KeysType; +import org.apache.doris.catalog.MaterializedIndex; +import org.apache.doris.catalog.MaterializedIndex.IndexState; +import org.apache.doris.catalog.OlapTable; +import org.apache.doris.catalog.Partition; +import org.apache.doris.catalog.PrimitiveType; +import org.apache.doris.catalog.RandomDistributionInfo; +import org.apache.doris.catalog.ScalarType; +import org.apache.doris.catalog.SinglePartitionInfo; +import org.apache.doris.common.FeConstants; +import org.apache.doris.common.jmockit.Deencapsulation; +import org.apache.doris.thrift.TStorageType; + +import com.google.common.collect.Lists; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; @@ -25,29 +47,6 @@ import java.io.FileOutputStream; import java.util.ArrayList; import java.util.List; -import org.apache.doris.catalog.FakeCatalog; -import org.apache.doris.catalog.ScalarType; -import org.apache.doris.common.jmockit.Deencapsulation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import org.apache.doris.catalog.AggregateType; -import org.apache.doris.catalog.Catalog; -import org.apache.doris.catalog.Column; -import org.apache.doris.catalog.KeysType; -import org.apache.doris.catalog.MaterializedIndex; -import org.apache.doris.catalog.OlapTable; -import org.apache.doris.catalog.Partition; -import org.apache.doris.catalog.PrimitiveType; -import org.apache.doris.catalog.RandomDistributionInfo; -import org.apache.doris.catalog.SinglePartitionInfo; -import org.apache.doris.catalog.MaterializedIndex.IndexState; -import org.apache.doris.common.FeConstants; -import org.apache.doris.thrift.TStorageType; - -import com.google.common.collect.Lists; - public class CreateTableInfoTest { private Catalog catalog; @@ -68,16 +67,16 @@ public class CreateTableInfoTest { File file = new File("./createTableInfo"); file.createNewFile(); DataOutputStream dos = new DataOutputStream(new FileOutputStream(file)); - + List columns = new ArrayList(); Column column2 = new Column("column2", ScalarType.createType(PrimitiveType.TINYINT), false, AggregateType.MIN, "", ""); columns.add(column2); columns.add(new Column("column3", ScalarType.createType(PrimitiveType.SMALLINT), false, AggregateType.SUM, "", "")); - columns.add(new Column("column4", + columns.add(new Column("column4", ScalarType.createType(PrimitiveType.INT), false, AggregateType.REPLACE, "", "")); - columns.add(new Column("column5", + columns.add(new Column("column5", ScalarType.createType(PrimitiveType.BIGINT), false, AggregateType.REPLACE, "", "")); columns.add(new Column("column6", ScalarType.createType(PrimitiveType.FLOAT), false, AggregateType.REPLACE, "", "")); @@ -91,7 +90,7 @@ public class CreateTableInfoTest { MaterializedIndex index = new MaterializedIndex(1, IndexState.NORMAL); RandomDistributionInfo distributionInfo = new RandomDistributionInfo(10); Partition partition = new Partition(20000L, "table", index, distributionInfo); - OlapTable table = new OlapTable(1000L, "table", columns, KeysType.AGG_KEYS, + OlapTable table = new OlapTable(1000L, "table", columns, KeysType.AGG_KEYS, new SinglePartitionInfo(), distributionInfo); short shortKeyColumnCount = 1; table.setIndexMeta(1000, "group1", columns, 1,1,shortKeyColumnCount,TStorageType.COLUMN, KeysType.AGG_KEYS); @@ -107,15 +106,15 @@ public class CreateTableInfoTest { dos.flush(); dos.close(); - + // 2. Read objects from file DataInputStream dis = new DataInputStream(new FileInputStream(file)); - + CreateTableInfo rInfo1 = CreateTableInfo.read(dis); Assert.assertTrue(rInfo1.getTable().equals(table)); Assert.assertTrue(rInfo1.equals(info)); Assert.assertEquals(rInfo1.getDbName(), "db1"); - + // 3. delete files dis.close(); file.delete(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/DropDbInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/DropDbInfoTest.java index 0213e041a0..80a78a264d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/DropDbInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/DropDbInfoTest.java @@ -19,6 +19,7 @@ package org.apache.doris.persist; import org.apache.doris.common.FeMetaVersion; import org.apache.doris.meta.MetaContext; + import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/DropInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/DropInfoTest.java index d704cf31b6..629d03cb45 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/DropInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/DropInfoTest.java @@ -19,6 +19,7 @@ package org.apache.doris.persist; import org.apache.doris.common.FeMetaVersion; import org.apache.doris.meta.MetaContext; + import org.junit.Assert; import org.junit.Test; @@ -39,29 +40,29 @@ public class DropInfoTest { File file = new File("./dropInfo"); file.createNewFile(); DataOutputStream dos = new DataOutputStream(new FileOutputStream(file)); - + DropInfo info1 = new DropInfo(); info1.write(dos); - + DropInfo info2 = new DropInfo(1, 2, -1, true); info2.write(dos); dos.flush(); dos.close(); - + // 2. Read objects from file DataInputStream dis = new DataInputStream(new FileInputStream(file)); - + DropInfo rInfo1 = DropInfo.read(dis); Assert.assertTrue(rInfo1.equals(info1)); - + DropInfo rInfo2 = DropInfo.read(dis); Assert.assertTrue(rInfo2.equals(info2)); - + Assert.assertEquals(1, rInfo2.getDbId()); Assert.assertEquals(2, rInfo2.getTableId()); Assert.assertTrue(rInfo2.isForceDrop()); - + Assert.assertTrue(rInfo2.equals(rInfo2)); Assert.assertFalse(rInfo2.equals(this)); Assert.assertFalse(info2.equals(new DropInfo(0, 2, -1L, true))); diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/DropPartitionInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/DropPartitionInfoTest.java index 46ca4a3dc5..e4aadb6aac 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/DropPartitionInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/DropPartitionInfoTest.java @@ -19,6 +19,7 @@ package org.apache.doris.persist; import org.apache.doris.common.FeMetaVersion; import org.apache.doris.meta.MetaContext; + import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/EditLogTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/EditLogTest.java index 042dcc63c0..e1c56810db 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/EditLogTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/EditLogTest.java @@ -25,7 +25,7 @@ import java.io.IOException; public class EditLogTest { private String meta = "editLogTestDir/"; - + public void mkdir() { File dir = new File(meta); if (!dir.exists()) { @@ -39,7 +39,7 @@ public class EditLogTest { } } } - + public void addFiles(int image, int edit) { File imageFile = new File(meta + "image." + image); try { @@ -47,7 +47,7 @@ public class EditLogTest { } catch (IOException e) { e.printStackTrace(); } - + for (int i = 1; i <= edit; i++) { File editFile = new File(meta + "edits." + i); try { @@ -56,14 +56,14 @@ public class EditLogTest { e.printStackTrace(); } } - + File current = new File(meta + "edits"); try { current.createNewFile(); } catch (IOException e) { e.printStackTrace(); } - + File version = new File(meta + "VERSION"); try { version.createNewFile(); @@ -78,7 +78,7 @@ public class EditLogTest { e.printStackTrace(); } } - + public void deleteDir() { File dir = new File(meta); if (dir.exists()) { @@ -88,16 +88,16 @@ public class EditLogTest { file.delete(); } } - + dir.delete(); } } - + @Test public void testWriteLog() throws IOException { } - + @Test public void test() { diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/FsBrokerTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/FsBrokerTest.java index 8a24660acc..15b621bb02 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/FsBrokerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/FsBrokerTest.java @@ -57,7 +57,7 @@ public class FsBrokerTest { File file = new File(fileName1); file.createNewFile(); DataOutputStream dos = new DataOutputStream(new FileOutputStream(file)); - + FsBroker fsBroker = new FsBroker("127.0.0.1", 8118); long time = System.currentTimeMillis(); BrokerHbResponse hbResponse = new BrokerHbResponse("broker", "127.0.0.1", 8118, time); @@ -65,10 +65,10 @@ public class FsBrokerTest { fsBroker.write(dos); dos.flush(); dos.close(); - + // 2. Read objects from file DataInputStream dis = new DataInputStream(new FileInputStream(file)); - + FsBroker readBroker = FsBroker.readIn(dis); Assert.assertEquals(fsBroker.ip, readBroker.ip); Assert.assertEquals(fsBroker.port, readBroker.port); diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/GlobalVarPersistInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/GlobalVarPersistInfoTest.java index 10517802c3..2494f7103b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/GlobalVarPersistInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/GlobalVarPersistInfoTest.java @@ -21,7 +21,6 @@ import org.apache.doris.qe.SessionVariable; import org.apache.doris.qe.VariableMgr; import com.google.common.collect.Lists; - import org.junit.After; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/LoadJobV2PersistTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/LoadJobV2PersistTest.java index a63c323497..093d6dd0c4 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/LoadJobV2PersistTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/LoadJobV2PersistTest.java @@ -28,11 +28,13 @@ import org.apache.doris.load.EtlJobType; import org.apache.doris.load.loadv2.BrokerLoadJob; import org.apache.doris.qe.OriginStatement; +import com.google.common.collect.Maps; +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.junit.Assert; import org.junit.Test; -import com.google.common.collect.Maps; - import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; @@ -40,10 +42,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.util.Map; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; - public class LoadJobV2PersistTest { private BrokerLoadJob createJob() throws Exception { String loadStmt = ""; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/ModifyCommentOperationLogTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/ModifyCommentOperationLogTest.java index 51a547af1f..b5ed916ece 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/ModifyCommentOperationLogTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/ModifyCommentOperationLogTest.java @@ -14,13 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. + package org.apache.doris.persist; +import com.google.common.collect.Maps; import org.junit.Assert; import org.junit.Test; -import com.google.common.collect.Maps; - import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; @@ -88,4 +88,3 @@ public class ModifyCommentOperationLogTest { file.delete(); } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/ModifyDynamicPartitionInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/ModifyDynamicPartitionInfoTest.java index be32d0a5e3..87ae23470a 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/ModifyDynamicPartitionInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/ModifyDynamicPartitionInfoTest.java @@ -18,6 +18,7 @@ package org.apache.doris.persist; import org.apache.doris.catalog.DynamicPartitionProperty; + import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/RefreshExternalTableInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/RefreshExternalTableInfoTest.java index 8194b87e48..c8726de33f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/RefreshExternalTableInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/RefreshExternalTableInfoTest.java @@ -17,6 +17,19 @@ package org.apache.doris.persist; +import org.apache.doris.catalog.AggregateType; +import org.apache.doris.catalog.Catalog; +import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.FakeCatalog; +import org.apache.doris.catalog.PrimitiveType; +import org.apache.doris.catalog.ScalarType; +import org.apache.doris.common.FeConstants; +import org.apache.doris.common.jmockit.Deencapsulation; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; @@ -25,19 +38,6 @@ import java.io.FileOutputStream; import java.util.ArrayList; import java.util.List; -import org.apache.doris.catalog.FakeCatalog; -import org.apache.doris.catalog.ScalarType; -import org.apache.doris.common.jmockit.Deencapsulation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import org.apache.doris.catalog.AggregateType; -import org.apache.doris.catalog.Catalog; -import org.apache.doris.catalog.Column; -import org.apache.doris.catalog.PrimitiveType; -import org.apache.doris.common.FeConstants; - public class RefreshExternalTableInfoTest { private Catalog catalog; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/ReplaceTableOperationLogTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/ReplaceTableOperationLogTest.java index b7af609d3b..5ee74bbbca 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/ReplaceTableOperationLogTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/ReplaceTableOperationLogTest.java @@ -54,4 +54,3 @@ public class ReplaceTableOperationLogTest { file.delete(); } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/ReplicaPersistInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/ReplicaPersistInfoTest.java index 994f5a0a37..6d8cd1115d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/ReplicaPersistInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/ReplicaPersistInfoTest.java @@ -40,13 +40,13 @@ public class ReplicaPersistInfoTest { File file = new File("./replicaInfo"); file.createNewFile(); DataOutputStream dos = new DataOutputStream(new FileOutputStream(file)); - + ReplicaPersistInfo info2 = ReplicaPersistInfo.createForLoad(1, 2, 3, 4, 5, 7, 0, 8, 9); info2.write(dos); dos.flush(); dos.close(); - + // 2. Read objects from file DataInputStream dis = new DataInputStream(new FileInputStream(file)); @@ -56,7 +56,7 @@ public class ReplicaPersistInfoTest { dis.close(); file.delete(); } - + @Test public void testGet() throws Exception { ReplicaPersistInfo info = ReplicaPersistInfo.createForLoad(0, 1, 2, 3, 4, 5, 7, 0, 8); diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/StorageInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/StorageInfoTest.java index 2574e42861..7adf1c0b6f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/StorageInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/StorageInfoTest.java @@ -27,16 +27,16 @@ public class StorageInfoTest { Assert.assertEquals(-1, info.getClusterID()); Assert.assertEquals(0, info.getImageSeq()); Assert.assertEquals(0, info.getEditsSeq()); - + info = new StorageInfo(10, 20, 30); Assert.assertEquals(10, info.getClusterID()); Assert.assertEquals(20, info.getImageSeq()); Assert.assertEquals(30, info.getEditsSeq()); - + info.setClusterID(100); info.setImageSeq(200); info.setEditsSeq(300); - + Assert.assertEquals(100, info.getClusterID()); Assert.assertEquals(200, info.getImageSeq()); Assert.assertEquals(300, info.getEditsSeq()); diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/gson/GsonDerivedClassSerializationTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/gson/GsonDerivedClassSerializationTest.java index 3f3a938235..c2421155d1 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/gson/GsonDerivedClassSerializationTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/gson/GsonDerivedClassSerializationTest.java @@ -26,7 +26,6 @@ import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.annotations.SerializedName; - import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -43,21 +42,21 @@ import java.util.Map; /* * This unit test shows how to serialize and deserialize inherited class. - * + * * ParentClass is the parent class of 2 derived classes: * ChildClassA * ChildClassB - * + * * User need to create a RuntimeTypeAdapterFactory for ParentClass and * register 2 derived classes to the factory. And then register the factory * to the GsonBuilder to create GSON instance. - * - * - * + * + * + * */ public class GsonDerivedClassSerializationTest { private static String fileName = "./GsonDerivedClassSerializationTest"; - + @After public void tearDown() { File file = new File(fileName); diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/gson/GsonSerializationTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/gson/GsonSerializationTest.java index c89709f171..09433755fd 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/gson/GsonSerializationTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/gson/GsonSerializationTest.java @@ -30,7 +30,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import com.google.common.collect.Table; import com.google.gson.annotations.SerializedName; - import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -50,19 +49,19 @@ import java.util.Set; /* * This unit test provides examples about how to make a class serializable. - * + * * "OrigClassA" is a class includes user-defined class "InnerClassA". * And "InnerClassA" includes some collections which contain another user-defined class "InnerClassB". - * + * * And there are 2 other classes "OriginClassADifferentMembers" and "OriginClassADifferentMemberName". * "OriginClassADifferentMembers" shows how to add/remove members of a serializable class. * "OriginClassADifferentMemberName" shows how to modify members' name of a serializable class. - * + * * Every fields which need to be serialized should be with annotation @SerializedName. * @SerializedName has 2 attributes: * 1. value(required): the name of this field in Json string. * 2. alternate(optional): if we want to use new name for a field and its value in annotation, use alternate. - * + * */ public class GsonSerializationTest { private static String fileName = "./GsonSerializationTest"; @@ -109,10 +108,10 @@ public class GsonSerializationTest { public InnerClassA(int flag) { list1.add("string1"); list1.add("string2"); - + map1.put(1L, "value1"); map1.put(2L, "value2"); - + map2.put(1, new InnerClassB(1)); map2.put(2, new InnerClassB(2)); @@ -153,7 +152,7 @@ public class GsonSerializationTest { this.hashBasedTable.put(1L, "col1", 1L); this.hashBasedTable.put(2L, "col2", 2L); - + this.arrayListMultimap.put(1L, "value1"); this.arrayListMultimap.put(1L, "value2"); @@ -230,7 +229,7 @@ public class GsonSerializationTest { return GsonUtils.GSON.fromJson(json, OriginClassADifferentMemberName.class); } } - + @After public void tearDown() { File file = new File(fileName); @@ -273,7 +272,7 @@ public class GsonSerializationTest { Assert.assertEquals(0, readClassA.classA1.map2.get(1).ignoreField); Assert.assertEquals(0, readClassA.classA1.map2.get(2).ignoreField); Assert.assertEquals(Sets.newHashSet("set1", "set2"), readClassA.classA1.set1); - + Table hashBasedTable = readClassA.classA1.map2.get(1).hashBasedTable; Assert.assertEquals("HashBasedTable", hashBasedTable.getClass().getSimpleName()); Multimap hashMultimap = readClassA.classA1.map2.get(1).hashMultimap; diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/ColocatePlanTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/ColocatePlanTest.java index 716e3c68be..a27387f478 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/ColocatePlanTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/ColocatePlanTest.java @@ -29,16 +29,15 @@ import org.apache.doris.qe.StmtExecutor; import org.apache.doris.utframe.UtFrameUtils; import org.apache.commons.lang.StringUtils; - -import java.io.File; -import java.util.List; -import java.util.UUID; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import java.io.File; +import java.util.List; +import java.util.UUID; + public class ColocatePlanTest { private static final String COLOCATE_ENABLE = "colocate: true"; private static String runningDir = "fe/mocked/DemoTest/" + UUID.randomUUID().toString() + "/"; diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/DistributedPlannerTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/DistributedPlannerTest.java index 94b68b295d..56bc5ad554 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/DistributedPlannerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/DistributedPlannerTest.java @@ -29,7 +29,9 @@ import org.apache.doris.utframe.UtFrameUtils; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.junit.After; @@ -42,10 +44,6 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; - public class DistributedPlannerTest { private static String runningDir = "fe/mocked/DemoTest/" + UUID.randomUUID().toString() + "/"; private static ConnectContext ctx; diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/HashDistributionPrunerTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/HashDistributionPrunerTest.java index c7b5c66d7c..7f3df304e3 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/HashDistributionPrunerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/HashDistributionPrunerTest.java @@ -28,7 +28,6 @@ import org.apache.doris.catalog.PrimitiveType; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.junit.Assert; import org.junit.Test; @@ -45,7 +44,7 @@ public class HashDistributionPrunerTest { for (long i = 0; i < 300; i++) { tabletIds.add(i); } - + // distribution columns Column dealDate = new Column("dealDate", PrimitiveType.DATE, false); Column mainBrandId = new Column("main_brand_id", PrimitiveType.CHAR, false); @@ -53,12 +52,12 @@ public class HashDistributionPrunerTest { Column channel = new Column("channel", PrimitiveType.CHAR, false); Column shopType = new Column("shop_type", PrimitiveType.CHAR, false); List columns = Lists.newArrayList(dealDate, mainBrandId, itemThirdCateId, channel, shopType); - + // filters PartitionColumnFilter dealDatefilter = new PartitionColumnFilter(); dealDatefilter.setLowerBound(new StringLiteral("2019-08-22"), true); dealDatefilter.setUpperBound(new StringLiteral("2019-08-22"), true); - + PartitionColumnFilter mainBrandFilter = new PartitionColumnFilter(); List inList = Lists.newArrayList(); inList.add(new StringLiteral("1323")); @@ -67,31 +66,31 @@ public class HashDistributionPrunerTest { inList.add(new StringLiteral("3893")); inList.add(new StringLiteral("6121")); mainBrandFilter.setInPredicate(new InPredicate(new SlotRef(null, "main_brand_id"), inList, false)); - + PartitionColumnFilter itemThirdFilter = new PartitionColumnFilter(); List inList2 = Lists.newArrayList(); inList2.add(new StringLiteral("9719")); inList2.add(new StringLiteral("11163")); itemThirdFilter.setInPredicate(new InPredicate(new SlotRef(null, "item_third_cate_id"), inList2, false)); - + PartitionColumnFilter channelFilter = new PartitionColumnFilter(); List inList3 = Lists.newArrayList(); inList3.add(new StringLiteral("1")); inList3.add(new StringLiteral("3")); channelFilter.setInPredicate(new InPredicate(new SlotRef(null, "channel"), inList3, false)); - + PartitionColumnFilter shopTypeFilter = new PartitionColumnFilter(); List inList4 = Lists.newArrayList(); inList4.add(new StringLiteral("2")); shopTypeFilter.setInPredicate(new InPredicate(new SlotRef(null, "shop_type"), inList4, false)); - + Map filters = Maps.newHashMap(); filters.put("dealDate", dealDatefilter); filters.put("main_brand_id", mainBrandFilter); filters.put("item_third_cate_id", itemThirdFilter); filters.put("channel", channelFilter); filters.put("shop_type", shopTypeFilter); - + HashDistributionPruner pruner = new HashDistributionPruner(tabletIds, columns, filters, tabletIds.size()); Collection results = pruner.prune(); @@ -103,7 +102,7 @@ public class HashDistributionPrunerTest { // 40 = 1 * 5 * 2 * 2 * 2 (element num of each filter) // 39 is because these is hash conflict Assert.assertEquals(39, results.size()); - + filters.get("shop_type").getInPredicate().addChild(new StringLiteral("5")); filters.get("shop_type").getInPredicate().addChild(new StringLiteral("6")); filters.get("shop_type").getInPredicate().addChild(new StringLiteral("7")); diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/JoinCostEvaluationTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/JoinCostEvaluationTest.java index ed4cd3c4be..00646b63e8 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/JoinCostEvaluationTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/JoinCostEvaluationTest.java @@ -22,7 +22,8 @@ import org.apache.doris.analysis.TableRef; import org.apache.doris.qe.ConnectContext; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -30,9 +31,6 @@ import org.junit.Test; import java.util.ArrayList; import java.util.Collections; -import mockit.Expectations; -import mockit.Mocked; - public class JoinCostEvaluationTest { @Mocked diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewSelectorTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewSelectorTest.java index 2a18f2b704..7a31808de5 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewSelectorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewSelectorTest.java @@ -34,12 +34,13 @@ import org.apache.doris.catalog.OlapTable; import org.apache.doris.catalog.Table; import org.apache.doris.catalog.Type; import org.apache.doris.common.jmockit.Deencapsulation; +import org.apache.doris.thrift.TStorageType; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - -import org.apache.doris.thrift.TStorageType; +import mockit.Expectations; +import mockit.Injectable; import org.junit.Assert; import org.junit.Test; @@ -47,9 +48,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import mockit.Expectations; -import mockit.Injectable; - public class MaterializedViewSelectorTest { diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/OlapScanNodeTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/OlapScanNodeTest.java index ebe7da33c7..68517a29c7 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/OlapScanNodeTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/OlapScanNodeTest.java @@ -29,16 +29,15 @@ import org.apache.doris.common.AnalysisException; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.junit.Assert; +import org.junit.Test; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; - -public class OlapScanNodeTest { +public class OlapScanNodeTest { // columnA in (1) hashmode=3 @Test public void testHashDistributionOneUser() throws AnalysisException { @@ -48,10 +47,10 @@ public class OlapScanNodeTest { partitions.add(new Long(1)); partitions.add(new Long(2)); - + List columns = Lists.newArrayList(); columns.add(new Column("columnA", PrimitiveType.BIGINT)); - + List inList = Lists.newArrayList(); inList.add(new IntLiteral(1)); @@ -62,13 +61,13 @@ public class OlapScanNodeTest { columnFilter.setInPredicate(inPredicate); Map filterMap = Maps.newHashMap(); filterMap.put("columnA", columnFilter); - + DistributionPruner partitionPruner = new HashDistributionPruner( - partitions, + partitions, columns, filterMap, 3); - + Collection ids = partitionPruner.prune(); Assert.assertEquals(ids.size(), 1); @@ -76,7 +75,7 @@ public class OlapScanNodeTest { Assert.assertEquals((1 & 0xffffffff) % 3, id.intValue()); } } - + // columnA in (1, 2 ,3, 4, 5, 6) hashmode=3 @Test public void testHashPartitionManyUser() throws AnalysisException { @@ -87,8 +86,8 @@ public class OlapScanNodeTest { partitions.add(new Long(2)); List columns = Lists.newArrayList(); - columns.add(new Column("columnA", PrimitiveType.BIGINT)); - + columns.add(new Column("columnA", PrimitiveType.BIGINT)); + List inList = Lists.newArrayList(); inList.add(new IntLiteral(1)); inList.add(new IntLiteral(2)); @@ -104,17 +103,17 @@ public class OlapScanNodeTest { columnFilter.setInPredicate(inPredicate); Map filterMap = Maps.newHashMap(); filterMap.put("columnA", columnFilter); - + DistributionPruner partitionPruner = new HashDistributionPruner( - partitions, + partitions, columns, filterMap, 3); - + Collection ids = partitionPruner.prune(); Assert.assertEquals(ids.size(), 3); } - + @Test public void testHashForIntLiteral() { { diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/OlapTableSinkTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/OlapTableSinkTest.java index a072cf020e..1ca91b77eb 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/OlapTableSinkTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/OlapTableSinkTest.java @@ -39,15 +39,13 @@ import org.apache.doris.thrift.TExplainLevel; import org.apache.doris.thrift.TUniqueId; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Injectable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Before; import org.junit.Test; -import mockit.Expectations; -import mockit.Injectable; - public class OlapTableSinkTest { private static final Logger LOG = LogManager.getLogger(OlapTableSinkTest.class); diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/PlannerTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/PlannerTest.java index 121a7a7184..edff8da8bc 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/PlannerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/PlannerTest.java @@ -25,13 +25,11 @@ import org.apache.doris.utframe.TestWithFeService; import org.apache.commons.lang3.StringUtils; import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class PlannerTest extends TestWithFeService { @Override @@ -436,7 +434,7 @@ public class PlannerTest extends TestWithFeService { String createTbl1 = "create table db1.tbl1(k1 string, k2 varchar(32), k3 varchar(32), k4 int) " + "AGGREGATE KEY(k1, k2,k3,k4) distributed by hash(k1) buckets 3 properties('replication_num' = '1')"; AnalysisException exception = - assertThrows(AnalysisException.class, () -> parseAndAnalyzeStmt(createTbl1)); - assertTrue(exception.getMessage().contains("String Type should not be used in key column[k1].")); + Assertions.assertThrows(AnalysisException.class, () -> parseAndAnalyzeStmt(createTbl1)); + Assertions.assertTrue(exception.getMessage().contains("String Type should not be used in key column[k1].")); } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java index 9bf04edab6..81e751a0a4 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java @@ -17,8 +17,6 @@ package org.apache.doris.planner; -import java.util.List; - import org.apache.doris.analysis.Analyzer; import org.apache.doris.analysis.CreateDbStmt; import org.apache.doris.analysis.DropDbStmt; @@ -50,12 +48,13 @@ import org.apache.doris.thrift.TRuntimeFilterType; import org.apache.doris.utframe.TestWithFeService; import com.google.common.collect.Lists; - import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Ignore; import org.junit.jupiter.api.Test; +import java.util.List; + public class QueryPlanTest extends TestWithFeService { @Override diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/RepeatNodeTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/RepeatNodeTest.java index 95b58482dc..841155d42e 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/RepeatNodeTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/RepeatNodeTest.java @@ -31,7 +31,6 @@ import org.apache.doris.thrift.TPlanNodeType; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java index e43c672c93..a896dfc899 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java @@ -49,7 +49,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Table; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.AfterClass; @@ -303,5 +302,3 @@ public class ResourceTagQueryTest { System.out.println("table " + tbl.getId() + " is stable"); } } - - diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java index fe8b6c0dad..57d29b83c0 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java @@ -39,16 +39,14 @@ import org.apache.doris.qe.ConnectContext; import org.apache.doris.thrift.TPartitionType; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import java.util.ArrayList; -import mockit.Expectations; -import mockit.Mocked; - public class RuntimeFilterGeneratorTest { private Analyzer analyzer; private PlanFragment testPlanFragment; diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/SingleNodePlannerTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/SingleNodePlannerTest.java index c247ff9da4..fd363ff504 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/SingleNodePlannerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/SingleNodePlannerTest.java @@ -17,9 +17,6 @@ package org.apache.doris.planner; -import mockit.Mock; -import mockit.MockUp; -import mockit.Tested; import org.apache.doris.analysis.Analyzer; import org.apache.doris.analysis.BaseTableRef; import org.apache.doris.analysis.BinaryPredicate; @@ -39,16 +36,17 @@ import org.apache.doris.common.Pair; import org.apache.doris.common.jmockit.Deencapsulation; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mock; +import mockit.MockUp; +import mockit.Tested; import org.junit.Assert; import org.junit.Test; import java.util.ArrayList; import java.util.List; -import mockit.Expectations; -import mockit.Injectable; - public class SingleNodePlannerTest { @Test diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/SqlDigestTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/SqlDigestTest.java index 3247a75550..5ad1252f00 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/SqlDigestTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/SqlDigestTest.java @@ -23,8 +23,8 @@ import org.apache.doris.catalog.Catalog; import org.apache.doris.qe.ConnectContext; import org.apache.doris.utframe.UtFrameUtils; -import org.junit.Assert; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -139,4 +139,4 @@ public class SqlDigestTest { String digest2 = UtFrameUtils.getStmtDigest(connectContext, sql2); Assert.assertEquals(digest1, digest2); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/StreamLoadPlannerTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/StreamLoadPlannerTest.java index eadeca9dab..d8ddcfe909 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/StreamLoadPlannerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/StreamLoadPlannerTest.java @@ -37,7 +37,9 @@ import org.apache.doris.thrift.TStreamLoadPutRequest; import org.apache.doris.thrift.TUniqueId; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.junit.Assert; import org.junit.Test; @@ -45,10 +47,6 @@ import java.io.StringReader; import java.util.Arrays; import java.util.List; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; - public class StreamLoadPlannerTest { @Injectable Database db; diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/StreamLoadScanNodeTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/StreamLoadScanNodeTest.java index 7dce85972f..545f4c7c9d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/StreamLoadScanNodeTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/StreamLoadScanNodeTest.java @@ -45,7 +45,9 @@ import org.apache.doris.thrift.TPlanNode; import org.apache.doris.thrift.TStreamLoadPutRequest; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mocked; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Assert; @@ -53,10 +55,6 @@ import org.junit.Test; import java.util.List; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mocked; - public class StreamLoadScanNodeTest { private static final Logger LOG = LogManager.getLogger(StreamLoadScanNodeTest.class); @@ -165,7 +163,7 @@ public class StreamLoadScanNodeTest { return columns; } - + private StreamLoadScanNode getStreamLoadScanNode(TupleDescriptor dstDesc, TStreamLoadPutRequest request) throws UserException { StreamLoadTask streamLoadTask = StreamLoadTask.fromTStreamLoadPutRequest(request); @@ -331,7 +329,7 @@ public class StreamLoadScanNodeTest { slot.setIsNullable(false); } } - + new Expectations() { { catalog.getFunction((Function) any, (Function.CompareMode) any); @@ -866,4 +864,3 @@ public class StreamLoadScanNodeTest { scanNode.toThrift(planNode); } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/UpdatePlannerTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/UpdatePlannerTest.java index d1e0e3c921..ac36efdba5 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/UpdatePlannerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/UpdatePlannerTest.java @@ -17,6 +17,7 @@ package org.apache.doris.planner; +import org.apache.doris.alter.SchemaChangeHandler; import org.apache.doris.analysis.Analyzer; import org.apache.doris.analysis.BinaryPredicate; import org.apache.doris.analysis.Expr; @@ -34,15 +35,13 @@ import org.apache.doris.common.IdGenerator; import org.apache.doris.common.jmockit.Deencapsulation; import org.apache.doris.load.update.UpdatePlanner; -import java.util.List; - import com.clearspring.analytics.util.Lists; import mockit.Expectations; import mockit.Injectable; import org.junit.Assert; import org.junit.Test; -import static org.apache.doris.alter.SchemaChangeHandler.SHADOW_NAME_PRFIX; +import java.util.List; public class UpdatePlannerTest { @@ -96,7 +95,7 @@ public class UpdatePlannerTest { v1.getName(); result = "v1"; shadow_v1.getName(); - result = SHADOW_NAME_PRFIX + "v1"; + result = SchemaChangeHandler.SHADOW_NAME_PRFIX + "v1"; } }; diff --git a/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginInfoTest.java index c335a80be7..6ba83661a5 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginInfoTest.java @@ -17,15 +17,6 @@ package org.apache.doris.plugin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.FakeCatalog; import org.apache.doris.common.FeConstants; @@ -33,9 +24,16 @@ import org.apache.doris.common.io.DataOutputBuffer; import org.apache.doris.common.jmockit.Deencapsulation; import org.apache.doris.common.util.DigitalVersion; import org.apache.doris.plugin.PluginInfo.PluginType; + +import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + public class PluginInfoTest { private Catalog catalog; @@ -56,11 +54,11 @@ public class PluginInfoTest { PluginInfo info = PluginInfo.readFromProperties(PluginTestUtil.getTestPath("source"), "test"); - assertEquals("plugin_test", info.getName()); - assertEquals(PluginType.STORAGE, info.getType()); - assertTrue(DigitalVersion.CURRENT_DORIS_VERSION.onOrAfter(info.getVersion())); - assertTrue(DigitalVersion.JDK_9_0_0.onOrAfter(info.getJavaVersion())); - assertTrue(DigitalVersion.JDK_1_8_0.before(info.getJavaVersion())); + Assert.assertEquals("plugin_test", info.getName()); + Assert.assertEquals(PluginType.STORAGE, info.getType()); + Assert.assertTrue(DigitalVersion.CURRENT_DORIS_VERSION.onOrAfter(info.getVersion())); + Assert.assertTrue(DigitalVersion.JDK_9_0_0.onOrAfter(info.getJavaVersion())); + Assert.assertTrue(DigitalVersion.JDK_1_8_0.before(info.getJavaVersion())); } catch (IOException e) { e.printStackTrace(); } @@ -85,8 +83,8 @@ public class PluginInfoTest { DataInputStream dis = new DataInputStream(new ByteArrayInputStream(dob.getData())); PluginInfo pi = PluginInfo.read(dis); - assertFalse(pi.properties.isEmpty()); - assertEquals("cf0c536b8f2a0a0690b44d783d019e90", pi.properties.get("md5sum")); - assertEquals(info, pi); + Assert.assertFalse(pi.properties.isEmpty()); + Assert.assertEquals("cf0c536b8f2a0a0690b44d783d019e90", pi.properties.get("md5sum")); + Assert.assertEquals(info, pi); } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginLoaderTest.java b/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginLoaderTest.java index f97e389a0b..eb63f6a79f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginLoaderTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginLoaderTest.java @@ -17,15 +17,12 @@ package org.apache.doris.plugin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import org.apache.doris.common.UserException; import org.apache.doris.common.util.DigitalVersion; import org.apache.doris.plugin.PluginInfo.PluginType; import org.apache.commons.io.FileUtils; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -39,9 +36,9 @@ public class PluginLoaderTest { public void setUp() { try { FileUtils.deleteQuietly(PluginTestUtil.getTestFile("target")); - assertFalse(Files.exists(PluginTestUtil.getTestPath("target"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target"))); Files.createDirectory(PluginTestUtil.getTestPath("target")); - assertTrue(Files.exists(PluginTestUtil.getTestPath("target"))); + Assert.assertTrue(Files.exists(PluginTestUtil.getTestPath("target"))); } catch (IOException e) { e.printStackTrace(); @@ -58,8 +55,8 @@ public class PluginLoaderTest { PluginLoader util = new DynamicPluginLoader(PluginTestUtil.getTestPathString("source"), pf); ((DynamicPluginLoader) util).installPath = PluginTestUtil.getTestPath("target"); ((DynamicPluginLoader) util).movePlugin(); - assertTrue(Files.isDirectory(PluginTestUtil.getTestPath("source/test-plugin"))); - assertTrue(FileUtils.deleteQuietly(PluginTestUtil.getTestFile("source/test-plugin"))); + Assert.assertTrue(Files.isDirectory(PluginTestUtil.getTestPath("source/test-plugin"))); + Assert.assertTrue(FileUtils.deleteQuietly(PluginTestUtil.getTestFile("source/test-plugin"))); } catch (IOException | UserException e) { e.printStackTrace(); } @@ -76,15 +73,15 @@ public class PluginLoaderTest { p.init(null, null); p.close(); - assertEquals(2, p.flags()); + Assert.assertEquals(2, p.flags()); p.setVariable("test", "value"); Map m = p.variable(); - assertEquals(1, m.size()); - assertTrue(m.containsKey("test")); - assertEquals("value", m.get("test")); + Assert.assertEquals(1, m.size()); + Assert.assertTrue(m.containsKey("test")); + Assert.assertEquals("value", m.get("test")); } catch (IOException | UserException e) { e.printStackTrace(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginMgrTest.java b/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginMgrTest.java index 80edee5047..13495db846 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginMgrTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginMgrTest.java @@ -24,14 +24,14 @@ import org.apache.doris.common.UserException; import org.apache.doris.common.io.DataOutputBuffer; import org.apache.doris.utframe.UtFrameUtils; +import com.google.common.collect.Maps; import org.apache.commons.io.FileUtils; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.google.common.collect.Maps; - import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -40,11 +40,6 @@ import java.io.IOException; import java.nio.file.Files; import java.util.UUID; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - public class PluginMgrTest { private static String runningDir = "fe/mocked/PluginMgrTest/" + UUID.randomUUID().toString() + "/"; @@ -63,9 +58,9 @@ public class PluginMgrTest { @Before public void setUp() throws IOException { FileUtils.deleteQuietly(PluginTestUtil.getTestFile("target")); - assertFalse(Files.exists(PluginTestUtil.getTestPath("target"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target"))); Files.createDirectory(PluginTestUtil.getTestPath("target")); - assertTrue(Files.exists(PluginTestUtil.getTestPath("target"))); + Assert.assertTrue(Files.exists(PluginTestUtil.getTestPath("target"))); Config.plugin_dir = PluginTestUtil.getTestPathString("target"); } @@ -73,38 +68,38 @@ public class PluginMgrTest { public void testInstallPluginZip() { try { // path "target/audit_plugin_demo" is where we are going to install the plugin - assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); - assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); InstallPluginStmt stmt = new InstallPluginStmt(PluginTestUtil.getTestPathString("auditdemo.zip"), Maps.newHashMap()); Catalog.getCurrentCatalog().installPlugin(stmt); PluginMgr pluginMgr = Catalog.getCurrentPluginMgr(); - assertEquals(2, pluginMgr.getActivePluginList(PluginInfo.PluginType.AUDIT).size()); + Assert.assertEquals(2, pluginMgr.getActivePluginList(PluginInfo.PluginType.AUDIT).size()); Plugin p = pluginMgr.getActivePlugin("audit_plugin_demo", PluginInfo.PluginType.AUDIT); - assertNotNull(p); - assertTrue(p instanceof AuditPlugin); - assertTrue(((AuditPlugin) p).eventFilter(AuditEvent.EventType.AFTER_QUERY)); - assertFalse(((AuditPlugin) p).eventFilter(AuditEvent.EventType.BEFORE_QUERY)); + Assert.assertNotNull(p); + Assert.assertTrue(p instanceof AuditPlugin); + Assert.assertTrue(((AuditPlugin) p).eventFilter(AuditEvent.EventType.AFTER_QUERY)); + Assert.assertFalse(((AuditPlugin) p).eventFilter(AuditEvent.EventType.BEFORE_QUERY)); - assertTrue(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); - assertTrue(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); + Assert.assertTrue(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); + Assert.assertTrue(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); - assertEquals(1, pluginMgr.getAllDynamicPluginInfo().size()); + Assert.assertEquals(1, pluginMgr.getAllDynamicPluginInfo().size()); PluginInfo info = pluginMgr.getAllDynamicPluginInfo().get(0); - assertEquals("audit_plugin_demo", info.getName()); - assertEquals(PluginInfo.PluginType.AUDIT, info.getType()); - assertEquals("just for test", info.getDescription()); - assertEquals("plugin.AuditPluginDemo", info.getClassName()); + Assert.assertEquals("audit_plugin_demo", info.getName()); + Assert.assertEquals(PluginInfo.PluginType.AUDIT, info.getType()); + Assert.assertEquals("just for test", info.getDescription()); + Assert.assertEquals("plugin.AuditPluginDemo", info.getClassName()); pluginMgr.uninstallPlugin("audit_plugin_demo"); - assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); - assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); } catch (IOException | UserException e) { e.printStackTrace(); @@ -116,34 +111,34 @@ public class PluginMgrTest { public void testInstallPluginLocal() { try { // path "target/audit_plugin_demo" is where we are going to install the plugin - assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); - assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); InstallPluginStmt stmt = new InstallPluginStmt(PluginTestUtil.getTestPathString("test_local_plugin"), Maps.newHashMap()); Catalog.getCurrentCatalog().installPlugin(stmt); PluginMgr pluginMgr = Catalog.getCurrentPluginMgr(); - assertTrue(Files.exists(PluginTestUtil.getTestPath("test_local_plugin"))); - assertTrue(Files.exists(PluginTestUtil.getTestPath("test_local_plugin/auditdemo.jar"))); + Assert.assertTrue(Files.exists(PluginTestUtil.getTestPath("test_local_plugin"))); + Assert.assertTrue(Files.exists(PluginTestUtil.getTestPath("test_local_plugin/auditdemo.jar"))); Plugin p = pluginMgr.getActivePlugin("audit_plugin_demo", PluginInfo.PluginType.AUDIT); - assertEquals(2, pluginMgr.getActivePluginList(PluginInfo.PluginType.AUDIT).size()); + Assert.assertEquals(2, pluginMgr.getActivePluginList(PluginInfo.PluginType.AUDIT).size()); - assertNotNull(p); - assertTrue(p instanceof AuditPlugin); - assertTrue(((AuditPlugin) p).eventFilter(AuditEvent.EventType.AFTER_QUERY)); - assertFalse(((AuditPlugin) p).eventFilter(AuditEvent.EventType.BEFORE_QUERY)); + Assert.assertNotNull(p); + Assert.assertTrue(p instanceof AuditPlugin); + Assert.assertTrue(((AuditPlugin) p).eventFilter(AuditEvent.EventType.AFTER_QUERY)); + Assert.assertFalse(((AuditPlugin) p).eventFilter(AuditEvent.EventType.BEFORE_QUERY)); - assertTrue(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); - assertTrue(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); + Assert.assertTrue(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); + Assert.assertTrue(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); testSerializeBuiltinPlugin(pluginMgr); pluginMgr.uninstallPlugin("audit_plugin_demo"); - assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); - assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target/audit_plugin_demo/auditdemo.jar"))); } catch (IOException | UserException e) { e.printStackTrace(); @@ -160,7 +155,7 @@ public class PluginMgrTest { PluginMgr test = new PluginMgr(); test.readFields(new DataInputStream(new ByteArrayInputStream(dob.getData()))); - assertEquals(1, test.getAllDynamicPluginInfo().size()); + Assert.assertEquals(1, test.getAllDynamicPluginInfo().size()); } catch (IOException e) { e.printStackTrace(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginZipTest.java b/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginZipTest.java index a399338b57..c90eac79ee 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginZipTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/plugin/PluginZipTest.java @@ -17,13 +17,11 @@ package org.apache.doris.plugin; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import org.apache.doris.common.UserException; +import mockit.Expectations; import org.apache.commons.io.FileUtils; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -33,17 +31,15 @@ import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; -import mockit.Expectations; - public class PluginZipTest { @Before public void setUp() { try { FileUtils.deleteQuietly(PluginTestUtil.getTestFile("target")); - assertFalse(Files.exists(PluginTestUtil.getTestPath("target"))); + Assert.assertFalse(Files.exists(PluginTestUtil.getTestPath("target"))); Files.createDirectory(PluginTestUtil.getTestPath("target")); - assertTrue(Files.exists(PluginTestUtil.getTestPath("target"))); + Assert.assertTrue(Files.exists(PluginTestUtil.getTestPath("target"))); } catch (IOException e) { e.printStackTrace(); @@ -66,8 +62,8 @@ public class PluginZipTest { }; Path zipPath = zip.downloadRemoteZip(PluginTestUtil.getTestPath("target")); - assertTrue(Files.exists(zipPath)); - assertTrue(Files.deleteIfExists(zipPath)); + Assert.assertTrue(Files.exists(zipPath)); + Assert.assertTrue(Files.deleteIfExists(zipPath)); } catch (Exception e) { e.printStackTrace(); @@ -88,8 +84,8 @@ public class PluginZipTest { }; Path zipPath = zip.downloadRemoteZip(PluginTestUtil.getTestPath("target")); - assertTrue(Files.exists(zipPath)); - assertTrue(Files.deleteIfExists(zipPath)); + Assert.assertTrue(Files.exists(zipPath)); + Assert.assertTrue(Files.deleteIfExists(zipPath)); } catch (Exception e) { e.printStackTrace(); @@ -112,10 +108,10 @@ public class PluginZipTest { }; Path zipPath = zip.downloadRemoteZip(PluginTestUtil.getTestPath("target")); - assertFalse(Files.exists(zipPath)); + Assert.assertFalse(Files.exists(zipPath)); } catch (Exception e) { - assertTrue(e instanceof UserException); - assertTrue(e.getMessage().contains("MD5 check mismatch")); + Assert.assertTrue(e instanceof UserException); + Assert.assertTrue(e.getMessage().contains("MD5 check mismatch")); } } @@ -125,7 +121,7 @@ public class PluginZipTest { try { Path zipPath = util.downloadRemoteZip(PluginTestUtil.getTestPath("target")); } catch (Exception e) { - assertTrue(e instanceof IOException); + Assert.assertTrue(e instanceof IOException); } } @@ -138,12 +134,12 @@ public class PluginZipTest { PluginZip util = new PluginZip(PluginTestUtil.getTestPathString("source/test-a.zip"), null); Path actualPath = util.extract(PluginTestUtil.getTestPath("target")); - assertTrue(Files.isDirectory(actualPath)); + Assert.assertTrue(Files.isDirectory(actualPath)); Path txtPath = FileSystems.getDefault().getPath(actualPath.toString(), "test.txt"); - assertTrue(Files.exists(txtPath)); + Assert.assertTrue(Files.exists(txtPath)); - assertTrue(FileUtils.deleteQuietly(actualPath.toFile())); + Assert.assertTrue(FileUtils.deleteQuietly(actualPath.toFile())); } catch (Exception e) { e.printStackTrace(); assert false; @@ -157,7 +153,7 @@ public class PluginZipTest { try { PluginZip util = new PluginZip(PluginTestUtil.getTestPathString("source/test.zip"), null); Path p = util.downloadZip(PluginTestUtil.getTestPath("target")); - assertTrue(Files.exists(p)); + Assert.assertTrue(Files.exists(p)); } catch (IOException | UserException e) { e.printStackTrace(); @@ -174,7 +170,7 @@ public class PluginZipTest { }; Path p = util.downloadZip(PluginTestUtil.getTestPath("target")); - assertNull(p); + Assert.assertNull(p); } catch (IOException | UserException e) { e.printStackTrace(); @@ -187,7 +183,7 @@ public class PluginZipTest { util.downloadZip(PluginTestUtil.getTestPath("target")); } catch (Exception e) { - assertTrue(e instanceof IllegalArgumentException); + Assert.assertTrue(e instanceof IllegalArgumentException); } } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectContextTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectContextTest.java index 21d2782336..b3b217cc89 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectContextTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectContextTest.java @@ -17,14 +17,14 @@ package org.apache.doris.qe; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.catalog.Catalog; import org.apache.doris.mysql.MysqlCapability; import org.apache.doris.mysql.MysqlChannel; import org.apache.doris.mysql.MysqlCommand; import org.apache.doris.thrift.TUniqueId; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -86,7 +86,7 @@ public class ConnectContextTest { Assert.assertEquals("", ctx.getClusterName()); ctx.setCluster("testCluster"); Assert.assertEquals("testCluster", ctx.getClusterName()); - + // Current db Assert.assertEquals("", ctx.getDatabase()); ctx.setDatabase("testCluster:testDb"); diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectProcessorTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectProcessorTest.java index 2a7fe57144..48d506cce8 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectProcessorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectProcessorTest.java @@ -31,6 +31,8 @@ import org.apache.doris.plugin.AuditEvent.AuditEventBuilder; import org.apache.doris.proto.Data; import org.apache.doris.thrift.TUniqueId; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -40,9 +42,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; -import mockit.Expectations; -import mockit.Mocked; - public class ConnectProcessorTest { private static ByteBuffer initDbPacket; private static ByteBuffer pingPacket; diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectSchedulerTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectSchedulerTest.java index 94af38b499..42dc22009c 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectSchedulerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/ConnectSchedulerTest.java @@ -21,6 +21,9 @@ import org.apache.doris.analysis.AccessTestUtil; import org.apache.doris.mysql.MysqlChannel; import org.apache.doris.mysql.MysqlProto; +import mockit.Delegate; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -30,10 +33,6 @@ import org.slf4j.LoggerFactory; import java.nio.channels.SocketChannel; import java.util.concurrent.atomic.AtomicLong; -import mockit.Delegate; -import mockit.Expectations; -import mockit.Mocked; - public class ConnectSchedulerTest { private static final Logger LOG = LoggerFactory.getLogger(ConnectScheduler.class); private static AtomicLong succSubmit; diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/CoordinatorTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/CoordinatorTest.java index 036ba85743..8154bedea6 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/CoordinatorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/CoordinatorTest.java @@ -17,11 +17,6 @@ package org.apache.doris.qe; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import mockit.Mocked; -import org.apache.commons.collections.map.HashedMap; import org.apache.doris.analysis.Analyzer; import org.apache.doris.analysis.BinaryPredicate; import org.apache.doris.analysis.BoolLiteral; @@ -51,6 +46,12 @@ import org.apache.doris.thrift.TScanRangeLocation; import org.apache.doris.thrift.TScanRangeLocations; import org.apache.doris.thrift.TScanRangeParams; import org.apache.doris.thrift.TUniqueId; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import mockit.Mocked; +import org.apache.commons.collections.map.HashedMap; import org.junit.Assert; import org.junit.Test; @@ -75,7 +76,7 @@ public class CoordinatorTest extends Coordinator { @Mocked static FrontendOptions frontendOptions; static Analyzer analyzer = new Analyzer(catalog, context); - + public CoordinatorTest() { super(context, analyzer, planner); } @@ -844,5 +845,3 @@ public class CoordinatorTest extends Coordinator { } } } - - diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/HelpObjectLoaderTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/HelpObjectLoaderTest.java index eb5adf4eba..6dd6af2bad 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/HelpObjectLoaderTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/HelpObjectLoaderTest.java @@ -20,7 +20,6 @@ package org.apache.doris.qe; import org.apache.doris.common.UserException; import com.google.common.collect.Lists; - import org.junit.Assert; import org.junit.Test; @@ -30,7 +29,7 @@ import java.util.Arrays; import java.util.List; public class HelpObjectLoaderTest { - + @Test public void testTopicNormal() throws IOException, UserException { URL resource = getClass().getClassLoader().getResource("data/helpTopicNormal.md"); diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/JournalObservableTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/JournalObservableTest.java index c649a278f8..a76b5a1f91 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/JournalObservableTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/JournalObservableTest.java @@ -19,12 +19,11 @@ package org.apache.doris.qe; import com.google.common.collect.Multiset; import com.google.common.collect.TreeMultiset; - -import java.util.concurrent.CountDownLatch; - import org.junit.Assert; import org.junit.Test; +import java.util.concurrent.CountDownLatch; + public class JournalObservableTest { @Test public void testUpperBound() { @@ -146,4 +145,3 @@ public class JournalObservableTest { System.out.println("success"); } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/MultiLoadMgrTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/MultiLoadMgrTest.java index bd099083b1..f5058b70c3 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/MultiLoadMgrTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/MultiLoadMgrTest.java @@ -24,16 +24,14 @@ import org.apache.doris.system.BeSelectionPolicy; import org.apache.doris.system.SystemInfoService; import com.google.common.collect.Lists; - +import mockit.Delegate; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import java.util.List; -import mockit.Delegate; -import mockit.Expectations; -import mockit.Mocked; - public class MultiLoadMgrTest { @Mocked diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/PartitionCacheTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/PartitionCacheTest.java index 414dc28bb1..39edf3f734 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/PartitionCacheTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/PartitionCacheTest.java @@ -17,7 +17,6 @@ package org.apache.doris.qe; -import com.google.common.collect.Range; import org.apache.doris.analysis.Analyzer; import org.apache.doris.analysis.PartitionValue; import org.apache.doris.analysis.SelectStmt; @@ -60,9 +59,9 @@ import org.apache.doris.planner.ScanNode; import org.apache.doris.proto.Types; import org.apache.doris.qe.cache.Cache; import org.apache.doris.qe.cache.CacheAnalyzer; -import org.apache.doris.qe.cache.CacheProxy; import org.apache.doris.qe.cache.CacheAnalyzer.CacheMode; import org.apache.doris.qe.cache.CacheCoordinator; +import org.apache.doris.qe.cache.CacheProxy; import org.apache.doris.qe.cache.PartitionCache; import org.apache.doris.qe.cache.PartitionRange; import org.apache.doris.qe.cache.RowBatchBuilder; @@ -74,7 +73,11 @@ import org.apache.doris.thrift.TStorageType; import org.apache.doris.thrift.TUniqueId; import com.google.common.collect.Lists; - +import com.google.common.collect.Range; +import mockit.Expectations; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Assert; @@ -88,11 +91,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import mockit.Expectations; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; - public class PartitionCacheTest { private static final Logger LOG = LogManager.getLogger(PartitionCacheTest.class); public static String clusterName = "testCluster"; @@ -1231,4 +1229,3 @@ public class PartitionCacheTest { } } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/QueryDetailQueueTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/QueryDetailQueueTest.java index a1c89a8d1d..d5ad913df6 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/QueryDetailQueueTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/QueryDetailQueueTest.java @@ -18,7 +18,6 @@ package org.apache.doris.qe; import com.google.gson.Gson; - import org.junit.Assert; import org.junit.Test; @@ -34,14 +33,14 @@ public class QueryDetailQueueTest { QueryDetailQueue.addOrUpdateQueryDetail(queryDetail); List queryDetails = QueryDetailQueue.getQueryDetails(eventTime); - Assert.assertTrue(queryDetails.size() == 0); + Assert.assertTrue(queryDetails.size() == 0); queryDetails = QueryDetailQueue.getQueryDetails(eventTime - 1); - Assert.assertTrue(queryDetails.size() == 1); + Assert.assertTrue(queryDetails.size() == 1); Gson gson = new Gson(); String json_string = gson.toJson(queryDetails); - String query_detail_string = "[{\"eventTime\":1592208814796," + String query_detail_string = "[{\"eventTime\":1592208814796," + "\"queryId\":\"219a2d5443c542d4-8fc938db37c892e3\"," + "\"startTime\":1592208814796,\"endTime\":-1,\"latency\":-1," + "\"state\":\"RUNNING\",\"database\":\"testDb\"," @@ -55,10 +54,10 @@ public class QueryDetailQueueTest { QueryDetailQueue.addOrUpdateQueryDetail(queryDetail); queryDetails = QueryDetailQueue.getQueryDetails(eventTime); - Assert.assertTrue(queryDetails.size() == 1); + Assert.assertTrue(queryDetails.size() == 1); json_string = gson.toJson(queryDetails); - query_detail_string = "[{\"eventTime\":1592208814797," + query_detail_string = "[{\"eventTime\":1592208814797," + "\"queryId\":\"219a2d5443c542d4-8fc938db37c892e3\"," + "\"startTime\":1592208814796,\"endTime\":1592208814797," + "\"latency\":1,\"state\":\"FINISHED\",\"database\":\"testDb\"," diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/SetExecutorTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/SetExecutorTest.java index 9c49f3f1d6..f3b33794a3 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/SetExecutorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/SetExecutorTest.java @@ -17,7 +17,6 @@ package org.apache.doris.qe; -import mockit.Expectations; import org.apache.doris.analysis.AccessTestUtil; import org.apache.doris.analysis.Analyzer; import org.apache.doris.analysis.IntLiteral; @@ -33,14 +32,13 @@ import org.apache.doris.mysql.privilege.PaloAuth; import org.apache.doris.mysql.privilege.PrivPredicate; import com.google.common.collect.Lists; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.Before; import org.junit.Test; import java.util.List; -import mockit.Mocked; - public class SetExecutorTest { private Analyzer analyzer; private ConnectContext ctx; diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/ShowExecutorTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/ShowExecutorTest.java index 36f82fa77d..8facfc27ed 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/ShowExecutorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/ShowExecutorTest.java @@ -54,8 +54,11 @@ import org.apache.doris.mysql.MysqlCommand; import org.apache.doris.mysql.privilege.PaloAuth; import org.apache.doris.system.SystemInfoService; import org.apache.doris.thrift.TStorageType; -import com.google.common.collect.Lists; +import com.google.common.collect.Lists; +import mockit.Expectations; +import mockit.Mock; +import mockit.MockUp; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -66,9 +69,6 @@ import org.junit.rules.ExpectedException; import java.io.IOException; import java.net.URL; import java.util.List; -import mockit.Expectations; -import mockit.Mock; -import mockit.MockUp; public class ShowExecutorTest { private ConnectContext ctx; @@ -164,7 +164,7 @@ public class ShowExecutorTest { result = table; } }; - + // mock auth PaloAuth auth = AccessTestUtil.fetchAdminAccess(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/ShowResultSetMetaDataTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/ShowResultSetMetaDataTest.java index acd2bb541c..b743ecf777 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/ShowResultSetMetaDataTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/ShowResultSetMetaDataTest.java @@ -18,8 +18,8 @@ package org.apache.doris.qe; import org.apache.doris.catalog.Column; -import org.apache.doris.catalog.ScalarType; import org.apache.doris.catalog.PrimitiveType; +import org.apache.doris.catalog.ScalarType; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/SimpleSchedulerTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/SimpleSchedulerTest.java index 09f8a10c79..63b907006d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/SimpleSchedulerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/SimpleSchedulerTest.java @@ -28,7 +28,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/SqlModeHelperTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/SqlModeHelperTest.java index 5a00ee5a06..96b9713844 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/SqlModeHelperTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/SqlModeHelperTest.java @@ -18,6 +18,7 @@ package org.apache.doris.qe; import org.apache.doris.common.DdlException; + import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java index 0ab38a3fbd..5ba2e7237b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java @@ -45,7 +45,9 @@ import org.apache.doris.thrift.TUniqueId; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - +import java_cup.runtime.Symbol; +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -59,10 +61,6 @@ import java.util.List; import java.util.SortedMap; import java.util.concurrent.atomic.AtomicBoolean; -import java_cup.runtime.Symbol; -import mockit.Expectations; -import mockit.Mocked; - public class StmtExecutorTest { private ConnectContext ctx; private QueryState state; @@ -733,4 +731,3 @@ public class StmtExecutorTest { Assert.assertEquals(QueryState.MysqlStateType.ERR, state.getStateType()); } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/VariableMgrTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/VariableMgrTest.java index 38e235ce0f..b248bcc0cb 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/VariableMgrTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/VariableMgrTest.java @@ -234,4 +234,3 @@ public class VariableMgrTest { Assert.fail("No exception throws."); } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/resource/TagSerializationTest.java b/fe/fe-core/src/test/java/org/apache/doris/resource/TagSerializationTest.java index 98af1d3437..c76dc37dc4 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/resource/TagSerializationTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/resource/TagSerializationTest.java @@ -21,7 +21,6 @@ package org.apache.doris.resource; import org.apache.doris.common.AnalysisException; import com.google.common.collect.Sets; - import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/resource/TagTest.java b/fe/fe-core/src/test/java/org/apache/doris/resource/TagTest.java index 2fce1e2c05..45130269c0 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/resource/TagTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/resource/TagTest.java @@ -20,7 +20,6 @@ package org.apache.doris.resource; import org.apache.doris.common.AnalysisException; import com.google.common.collect.Maps; - import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleFunctionTest.java b/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleFunctionTest.java index d462de7fc6..7ed2284c2a 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleFunctionTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleFunctionTest.java @@ -6,7 +6,7 @@ // "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 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, // software distributed under the License is distributed on an @@ -14,7 +14,6 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// package org.apache.doris.rewrite; diff --git a/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleTest.java b/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleTest.java index d537056661..430d45e1d3 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleTest.java @@ -6,7 +6,7 @@ // "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 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, // software distributed under the License is distributed on an @@ -14,7 +14,6 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// package org.apache.doris.rewrite; @@ -27,20 +26,19 @@ import org.apache.doris.analysis.SlotRef; import org.apache.doris.analysis.TableName; import org.apache.doris.common.jmockit.Deencapsulation; +import com.clearspring.analytics.util.Lists; import com.google.common.collect.BoundType; import com.google.common.collect.Maps; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import com.google.common.collect.TreeRangeSet; +import org.junit.Assert; +import org.junit.Test; import java.util.List; import java.util.Map; import java.util.Set; -import com.clearspring.analytics.util.Lists; -import org.junit.Assert; -import org.junit.Test; - public class ExtractCommonFactorsRuleTest { // Input: k1 in (k2, 1) diff --git a/fe/fe-core/src/test/java/org/apache/doris/rewrite/FEFunctionsTest.java b/fe/fe-core/src/test/java/org/apache/doris/rewrite/FEFunctionsTest.java index af93c5ceda..f9f726dfca 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/rewrite/FEFunctionsTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/rewrite/FEFunctionsTest.java @@ -17,9 +17,6 @@ package org.apache.doris.rewrite; -import mockit.Expectations; -import mockit.Mocked; - import org.apache.doris.analysis.DateLiteral; import org.apache.doris.analysis.DecimalLiteral; import org.apache.doris.analysis.FloatLiteral; @@ -30,6 +27,8 @@ import org.apache.doris.catalog.Type; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.util.TimeUtils; +import mockit.Expectations; +import mockit.Mocked; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Before; @@ -41,8 +40,6 @@ import java.time.ZoneId; import java.util.Locale; import java.util.TimeZone; -import static org.junit.Assert.fail; - public class FEFunctionsTest { @Mocked @@ -94,7 +91,7 @@ public class FEFunctionsTest { expectedResult = new IntLiteral(-30); Assert.assertEquals(expectedResult, actualResult); } - + @Test public void dateAddTest() throws AnalysisException { DateLiteral actualResult = FEFunctions.dateAdd(new DateLiteral("2018-08-08", Type.DATE), new IntLiteral(1)); @@ -105,7 +102,7 @@ public class FEFunctionsTest { expectedResult = new DateLiteral("2018-08-07 00:00:00", Type.DATETIME); Assert.assertEquals(expectedResult, actualResult); } - + @Test public void addDateTest() throws AnalysisException { DateLiteral actualResult = FEFunctions.addDate(new DateLiteral("2018-08-08", Type.DATE), new IntLiteral(1)); @@ -117,7 +114,7 @@ public class FEFunctionsTest { Assert.assertEquals(expectedResult, actualResult); } - + @Test public void daysAddTest() throws AnalysisException { DateLiteral actualResult = FEFunctions.daysAdd(new DateLiteral("2018-08-08", Type.DATE), new IntLiteral(1)); @@ -128,7 +125,7 @@ public class FEFunctionsTest { expectedResult = new DateLiteral("2018-08-07", Type.DATE); Assert.assertEquals(expectedResult, actualResult); } - + @Test public void fromUnixTimeTest() throws AnalysisException { StringLiteral actualResult = FEFunctions.fromUnixTime(new IntLiteral(100000)); @@ -216,12 +213,12 @@ public class FEFunctionsTest { Assert.assertEquals("2013-05-17 08:07:05", FEFunctions.dateParse(new StringLiteral("2013-05-17 08:07:05"), new StringLiteral("%Y-%m-%d %T")).getStringValue()); } catch (AnalysisException e) { e.printStackTrace(); - fail("Junit test dateParse fail"); + Assert.fail("Junit test dateParse fail"); } try { FEFunctions.dateParse(new StringLiteral("2013-05-17"), new StringLiteral("%W")); - fail("Junit test dateParse fail"); + Assert.fail("Junit test dateParse fail"); } catch (AnalysisException e) { Assert.assertEquals(e.getMessage(), "errCode = 2, detailMessage = '' is invalid"); } diff --git a/fe/fe-core/src/test/java/org/apache/doris/rewrite/InferFiltersRuleTest.java b/fe/fe-core/src/test/java/org/apache/doris/rewrite/InferFiltersRuleTest.java index 9e003a1d5a..0a402bc2e2 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/rewrite/InferFiltersRuleTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/rewrite/InferFiltersRuleTest.java @@ -6,7 +6,7 @@ // "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 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, // software distributed under the License is distributed on an @@ -14,15 +14,14 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// package org.apache.doris.rewrite; import org.apache.doris.common.FeConstants; - import org.apache.doris.qe.SessionVariable; import org.apache.doris.utframe.DorisAssert; import org.apache.doris.utframe.UtFrameUtils; + import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/fe/fe-core/src/test/java/org/apache/doris/rewrite/RewriteDateLiteralRuleTest.java b/fe/fe-core/src/test/java/org/apache/doris/rewrite/RewriteDateLiteralRuleTest.java index dc9f4d8270..1964a3b1af 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/rewrite/RewriteDateLiteralRuleTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/rewrite/RewriteDateLiteralRuleTest.java @@ -6,7 +6,7 @@ // "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 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, // software distributed under the License is distributed on an @@ -14,7 +14,6 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// package org.apache.doris.rewrite; diff --git a/fe/fe-core/src/test/java/org/apache/doris/rewrite/mvrewrite/CountFieldToSumTest.java b/fe/fe-core/src/test/java/org/apache/doris/rewrite/mvrewrite/CountFieldToSumTest.java index 182ab73d84..b9a89fb6b6 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/rewrite/mvrewrite/CountFieldToSumTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/rewrite/mvrewrite/CountFieldToSumTest.java @@ -24,18 +24,16 @@ import org.apache.doris.analysis.SlotRef; import org.apache.doris.analysis.TableName; import org.apache.doris.catalog.FunctionSet; import org.apache.doris.common.AnalysisException; +import org.apache.doris.rewrite.ExprRewriter; import com.google.common.collect.Lists; - -import org.apache.doris.rewrite.ExprRewriter; +import mockit.Expectations; +import mockit.Injectable; import org.junit.Assert; import org.junit.Test; import java.util.List; -import mockit.Expectations; -import mockit.Injectable; - public class CountFieldToSumTest { @Test diff --git a/fe/fe-core/src/test/java/org/apache/doris/system/HeartbeatMgrTest.java b/fe/fe-core/src/test/java/org/apache/doris/system/HeartbeatMgrTest.java index 00aea973a2..9e28a57271 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/system/HeartbeatMgrTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/system/HeartbeatMgrTest.java @@ -17,7 +17,6 @@ package org.apache.doris.system; -import mockit.Expectations; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.FsBroker; import org.apache.doris.common.GenericPool; @@ -36,15 +35,15 @@ import org.apache.doris.thrift.TFrontendPingFrontendStatusCode; import org.apache.doris.thrift.TNetworkAddress; import org.apache.doris.thrift.TPaloBrokerService; +import mockit.Expectations; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; import org.apache.thrift.TException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; - public class HeartbeatMgrTest { @Mocked diff --git a/fe/fe-core/src/test/java/org/apache/doris/system/SystemInfoServiceTest.java b/fe/fe-core/src/test/java/org/apache/doris/system/SystemInfoServiceTest.java index b2570095a0..4d158604aa 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/system/SystemInfoServiceTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/system/SystemInfoServiceTest.java @@ -28,7 +28,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -36,8 +37,6 @@ import org.junit.Test; import java.util.Collections; import java.util.List; import java.util.Map; -import mockit.Expectations; -import mockit.Mocked; public class SystemInfoServiceTest { diff --git a/fe/fe-core/src/test/java/org/apache/doris/task/AgentTaskTest.java b/fe/fe-core/src/test/java/org/apache/doris/task/AgentTaskTest.java index bce7709b60..71691b67de 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/task/AgentTaskTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/task/AgentTaskTest.java @@ -36,7 +36,6 @@ import org.apache.doris.thrift.TTabletType; import org.apache.doris.thrift.TTaskType; import com.google.common.collect.Range; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -138,7 +137,7 @@ public class AgentTaskTest { // add null agentBatchTask.addTask(null); Assert.assertEquals(0, agentBatchTask.getTaskNum()); - + // normal agentBatchTask.addTask(createReplicaTask); Assert.assertEquals(1, agentBatchTask.getTaskNum()); diff --git a/fe/fe-core/src/test/java/org/apache/doris/task/LoadEtlTaskTest.java b/fe/fe-core/src/test/java/org/apache/doris/task/LoadEtlTaskTest.java index 6e5121d9b3..eb8a1b8f73 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/task/LoadEtlTaskTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/task/LoadEtlTaskTest.java @@ -17,8 +17,6 @@ package org.apache.doris.task; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.Database; import org.apache.doris.catalog.MaterializedIndex; @@ -42,7 +40,8 @@ import org.apache.doris.thrift.TEtlState; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -78,12 +77,12 @@ public class LoadEtlTaskTest { indexId = 0L; tabletId = 0L; backendId = 0L; - + label = "test_label"; - + UnitTestUtil.initDppConfig(); } - + @Test public void testRunEtlTask(@Mocked DppScheduler dppScheduler) throws Exception { // mock catalog @@ -144,7 +143,7 @@ public class LoadEtlTaskTest { result = load; } }; - + // mock dppscheduler EtlStatus runningStatus = new EtlStatus(); runningStatus.setState(TEtlState.RUNNING); @@ -178,15 +177,15 @@ public class LoadEtlTaskTest { // test exec: running HadoopLoadEtlTask loadEtlTask = new HadoopLoadEtlTask(job); loadEtlTask.exec(); - + // verify running Assert.assertEquals(job.getId(), loadEtlTask.getSignature()); Assert.assertEquals(60, job.getProgress()); Assert.assertEquals(JobState.ETL, job.getState()); - + // test exec: finished loadEtlTask.exec(); - + // verify finished Assert.assertEquals(100, job.getProgress()); long expectVersion = partition.getVisibleVersion() + 1; @@ -203,5 +202,5 @@ public class LoadEtlTaskTest { } Assert.assertEquals(tabletNum, tabletLoadInfos.size()); } - + } diff --git a/fe/fe-core/src/test/java/org/apache/doris/task/LoadPendingTaskTest.java b/fe/fe-core/src/test/java/org/apache/doris/task/LoadPendingTaskTest.java index 624c2375d5..b12475e1a2 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/task/LoadPendingTaskTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/task/LoadPendingTaskTest.java @@ -17,8 +17,6 @@ package org.apache.doris.task; -import mockit.Expectations; -import mockit.Mocked; import org.apache.doris.catalog.Catalog; import org.apache.doris.catalog.Database; import org.apache.doris.catalog.OlapTable; @@ -36,8 +34,10 @@ import org.apache.doris.load.TableLoadInfo; import org.apache.doris.persist.EditLog; import org.apache.doris.thrift.TStatus; import org.apache.doris.thrift.TStatusCode; - import org.apache.doris.transaction.GlobalTransactionMgr; + +import mockit.Expectations; +import mockit.Mocked; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -75,11 +75,11 @@ public class LoadPendingTaskTest { indexId = 0L; tabletId = 0L; backendId = 0L; - + label = "test_label"; UnitTestUtil.initDppConfig(); } - + @Test public void testRunPendingTask() throws Exception { // mock catalog @@ -113,7 +113,7 @@ public class LoadPendingTaskTest { result = globalTransactionMgr; } }; - + // create job LoadJob job = new LoadJob(label); job.setState(JobState.PENDING); diff --git a/fe/fe-core/src/test/java/org/apache/doris/task/MasterTaskExecutorTest.java b/fe/fe-core/src/test/java/org/apache/doris/task/MasterTaskExecutorTest.java index 352e300b09..ae88afe2e5 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/task/MasterTaskExecutorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/task/MasterTaskExecutorTest.java @@ -36,7 +36,7 @@ public class MasterTaskExecutorTest { executor = new MasterTaskExecutor("master_task_executor_test", THREAD_NUM, false); executor.start(); } - + @After public void tearDown() { if (executor != null) { @@ -53,12 +53,12 @@ public class MasterTaskExecutorTest { // submit same running task error Assert.assertFalse(executor.submit(task1)); Assert.assertEquals(1, executor.getTaskNum()); - + // submit another task MasterTask task2 = new TestMasterTask(2L); Assert.assertTrue(executor.submit(task2)); Assert.assertEquals(2, executor.getTaskNum()); - + // wait for tasks run to end try { // checker thread interval is 1s @@ -69,9 +69,9 @@ public class MasterTaskExecutorTest { LOG.error("error", e); } } - + private class TestMasterTask extends MasterTask { - + public TestMasterTask(long signature) { this.signature = signature; } @@ -85,6 +85,6 @@ public class MasterTaskExecutorTest { LOG.error("error", e); } } - + } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/transaction/DatabaseTransactionMgrTest.java b/fe/fe-core/src/test/java/org/apache/doris/transaction/DatabaseTransactionMgrTest.java index a20c19da17..7d8abf1a81 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/transaction/DatabaseTransactionMgrTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/transaction/DatabaseTransactionMgrTest.java @@ -32,7 +32,7 @@ import org.apache.doris.meta.MetaContext; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -42,10 +42,6 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class DatabaseTransactionMgrTest { @Rule @@ -133,30 +129,30 @@ public class DatabaseTransactionMgrTest { @Test public void testNormal() throws UserException { DatabaseTransactionMgr masterDbTransMgr = masterTransMgr.getDatabaseTransactionMgr(CatalogTestUtil.testDbId1); - assertEquals(4, masterDbTransMgr.getTransactionNum()); - assertEquals(2, masterDbTransMgr.getRunningTxnNums()); - assertEquals(1, masterDbTransMgr.getRunningRoutineLoadTxnNums()); - assertEquals(1, masterDbTransMgr.getFinishedTxnNums()); + Assert.assertEquals(4, masterDbTransMgr.getTransactionNum()); + Assert.assertEquals(2, masterDbTransMgr.getRunningTxnNums()); + Assert.assertEquals(1, masterDbTransMgr.getRunningRoutineLoadTxnNums()); + Assert.assertEquals(1, masterDbTransMgr.getFinishedTxnNums()); DatabaseTransactionMgr slaveDbTransMgr = slaveTransMgr.getDatabaseTransactionMgr(CatalogTestUtil.testDbId1); - assertEquals(1, slaveDbTransMgr.getTransactionNum()); - assertEquals(1, slaveDbTransMgr.getFinishedTxnNums()); + Assert.assertEquals(1, slaveDbTransMgr.getTransactionNum()); + Assert.assertEquals(1, slaveDbTransMgr.getFinishedTxnNums()); - assertEquals(1, masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel1).size()); - assertEquals(1, masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel2).size()); - assertEquals(1, masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel3).size()); - assertEquals(1, masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel4).size()); + Assert.assertEquals(1, masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel1).size()); + Assert.assertEquals(1, masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel2).size()); + Assert.assertEquals(1, masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel3).size()); + Assert.assertEquals(1, masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel4).size()); Long txnId1 = masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel1).iterator().next(); - assertEquals(txnId1, LabelToTxnId.get(CatalogTestUtil.testTxnLabel1)); + Assert.assertEquals(txnId1, LabelToTxnId.get(CatalogTestUtil.testTxnLabel1)); TransactionState transactionState1 = masterDbTransMgr.getTransactionState(LabelToTxnId.get(CatalogTestUtil.testTxnLabel1)); - assertEquals(txnId1.longValue(), transactionState1.getTransactionId()); - assertEquals(TransactionStatus.VISIBLE, transactionState1.getTransactionStatus()); + Assert.assertEquals(txnId1.longValue(), transactionState1.getTransactionId()); + Assert.assertEquals(TransactionStatus.VISIBLE, transactionState1.getTransactionStatus()); Long txnId2 = masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel2).iterator().next(); - assertEquals(txnId2, LabelToTxnId.get(CatalogTestUtil.testTxnLabel2)); + Assert.assertEquals(txnId2, LabelToTxnId.get(CatalogTestUtil.testTxnLabel2)); TransactionState transactionState2 = masterDbTransMgr.getTransactionState(txnId2); - assertEquals(txnId2.longValue(), transactionState2.getTransactionId()); - assertEquals(TransactionStatus.PREPARE, transactionState2.getTransactionStatus()); + Assert.assertEquals(txnId2.longValue(), transactionState2.getTransactionId()); + Assert.assertEquals(TransactionStatus.PREPARE, transactionState2.getTransactionStatus()); } @@ -167,17 +163,17 @@ public class DatabaseTransactionMgrTest { long txnId2 = LabelToTxnId.get(CatalogTestUtil.testTxnLabel2); masterDbTransMgr.abortTransaction(txnId2, "test abort transaction", null); - assertEquals(2, masterDbTransMgr.getRunningTxnNums()); - assertEquals(0, masterDbTransMgr.getRunningRoutineLoadTxnNums()); - assertEquals(2, masterDbTransMgr.getFinishedTxnNums()); - assertEquals(4, masterDbTransMgr.getTransactionNum()); + Assert.assertEquals(2, masterDbTransMgr.getRunningTxnNums()); + Assert.assertEquals(0, masterDbTransMgr.getRunningRoutineLoadTxnNums()); + Assert.assertEquals(2, masterDbTransMgr.getFinishedTxnNums()); + Assert.assertEquals(4, masterDbTransMgr.getTransactionNum()); long txnId3 = LabelToTxnId.get(CatalogTestUtil.testTxnLabel3); masterDbTransMgr.abortTransaction(txnId3, "test abort transaction", null); - assertEquals(1, masterDbTransMgr.getRunningTxnNums()); - assertEquals(0, masterDbTransMgr.getRunningRoutineLoadTxnNums()); - assertEquals(3, masterDbTransMgr.getFinishedTxnNums()); - assertEquals(4, masterDbTransMgr.getTransactionNum()); + Assert.assertEquals(1, masterDbTransMgr.getRunningTxnNums()); + Assert.assertEquals(0, masterDbTransMgr.getRunningRoutineLoadTxnNums()); + Assert.assertEquals(3, masterDbTransMgr.getFinishedTxnNums()); + Assert.assertEquals(4, masterDbTransMgr.getTransactionNum()); } @Test @@ -195,9 +191,9 @@ public class DatabaseTransactionMgrTest { public void testGetTransactionIdByCoordinateBe() throws UserException { DatabaseTransactionMgr masterDbTransMgr = masterTransMgr.getDatabaseTransactionMgr(CatalogTestUtil.testDbId1); List> transactionInfoList = masterDbTransMgr.getTransactionIdByCoordinateBe("be1", 10); - assertEquals(3, transactionInfoList.size()); - assertEquals(CatalogTestUtil.testDbId1, transactionInfoList.get(0).first.longValue()); - assertEquals(TransactionStatus.PREPARE, + Assert.assertEquals(3, transactionInfoList.size()); + Assert.assertEquals(CatalogTestUtil.testDbId1, transactionInfoList.get(0).first.longValue()); + Assert.assertEquals(TransactionStatus.PREPARE, masterDbTransMgr.getTransactionState(transactionInfoList.get(0).second).getTransactionStatus()); } @@ -206,23 +202,23 @@ public class DatabaseTransactionMgrTest { DatabaseTransactionMgr masterDbTransMgr = masterTransMgr.getDatabaseTransactionMgr(CatalogTestUtil.testDbId1); long txnId = LabelToTxnId.get(CatalogTestUtil.testTxnLabel1); List> singleTranInfos = masterDbTransMgr.getSingleTranInfo(CatalogTestUtil.testDbId1, txnId); - assertEquals(1, singleTranInfos.size()); + Assert.assertEquals(1, singleTranInfos.size()); List txnInfo = singleTranInfos.get(0); - assertEquals("1000", txnInfo.get(0)); - assertEquals(CatalogTestUtil.testTxnLabel1, txnInfo.get(1)); - assertEquals("FE: localfe", txnInfo.get(2)); - assertEquals("VISIBLE", txnInfo.get(3)); - assertEquals("FRONTEND", txnInfo.get(4)); + Assert.assertEquals("1000", txnInfo.get(0)); + Assert.assertEquals(CatalogTestUtil.testTxnLabel1, txnInfo.get(1)); + Assert.assertEquals("FE: localfe", txnInfo.get(2)); + Assert.assertEquals("VISIBLE", txnInfo.get(3)); + Assert.assertEquals("FRONTEND", txnInfo.get(4)); long currentTime = System.currentTimeMillis(); - assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(5))); - assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(6))); - assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(7))); - assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(8))); - assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(9))); - assertEquals("", txnInfo.get(10)); - assertEquals("0", txnInfo.get(11)); - assertEquals("-1", txnInfo.get(12)); - assertEquals(String.valueOf(Config.stream_load_default_timeout_second * 1000), txnInfo.get(13)); + Assert.assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(5))); + Assert.assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(6))); + Assert.assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(7))); + Assert.assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(8))); + Assert.assertTrue(currentTime > TimeUtils.timeStringToLong(txnInfo.get(9))); + Assert.assertEquals("", txnInfo.get(10)); + Assert.assertEquals("0", txnInfo.get(11)); + Assert.assertEquals("-1", txnInfo.get(12)); + Assert.assertEquals(String.valueOf(Config.stream_load_default_timeout_second * 1000), txnInfo.get(13)); } @Test @@ -231,9 +227,9 @@ public class DatabaseTransactionMgrTest { Config.label_keep_max_second = -1; long currentMillis = System.currentTimeMillis(); masterDbTransMgr.removeExpiredTxns(currentMillis); - assertEquals(0, masterDbTransMgr.getFinishedTxnNums()); - assertEquals(3, masterDbTransMgr.getTransactionNum()); - assertNull(masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel1)); + Assert.assertEquals(0, masterDbTransMgr.getFinishedTxnNums()); + Assert.assertEquals(3, masterDbTransMgr.getTransactionNum()); + Assert.assertNull(masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel1)); } @Test @@ -241,11 +237,11 @@ public class DatabaseTransactionMgrTest { DatabaseTransactionMgr masterDbTransMgr = masterTransMgr.getDatabaseTransactionMgr(CatalogTestUtil.testDbId1); Long txnId = LabelToTxnId.get(CatalogTestUtil.testTxnLabel1); List> tableTransInfos = masterDbTransMgr.getTableTransInfo(txnId); - assertEquals(1, tableTransInfos.size()); + Assert.assertEquals(1, tableTransInfos.size()); List tableTransInfo = tableTransInfos.get(0); - assertEquals(2, tableTransInfo.size()); - assertEquals(2L, tableTransInfo.get(0)); - assertEquals("3", tableTransInfo.get(1)); + Assert.assertEquals(2, tableTransInfo.size()); + Assert.assertEquals(2L, tableTransInfo.get(0)); + Assert.assertEquals("3", tableTransInfo.get(1)); } @Test @@ -253,11 +249,11 @@ public class DatabaseTransactionMgrTest { DatabaseTransactionMgr masterDbTransMgr = masterTransMgr.getDatabaseTransactionMgr(CatalogTestUtil.testDbId1); Long txnId = LabelToTxnId.get(CatalogTestUtil.testTxnLabel1); List> partitionTransInfos = masterDbTransMgr.getPartitionTransInfo(txnId, CatalogTestUtil.testTableId1); - assertEquals(1, partitionTransInfos.size()); + Assert.assertEquals(1, partitionTransInfos.size()); List partitionTransInfo = partitionTransInfos.get(0); - assertEquals(2, partitionTransInfo.size()); - assertEquals(3L, partitionTransInfo.get(0)); - assertEquals(13L, partitionTransInfo.get(1)); + Assert.assertEquals(2, partitionTransInfo.size()); + Assert.assertEquals(3L, partitionTransInfo.get(0)); + Assert.assertEquals(13L, partitionTransInfo.get(1)); } @Test @@ -266,10 +262,10 @@ public class DatabaseTransactionMgrTest { long txnId = LabelToTxnId.get(CatalogTestUtil.testTxnLabel1); TransactionState transactionState = masterDbTransMgr.getTransactionState(txnId); masterDbTransMgr.replayDeleteTransaction(transactionState); - assertEquals(2, masterDbTransMgr.getRunningTxnNums()); - assertEquals(1, masterDbTransMgr.getRunningRoutineLoadTxnNums()); - assertEquals(0, masterDbTransMgr.getFinishedTxnNums()); - assertEquals(3, masterDbTransMgr.getTransactionNum()); - assertNull(masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel1)); + Assert.assertEquals(2, masterDbTransMgr.getRunningTxnNums()); + Assert.assertEquals(1, masterDbTransMgr.getRunningRoutineLoadTxnNums()); + Assert.assertEquals(0, masterDbTransMgr.getFinishedTxnNums()); + Assert.assertEquals(3, masterDbTransMgr.getTransactionNum()); + Assert.assertNull(masterDbTransMgr.unprotectedGetTxnIdsByLabel(CatalogTestUtil.testTxnLabel1)); } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/transaction/FakeTransactionIDGenerator.java b/fe/fe-core/src/test/java/org/apache/doris/transaction/FakeTransactionIDGenerator.java index 06c5e2e228..643c270975 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/transaction/FakeTransactionIDGenerator.java +++ b/fe/fe-core/src/test/java/org/apache/doris/transaction/FakeTransactionIDGenerator.java @@ -19,13 +19,13 @@ package org.apache.doris.transaction; import org.apache.doris.persist.EditLog; +import mockit.Mock; +import mockit.MockUp; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import mockit.Mock; -import mockit.MockUp; - public final class FakeTransactionIDGenerator extends MockUp { private long currentId = 1000L; diff --git a/fe/fe-core/src/test/java/org/apache/doris/transaction/GlobalTransactionMgrTest.java b/fe/fe-core/src/test/java/org/apache/doris/transaction/GlobalTransactionMgrTest.java index abdb01f940..39749d0965 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/transaction/GlobalTransactionMgrTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/transaction/GlobalTransactionMgrTest.java @@ -55,7 +55,8 @@ import org.apache.doris.transaction.TransactionState.TxnSourceType; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - +import mockit.Injectable; +import mockit.Mocked; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.junit.Assert; import org.junit.Before; @@ -67,13 +68,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import mockit.Injectable; -import mockit.Mocked; - public class GlobalTransactionMgrTest { private static FakeEditLog fakeEditLog; @@ -114,11 +108,11 @@ public class GlobalTransactionMgrTest { transactionSource, LoadJobSourceType.FRONTEND, Config.stream_load_default_timeout_second); TransactionState transactionState = masterTransMgr.getTransactionState(CatalogTestUtil.testDbId1, transactionId); - assertNotNull(transactionState); - assertEquals(transactionId, transactionState.getTransactionId()); - assertEquals(TransactionStatus.PREPARE, transactionState.getTransactionStatus()); - assertEquals(CatalogTestUtil.testDbId1, transactionState.getDbId()); - assertEquals(transactionSource.toString(), transactionState.getCoordinator().toString()); + Assert.assertNotNull(transactionState); + Assert.assertEquals(transactionId, transactionState.getTransactionId()); + Assert.assertEquals(TransactionStatus.PREPARE, transactionState.getTransactionStatus()); + Assert.assertEquals(CatalogTestUtil.testDbId1, transactionState.getDbId()); + Assert.assertEquals(transactionSource.toString(), transactionState.getCoordinator().toString()); } @Test @@ -139,11 +133,11 @@ public class GlobalTransactionMgrTest { e.printStackTrace(); } TransactionState transactionState = masterTransMgr.getTransactionState(CatalogTestUtil.testDbId1, transactionId); - assertNotNull(transactionState); - assertEquals(transactionId, transactionState.getTransactionId()); - assertEquals(TransactionStatus.PREPARE, transactionState.getTransactionStatus()); - assertEquals(CatalogTestUtil.testDbId1, transactionState.getDbId()); - assertEquals(transactionSource.toString(), transactionState.getCoordinator().toString()); + Assert.assertNotNull(transactionState); + Assert.assertEquals(transactionId, transactionState.getTransactionId()); + Assert.assertEquals(TransactionStatus.PREPARE, transactionState.getTransactionStatus()); + Assert.assertEquals(CatalogTestUtil.testDbId1, transactionState.getDbId()); + Assert.assertEquals(transactionSource.toString(), transactionState.getCoordinator().toString()); try { transactionId = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1, Lists.newArrayList(CatalogTestUtil.testTableId1), @@ -178,22 +172,22 @@ public class GlobalTransactionMgrTest { masterTransMgr.commitTransaction(CatalogTestUtil.testDbId1, Lists.newArrayList(testTable1), transactionId, transTablets); TransactionState transactionState = fakeEditLog.getTransaction(transactionId); // check status is committed - assertEquals(TransactionStatus.COMMITTED, transactionState.getTransactionStatus()); + Assert.assertEquals(TransactionStatus.COMMITTED, transactionState.getTransactionStatus()); // check replica version Partition testPartition = masterCatalog.getDbOrMetaException(CatalogTestUtil.testDbId1).getTableOrMetaException(CatalogTestUtil.testTableId1) .getPartition(CatalogTestUtil.testPartition1); // check partition version - assertEquals(CatalogTestUtil.testStartVersion, testPartition.getVisibleVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 2, testPartition.getNextVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, testPartition.getVisibleVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 2, testPartition.getNextVersion()); // check partition next version Tablet tablet = testPartition.getIndex(CatalogTestUtil.testIndexId1).getTablet(CatalogTestUtil.testTabletId1); for (Replica replica : tablet.getReplicas()) { - assertEquals(CatalogTestUtil.testStartVersion, replica.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replica.getVersion()); } // slave replay new state and compare catalog FakeCatalog.setCatalog(slaveCatalog); slaveTransMgr.replayUpsertTransactionState(transactionState); - assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); + Assert.assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); } // commit with only two replicas @@ -220,7 +214,7 @@ public class GlobalTransactionMgrTest { transactionState = fakeEditLog.getTransaction(transactionId); FakeCatalog.setCatalog(slaveCatalog); slaveTransMgr.replayUpsertTransactionState(transactionState); - assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); + Assert.assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); FakeCatalog.setCatalog(masterCatalog); // commit another transaction with 1,3 success @@ -240,21 +234,21 @@ public class GlobalTransactionMgrTest { } catch (TabletQuorumFailedException e) { transactionState = masterTransMgr.getTransactionState(CatalogTestUtil.testDbId1, transactionId2); // check status is prepare, because the commit failed - assertEquals(TransactionStatus.PREPARE, transactionState.getTransactionStatus()); + Assert.assertEquals(TransactionStatus.PREPARE, transactionState.getTransactionStatus()); } // check replica version Partition testPartition = masterCatalog.getDbOrMetaException(CatalogTestUtil.testDbId1).getTableOrMetaException(CatalogTestUtil.testTableId1) .getPartition(CatalogTestUtil.testPartition1); // check partition version - assertEquals(CatalogTestUtil.testStartVersion, testPartition.getVisibleVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 2, testPartition.getNextVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, testPartition.getVisibleVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 2, testPartition.getNextVersion()); // check partition next version Tablet tablet = testPartition.getIndex(CatalogTestUtil.testIndexId1).getTablet(CatalogTestUtil.testTabletId1); for (Replica replica : tablet.getReplicas()) { - assertEquals(CatalogTestUtil.testStartVersion, replica.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replica.getVersion()); } // the transaction not committed, so that catalog should be equal - assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); + Assert.assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); // commit the second transaction with 1,2,3 success tabletCommitInfo1 = new TabletCommitInfo(CatalogTestUtil.testTabletId1, CatalogTestUtil.testBackendId1); @@ -267,40 +261,40 @@ public class GlobalTransactionMgrTest { masterTransMgr.commitTransaction(CatalogTestUtil.testDbId1, Lists.newArrayList(testTable1), transactionId2, transTablets); transactionState = fakeEditLog.getTransaction(transactionId2); // check status is commit - assertEquals(TransactionStatus.COMMITTED, transactionState.getTransactionStatus()); + Assert.assertEquals(TransactionStatus.COMMITTED, transactionState.getTransactionStatus()); // check replica version testPartition = masterCatalog.getDbOrMetaException(CatalogTestUtil.testDbId1).getTableOrMetaException(CatalogTestUtil.testTableId1) .getPartition(CatalogTestUtil.testPartition1); // check partition version - assertEquals(CatalogTestUtil.testStartVersion, testPartition.getVisibleVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 3, testPartition.getNextVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, testPartition.getVisibleVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 3, testPartition.getNextVersion()); // check partition next version tablet = testPartition.getIndex(CatalogTestUtil.testIndexId1).getTablet(CatalogTestUtil.testTabletId1); for (Replica replica : tablet.getReplicas()) { - assertEquals(CatalogTestUtil.testStartVersion, replica.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replica.getVersion()); } Replica replcia1 = tablet.getReplicaById(CatalogTestUtil.testReplicaId1); Replica replcia2 = tablet.getReplicaById(CatalogTestUtil.testReplicaId2); Replica replcia3 = tablet.getReplicaById(CatalogTestUtil.testReplicaId3); - assertEquals(CatalogTestUtil.testStartVersion, replcia1.getVersion()); - assertEquals(CatalogTestUtil.testStartVersion, replcia2.getVersion()); - assertEquals(CatalogTestUtil.testStartVersion, replcia3.getVersion()); - assertEquals(-1, replcia1.getLastFailedVersion()); - assertEquals(-1, replcia2.getLastFailedVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 1, replcia3.getLastFailedVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replcia1.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replcia2.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replcia3.getVersion()); + Assert.assertEquals(-1, replcia1.getLastFailedVersion()); + Assert.assertEquals(-1, replcia2.getLastFailedVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 1, replcia3.getLastFailedVersion()); // last success version not change, because not published - assertEquals(CatalogTestUtil.testStartVersion, replcia1.getLastSuccessVersion()); - assertEquals(CatalogTestUtil.testStartVersion, replcia2.getLastSuccessVersion()); - assertEquals(CatalogTestUtil.testStartVersion, replcia3.getLastSuccessVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replcia1.getLastSuccessVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replcia2.getLastSuccessVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replcia3.getLastSuccessVersion()); // check partition version - assertEquals(CatalogTestUtil.testStartVersion, testPartition.getVisibleVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 3, testPartition.getNextVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, testPartition.getVisibleVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 3, testPartition.getNextVersion()); transactionState = fakeEditLog.getTransaction(transactionId2); FakeCatalog.setCatalog(slaveCatalog); slaveTransMgr.replayUpsertTransactionState(transactionState); - assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); + Assert.assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); } @Test @@ -379,7 +373,7 @@ public class GlobalTransactionMgrTest { throws UserException { FakeCatalog.setCatalog(masterCatalog); - + TabletCommitInfo tabletCommitInfo1 = new TabletCommitInfo(CatalogTestUtil.testTabletId1, CatalogTestUtil.testBackendId1); TabletCommitInfo tabletCommitInfo2 = new TabletCommitInfo(CatalogTestUtil.testTabletId1, CatalogTestUtil.testBackendId2); TabletCommitInfo tabletCommitInfo3 = new TabletCommitInfo(CatalogTestUtil.testTabletId1, CatalogTestUtil.testBackendId3); @@ -462,32 +456,32 @@ public class GlobalTransactionMgrTest { Table testTable1 = masterCatalog.getDbOrMetaException(CatalogTestUtil.testDbId1).getTableOrMetaException(CatalogTestUtil.testTableId1); masterTransMgr.commitTransaction(CatalogTestUtil.testDbId1, Lists.newArrayList(testTable1), transactionId, transTablets); TransactionState transactionState = fakeEditLog.getTransaction(transactionId); - assertEquals(TransactionStatus.COMMITTED, transactionState.getTransactionStatus()); + Assert.assertEquals(TransactionStatus.COMMITTED, transactionState.getTransactionStatus()); slaveTransMgr.replayUpsertTransactionState(transactionState); Set errorReplicaIds = Sets.newHashSet(); errorReplicaIds.add(CatalogTestUtil.testReplicaId1); masterTransMgr.finishTransaction(CatalogTestUtil.testDbId1, transactionId, errorReplicaIds); transactionState = fakeEditLog.getTransaction(transactionId); - assertEquals(TransactionStatus.VISIBLE, transactionState.getTransactionStatus()); + Assert.assertEquals(TransactionStatus.VISIBLE, transactionState.getTransactionStatus()); // check replica version Partition testPartition = masterCatalog.getDbOrMetaException(CatalogTestUtil.testDbId1).getTableOrMetaException(CatalogTestUtil.testTableId1) .getPartition(CatalogTestUtil.testPartition1); // check partition version - assertEquals(CatalogTestUtil.testStartVersion + 1, testPartition.getVisibleVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 2, testPartition.getNextVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 1, testPartition.getVisibleVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 2, testPartition.getNextVersion()); // check partition next version Tablet tablet = testPartition.getIndex(CatalogTestUtil.testIndexId1).getTablet(CatalogTestUtil.testTabletId1); for (Replica replica : tablet.getReplicas()) { if (replica.getId() == CatalogTestUtil.testReplicaId1) { - assertEquals(CatalogTestUtil.testStartVersion, replica.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replica.getVersion()); } else { - assertEquals(CatalogTestUtil.testStartVersion + 1, replica.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 1, replica.getVersion()); } } // slave replay new state and compare catalog slaveTransMgr.replayUpsertTransactionState(transactionState); - assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); + Assert.assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); } @Test @@ -516,41 +510,41 @@ public class GlobalTransactionMgrTest { transactionState = fakeEditLog.getTransaction(transactionId); FakeCatalog.setCatalog(slaveCatalog); slaveTransMgr.replayUpsertTransactionState(transactionState); - assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); + Assert.assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); // master finish the transaction failed FakeCatalog.setCatalog(masterCatalog); Set errorReplicaIds = Sets.newHashSet(); errorReplicaIds.add(CatalogTestUtil.testReplicaId2); masterTransMgr.finishTransaction(CatalogTestUtil.testDbId1, transactionId, errorReplicaIds); - assertEquals(TransactionStatus.COMMITTED, transactionState.getTransactionStatus()); + Assert.assertEquals(TransactionStatus.COMMITTED, transactionState.getTransactionStatus()); Replica replica1 = tablet.getReplicaById(CatalogTestUtil.testReplicaId1); Replica replica2 = tablet.getReplicaById(CatalogTestUtil.testReplicaId2); Replica replica3 = tablet.getReplicaById(CatalogTestUtil.testReplicaId3); // because after calling `finishTransaction`, the txn state is COMMITTED, not VISIBLE, // so all replicas' version are not changed. - assertEquals(CatalogTestUtil.testStartVersion, replica1.getVersion()); - assertEquals(CatalogTestUtil.testStartVersion, replica2.getVersion()); - assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion()); - assertEquals(-1, replica1.getLastFailedVersion()); - assertEquals(-1, replica2.getLastFailedVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 1, replica3.getLastFailedVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replica1.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replica2.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion()); + Assert.assertEquals(-1, replica1.getLastFailedVersion()); + Assert.assertEquals(-1, replica2.getLastFailedVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 1, replica3.getLastFailedVersion()); errorReplicaIds = Sets.newHashSet(); masterTransMgr.finishTransaction(CatalogTestUtil.testDbId1, transactionId, errorReplicaIds); - assertEquals(TransactionStatus.VISIBLE, transactionState.getTransactionStatus()); - assertEquals(CatalogTestUtil.testStartVersion + 1, replica1.getVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 1, replica2.getVersion()); - assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion()); - assertEquals(-1, replica1.getLastFailedVersion()); - assertEquals(-1, replica2.getLastFailedVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 1, replica3.getLastFailedVersion()); + Assert.assertEquals(TransactionStatus.VISIBLE, transactionState.getTransactionStatus()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 1, replica1.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 1, replica2.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion()); + Assert.assertEquals(-1, replica1.getLastFailedVersion()); + Assert.assertEquals(-1, replica2.getLastFailedVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 1, replica3.getLastFailedVersion()); // follower catalog replay the transaction transactionState = fakeEditLog.getTransaction(transactionId); FakeCatalog.setCatalog(slaveCatalog); slaveTransMgr.replayUpsertTransactionState(transactionState); - assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); + Assert.assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); FakeCatalog.setCatalog(masterCatalog); // commit another transaction with 1,3 success @@ -570,7 +564,7 @@ public class GlobalTransactionMgrTest { } catch (TabletQuorumFailedException e) { transactionState = masterTransMgr.getTransactionState(CatalogTestUtil.testDbId1, transactionId2); // check status is prepare, because the commit failed - assertEquals(TransactionStatus.PREPARE, transactionState.getTransactionStatus()); + Assert.assertEquals(TransactionStatus.PREPARE, transactionState.getTransactionStatus()); } // commit the second transaction with 1,2,3 success @@ -584,41 +578,41 @@ public class GlobalTransactionMgrTest { masterTransMgr.commitTransaction(CatalogTestUtil.testDbId1, Lists.newArrayList(testTable1), transactionId2, transTablets); transactionState = fakeEditLog.getTransaction(transactionId2); // check status is commit - assertEquals(TransactionStatus.COMMITTED, transactionState.getTransactionStatus()); + Assert.assertEquals(TransactionStatus.COMMITTED, transactionState.getTransactionStatus()); // check replica version testPartition = masterCatalog.getDbOrMetaException(CatalogTestUtil.testDbId1).getTableOrMetaException(CatalogTestUtil.testTableId1) .getPartition(CatalogTestUtil.testPartition1); // check partition version - assertEquals(CatalogTestUtil.testStartVersion + 1, testPartition.getVisibleVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 3, testPartition.getNextVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 1, testPartition.getVisibleVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 3, testPartition.getNextVersion()); // follower catalog replay the transaction transactionState = fakeEditLog.getTransaction(transactionId2); FakeCatalog.setCatalog(slaveCatalog); slaveTransMgr.replayUpsertTransactionState(transactionState); - assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); + Assert.assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); // master finish the transaction2 errorReplicaIds = Sets.newHashSet(); masterTransMgr.finishTransaction(CatalogTestUtil.testDbId1, transactionId2, errorReplicaIds); - assertEquals(TransactionStatus.VISIBLE, transactionState.getTransactionStatus()); - assertEquals(CatalogTestUtil.testStartVersion + 2, replica1.getVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 2, replica2.getVersion()); - assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion()); - assertEquals(-1, replica1.getLastFailedVersion()); - assertEquals(-1, replica2.getLastFailedVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 1, replica3.getLastFailedVersion()); + Assert.assertEquals(TransactionStatus.VISIBLE, transactionState.getTransactionStatus()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 2, replica1.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 2, replica2.getVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion, replica3.getVersion()); + Assert.assertEquals(-1, replica1.getLastFailedVersion()); + Assert.assertEquals(-1, replica2.getLastFailedVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 1, replica3.getLastFailedVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 2, replica1.getLastSuccessVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 2, replica2.getLastSuccessVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 2, replica3.getLastSuccessVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 2, replica1.getLastSuccessVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 2, replica2.getLastSuccessVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 2, replica3.getLastSuccessVersion()); // check partition version - assertEquals(CatalogTestUtil.testStartVersion + 2, testPartition.getVisibleVersion()); - assertEquals(CatalogTestUtil.testStartVersion + 3, testPartition.getNextVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 2, testPartition.getVisibleVersion()); + Assert.assertEquals(CatalogTestUtil.testStartVersion + 3, testPartition.getNextVersion()); transactionState = fakeEditLog.getTransaction(transactionId2); FakeCatalog.setCatalog(slaveCatalog); slaveTransMgr.replayUpsertTransactionState(transactionState); - assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); + Assert.assertTrue(CatalogTestUtil.compareCatalog(masterCatalog, slaveCatalog)); } } diff --git a/fe/fe-core/src/test/java/org/apache/doris/transaction/TransactionStateTest.java b/fe/fe-core/src/test/java/org/apache/doris/transaction/TransactionStateTest.java index cb5a79b753..c20b2097f8 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/transaction/TransactionStateTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/transaction/TransactionStateTest.java @@ -25,7 +25,6 @@ import org.apache.doris.transaction.TransactionState.TxnCoordinator; import org.apache.doris.transaction.TransactionState.TxnSourceType; import com.google.common.collect.Lists; - import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/AnotherDemoTest.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/AnotherDemoTest.java index 6d7b4cd07b..41ea13e905 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/utframe/AnotherDemoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/AnotherDemoTest.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.UUID; /* - * This demo is mainly used to confirm that + * This demo is mainly used to confirm that * repeatedly starting FE and BE in 2 UnitTest will not cause conflict */ public class AnotherDemoTest { diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/DemoMultiBackendsTest.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/DemoMultiBackendsTest.java index c4b5a92aa9..feec2e020a 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/utframe/DemoMultiBackendsTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/DemoMultiBackendsTest.java @@ -50,7 +50,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Table; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -223,4 +222,3 @@ public class DemoMultiBackendsTest { } } } - diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedBackend.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedBackend.java index 0924fdc014..eb362f5a3d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedBackend.java +++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedBackend.java @@ -26,20 +26,19 @@ import org.apache.doris.utframe.MockedBackendFactory.BeThriftService; import io.grpc.Server; import io.grpc.ServerBuilder; - import org.apache.thrift.TProcessor; import java.io.IOException; /* * Mocked Backend - * A mocked Backend has 3 rpc services. + * A mocked Backend has 3 rpc services. * HeartbeatService.Iface to handle heart beat from Frontend. * BeThriftService to handle agent tasks and other requests from Frontend. * BRpcService to handle the query request from Frontend. - * + * * Users can create a BE by customizing three rpc services. - * + * * Better to create a mocked Backend from MockedBackendFactory. * In MockedBackendFactory, there default rpc service for above 3 rpc services. */ @@ -48,7 +47,7 @@ public class MockedBackend { private ThriftServer heartbeatServer; private ThriftServer beThriftServer; private Server backendServer; - + private String host; private int heartbeatPort; private int thriftPort; diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedBackendFactory.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedBackendFactory.java index ca4da798ad..928c79a193 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedBackendFactory.java +++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedBackendFactory.java @@ -68,23 +68,21 @@ import org.apache.doris.thrift.TTransmitDataParams; import org.apache.doris.thrift.TTransmitDataResult; import org.apache.doris.thrift.TUniqueId; -import org.apache.thrift.TException; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Queues; +import io.grpc.stub.StreamObserver; +import org.apache.thrift.TException; import java.io.IOException; import java.util.List; import java.util.concurrent.BlockingQueue; -import io.grpc.stub.StreamObserver; - /* * This class is used to create mock backends. * Usage can be found in Demon.java's beforeClass() - * - * + * + * */ public class MockedBackendFactory { @@ -125,7 +123,7 @@ public class MockedBackendFactory { return result; } } - + // abstract BeThriftService. // User can extends this abstract class to create other custom be thrift service public static abstract class BeThriftService implements BackendService.Iface { diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedFrontend.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedFrontend.java index 73c5595c43..67820328e8 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedFrontend.java +++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedFrontend.java @@ -40,27 +40,27 @@ import java.util.Map; * MockedFrontend mockedFrontend = MockedFrontend.getInstance(); * mockedFrontend.init(confMap); * mockedFrontend.start(new String[0]); - * + * * ... - * + * * confMap is a instance of Map. * Here you can add any FE configuration you want to add. For example: * confMap.put("http_port", "8032"); - * + * * FrontendProcess already contains a minimal set of FE configurations. * Any configuration in confMap will form the final fe.conf file with this minimal set. - * + * * 1 environment variable must be set: * DORIS_HOME/ - * + * * The running dir is set when calling init(); * There will be 3 directories under running dir/: * running dir/conf/ * running dir/log/ * running dir/palo-meta/ - * + * * All these 3 directories will be cleared first. - * + * */ public class MockedFrontend { public static final String FE_PROCESS = "fe"; diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/UtFrameUtils.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/UtFrameUtils.java index 5153931a42..739947bd70 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/utframe/UtFrameUtils.java +++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/UtFrameUtils.java @@ -51,7 +51,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FileUtils; @@ -315,4 +314,3 @@ public class UtFrameUtils { return DigestUtils.md5Hex(digest); } } - diff --git a/fe/fe-core/src/test/java/plugin/PluginTest.java b/fe/fe-core/src/test/java/plugin/PluginTest.java index f332a4b5b3..af1ff7cfe7 100644 --- a/fe/fe-core/src/test/java/plugin/PluginTest.java +++ b/fe/fe-core/src/test/java/plugin/PluginTest.java @@ -17,14 +17,14 @@ package plugin; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - import org.apache.doris.plugin.Plugin; import org.apache.doris.plugin.PluginContext; import org.apache.doris.plugin.PluginInfo; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + public class PluginTest extends Plugin { private Map map = new HashMap<>(); diff --git a/fe/hive-udf/src/main/java/org/apache/doris/common/BitmapValueUtil.java b/fe/hive-udf/src/main/java/org/apache/doris/common/BitmapValueUtil.java index 6724e767e9..1d4f6be37f 100644 --- a/fe/hive-udf/src/main/java/org/apache/doris/common/BitmapValueUtil.java +++ b/fe/hive-udf/src/main/java/org/apache/doris/common/BitmapValueUtil.java @@ -18,8 +18,9 @@ package org.apache.doris.common; import org.apache.doris.common.io.BitmapValue; -import java.io.ByteArrayOutputStream; + import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapAndUDF.java b/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapAndUDF.java index 19a3388749..cf7033783d 100644 --- a/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapAndUDF.java +++ b/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapAndUDF.java @@ -19,6 +19,7 @@ package org.apache.doris.udf; import org.apache.doris.common.BitmapValueUtil; import org.apache.doris.common.io.BitmapValue; + import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDFArgumentException; import org.apache.hadoop.hive.ql.metadata.HiveException; @@ -26,6 +27,7 @@ import org.apache.hadoop.hive.ql.udf.generic.GenericUDF; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; + import java.io.IOException; @Description(name = "bitmap_and", value = "a _FUNC_ b - Compute intersection of two or more input bitmaps, return the new bitmap") diff --git a/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapCountUDF.java b/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapCountUDF.java index adc87d0f0c..29adc008ec 100644 --- a/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapCountUDF.java +++ b/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapCountUDF.java @@ -19,6 +19,7 @@ package org.apache.doris.udf; import org.apache.doris.common.BitmapValueUtil; import org.apache.doris.common.io.BitmapValue; + import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDFArgumentException; import org.apache.hadoop.hive.ql.metadata.HiveException; diff --git a/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapOrUDF.java b/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapOrUDF.java index 24a71445d7..f04b707b87 100644 --- a/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapOrUDF.java +++ b/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapOrUDF.java @@ -19,6 +19,7 @@ package org.apache.doris.udf; import org.apache.doris.common.BitmapValueUtil; import org.apache.doris.common.io.BitmapValue; + import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDFArgumentException; import org.apache.hadoop.hive.ql.metadata.HiveException; diff --git a/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapUnionUDAF.java b/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapUnionUDAF.java index cb46d92f52..82140c8e16 100644 --- a/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapUnionUDAF.java +++ b/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapUnionUDAF.java @@ -19,6 +19,7 @@ package org.apache.doris.udf; import org.apache.doris.common.BitmapValueUtil; import org.apache.doris.common.io.BitmapValue; + import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException; import org.apache.hadoop.hive.ql.metadata.HiveException; diff --git a/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapXorUDF.java b/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapXorUDF.java index 40cba399c0..ec8c3d89dd 100644 --- a/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapXorUDF.java +++ b/fe/hive-udf/src/main/java/org/apache/doris/udf/BitmapXorUDF.java @@ -19,6 +19,7 @@ package org.apache.doris.udf; import org.apache.doris.common.BitmapValueUtil; import org.apache.doris.common.io.BitmapValue; + import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDFArgumentException; import org.apache.hadoop.hive.ql.metadata.HiveException; diff --git a/fe/hive-udf/src/main/java/org/apache/doris/udf/ToBitmapUDAF.java b/fe/hive-udf/src/main/java/org/apache/doris/udf/ToBitmapUDAF.java index e6819d4257..b4a5defc6f 100644 --- a/fe/hive-udf/src/main/java/org/apache/doris/udf/ToBitmapUDAF.java +++ b/fe/hive-udf/src/main/java/org/apache/doris/udf/ToBitmapUDAF.java @@ -19,15 +19,16 @@ package org.apache.doris.udf; import org.apache.doris.common.BitmapValueUtil; import org.apache.doris.common.io.BitmapValue; -import org.apache.hadoop.hive.ql.udf.generic.AbstractGenericUDAFResolver; -import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector; + import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.parse.SemanticException; +import org.apache.hadoop.hive.ql.udf.generic.AbstractGenericUDAFResolver; +import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; diff --git a/fe/java-udf/src/main/java/org/apache/doris/udf/JMXJsonUtil.java b/fe/java-udf/src/main/java/org/apache/doris/udf/JMXJsonUtil.java index e65c7ae7f6..b4016e32e0 100644 --- a/fe/java-udf/src/main/java/org/apache/doris/udf/JMXJsonUtil.java +++ b/fe/java-udf/src/main/java/org/apache/doris/udf/JMXJsonUtil.java @@ -24,6 +24,12 @@ import org.apache.log4j.Logger; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonGenerator; +import java.io.IOException; +import java.io.StringWriter; +import java.lang.management.ManagementFactory; +import java.lang.reflect.Array; +import java.util.Iterator; +import java.util.Set; import javax.management.AttributeNotFoundException; import javax.management.InstanceNotFoundException; import javax.management.IntrospectionException; @@ -38,12 +44,6 @@ import javax.management.RuntimeMBeanException; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; import javax.management.openmbean.TabularData; -import java.io.IOException; -import java.io.StringWriter; -import java.lang.management.ManagementFactory; -import java.lang.reflect.Array; -import java.util.Iterator; -import java.util.Set; /** * Utility class that returns a JSON representation of the JMX beans. diff --git a/fe/java-udf/src/main/java/org/apache/doris/udf/JniUtil.java b/fe/java-udf/src/main/java/org/apache/doris/udf/JniUtil.java index 8812376ef6..32ed79ca03 100644 --- a/fe/java-udf/src/main/java/org/apache/doris/udf/JniUtil.java +++ b/fe/java-udf/src/main/java/org/apache/doris/udf/JniUtil.java @@ -17,15 +17,15 @@ package org.apache.doris.udf; -import com.google.common.base.Joiner; - -import org.apache.doris.thrift.TJvmMemoryPool; +import org.apache.doris.monitor.jvm.JvmPauseMonitor; +import org.apache.doris.thrift.TGetJMXJsonResponse; import org.apache.doris.thrift.TGetJvmMemoryMetricsResponse; -import org.apache.doris.thrift.TJvmThreadInfo; import org.apache.doris.thrift.TGetJvmThreadsInfoRequest; import org.apache.doris.thrift.TGetJvmThreadsInfoResponse; -import org.apache.doris.thrift.TGetJMXJsonResponse; -import org.apache.doris.monitor.jvm.JvmPauseMonitor; +import org.apache.doris.thrift.TJvmMemoryPool; +import org.apache.doris.thrift.TJvmThreadInfo; + +import com.google.common.base.Joiner; import org.apache.thrift.TBase; import org.apache.thrift.TDeserializer; import org.apache.thrift.TException; @@ -36,14 +36,14 @@ import org.apache.thrift.protocol.TProtocolFactory; import java.io.PrintWriter; import java.io.StringWriter; import java.io.Writer; -import java.lang.management.ManagementFactory; -import java.lang.management.ThreadMXBean; import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.MemoryPoolMXBean; +import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; +import java.lang.management.MemoryPoolMXBean; import java.lang.management.MemoryUsage; import java.lang.management.RuntimeMXBean; import java.lang.management.ThreadInfo; +import java.lang.management.ThreadMXBean; import java.util.ArrayList; import java.util.Map; diff --git a/fe/java-udf/src/main/java/org/apache/doris/udf/UdfExecutor.java b/fe/java-udf/src/main/java/org/apache/doris/udf/UdfExecutor.java index cca787400a..201ae33285 100644 --- a/fe/java-udf/src/main/java/org/apache/doris/udf/UdfExecutor.java +++ b/fe/java-udf/src/main/java/org/apache/doris/udf/UdfExecutor.java @@ -17,13 +17,13 @@ package org.apache.doris.udf; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; - import org.apache.doris.catalog.Type; import org.apache.doris.thrift.TJavaUdfExecutorCtorParams; import org.apache.doris.thrift.TPrimitiveType; + +import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.log4j.Logger; import org.apache.thrift.TDeserializer; import org.apache.thrift.TException; diff --git a/fe/java-udf/src/main/java/org/apache/doris/udf/UdfUtils.java b/fe/java-udf/src/main/java/org/apache/doris/udf/UdfUtils.java index f412d8593f..da2d0c9324 100644 --- a/fe/java-udf/src/main/java/org/apache/doris/udf/UdfUtils.java +++ b/fe/java-udf/src/main/java/org/apache/doris/udf/UdfUtils.java @@ -17,8 +17,6 @@ package org.apache.doris.udf; -import com.google.common.base.Preconditions; - import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.catalog.ScalarType; import org.apache.doris.catalog.Type; @@ -28,6 +26,7 @@ import org.apache.doris.thrift.TScalarType; import org.apache.doris.thrift.TTypeDesc; import org.apache.doris.thrift.TTypeNode; +import com.google.common.base.Preconditions; import sun.misc.Unsafe; import java.lang.reflect.Field; diff --git a/fe/java-udf/src/test/java/org/apache/doris/udf/UdfExecutorTest.java b/fe/java-udf/src/test/java/org/apache/doris/udf/UdfExecutorTest.java index 17e781c4c2..d72c621491 100644 --- a/fe/java-udf/src/test/java/org/apache/doris/udf/UdfExecutorTest.java +++ b/fe/java-udf/src/test/java/org/apache/doris/udf/UdfExecutorTest.java @@ -27,6 +27,7 @@ import org.apache.doris.thrift.TScalarType; import org.apache.doris.thrift.TTypeDesc; import org.apache.doris.thrift.TTypeNode; import org.apache.doris.thrift.TTypeNodeType; + import org.apache.thrift.TSerializer; import org.apache.thrift.protocol.TBinaryProtocol; import org.junit.Test; diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/ColumnParser.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/ColumnParser.java index f3fbbc1866..fff375b6a5 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/ColumnParser.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/ColumnParser.java @@ -19,6 +19,7 @@ package org.apache.doris.load.loadv2.dpp; import org.apache.doris.common.SparkDppException; import org.apache.doris.load.loadv2.etl.EtlJobConfig; + import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; import org.slf4j.Logger; diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DorisRangePartitioner.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DorisRangePartitioner.java index 2425fe107a..f09d4641f9 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DorisRangePartitioner.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DorisRangePartitioner.java @@ -18,6 +18,7 @@ package org.apache.doris.load.loadv2.dpp; import org.apache.doris.load.loadv2.etl.EtlJobConfig; + import org.apache.spark.Partitioner; import java.io.Serializable; diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppColumns.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppColumns.java index 418bbc46a3..ece24cd991 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppColumns.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppColumns.java @@ -20,11 +20,11 @@ package org.apache.doris.load.loadv2.dpp; import com.google.common.base.Preconditions; import java.io.Serializable; -import java.util.List; import java.util.ArrayList; -import java.util.Date; -import java.util.Objects; import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Objects; // DppColumns is used to store the class DppColumns implements Comparable, Serializable { diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppUtils.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppUtils.java index 41e9e0b309..3d37acef88 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppUtils.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppUtils.java @@ -20,14 +20,13 @@ package org.apache.doris.load.loadv2.dpp; import org.apache.doris.common.SparkDppException; import org.apache.doris.load.loadv2.etl.EtlJobConfig; +import com.google.common.collect.Lists; +import org.apache.spark.sql.Row; import org.apache.spark.sql.types.DataType; import org.apache.spark.sql.types.DataTypes; +import org.apache.spark.sql.types.DecimalType; import org.apache.spark.sql.types.StructField; import org.apache.spark.sql.types.StructType; -import org.apache.spark.sql.types.DecimalType; -import org.apache.spark.sql.Row; - -import com.google.common.collect.Lists; import java.math.BigDecimal; import java.nio.ByteBuffer; diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java index 69ddbf50f8..60697bf79e 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java @@ -19,9 +19,9 @@ package org.apache.doris.load.loadv2.dpp; import org.apache.doris.common.SparkDppException; import org.apache.doris.load.loadv2.etl.EtlJobConfig; + import com.google.common.base.Strings; import com.google.gson.Gson; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.hadoop.conf.Configuration; @@ -56,6 +56,7 @@ import org.apache.spark.util.LongAccumulator; import org.apache.spark.util.SerializableConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import scala.Tuple2; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -75,8 +76,6 @@ import java.util.Map; import java.util.Queue; import java.util.Set; -import scala.Tuple2; - // This class is a Spark-based data preprocessing program, // which will make use of the distributed compute framework of spark to // do ETL job/sort/preaggregate jobs in spark job @@ -1096,4 +1095,3 @@ public final class SparkDpp implements java.io.Serializable { } } } - diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkRDDAggregator.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkRDDAggregator.java index 72be382567..fcc5e1725f 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkRDDAggregator.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkRDDAggregator.java @@ -17,12 +17,13 @@ package org.apache.doris.load.loadv2.dpp; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; import org.apache.doris.common.SparkDppException; import org.apache.doris.common.io.BitmapValue; import org.apache.doris.common.io.Hll; import org.apache.doris.load.loadv2.etl.EtlJobConfig; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; import org.apache.spark.Partitioner; import org.apache.spark.api.java.function.Function2; import org.apache.spark.api.java.function.PairFunction; diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/StringAccumulator.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/StringAccumulator.java index 1db52a74e5..afd23fafea 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/StringAccumulator.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/StringAccumulator.java @@ -18,8 +18,9 @@ package org.apache.doris.load.loadv2.dpp; import org.apache.spark.util.AccumulatorV2; -import java.util.List; + import java.util.ArrayList; +import java.util.List; // This class is a accumulator of string based on AccumulatorV2 // (https://spark.apache.org/docs/latest/api/java/org/apache/spark/util/AccumulatorV2.html). diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/etl/EtlJobConfig.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/etl/EtlJobConfig.java index 8238aea7e5..ea9df1a133 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/etl/EtlJobConfig.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/etl/EtlJobConfig.java @@ -84,7 +84,7 @@ import java.util.Map; "partitionType": "RANGE", "partitionColumnRefs": ["k1"], "distributionColumnRefs": ["k2"], - "partitions": [{ + "partitions": [{ "partitionId": 10020, "startKeys": [-100], "endKeys": [10], diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/etl/SparkEtlJob.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/etl/SparkEtlJob.java index 4066ecd8de..b2cac20d7e 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/etl/SparkEtlJob.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/etl/SparkEtlJob.java @@ -26,6 +26,9 @@ import org.apache.doris.load.loadv2.etl.EtlJobConfig.EtlFileGroup; import org.apache.doris.load.loadv2.etl.EtlJobConfig.EtlIndex; import org.apache.doris.load.loadv2.etl.EtlJobConfig.EtlTable; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.commons.collections.map.MultiValueMap; import org.apache.spark.SparkConf; import org.apache.spark.sql.Dataset; @@ -34,10 +37,6 @@ import org.apache.spark.sql.functions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - import java.util.List; import java.util.Map; import java.util.Set; diff --git a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/ColumnParserTest.java b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/ColumnParserTest.java index cfb41223b9..298603c75c 100644 --- a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/ColumnParserTest.java +++ b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/ColumnParserTest.java @@ -14,10 +14,11 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// + package org.apache.doris.load.loadv2.dpp; import org.apache.doris.load.loadv2.etl.EtlJobConfig; + import org.junit.Assert; import org.junit.Test; diff --git a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/DorisRangePartitionerTest.java b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/DorisRangePartitionerTest.java index c4f7d9bccf..b874a29121 100644 --- a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/DorisRangePartitionerTest.java +++ b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/DorisRangePartitionerTest.java @@ -14,11 +14,11 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// package org.apache.doris.load.loadv2.dpp; import org.apache.doris.load.loadv2.etl.EtlJobConfig; + import org.junit.Assert; import org.junit.Test; diff --git a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/DppUtilsTest.java b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/DppUtilsTest.java index 7b65067cc3..25e8c13601 100644 --- a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/DppUtilsTest.java +++ b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/DppUtilsTest.java @@ -14,22 +14,21 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// package org.apache.doris.load.loadv2.dpp; import org.apache.doris.load.loadv2.etl.EtlJobConfig; -import org.apache.spark.sql.types.DataTypes; import org.apache.spark.sql.types.DataType; +import org.apache.spark.sql.types.DataTypes; import org.apache.spark.sql.types.StructType; +import org.junit.Assert; +import org.junit.Test; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.junit.Assert; -import org.junit.Test; public class DppUtilsTest { diff --git a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/MinimumCoverageRollupTreeBuilderTest.java b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/MinimumCoverageRollupTreeBuilderTest.java index e2083350d3..9d34a166e4 100644 --- a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/MinimumCoverageRollupTreeBuilderTest.java +++ b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/MinimumCoverageRollupTreeBuilderTest.java @@ -14,7 +14,6 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// package org.apache.doris.load.loadv2.dpp; @@ -22,6 +21,7 @@ import org.apache.doris.load.loadv2.etl.EtlJobConfig; import org.junit.Assert; import org.junit.Test; + import java.util.ArrayList; import java.util.List; diff --git a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/SparkDppTest.java b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/SparkDppTest.java index c8a7b3a35c..29478cfb18 100644 --- a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/SparkDppTest.java +++ b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/SparkDppTest.java @@ -14,10 +14,11 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// + package org.apache.doris.load.loadv2.dpp; import org.apache.doris.load.loadv2.etl.EtlJobConfig; + import org.apache.spark.sql.RowFactory; import org.junit.Assert; import org.junit.Test;