This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push: new c5941fd166 [FE Code Style][sub] Adjust some check rules (#9345) c5941fd166 is described below commit c5941fd16613ccfe3bacd3ee06a61c29165d9f65 Author: leo65535 <leo65...@163.com> AuthorDate: Wed May 4 23:34:55 2022 +0800 [FE Code Style][sub] Adjust some check rules (#9345) Adjust `RedundantImport`,`UnusedImports`,`EmptyStatement`,`NewlineAtEndOfFile`,`UpperEll`, `AvoidStarImport`, `MissingOverride` rules. --- fe/check/checkstyle/checkstyle.xml | 24 +++++++++++++++++----- .../main/java/org/apache/doris/common/io/Hll.java | 6 +++--- .../analysis/AdminCancelRebalanceDiskStmt.java | 2 +- .../apache/doris/analysis/AdminCleanTrashStmt.java | 2 +- .../doris/analysis/AdminRebalanceDiskStmt.java | 2 +- .../org/apache/doris/analysis/AlterUserType.java | 2 +- .../java/org/apache/doris/analysis/BackupStmt.java | 2 +- .../java/org/apache/doris/analysis/BinlogDesc.java | 2 +- .../doris/analysis/CreateDataSyncJobStmt.java | 2 +- .../org/apache/doris/analysis/DescriptorTable.java | 2 +- .../java/org/apache/doris/analysis/JobName.java | 2 +- .../apache/doris/analysis/PauseSyncJobStmt.java | 2 +- .../apache/doris/analysis/ResumeSyncJobStmt.java | 2 +- .../org/apache/doris/analysis/ShowSyncJobStmt.java | 2 +- .../org/apache/doris/analysis/ShowViewStmt.java | 2 +- .../org/apache/doris/analysis/StmtRewriter.java | 2 +- .../org/apache/doris/analysis/StopSyncJobStmt.java | 2 +- .../java/org/apache/doris/analysis/SyncStmt.java | 2 +- .../doris/analysis/TransactionBeginStmt.java | 2 +- .../doris/analysis/TransactionCommitStmt.java | 2 +- .../doris/analysis/TransactionRollbackStmt.java | 2 +- .../org/apache/doris/analysis/TransactionStmt.java | 2 +- .../java/org/apache/doris/backup/RestoreJob.java | 2 +- .../apache/doris/catalog/CatalogRecycleBin.java | 2 +- .../apache/doris/catalog/HashDistributionInfo.java | 2 +- .../org/apache/doris/catalog/MetaReplayState.java | 2 +- .../org/apache/doris/catalog/MultiRowType.java | 2 +- .../org/apache/doris/catalog/TempPartitions.java | 2 +- .../doris/common/logger/DefaultDorisLogger.java | 2 +- .../doris/common/proc/DeleteInfoProcDir.java | 2 +- .../org/apache/doris/common/util/NetUtils.java | 2 +- .../java/org/apache/doris/ha/FrontendNodeType.java | 2 +- .../apache/doris/httpv2/IllegalArgException.java | 2 +- .../org/apache/doris/httpv2/rest/ShowAction.java | 1 - .../doris/httpv2/rest/TableQueryPlanAction.java | 2 +- .../httpv2/rest/manager/QueryProfileAction.java | 2 +- .../java/org/apache/doris/ldap/LdapClient.java | 2 +- .../main/java/org/apache/doris/load/LoadJob.java | 1 - .../org/apache/doris/load/PartitionLoadInfo.java | 2 +- .../org/apache/doris/load/loadv2/BulkLoadJob.java | 4 ---- .../org/apache/doris/load/sync/SyncChannel.java | 2 +- .../doris/load/sync/SyncChannelCallback.java | 2 +- .../apache/doris/load/sync/SyncChannelHandle.java | 2 +- .../apache/doris/load/sync/SyncDataConsumer.java | 2 +- .../apache/doris/load/sync/SyncDataReceiver.java | 2 +- .../org/apache/doris/load/sync/SyncFailMsg.java | 2 +- .../java/org/apache/doris/load/sync/SyncJob.java | 2 +- .../org/apache/doris/load/sync/SyncLifeCycle.java | 2 +- .../org/apache/doris/load/sync/SyncTxnParam.java | 2 +- .../apache/doris/load/sync/canal/CanalConfigs.java | 2 +- .../load/sync/canal/CanalSyncDataConsumer.java | 2 +- .../load/sync/canal/CanalSyncDataReceiver.java | 2 +- .../apache/doris/load/sync/canal/CanalUtils.java | 2 +- .../doris/load/sync/canal/SyncCanalClient.java | 2 +- .../org/apache/doris/load/sync/model/Data.java | 2 +- .../org/apache/doris/load/sync/model/Events.java | 2 +- .../doris/load/sync/position/EntryPosition.java | 2 +- .../doris/load/sync/position/PositionMeta.java | 2 +- .../doris/load/sync/position/PositionRange.java | 2 +- .../org/apache/doris/mysql/privilege/PaloAuth.java | 2 +- .../doris/persist/RefreshExternalTableInfo.java | 2 +- .../org/apache/doris/persist/gson/GsonUtils.java | 2 +- .../persist/gson/RuntimeTypeAdapterFactory.java | 2 +- .../org/apache/doris/planner/OdbcTableSink.java | 2 +- .../org/apache/doris/planner/RuntimeFilter.java | 2 +- .../java/org/apache/doris/plugin/PluginZip.java | 2 +- .../java/org/apache/doris/qe/QueryDetailQueue.java | 1 - .../org/apache/doris/qe/cache/PartitionRange.java | 1 - .../java/org/apache/doris/rewrite/FEFunction.java | 2 +- .../apache/doris/task/CheckConsistencyTask.java | 2 +- .../doris/task/UpdateTabletMetaInfoTask.java | 2 +- .../IllegalTransactionParameterException.java | 2 +- .../apache/doris/analysis/AlterTableStmtTest.java | 2 +- .../apache/doris/analysis/BinaryPredicateTest.java | 2 +- .../apache/doris/analysis/ColumnPositionTest.java | 2 +- .../doris/analysis/CreateDataSyncJobStmtTest.java | 2 +- .../apache/doris/analysis/CreateDbStmtTest.java | 2 +- .../doris/analysis/CreateIndexClauseTest.java | 2 +- .../apache/doris/common/util/BrokerUtilTest.java | 2 +- .../doris/load/sync/canal/CanalSyncJobTest.java | 2 +- .../doris/load/sync/canal/CanalTestUtil.java | 2 +- .../apache/doris/qe/AuditEventProcessorTest.java | 2 +- .../java/org/apache/doris/udf/BitmapOrUDF.java | 2 +- .../java/org/apache/doris/udf/BitmapUnionUDAF.java | 2 +- .../java/org/apache/doris/udf/BitmapXorUDF.java | 2 +- .../java/org/apache/doris/udf/ToBitmapUDAF.java | 2 +- .../apache/doris/load/loadv2/dpp/ColumnParser.java | 2 +- .../load/loadv2/dpp/DorisKryoRegistrator.java | 2 +- .../load/loadv2/dpp/DorisRangePartitioner.java | 2 +- .../apache/doris/load/loadv2/dpp/DppColumns.java | 4 ++-- .../apache/doris/load/loadv2/dpp/DppResult.java | 2 +- .../org/apache/doris/load/loadv2/dpp/DppUtils.java | 2 +- .../doris/load/loadv2/dpp/GlobalDictBuilder.java | 2 +- .../dpp/MinimumCoverageRollupTreeBuilder.java | 2 +- .../doris/load/loadv2/dpp/RollupTreeBuilder.java | 2 +- .../doris/load/loadv2/dpp/RollupTreeNode.java | 2 +- .../org/apache/doris/load/loadv2/dpp/SparkDpp.java | 4 ++-- .../doris/load/loadv2/dpp/SparkRDDAggregator.java | 2 +- .../doris/load/loadv2/dpp/StringAccumulator.java | 2 +- 99 files changed, 116 insertions(+), 110 deletions(-) diff --git a/fe/check/checkstyle/checkstyle.xml b/fe/check/checkstyle/checkstyle.xml index 87aade2148..0477368ce8 100644 --- a/fe/check/checkstyle/checkstyle.xml +++ b/fe/check/checkstyle/checkstyle.xml @@ -42,6 +42,7 @@ under the License. </module> <module name="NewlineAtEndOfFile"> <property name="lineSeparator" value="lf"/> + <property name="severity" value="error"/> </module> <module name="RegexpSingleline"> @@ -71,7 +72,9 @@ under the License. <property name="tokens" value="VARIABLE_DEF"/> <property name="allowSamelineMultipleAnnotations" value="true"/> </module> - <module name="MissingOverride"/> + <module name="MissingOverride"> + <property name="severity" value="error"/> + </module> <module name="MissingDeprecated"/> <!-- Block Checks --> @@ -140,7 +143,9 @@ under the License. <!-- Headers --> <!-- Imports --> - <module name="AvoidStarImport"/> + <module name="AvoidStarImport"> + <property name="severity" value="error"/> + </module> <module name="AvoidStaticImport"/> <module name="CustomImportOrder"> <property name="sortImportsInGroupAlphabetically" value="true"/> @@ -148,8 +153,15 @@ under the License. <property name="customImportOrderRules" value="SAME_PACKAGE(3)###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/> <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/> </module> - <module name="RedundantImport"/> - <module name="UnusedImports"/> + <module name="RedundantImport"> + <property name="severity" value="error"/> + </module> + <module name="UnusedImports"> + <property name="severity" value="error"/> + </module> + <module name="EmptyStatement"> + <property name="severity" value="error"/> + </module> <!-- Javadoc Comments --> <module name="AtclauseOrder"> @@ -210,7 +222,9 @@ under the License. <property name="arrayInitIndent" value="4"/> </module> <module name="OuterTypeFilename"/> - <module name="UpperEll"/> + <module name="UpperEll"> + <property name="severity" value="error"/> + </module> <!-- Modifiers --> <module name="ModifierOrder"/> diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/Hll.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/Hll.java index 0f6993ae3d..36385072a3 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/io/Hll.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/Hll.java @@ -81,7 +81,7 @@ public class Hll { } hashValue >>>= HLL_COLUMN_PRECISION; - hashValue |= (1l << HLL_ZERO_COUNT_BITS); + hashValue |= (1L << HLL_ZERO_COUNT_BITS); byte firstOneBit = (byte) (getLongTailZeroNum(hashValue) + 1); registers[idx] = registers[idx] > firstOneBit ? registers[idx] : firstOneBit ; } @@ -96,7 +96,7 @@ public class Hll { if (hashValue == 0) { return 0; } - long value = 1l; + long value = 1L; byte idx = 0; for (;; idx++) { if ((value & hashValue) != 0) { @@ -393,4 +393,4 @@ public class Hll { return type; } -} \ No newline at end of file +} 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 3e9bab3f21..626366f4b9 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 @@ -70,4 +70,4 @@ public class AdminCancelRebalanceDiskStmt extends DdlStmt { public RedirectStatus getRedirectStatus() { return RedirectStatus.NO_FORWARD; } -} \ No newline at end of file +} 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 1f798f0ce9..263897e5e1 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 @@ -70,4 +70,4 @@ public class AdminCleanTrashStmt extends DdlStmt { public RedirectStatus getRedirectStatus() { return RedirectStatus.NO_FORWARD; } -} \ No newline at end of file +} 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 c8f0aa6b76..9b861e79be 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 @@ -76,4 +76,4 @@ public class AdminRebalanceDiskStmt extends DdlStmt { public RedirectStatus getRedirectStatus() { return RedirectStatus.NO_FORWARD; } -} \ No newline at end of file +} 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 83252e36fd..99d8682bed 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 @@ -26,4 +26,4 @@ public enum AlterUserType { private AlterUserType(String type) { this.type = type; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BackupStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BackupStmt.java index 89709b9ba8..43dee100be 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BackupStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BackupStmt.java @@ -127,4 +127,4 @@ public class BackupStmt extends AbstractBackupStmt { sb.append("\n)"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BinlogDesc.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BinlogDesc.java index 495092d5fe..d1e99e411d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BinlogDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BinlogDesc.java @@ -64,4 +64,4 @@ public class BinlogDesc { } dataSyncJobType = DataSyncJobType.fromString(properties.get(TYPE)); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateDataSyncJobStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateDataSyncJobStmt.java index 60f02aa44d..5b51f21163 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateDataSyncJobStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateDataSyncJobStmt.java @@ -133,4 +133,4 @@ public class CreateDataSyncJobStmt extends DdlStmt { public DataSyncJobType getDataSyncJobType() { return dataSyncJobType; } -} \ No newline at end of file +} 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 255a2be716..908657fe23 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 @@ -47,7 +47,7 @@ public class DescriptorTable { private final HashMap<TupleId, TupleDescriptor> tupleDescs = new HashMap<TupleId, TupleDescriptor>(); // List of referenced tables with no associated TupleDescriptor to ship to the BE. // For example, the output table of an insert query. - private final List<Table> referencedTables = new ArrayList<Table>();; + private final List<Table> referencedTables = new ArrayList<Table>(); private final IdGenerator<TupleId> tupleIdGenerator_ = TupleId.createGenerator(); private final IdGenerator<SlotId> slotIdGenerator_ = SlotId.createGenerator(); private final HashMap<SlotId, SlotDescriptor> slotDescs = Maps.newHashMap(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/JobName.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/JobName.java index 706d126a52..634f4dc97c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/JobName.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/JobName.java @@ -56,4 +56,4 @@ public class JobName { sb.append("`").append(dbName).append("`.`").append(jobName).append("`"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/PauseSyncJobStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/PauseSyncJobStmt.java index fdf49437f1..a032caa262 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/PauseSyncJobStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/PauseSyncJobStmt.java @@ -53,4 +53,4 @@ public class PauseSyncJobStmt extends DdlStmt { stringBuilder.append(jobName.toSql()); return stringBuilder.toString(); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ResumeSyncJobStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ResumeSyncJobStmt.java index b24c38387e..d4b6c65c80 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ResumeSyncJobStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ResumeSyncJobStmt.java @@ -53,4 +53,4 @@ public class ResumeSyncJobStmt extends DdlStmt { stringBuilder.append(jobName.toSql()); return stringBuilder.toString(); } -} \ No newline at end of file +} 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 b17a646aa1..4f50a8555b 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 @@ -94,4 +94,4 @@ public class ShowSyncJobStmt extends ShowStmt { public RedirectStatus getRedirectStatus() { return RedirectStatus.FORWARD_NO_SYNC; } -} \ No newline at end of file +} 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 45fcbbc3b3..12486ac74b 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 @@ -51,7 +51,7 @@ public class ShowViewStmt extends ShowStmt { private String db; private TableName tbl; - private List<View> matchViews = Lists.newArrayList();; + private List<View> matchViews = Lists.newArrayList(); public ShowViewStmt(String db, TableName tbl) { this.db = db; 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 32069bd533..ef5c7f91d0 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 @@ -327,7 +327,7 @@ public class StmtRewriter { private static boolean hasSubqueryInDisjunction(Expr expr) { if (!(expr instanceof CompoundPredicate)) { return false; - }; + } if (Expr.IS_OR_PREDICATE.apply(expr)) { return expr.contains(Subquery.class); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/StopSyncJobStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/StopSyncJobStmt.java index 70b9928c3c..34ab27b451 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StopSyncJobStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StopSyncJobStmt.java @@ -53,4 +53,4 @@ public class StopSyncJobStmt extends DdlStmt { stringBuilder.append(jobName.toSql()); return stringBuilder.toString(); } -} \ No newline at end of file +} 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 146a504f8f..c46f857d53 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 @@ -32,4 +32,4 @@ public class SyncStmt extends DdlStmt { public RedirectStatus getRedirectStatus() { return RedirectStatus.FORWARD_WITH_SYNC; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionBeginStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionBeginStmt.java index 7e631b536e..287e45952c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionBeginStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionBeginStmt.java @@ -42,4 +42,4 @@ public class TransactionBeginStmt extends TransactionStmt { super.analyze(analyzer); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionCommitStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionCommitStmt.java index 08bca1845e..cdfe53e9ce 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionCommitStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionCommitStmt.java @@ -19,4 +19,4 @@ package org.apache.doris.analysis; public class TransactionCommitStmt extends TransactionStmt { -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionRollbackStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionRollbackStmt.java index d62028e6d3..d285ba9fe1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionRollbackStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionRollbackStmt.java @@ -19,4 +19,4 @@ package org.apache.doris.analysis; public class TransactionRollbackStmt extends TransactionStmt { -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionStmt.java index 1aeb635ae3..bad6d4670a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TransactionStmt.java @@ -31,4 +31,4 @@ public class TransactionStmt extends StatementBase { public void analyze(Analyzer analyzer) throws AnalysisException, UserException { super.analyze(analyzer); } -} \ No newline at end of file +} 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 30878a29ca..0395b0d320 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 @@ -1743,7 +1743,7 @@ public class RestoreJob extends AbstractJob { out.writeLong(entry.getKey()); out.writeLong(entry.getValue()); // It is version hash in the past, but it useless but should compatible with old version so that write 0 here - out.writeLong(0l); + out.writeLong(0L); } } 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 98b1b741a1..68ef8a8e6d 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 @@ -439,7 +439,7 @@ public class CatalogRecycleBin extends MasterDaemon implements Writable { if (partitionInfo.getType() == PartitionType.RANGE) { recoverItem = new RangePartitionItem(recoverRange); } else if (partitionInfo.getType() == PartitionType.LIST) { - recoverItem = recoverPartitionInfo.getListPartitionItem();; + recoverItem = recoverPartitionInfo.getListPartitionItem(); } // check if partition item is invalid if (partitionInfo.getAnyIntersectItem(recoverItem, false) != null) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/HashDistributionInfo.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/HashDistributionInfo.java index be9526a743..d5cac299f8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/HashDistributionInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/HashDistributionInfo.java @@ -142,7 +142,7 @@ public class HashDistributionInfo extends DistributionInfo { } builder.append("]; "); - builder.append("bucket num: ").append(bucketNum).append("; ");; + builder.append("bucket num: ").append(bucketNum).append("; "); return builder.toString(); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaReplayState.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaReplayState.java index 8f217aefb6..769233cd50 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaReplayState.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaReplayState.java @@ -68,4 +68,4 @@ public class MetaReplayState { return resultMap; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/MultiRowType.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/MultiRowType.java index 59182b01ed..582cbb5cb3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/MultiRowType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/MultiRowType.java @@ -76,4 +76,4 @@ public class MultiRowType extends Type { structStr = structStr.substring(lpad); return String.format("%sARRAY<%s>", leftPadding, structStr); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/TempPartitions.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/TempPartitions.java index 25ca67d21e..f389b73f51 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/TempPartitions.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/TempPartitions.java @@ -57,7 +57,7 @@ public class TempPartitions implements Writable, GsonPostProcessable { nameToPartition.put(partition.getName(), partition); } public long getUpdateTime() { - long updateTime = -1l; + long updateTime = -1L; for (Partition p : idToPartition.values()) { if (p.getVisibleVersionTime() > updateTime) { updateTime = p.getVisibleVersionTime(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/logger/DefaultDorisLogger.java b/fe/fe-core/src/main/java/org/apache/doris/common/logger/DefaultDorisLogger.java index 7be90dff82..8134732923 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/logger/DefaultDorisLogger.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/logger/DefaultDorisLogger.java @@ -52,4 +52,4 @@ public class DefaultDorisLogger extends ExtendedLoggerWrapper implements Taggabl super.logMessage(fqcn, level, marker, m, t); tags.next = null; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/DeleteInfoProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/DeleteInfoProcDir.java index e1aac2acaa..b28f8cc207 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/DeleteInfoProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/DeleteInfoProcDir.java @@ -58,4 +58,4 @@ public class DeleteInfoProcDir implements ProcNodeInterface { } return result; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/NetUtils.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/NetUtils.java index bbd47a989f..80806b90f9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/NetUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/NetUtils.java @@ -113,4 +113,4 @@ public class NetUtils { } return false; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/ha/FrontendNodeType.java b/fe/fe-core/src/main/java/org/apache/doris/ha/FrontendNodeType.java index e6d644bac0..b1fdb19417 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/ha/FrontendNodeType.java +++ b/fe/fe-core/src/main/java/org/apache/doris/ha/FrontendNodeType.java @@ -24,4 +24,4 @@ public enum FrontendNodeType { REPLICA, INIT, UNKNOWN -} \ No newline at end of file +} 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 b77cf08449..e7f5db7713 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 @@ -30,4 +30,4 @@ public class IllegalArgException extends Exception { public IllegalArgException(String msg, Throwable cause) { super(msg, cause); } -} \ No newline at end of file +} 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 e3543db693..f4c7ac7ad4 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 @@ -158,7 +158,6 @@ public class ShowAction extends RestBaseController { parentThread.getParent() != null; parentThread = parentThread.getParent()) { } - ; feInfo.put("thread_cnt", String.valueOf(parentThread.activeCount())); return ResponseEntityBuilder.ok(feInfo); 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 90f6019b01..1fe8a2aa41 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 @@ -225,7 +225,7 @@ public class TableQueryPlanAction extends RestBaseController { Map<String, Node> tabletRoutings = assemblePrunedPartitions(scanRangeLocations); tabletRoutings.forEach((tabletId, node) -> { long tablet = Long.parseLong(tabletId); - tablet_info.put(tablet, new TTabletVersionInfo(tablet, node.version, 0l /*version hash*/, node.schemaHash)); + tablet_info.put(tablet, new TTabletVersionInfo(tablet, node.version, 0L /*version hash*/, node.schemaHash)); }); tQueryPlanInfo.tablet_info = tablet_info; 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 28e96ddbe3..56abc91487 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 @@ -336,4 +336,4 @@ public class QueryProfileAction extends RestBaseController { } return ResponseEntityBuilder.ok(graph); } -} \ No newline at end of file +} 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 ede65287eb..306106f473 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 @@ -207,4 +207,4 @@ public class LdapClient { private static String getUserFilter(String userFilter, String userName) { return userFilter.replaceAll("\\{login}", userName); } -} \ No newline at end of file +} 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 0fa8a304da..5943a2d95e 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 @@ -489,7 +489,6 @@ public class LoadJob implements Writable { public void setHadoopEtlJobId(String etlJobId) { if (etlJobType == EtlJobType.HADOOP) { ((HadoopEtlJobInfo) etlJobInfo).setEtlJobId(etlJobId); - ; } } 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 4f205c5064..e3dadfc483 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 @@ -63,7 +63,7 @@ public class PartitionLoadInfo implements Writable { public void write(DataOutput out) throws IOException { out.writeLong(version); // Versionhash useless just for compatible - out.writeLong(0l); + out.writeLong(0L); int count = 0; if (sources == null) { 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 14f47e5179..7009058b94 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 @@ -55,10 +55,6 @@ 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; import java.io.IOException; 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 8a47385816..66a74ec34a 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 @@ -102,4 +102,4 @@ public class SyncChannel { public void setPartitions(PartitionNames partitionNames) { this.partitionNames = partitionNames; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannelCallback.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannelCallback.java index 2cdf717467..94ee389871 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannelCallback.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannelCallback.java @@ -23,4 +23,4 @@ public interface SyncChannelCallback { public void onFailed(String errMsg); -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannelHandle.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannelHandle.java index 8f7721ed5b..9fdb1048e9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannelHandle.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncChannelHandle.java @@ -55,4 +55,4 @@ public class SyncChannelHandle implements SyncChannelCallback { public Status getStatus() { return latch.getStatus(); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncDataConsumer.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncDataConsumer.java index ca12d30511..c72c43abaf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncDataConsumer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncDataConsumer.java @@ -47,4 +47,4 @@ public class SyncDataConsumer extends SyncLifeCycle { @Override public void process() { } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncDataReceiver.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncDataReceiver.java index fdd52bcc2a..0e942b621a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncDataReceiver.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncDataReceiver.java @@ -33,4 +33,4 @@ public class SyncDataReceiver extends SyncLifeCycle { public void process() { } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncFailMsg.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncFailMsg.java index 9c531b9099..ffedba6a3c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncFailMsg.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncFailMsg.java @@ -91,4 +91,4 @@ public class SyncFailMsg implements Writable { return msgType.equals(other.msgType) && msg.equals(other.msg); } -} \ No newline at end of file +} 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 3565c04922..266125e481 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 @@ -467,4 +467,4 @@ public abstract class SyncJob implements Writable { public long getFinishTimeMs() { return finishTimeMs; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncLifeCycle.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncLifeCycle.java index 227f175ffe..14645b93a2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncLifeCycle.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncLifeCycle.java @@ -74,4 +74,4 @@ public abstract class SyncLifeCycle { } } } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncTxnParam.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncTxnParam.java index 701c6a91b5..966ff903df 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncTxnParam.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/SyncTxnParam.java @@ -62,4 +62,4 @@ public class SyncTxnParam { public Backend getBackend() { return backend; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalConfigs.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalConfigs.java index 394bb67c22..8d2cf4fd82 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalConfigs.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalConfigs.java @@ -24,4 +24,4 @@ public class CanalConfigs { // Maximal waiting time for consumer to poll one batch public static long pollWaitingTimeoutMs = 80L; -} \ No newline at end of file +} 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 16b897dc08..d5737ff70a 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 @@ -472,4 +472,4 @@ public class CanalSyncDataConsumer extends SyncDataConsumer { private void releaseGetLock() { getLock.unlock(); } -} \ No newline at end of file +} 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 fe78f660bd..0c76cc3273 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 @@ -113,4 +113,4 @@ public class CanalSyncDataReceiver extends SyncDataReceiver { private void releaseGetLock() { getLock.unlock(); } -} \ No newline at end of file +} 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 02dd6da573..b1a9688995 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 @@ -234,4 +234,4 @@ public class CanalUtils { return false; } } -} \ No newline at end of file +} 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 e1c1eb7282..d9e450d8d4 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 @@ -113,4 +113,4 @@ public class SyncCanalClient { public String getPositionInfo() { return consumer.getPositionInfo(); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/model/Data.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/model/Data.java index 48300adada..554293eece 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/model/Data.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/model/Data.java @@ -49,4 +49,4 @@ public class Data<T> { public boolean isNotEmpty() { return datas.size() > 0; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/model/Events.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/model/Events.java index 6b51e8c68e..0ccc235bd9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/model/Events.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/model/Events.java @@ -70,4 +70,4 @@ public class Events<T, P> { public long getMemSize() { return this.memSize; } -} \ No newline at end of file +} 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 23deb5e4a0..f2b708adac 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 @@ -173,4 +173,4 @@ public class EntryPosition { } return result; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/PositionMeta.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/PositionMeta.java index d4d8f718da..55dddaf6e3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/PositionMeta.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/PositionMeta.java @@ -95,4 +95,4 @@ public class PositionMeta<T> { this.batches.clear(); this.commitPositions.clear(); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/PositionRange.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/PositionRange.java index a33fe41db1..08781cb0cc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/PositionRange.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/position/PositionRange.java @@ -85,4 +85,4 @@ public class PositionRange<T> { return true; } -} \ No newline at end of file +} 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 309d5b50a6..023d6df66c 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 @@ -82,7 +82,7 @@ public class PaloAuth implements Writable { private TablePrivTable tablePrivTable = new TablePrivTable(); private ResourcePrivTable resourcePrivTable = new ResourcePrivTable(); - private RoleManager roleManager = new RoleManager();; + private RoleManager roleManager = new RoleManager(); private UserPropertyMgr propertyMgr = new UserPropertyMgr(); private LdapInfo ldapInfo = new LdapInfo(); 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 a2e327df5d..a5bfa3bc08 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 @@ -88,4 +88,4 @@ public class RefreshExternalTableInfo implements Writable { return (dbName.equals(info.dbName)) && (tableName.equals(info.tableName)) && (newSchema.equals(newSchema)); } -} \ No newline at end of file +} 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 2c91e79428..5e51b16e58 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 @@ -409,4 +409,4 @@ public class GsonUtils { } } -} \ No newline at end of file +} 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 2839e40833..c210e868fd 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 @@ -321,4 +321,4 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory { } }.nullSafe(); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcTableSink.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcTableSink.java index f75e8f9cc6..ca98d85788 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcTableSink.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OdbcTableSink.java @@ -71,4 +71,4 @@ public class OdbcTableSink extends DataSink { public DataPartition getOutputPartition() { return null; } -} \ No newline at end of file +} 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 6c504d6ccd..29b3f9e1bc 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 @@ -454,4 +454,4 @@ public final class RuntimeFilter { Joiner.on(", ").join(targets) + " " + "Selectivity: " + getSelectivity(); } -} \ No newline at end of file +} 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 14508a33cc..5abc3f9c92 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 @@ -199,4 +199,4 @@ class PluginZip { InputStream getInputStreamFromUrl(String url) throws IOException { return Util.getInputStreamFromUrl(url, null, HTTP_TIMEOUT_MS, HTTP_TIMEOUT_MS); } -} \ No newline at end of file +} 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 97f26d57b0..223db7bd79 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 @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.doris.qe.QueryDetail; // Queue of QueryDetail. // It's used to collect queries for monitor. 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 490303fec2..7c06252ae0 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 @@ -562,7 +562,6 @@ public class PartitionRange { return null; } PartitionColumnFilter partitionColumnFilter = new PartitionColumnFilter(); - ; for (Expr expr : partitionKeyPredicate.getChildren()) { if (expr instanceof BinaryPredicate) { BinaryPredicate binPredicate = (BinaryPredicate) expr; diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/FEFunction.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/FEFunction.java index d3e4c3fe06..8b1f9a70e3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/FEFunction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/FEFunction.java @@ -30,4 +30,4 @@ public @interface FEFunction { String[] argTypes(); String returnType(); -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/CheckConsistencyTask.java b/fe/fe-core/src/main/java/org/apache/doris/task/CheckConsistencyTask.java index df0e22faae..b6bda2cf46 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/task/CheckConsistencyTask.java +++ b/fe/fe-core/src/main/java/org/apache/doris/task/CheckConsistencyTask.java @@ -44,7 +44,7 @@ public class CheckConsistencyTask extends AgentTask { } public TCheckConsistencyReq toThrift() { - TCheckConsistencyReq request = new TCheckConsistencyReq(tabletId, schemaHash, version, 0l); + TCheckConsistencyReq request = new TCheckConsistencyReq(tabletId, schemaHash, version, 0L); return request; } } 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 b7b52c800e..e2cec179f0 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 @@ -151,4 +151,4 @@ public class UpdateTabletMetaInfoTask extends AgentTask { updateTabletMetaInfoReq.setTabletMetaInfos(metaInfos); return updateTabletMetaInfoReq; } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/IllegalTransactionParameterException.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/IllegalTransactionParameterException.java index 39b0f98210..a1be66239e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/transaction/IllegalTransactionParameterException.java +++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/IllegalTransactionParameterException.java @@ -30,4 +30,4 @@ public class IllegalTransactionParameterException extends UserException { public IllegalTransactionParameterException(String msg, Throwable e) { super(msg, e); } -} \ No newline at end of file +} 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 1a1b38118e..2fb013f7b0 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 @@ -122,4 +122,4 @@ public class AlterTableStmtTest { stmt.toSql()); Assert.assertEquals("testCluster:testDb", stmt.getTbl().getDb()); } -} \ No newline at end of file +} 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 aa863a2003..5b6aff9323 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 @@ -123,4 +123,4 @@ public class BinaryPredicateTest { Assert.assertFalse(range.hasLowerBound()); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnPositionTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnPositionTest.java index 5920ae3b72..45c5b2fced 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnPositionTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnPositionTest.java @@ -44,4 +44,4 @@ public class ColumnPositionTest { pos.analyze(); Assert.fail("No exception throws."); } -} \ No newline at end of file +} 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 de3ef16cf6..3fa047767a 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 @@ -180,4 +180,4 @@ public class CreateDataSyncJobStmtTest { } catch (UserException e) { } } -} \ No newline at end of file +} 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 47672286cf..32ff7d9df0 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 @@ -86,4 +86,4 @@ public class CreateDbStmtTest { stmt.analyze(analyzer); Assert.fail("No exception throws."); } -} \ No newline at end of file +} 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 bbabc71a71..f7c3105cca 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 @@ -49,4 +49,4 @@ public class CreateIndexClauseTest { clause.analyze(analyzer); } -} \ No newline at end of file +} 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 af7d3279e6..ae690c598a 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 @@ -323,4 +323,4 @@ public class BrokerUtilTest { Assert.fail(e.getMessage()); } } -} \ No newline at end of file +} 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 18329e4e82..b1c8e0f3fd 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 @@ -409,4 +409,4 @@ public class CanalSyncJobTest { Assert.fail(e.getMessage()); } } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalTestUtil.java b/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalTestUtil.java index d2da579002..797e88ee1d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalTestUtil.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/sync/canal/CanalTestUtil.java @@ -91,4 +91,4 @@ public class CanalTestUtil { } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/AuditEventProcessorTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/AuditEventProcessorTest.java index 0c10a80f8b..292ce9f5ac 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/AuditEventProcessorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/AuditEventProcessorTest.java @@ -118,4 +118,4 @@ public class AuditEventProcessorTest { long total = System.currentTimeMillis() - start; System.out.println("total(ms): " + total + ", avg: " + total / 10000.0); } -} \ No newline at end of file +} 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 1bf9debb1e..24a71445d7 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 @@ -73,4 +73,4 @@ public class BitmapOrUDF extends GenericUDF { public String getDisplayString(String[] children) { return "Usage: bitmap_or(bitmap1,bitmap2)"; } -} \ No newline at end of file +} 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 716fd7c42b..cb46d92f52 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 @@ -129,4 +129,4 @@ public class BitmapUnionUDAF extends AbstractGenericUDAFResolver { return terminate(agg); } } -} \ No newline at end of file +} 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 4b596db5da..40cba399c0 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 @@ -73,4 +73,4 @@ public class BitmapXorUDF extends GenericUDF { public String getDisplayString(String[] children) { return "Usage: bitmap_xor(bitmap1,bitmap2)"; } -} \ No newline at end of file +} 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 09759668d4..e6819d4257 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 @@ -140,4 +140,4 @@ public class ToBitmapUDAF extends AbstractGenericUDAFResolver { myagg.bitmap.add(newRow); } } -} \ No newline at end of file +} 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 a7b8d3df5b..f3fbbc1866 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 @@ -261,4 +261,4 @@ class LargeIntParser extends ColumnParser { throw new RuntimeException("large int parse failed:" + value, e); } } -} \ No newline at end of file +} diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DorisKryoRegistrator.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DorisKryoRegistrator.java index f58367db53..c873f5af5a 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DorisKryoRegistrator.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DorisKryoRegistrator.java @@ -33,4 +33,4 @@ public class DorisKryoRegistrator implements KryoRegistrator { kryo.register(Roaring64Map.class); kryo.register(BitmapValue.class); } -} \ No newline at end of file +} 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 c92529f483..2425fe107a 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 @@ -84,4 +84,4 @@ public class DorisRangePartitioner extends Partitioner { '}'; } } -} \ No newline at end of file +} 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 b5efb2c54a..418bbc46a3 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 @@ -28,7 +28,7 @@ import java.util.Comparator; // DppColumns is used to store the class DppColumns implements Comparable<DppColumns>, Serializable { - public List<Object> columns = new ArrayList<Object>();; + public List<Object> columns = new ArrayList<Object>(); public DppColumns(List<Object> keys){ this.columns = keys; @@ -109,4 +109,4 @@ class DppColumnsComparator implements Comparator<DppColumns> { public int compare(DppColumns left, DppColumns right) { return left.compareTo(right); } -} \ No newline at end of file +} diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppResult.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppResult.java index 037cc9bf61..63e307f890 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppResult.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppResult.java @@ -65,4 +65,4 @@ public class DppResult implements Serializable { @SerializedName("scanned_bytes") public long scannedBytes; -} \ No newline at end of file +} 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 1249cac993..41e9e0b309 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 @@ -268,4 +268,4 @@ public class DppUtils { } return Lists.newArrayList(columns); } -} \ No newline at end of file +} diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/GlobalDictBuilder.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/GlobalDictBuilder.java index c19f73fca1..8ffbc223f0 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/GlobalDictBuilder.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/GlobalDictBuilder.java @@ -410,4 +410,4 @@ public class GlobalDictBuilder { private interface GlobalDictBuildWorker { void work(); } -} \ No newline at end of file +} diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/MinimumCoverageRollupTreeBuilder.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/MinimumCoverageRollupTreeBuilder.java index 4bf95a5ce1..6b680c4d91 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/MinimumCoverageRollupTreeBuilder.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/MinimumCoverageRollupTreeBuilder.java @@ -124,4 +124,4 @@ public class MinimumCoverageRollupTreeBuilder implements RollupTreeBuilder { return false; } -} \ No newline at end of file +} diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/RollupTreeBuilder.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/RollupTreeBuilder.java index 6a0faa8aac..05084c97b5 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/RollupTreeBuilder.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/RollupTreeBuilder.java @@ -22,4 +22,4 @@ import org.apache.doris.load.loadv2.etl.EtlJobConfig; // RollupTreeBuilder is used to get the RollupTree from the TableMeta public abstract interface RollupTreeBuilder { public RollupTreeNode build(EtlJobConfig.EtlTable tableMeta); -} \ No newline at end of file +} diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/RollupTreeNode.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/RollupTreeNode.java index 5d4efc7125..265310f3f3 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/RollupTreeNode.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/RollupTreeNode.java @@ -50,4 +50,4 @@ public class RollupTreeNode { } return builder.toString(); } -} \ No newline at end of file +} 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 f94a82700b..69ddbf50f8 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 @@ -455,7 +455,7 @@ public final class SparkDpp implements java.io.Serializable { if(!validateData(columnObject, baseIndex.getColumn(columnName), parsers.get(i), row)) { abnormalRowAcc.add(1); return result.iterator(); - }; + } keyColumns.add(columnObject); } @@ -465,7 +465,7 @@ public final class SparkDpp implements java.io.Serializable { if(!validateData(columnObject, baseIndex.getColumn(columnName), parsers.get(i + keyColumnNames.size()),row)) { abnormalRowAcc.add(1); return result.iterator(); - }; + } valueColumns.add(columnObject); } 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 c411883ba6..72be382567 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 @@ -581,4 +581,4 @@ class BucketPartitioner extends Partitioner { List<Object> rddKey = (List<Object>) key; return bucketKeyMap.get(String.valueOf(rddKey.get(0))); } -} \ No newline at end of file +} 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 02099dec33..1db52a74e5 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 @@ -61,4 +61,4 @@ public class StringAccumulator extends AccumulatorV2<String, String> { public String value() { return strs.toString(); } -} \ No newline at end of file +} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org