From 088434a8ec42aef4b5d0d114c9850db819f17059 Mon Sep 17 00:00:00 2001
From: morrySnow <morrysnow@126.com>
Date: Wed, 18 May 2022 16:47:19 +0800
Subject: [PATCH 1/2] [style](fe) code correct rules and name rules

---
 build-support/IntelliJ-code-format.xml        |   2 +-
 fe/check/checkstyle/checkstyle.xml            |  40 ++-
 .../apache/doris/common/io/BitmapValue.java   |  34 +-
 .../org/apache/doris/common/io/Codec.java     |   4 +-
 .../common/io/FastByteArrayInputStream.java   |   3 +-
 .../java/org/apache/doris/common/io/Hll.java  |  28 +-
 .../java/org/apache/doris/common/io/Text.java |  16 +-
 .../doris/common/io/BitmapValueTest.java      | 122 ++++----
 .../org/apache/doris/common/io/HllTest.java   |   2 +-
 .../org/apache/doris/alter/AlterHandler.java  |   4 +-
 .../doris/alter/MaterializedViewHandler.java  |   3 +-
 .../apache/doris/analysis/AggregateInfo.java  | 288 +++++++++--------
 .../doris/analysis/AggregateInfoBase.java     |  88 +++---
 .../apache/doris/analysis/AnalyticExpr.java   |   9 +-
 .../apache/doris/analysis/AnalyticInfo.java   |  86 ++---
 .../apache/doris/analysis/AnalyticWindow.java | 181 ++++++-----
 .../org/apache/doris/analysis/Analyzer.java   | 160 ++++++----
 .../apache/doris/analysis/ArithmeticExpr.java |   1 +
 .../apache/doris/analysis/BaseTableRef.java   |   6 +-
 .../doris/analysis/BetweenPredicate.java      |  15 +
 .../doris/analysis/BinaryPredicate.java       |  31 +-
 .../apache/doris/analysis/BoolLiteral.java    |  15 +
 .../analysis/BuiltinAggregateFunction.java    |  20 +-
 .../org/apache/doris/analysis/CaseExpr.java   |   6 +
 .../org/apache/doris/analysis/CastExpr.java   |   5 +
 .../org/apache/doris/analysis/ColumnDef.java  |   1 +
 .../doris/analysis/CompoundPredicate.java     |   6 +-
 .../apache/doris/analysis/DateLiteral.java    |  31 +-
 .../doris/analysis/DescriptorTable.java       |  14 +-
 .../java/org/apache/doris/analysis/Expr.java  |  92 ++++--
 .../org/apache/doris/analysis/ExprId.java     |   4 +-
 .../doris/analysis/ExprSubstitutionMap.java   | 100 +++---
 .../doris/analysis/ExpressionFunctions.java   |   6 +-
 .../org/apache/doris/analysis/FromClause.java |  68 ++--
 .../doris/analysis/FunctionCallExpr.java      |   8 +-
 .../apache/doris/analysis/FunctionName.java   |  86 ++---
 .../apache/doris/analysis/GroupByClause.java  |   8 +-
 .../apache/doris/analysis/InPredicate.java    |   8 +-
 .../apache/doris/analysis/InlineViewRef.java  |  16 +-
 .../doris/analysis/IsNullPredicate.java       |   4 +-
 .../apache/doris/analysis/LimitElement.java   |   4 +-
 .../apache/doris/analysis/OutFileClause.java  |   5 +-
 .../org/apache/doris/analysis/QueryStmt.java  |  55 ++--
 .../org/apache/doris/analysis/SelectStmt.java | 120 +++----
 .../doris/analysis/SetOperationStmt.java      | 174 ++++++----
 .../doris/analysis/ShowStreamLoadStmt.java    |   8 +-
 .../apache/doris/analysis/SlotDescriptor.java |  44 ++-
 .../org/apache/doris/analysis/SlotId.java     |   4 +-
 .../org/apache/doris/analysis/SlotRef.java    |   4 +-
 .../org/apache/doris/analysis/SortInfo.java   |  88 +++---
 .../apache/doris/analysis/StatementBase.java  |   8 +-
 .../apache/doris/analysis/StmtRewriter.java   |  20 +-
 .../org/apache/doris/analysis/Subquery.java   |  12 +-
 .../org/apache/doris/analysis/TableRef.java   |  64 ++--
 .../doris/analysis/TupleDescriptor.java       |  26 +-
 .../org/apache/doris/analysis/TupleId.java    |   4 +-
 .../doris/analysis/TupleIsNullPredicate.java  |   9 +-
 .../apache/doris/analysis/UserIdentity.java   |   8 +-
 .../org/apache/doris/analysis/WithClause.java |  30 +-
 .../{HDFSStorage.java => HdfsStorage.java}    |   2 +-
 .../apache/doris/catalog/AggregateType.java   |  14 +-
 .../apache/doris/catalog/AliasFunction.java   |   2 +
 .../org/apache/doris/catalog/ArrayType.java   |   7 +
 .../org/apache/doris/catalog/Catalog.java     |   9 +-
 .../java/org/apache/doris/catalog/Column.java |  11 +
 .../org/apache/doris/catalog/ColumnStats.java |  14 +-
 .../apache/doris/catalog/DataProperty.java    |   6 +
 .../org/apache/doris/catalog/Database.java    |   6 +
 .../org/apache/doris/catalog/Function.java    |   2 +-
 .../org/apache/doris/catalog/FunctionSet.java |   2 +-
 .../org/apache/doris/catalog/OdbcTable.java   |   3 +-
 .../org/apache/doris/catalog/Partition.java   |   1 +
 .../apache/doris/catalog/PartitionKey.java    |  10 +-
 .../doris/catalog/ReplicaAllocation.java      |   8 +-
 .../apache/doris/catalog/ResourceType.java    |   3 +-
 .../apache/doris/catalog/ScalarFunction.java  |   8 +-
 .../java/org/apache/doris/catalog/Type.java   |  56 +++-
 .../java/org/apache/doris/catalog/View.java   |  20 +-
 .../clone/DynamicPartitionScheduler.java      |   2 +-
 .../TwoDimensionalGreedyRebalanceAlgo.java    |  14 +-
 .../org/apache/doris/common/IdGenerator.java  |   2 +-
 .../common/ThriftServerEventProcessor.java    |   3 +-
 .../org/apache/doris/common/TreeNode.java     |  50 ++-
 ...ProcDir.java => BdbjeDatabaseProcDir.java} |   6 +-
 ...ode.java => BdbjeJournalDataProcNode.java} |   4 +-
 .../{BDBJEProcDir.java => BdbjeProcDir.java}  |   4 +-
 .../apache/doris/common/proc/ProcService.java |   2 +-
 .../common/proc/TabletHealthProcDir.java      |   2 +-
 .../doris/common/util/ReflectionUtils.java    |   4 +-
 .../org/apache/doris/common/util/Util.java    |   4 +-
 .../external/elasticsearch/EsNodeInfo.java    |   8 +-
 .../doris/ha/{BDBHA.java => BdbHA.java}       |   6 +-
 .../httpv2/controller/HelpController.java     |  12 +-
 .../httpv2/rest/TableQueryPlanAction.java     |  14 +-
 .../doris/httpv2/rest/manager/NodeAction.java |   6 +-
 .../apache/doris/httpv2/util/HttpUtil.java    |   3 +-
 .../doris/httpv2/util/LoadSubmitter.java      |  34 +-
 .../doris/httpv2/util/StatementSubmitter.java |   4 +-
 .../doris/journal/bdbje/BDBEnvironment.java   |   4 +-
 .../{BDBJEJournal.java => BdbjeJournal.java}  |   6 +-
 .../apache/doris/ldap/LdapPrivsChecker.java   |  12 +-
 .../org/apache/doris/load/LoadErrorHub.java   |   1 +
 .../doris/load/StreamLoadRecordMgr.java       |  18 +-
 .../doris/load/loadv2/SparkRepository.java    |   8 +-
 .../load/routineload/RoutineLoadManager.java  |   6 +-
 .../doris/load/sync/SyncChannelHandle.java    |   2 +-
 .../org/apache/doris/load/sync/SyncJob.java   |   2 +-
 .../load/sync/canal/CanalDestination.java     |   4 +-
 .../doris/load/sync/canal/CanalSyncJob.java   |   2 +
 .../doris/load/update/UpdatePlanner.java      |   8 +-
 .../doris/monitor/jvm/JvmPauseMonitor.java    |  38 ++-
 .../apache/doris/monitor/jvm/JvmStats.java    |   4 +-
 .../doris/monitor/unit/ByteSizeUnit.java      |  40 +--
 .../apache/doris/monitor/unit/TimeValue.java  |   8 +-
 .../doris/mysql/nio/AcceptListener.java       |   4 +-
 .../apache/doris/mysql/nio/NMysqlChannel.java |   2 +-
 .../apache/doris/mysql/nio/NMysqlServer.java  |   2 +-
 .../apache/doris/mysql/nio/ReadListener.java  |   2 +-
 .../doris/mysql/privilege/PaloAuth.java       |   2 +-
 .../nereids/parser/LogicalPlanBuilder.java    |   1 -
 .../trees/expressions/BinaryExpression.java   |   1 -
 .../apache/doris/persist/AlterViewInfo.java   |   4 +-
 .../doris/persist/ColocatePersistInfo.java    |   6 +
 .../apache/doris/persist/CreateTableInfo.java |   6 +
 .../org/apache/doris/persist/EditLog.java     |   4 +-
 .../apache/doris/persist/OperationType.java   |   2 +-
 .../apache/doris/planner/AggregationNode.java |   6 +-
 .../apache/doris/planner/AnalyticPlanner.java |  12 +-
 .../apache/doris/planner/BrokerScanNode.java  |  25 +-
 .../org/apache/doris/planner/ColumnBound.java |   8 +-
 .../apache/doris/planner/CrossJoinNode.java   |   6 +-
 .../org/apache/doris/planner/DataSink.java    |   6 +-
 .../doris/planner/DistributedPlanner.java     | 127 ++++----
 .../apache/doris/planner/EmptySetNode.java    |   4 +-
 .../apache/doris/planner/ExchangeNode.java    |   4 +-
 .../apache/doris/planner/HashJoinNode.java    |  24 +-
 .../doris/planner/ListPartitionPrunerV2.java  |   8 +-
 .../planner/MaterializedViewSelector.java     |   8 +-
 .../apache/doris/planner/PlanFragment.java    |  16 +-
 .../apache/doris/planner/PlanFragmentId.java  |   4 +-
 .../org/apache/doris/planner/PlanNode.java    |  16 +-
 .../org/apache/doris/planner/PlanNodeId.java  |   4 +-
 .../apache/doris/planner/PlannerContext.java  |  32 +-
 .../doris/planner/RangePartitionPrunerV2.java |   8 +-
 .../apache/doris/planner/ResultFileSink.java  |   6 +-
 .../apache/doris/planner/RuntimeFilter.java   |  55 +++-
 .../doris/planner/RuntimeFilterGenerator.java |  40 ++-
 .../apache/doris/planner/RuntimeFilterId.java |   4 +-
 .../org/apache/doris/planner/ScanNode.java    |   1 +
 .../doris/planner/SetOperationNode.java       | 121 +++----
 .../org/apache/doris/qe/AuditLogBuilder.java  |  10 +-
 .../org/apache/doris/qe/QeProcessorImpl.java  |   7 +-
 .../apache/doris/qe/QueryStateException.java  |   2 +-
 .../org/apache/doris/qe/StmtExecutor.java     |   4 +-
 .../apache/doris/qe/cache/CacheAnalyzer.java  |   4 +-
 .../doris/qe/cache/CacheCoordinator.java      |   4 +-
 .../org/apache/doris/qe/cache/CacheProxy.java |   8 +-
 .../apache/doris/qe/cache/PartitionRange.java |   4 +-
 .../doris/qe/cache/RowBatchBuilder.java       |   6 +-
 .../java/org/apache/doris/resource/Tag.java   |   4 +-
 .../doris/rewrite/BetweenToCompoundRule.java  |   4 +-
 .../rewrite/CompoundPredicateWriteRule.java   |  36 ++-
 .../apache/doris/rewrite/ExprRewriter.java    |  46 +--
 .../NormalizeBinaryPredicatesRule.java        |  12 +-
 .../rewrite/RewriteBinaryPredicatesRule.java  |   4 +-
 .../doris/rewrite/RewriteDateLiteralRule.java |   4 +-
 .../apache/doris/service/FrontendOptions.java |   8 +-
 .../doris/statistics/BaseStatsDerive.java     |   4 +-
 .../doris/statistics/DeriveFactory.java       |   8 +-
 .../java/org/apache/doris/system/Backend.java |   6 +
 .../doris/task/UpdateTabletMetaInfoTask.java  |   2 +
 .../org/apache/doris/alter/AlterTest.java     |  36 +--
 .../apache/doris/alter/RollupJobV2Test.java   |   9 +-
 .../doris/analysis/AdminShowReplicaTest.java  |   4 +-
 .../analysis/CreateDataSyncJobStmtTest.java   |   7 +-
 .../CreateMaterializedViewStmtTest.java       |   7 +-
 .../doris/analysis/DateLiteralTest.java       |   2 +-
 .../TableNameComparedLowercaseTest.java       |   4 +-
 .../TableNameStoredLowercaseTest.java         |   4 +-
 .../apache/doris/backup/BackupJobTest.java    |   6 +-
 .../doris/catalog/CreateTableLikeTest.java    | 296 ++++++++----------
 .../apache/doris/catalog/DatabaseTest.java    |   2 +-
 .../catalog/DynamicPartitionTableTest.java    |   2 +-
 .../org/apache/doris/catalog/FakeEditLog.java |   2 +-
 .../apache/doris/clone/DiskRebalanceTest.java |   2 +-
 .../org/apache/doris/clone/RebalanceTest.java |   2 +-
 .../clone/TabletRepairAndBalanceTest.java     |   2 +-
 .../doris/clone/TabletReplicaTooSlowTest.java |   2 +-
 ...TwoDimensionalGreedyRebalanceAlgoTest.java |  12 +-
 .../common/{CIDRTest.java => CidrTest.java}   |   2 +-
 .../apache/doris/common/GenericPoolTest.java  |  10 +-
 .../load/loadv2/SparkRepositoryTest.java      |  12 +-
 .../load/update/UpdateStmtExecutorTest.java   |  10 +-
 .../doris/mysql/privilege/AuthTest.java       |   2 +
 .../BatchModifyPartitionsInfoTest.java        |  22 +-
 .../planner/MaterializedViewFunctionTest.java | 210 ++++++-------
 .../org/apache/doris/planner/PlannerTest.java |   4 +-
 .../doris/planner/ResourceTagQueryTest.java   |   2 +-
 .../planner/RuntimeFilterGeneratorTest.java   |  10 +-
 .../doris/planner/UpdatePlannerTest.java      |  36 +--
 .../org/apache/doris/qe/CoordinatorTest.java  |  24 +-
 .../apache/doris/qe/PartitionCacheTest.java   |  14 +-
 .../apache/doris/qe/QueryDetailQueueTest.java |  12 +-
 .../apache/doris/service/ExecuteEnvTest.java  |   8 +-
 .../DatabaseTransactionMgrTest.java           |  12 +-
 .../FakeTransactionIDGenerator.java           |   2 +-
 .../apache/doris/utframe/AnotherDemoTest.java |   2 +-
 .../doris/utframe/DemoMultiBackendsTest.java  |   2 +-
 .../doris/utframe/MockedBackendFactory.java   |  12 +-
 .../doris/utframe/TestWithFeService.java      |  48 +--
 .../apache/doris/utframe/UtFrameUtils.java    |  48 +--
 .../org/apache/doris/udf/UdfExecutor.java     | 266 ++++++++--------
 .../doris/load/loadv2/dpp/DppColumns.java     |   8 +-
 .../doris/load/loadv2/dpp/SparkDpp.java       |   2 +
 214 files changed, 2711 insertions(+), 2077 deletions(-)
 rename fe/fe-core/src/main/java/org/apache/doris/backup/{HDFSStorage.java => HdfsStorage.java} (97%)
 rename fe/fe-core/src/main/java/org/apache/doris/common/proc/{BDBJEDatabaseProcDir.java => BdbjeDatabaseProcDir.java} (92%)
 rename fe/fe-core/src/main/java/org/apache/doris/common/proc/{BDBJEJournalDataProcNode.java => BdbjeJournalDataProcNode.java} (94%)
 rename fe/fe-core/src/main/java/org/apache/doris/common/proc/{BDBJEProcDir.java => BdbjeProcDir.java} (95%)
 rename fe/fe-core/src/main/java/org/apache/doris/ha/{BDBHA.java => BdbHA.java} (98%)
 rename fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/{BDBJEJournal.java => BdbjeJournal.java} (99%)
 rename fe/fe-core/src/test/java/org/apache/doris/common/{CIDRTest.java => CidrTest.java} (99%)

diff --git a/build-support/IntelliJ-code-format.xml b/build-support/IntelliJ-code-format.xml
index 04c4e7a681e68b..eea3822f66ef32 100644
--- a/build-support/IntelliJ-code-format.xml
+++ b/build-support/IntelliJ-code-format.xml
@@ -66,6 +66,7 @@ under the License.
     <option name="THROWS_KEYWORD_WRAP" value="1" />
     <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
     <option name="BINARY_OPERATION_WRAP" value="1" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
     <option name="TERNARY_OPERATION_WRAP" value="1" />
     <option name="FOR_STATEMENT_WRAP" value="1" />
     <option name="ARRAY_INITIALIZER_WRAP" value="1" />
@@ -92,4 +93,3 @@ under the License.
     </arrangement>
   </codeStyleSettings>
 </code_scheme>
-
diff --git a/fe/check/checkstyle/checkstyle.xml b/fe/check/checkstyle/checkstyle.xml
index c367452c90b4da..1bd1436b667721 100644
--- a/fe/check/checkstyle/checkstyle.xml
+++ b/fe/check/checkstyle/checkstyle.xml
@@ -36,6 +36,10 @@ under the License.
         <property name="file" value="fe/check/checkstyle/suppressions.xml"/>
         <property name="optional" value="true"/>
     </module>
+    <module name="SuppressWithPlainTextCommentFilter">
+        <property name="offCommentFormat" value="CHECKSTYLE OFF"/>
+        <property name="onCommentFormat" value="CHECKSTYLE ON"/>
+    </module>
 
     <module name="FileTabCharacter">
         <property name="eachLine" value="true"/>
@@ -69,6 +73,10 @@ under the License.
     </module>
 
     <module name="TreeWalker">
+        <!-- filter -->
+        <module name="SuppressWithNearbyCommentFilter">
+            <property name="commentFormat" value="CHECKSTYLE IGNORE THIS LINE"/>
+        </module>
         <!-- Annotations -->
         <module name="AnnotationLocation">
             <property name="id" value="AnnotationLocationMostCases"/>
@@ -100,6 +108,7 @@ under the License.
         <module name="NeedBraces">
             <property name="tokens"
                       value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
+            <property name="severity" value="error"/>
         </module>
         <module name="LeftCurly">
             <property name="tokens"
@@ -135,7 +144,9 @@ under the License.
 
         <!-- Coding -->
         <module name="DeclarationOrder"/>
-        <module name="FallThrough"/>
+        <module name="FallThrough">
+            <property name="severity" value="error"/>
+        </module>
         <module name="IllegalTokenText">
             <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
             <property name="format"
@@ -143,9 +154,13 @@ under the License.
             <property name="message"
                       value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
         </module>
-        <module name="MissingSwitchDefault"/>
+        <module name="MissingSwitchDefault">
+            <property name="severity" value="error"/>
+        </module>
         <module name="MultipleVariableDeclarations"/>
-        <module name="NoFinalizer"/>
+        <module name="NoFinalizer">
+            <property name="severity" value="error"/>
+        </module>
         <module name="OneStatementPerLine"/>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="StringLiteralEquality"/>
@@ -249,20 +264,22 @@ under the License.
         <!-- Naming Conventions -->
         <module name="AbbreviationAsWordInName">
             <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="3"/>
+            <property name="allowedAbbreviationLength" value="4"/>
             <property name="tokens"
                       value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
                     PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
                     RECORD_COMPONENT_DEF"/>
+            <property name="severity" value="error"/>
         </module>
         <module name="CatchParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <property name="format" value="^([a-z0-9][a-zA-Z0-9]*)?$"/>
             <property name="severity" value="error"/>
             <message key="name.invalidPattern"
                      value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="ClassTypeParameterName">
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*$)"/>
+            <property name="severity" value="error"/>
             <message key="name.invalidPattern"
                      value="Class type name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -273,22 +290,26 @@ under the License.
                      value="Interface type name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="LambdaParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <property name="format" value="^([a-z][a-zA-Z0-9]*)?$"/>
+            <property name="severity" value="error"/>
             <message key="name.invalidPattern"
                      value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="LocalVariableName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <property name="format" value="^([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <property name="severity" value="error"/>
             <message key="name.invalidPattern"
                      value="Local variable name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="MemberName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="format" value="^([a-z][a-zA-Z0-9]*)?$"/>
+            <property name="severity" value="error"/>
             <message key="name.invalidPattern"
                      value="Member name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <property name="severity" value="error"/>
             <message key="name.invalidPattern"
                      value="Method name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -305,7 +326,8 @@ under the License.
                      value="Package name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="ParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <property name="format" value="^([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <property name="severity" value="error"/>
             <message key="name.invalidPattern"
                      value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/BitmapValue.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/BitmapValue.java
index fe857bf5b3854c..bef2fba4f466b1 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/io/BitmapValue.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/BitmapValue.java
@@ -58,7 +58,7 @@ public void add(int value) {
     }
 
     public void add(long value) {
-        switch (bitmapType) {
+        switch (bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 singleValue = value;
                 bitmapType = SINGLE_VALUE;
@@ -95,7 +95,7 @@ public boolean contains(long value) {
     }
 
     public long cardinality() {
-        switch (bitmapType) {
+        switch (bitmapType) {  // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 return 0;
             case SINGLE_VALUE:
@@ -107,7 +107,7 @@ public long cardinality() {
     }
 
     public void serialize(DataOutput output) throws IOException {
-        switch (bitmapType) {
+        switch (bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 output.writeByte(EMPTY);
                 break;
@@ -155,12 +155,12 @@ public void deserialize(DataInput input) throws IOException {
 
     // In-place bitwise AND (intersection) operation. The current bitmap is modified.
     public void and(BitmapValue other) {
-        switch (other.bitmapType) {
+        switch (other.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 clear();
                 break;
             case SINGLE_VALUE:
-                switch (this.bitmapType) {
+                switch (this.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                     case EMPTY:
                         break;
                     case SINGLE_VALUE:
@@ -180,7 +180,7 @@ public void and(BitmapValue other) {
                 }
                 break;
             case BITMAP_VALUE:
-                switch (this.bitmapType) {
+                switch (this.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                     case EMPTY:
                         break;
                     case SINGLE_VALUE:
@@ -199,14 +199,14 @@ public void and(BitmapValue other) {
 
     // In-place bitwise OR (union) operation. The current bitmap is modified.
     public void or(BitmapValue other) {
-        switch (other.bitmapType) {
+        switch (other.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 break;
             case SINGLE_VALUE:
                 add(other.singleValue);
                 break;
             case BITMAP_VALUE:
-                switch (this.bitmapType) {
+                switch (this.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                     case EMPTY:
                         // deep copy the bitmap in case of multi-rollups update the bitmap repeatedly
                         this.bitmap = new Roaring64Map();
@@ -228,7 +228,7 @@ public void or(BitmapValue other) {
     }
 
     public void remove(long value){
-        switch (this.bitmapType){
+        switch (this.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 break;
             case SINGLE_VALUE:
@@ -245,14 +245,14 @@ public void remove(long value){
 
     //In-place bitwise ANDNOT (difference) operation. The current bitmap is modified
     public void not(BitmapValue other) {
-        switch (other.bitmapType) {
+        switch (other.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 break;
             case SINGLE_VALUE:
                 remove(other.singleValue);
                 break;
             case BITMAP_VALUE:
-                switch (this.bitmapType) {
+                switch (this.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                     case EMPTY:
                         break;
                     case SINGLE_VALUE:
@@ -271,11 +271,11 @@ public void not(BitmapValue other) {
 
     //In-place bitwise XOR (symmetric difference) operation. The current bitmap is modified
     public void xor(BitmapValue other) {
-        switch (other.bitmapType) {
+        switch (other.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 break;
             case SINGLE_VALUE:
-                switch (this.bitmapType){
+                switch (this.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                     case EMPTY:
                         add(other.singleValue);
                         break;
@@ -297,7 +297,7 @@ public void xor(BitmapValue other) {
                 }
                 break;
             case BITMAP_VALUE:
-                switch (this.bitmapType) {
+                switch (this.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                     case EMPTY:
                         this.bitmap = other.bitmap;
                         this.bitmapType = BITMAP_VALUE;
@@ -325,7 +325,7 @@ public boolean equals(BitmapValue other) {
         if (this.bitmapType != other.bitmapType) {
             return false;
         }
-        switch (other.bitmapType) {
+        switch (other.bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 ret = true;
                 break;
@@ -348,7 +348,7 @@ public boolean equals(BitmapValue other) {
     // TODO(wb): keep getSizeInBytes consistent with be and refactor roaring
     public long getSizeInBytes() {
         long size = 0;
-        switch (bitmapType) {
+        switch (bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 size = 1;
                 break;
@@ -368,7 +368,7 @@ public long getSizeInBytes() {
     @Override
     public String toString() {
         String toStringStr = "{}";
-        switch (bitmapType) {
+        switch (bitmapType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case EMPTY:
                 break;
             case SINGLE_VALUE:
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 05dada16019ae4..2d783a3f383da1 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
@@ -26,7 +26,7 @@ public class Codec {
     // not support encode negative value now
     public static void encodeVarint64(long source, DataOutput out) throws IOException {
         assert source >= 0;
-        short B = 128;
+        short B = 128; // CHECKSTYLE IGNORE THIS LINE
 
         while (source >= B) {
             out.write((int) (source & (B - 1) | B));
@@ -39,7 +39,7 @@ public static void encodeVarint64(long source, DataOutput out) throws IOExceptio
     public static long decodeVarint64(DataInput in) throws IOException {
         long result = 0;
         int shift = 0;
-        short B = 128;
+        short B = 128; // CHECKSTYLE IGNORE THIS LINE
 
         while (true) {
             int oneByte = in.readUnsignedByte();
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/io/FastByteArrayInputStream.java b/fe/fe-common/src/main/java/org/apache/doris/common/io/FastByteArrayInputStream.java
index c34ccf02e131b4..0375068f48d8f6 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/io/FastByteArrayInputStream.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/io/FastByteArrayInputStream.java
@@ -53,8 +53,9 @@ public final int read() {
     }
 
     public final int read(byte[] b, int off, int len) {
-        if (pos >= count)
+        if (pos >= count) {
             return -1;
+        }
 
         if ((pos + len) > count) {
             len = (count - pos);
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 36385072a3475c..ed02b0a4892d20 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
@@ -116,7 +116,7 @@ public void updateWithHash(Object value) {
     }
 
     public void update(long hashValue) {
-        switch (this.type) {
+        switch (this.type) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case HLL_DATA_EMPTY:
                 hashSet.add(hashValue);
                 type = HLL_DATA_EXPLICIT;
@@ -128,7 +128,7 @@ public void update(long hashValue) {
                 }
                 convertExplicitToRegister();
                 type = HLL_DATA_FULL;
-            case HLL_DATA_SPARSE:
+            case HLL_DATA_SPARSE: // CHECKSTYLE IGNORE THIS LINE: fall through
             case HLL_DATA_FULL:
                 updateRegisters(hashValue);
                 break;
@@ -139,10 +139,10 @@ public void merge(Hll other) {
         if (other.type == HLL_DATA_EMPTY) {
             return;
         }
-        switch (this.type) {
+        switch (this.type) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case HLL_DATA_EMPTY:
                 this.type = other.type;
-                switch (other.type) {
+                switch (other.type) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                     case HLL_DATA_EXPLICIT:
                         this.hashSet.addAll(other.hashSet);
                         break;
@@ -154,7 +154,7 @@ public void merge(Hll other) {
                 }
                 break;
             case HLL_DATA_EXPLICIT:
-                switch (other.type) {
+                switch (other.type) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                     case HLL_DATA_EXPLICIT:
                         this.hashSet.addAll(other.hashSet);
                         if (this.hashSet.size() > HLL_EXPLICLIT_INT64_NUM) {
@@ -172,7 +172,7 @@ public void merge(Hll other) {
                 break;
             case HLL_DATA_SPARSE:
             case HLL_DATA_FULL:
-                switch (other.type) {
+                switch (other.type) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                     case HLL_DATA_EXPLICIT:
                         for (long value : other.hashSet) {
                             update(value);
@@ -188,7 +188,7 @@ public void merge(Hll other) {
     }
 
     public void serialize(DataOutput output) throws IOException {
-        switch (type) {
+        switch (type) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case HLL_DATA_EMPTY:
                 output.writeByte(type);
                 break;
@@ -363,20 +363,20 @@ public static long hash64(final byte[] data, final int length, final int seed) {
         }
 
         final int index = (nblocks << 3);
-        switch (length - index) {
+        switch (length - index) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case 7:
                 h ^= ((long) data[index + 6] & 0xff) << 48;
-            case 6:
+            case 6: // CHECKSTYLE IGNORE THIS LINE: fall through
                 h ^= ((long) data[index + 5] & 0xff) << 40;
-            case 5:
+            case 5: // CHECKSTYLE IGNORE THIS LINE: fall through
                 h ^= ((long) data[index + 4] & 0xff) << 32;
-            case 4:
+            case 4: // CHECKSTYLE IGNORE THIS LINE: fall through
                 h ^= ((long) data[index + 3] & 0xff) << 24;
-            case 3:
+            case 3: // CHECKSTYLE IGNORE THIS LINE: fall through
                 h ^= ((long) data[index + 2] & 0xff) << 16;
-            case 2:
+            case 2: // CHECKSTYLE IGNORE THIS LINE: fall through
                 h ^= ((long) data[index + 1] & 0xff) << 8;
-            case 1:
+            case 1: // CHECKSTYLE IGNORE THIS LINE: fall through
                 h ^= ((long) data[index] & 0xff);
                 h *= M64;
         }
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 8309e245ba262e..a8977e5ed7f9d0 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
@@ -469,7 +469,7 @@ public static void validateUTF8(byte[] utf8, int start, int len)
         while (count < start + len) {
             int aByte = ((int) utf8[count] & 0xFF);
 
-            switch (state) {
+            switch (state) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case LEAD_BYTE:
                 leadByte = aByte;
                 length = bytesFromUTF8[aByte];
@@ -520,8 +520,9 @@ public static void validateUTF8(byte[] utf8, int start, int len)
                 }
                 // falls through to regular trail-byte test!!
             case TRAIL_BYTE:
-                if (aByte < 0x80 || aByte > 0xBF)
+                if (aByte < 0x80 || aByte > 0xBF) {
                     throw new MalformedInputException(count);
+                }
                 if (--length == 0) {
                     state = LEAD_BYTE;
                 } else {
@@ -570,28 +571,35 @@ public static int bytesToCodePoint(ByteBuffer bytes) {
         byte b = bytes.get();
         bytes.reset();
         int extraBytesToRead = bytesFromUTF8[(b & 0xFF)];
-        if (extraBytesToRead < 0)
+        if (extraBytesToRead < 0) {
             return -1; // trailing byte!
+        }
         int ch = 0;
 
-        switch (extraBytesToRead) {
+        switch (extraBytesToRead) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
         case 5:
             ch += (bytes.get() & 0xFF);
             ch <<= 6; /* remember, illegal UTF-8 */
+            // CHECKSTYLE IGNORE THIS LINE: fall through
         case 4:
             ch += (bytes.get() & 0xFF);
             ch <<= 6; /* remember, illegal UTF-8 */
+            // CHECKSTYLE IGNORE THIS LINE: fall through
         case 3:
             ch += (bytes.get() & 0xFF);
             ch <<= 6;
+            // CHECKSTYLE IGNORE THIS LINE: fall through
         case 2:
             ch += (bytes.get() & 0xFF);
             ch <<= 6;
+            // CHECKSTYLE IGNORE THIS LINE: fall through
         case 1:
             ch += (bytes.get() & 0xFF);
             ch <<= 6;
+            // CHECKSTYLE IGNORE THIS LINE: fall through
         case 0:
             ch += (bytes.get() & 0xFF);
+            // CHECKSTYLE IGNORE THIS LINE: fall through, missing switch default
         }
         ch -= offsetsFromUTF8[extraBytesToRead];
 
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 d30e734c91b11f..8c802da3ee0f99 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
@@ -102,112 +102,112 @@ public void testBitmapValueAdd() {
     public void testBitmapValueAnd() {
         // empty and empty
         BitmapValue bitmapValue1 = new BitmapValue();
-        BitmapValue bitmapValue1_1 = new BitmapValue();
-        bitmapValue1.and(bitmapValue1_1);
+        BitmapValue bitmapValue1Dot1 = new BitmapValue();
+        bitmapValue1.and(bitmapValue1Dot1);
         Assert.assertTrue(bitmapValue1.getBitmapType() == BitmapValue.EMPTY);
         Assert.assertTrue(bitmapValue1.cardinality() == 0);
 
         // empty and single value
         BitmapValue bitmapValue2 = new BitmapValue();
-        BitmapValue bitmapValue2_1 = new BitmapValue();
-        bitmapValue2_1.add(1);
-        bitmapValue2.and(bitmapValue2_1);
+        BitmapValue bitmapValue2Dot1 = new BitmapValue();
+        bitmapValue2Dot1.add(1);
+        bitmapValue2.and(bitmapValue2Dot1);
         Assert.assertTrue(bitmapValue2.getBitmapType() == BitmapValue.EMPTY);
         Assert.assertTrue(bitmapValue2.cardinality() == 0);
 
         // empty and bitmap
         BitmapValue bitmapValue3 = new BitmapValue();
-        BitmapValue bitmapValue3_1 =new BitmapValue();
-        bitmapValue3_1.add(1);
-        bitmapValue3_1.add(2);
-        bitmapValue3.and(bitmapValue3_1);
+        BitmapValue bitmapValue3Dot1 =new BitmapValue();
+        bitmapValue3Dot1.add(1);
+        bitmapValue3Dot1.add(2);
+        bitmapValue3.and(bitmapValue3Dot1);
         Assert.assertTrue(bitmapValue2.getBitmapType() == BitmapValue.EMPTY);
         Assert.assertTrue(bitmapValue3.cardinality() == 0);
 
         // single value and empty
         BitmapValue bitmapValue4 = new BitmapValue();
         bitmapValue4.add(1);
-        BitmapValue bitmapValue4_1 = new BitmapValue();
-        bitmapValue4.and(bitmapValue4_1);
+        BitmapValue bitmapValue4Dot1 = new BitmapValue();
+        bitmapValue4.and(bitmapValue4Dot1);
         Assert.assertTrue(bitmapValue4.getBitmapType() == BitmapValue.EMPTY);
         Assert.assertTrue(bitmapValue4.cardinality() == 0);
 
         // single value and single value
         BitmapValue bitmapValue5 = new BitmapValue();
         bitmapValue5.add(1);
-        BitmapValue bitmapValue5_1 = new BitmapValue();
-        bitmapValue5_1.add(1);
-        bitmapValue5.and(bitmapValue5_1);
+        BitmapValue bitmapValue5Dot1 = new BitmapValue();
+        bitmapValue5Dot1.add(1);
+        bitmapValue5.and(bitmapValue5Dot1);
         Assert.assertTrue(bitmapValue5.getBitmapType() == BitmapValue.SINGLE_VALUE);
         Assert.assertTrue(bitmapValue5.contains(1));
 
         bitmapValue5.clear();
-        bitmapValue5_1.clear();
+        bitmapValue5Dot1.clear();
         bitmapValue5.add(1);
-        bitmapValue5_1.add(2);
-        bitmapValue5.and(bitmapValue5_1);
+        bitmapValue5Dot1.add(2);
+        bitmapValue5.and(bitmapValue5Dot1);
         Assert.assertTrue(bitmapValue5.getBitmapType() == BitmapValue.EMPTY);
 
         // single value and bitmap
         BitmapValue bitmapValue6 = new BitmapValue();
         bitmapValue6.add(1);
-        BitmapValue bitmapValue6_1 = new BitmapValue();
-        bitmapValue6_1.add(1);
-        bitmapValue6_1.add(2);
-        bitmapValue6.and(bitmapValue6_1);
+        BitmapValue bitmapValue6Dot1 = new BitmapValue();
+        bitmapValue6Dot1.add(1);
+        bitmapValue6Dot1.add(2);
+        bitmapValue6.and(bitmapValue6Dot1);
         Assert.assertTrue(bitmapValue6.getBitmapType() == BitmapValue.SINGLE_VALUE);
 
         bitmapValue6.clear();
         bitmapValue6.add(3);
-        bitmapValue6.and(bitmapValue6_1);
+        bitmapValue6.and(bitmapValue6Dot1);
         Assert.assertTrue(bitmapValue6.getBitmapType() == BitmapValue.EMPTY);
 
         // bitmap and empty
         BitmapValue bitmapValue7 = new BitmapValue();
         bitmapValue7.add(1);
         bitmapValue7.add(2);
-        BitmapValue bitmapValue7_1 = new BitmapValue();
-        bitmapValue7.and(bitmapValue7_1);
+        BitmapValue bitmapValue7Dot1 = new BitmapValue();
+        bitmapValue7.and(bitmapValue7Dot1);
         Assert.assertTrue(bitmapValue7.getBitmapType() == BitmapValue.EMPTY);
 
         // bitmap and single value
         BitmapValue bitmapValue8 = new BitmapValue();
         bitmapValue8.add(1);
         bitmapValue8.add(2);
-        BitmapValue bitmapValue8_1 = new BitmapValue();
-        bitmapValue8_1.add(1);
-        bitmapValue8.and(bitmapValue8_1);
+        BitmapValue bitmapValue8Dot1 = new BitmapValue();
+        bitmapValue8Dot1.add(1);
+        bitmapValue8.and(bitmapValue8Dot1);
         Assert.assertTrue(bitmapValue8.getBitmapType() == BitmapValue.SINGLE_VALUE);
 
         bitmapValue8.clear();
         bitmapValue8.add(2);
         bitmapValue8.add(3);
-        bitmapValue8.and(bitmapValue8_1);
+        bitmapValue8.and(bitmapValue8Dot1);
         Assert.assertTrue(bitmapValue8.getBitmapType() == BitmapValue.EMPTY);
 
         // bitmap and bitmap
         BitmapValue bitmapValue9 = new BitmapValue();
         bitmapValue9.add(1);
         bitmapValue9.add(2);
-        BitmapValue bitmapValue9_1 = new BitmapValue();
-        bitmapValue9_1.add(2);
-        bitmapValue9_1.add(3);
-        bitmapValue9.and(bitmapValue9_1);
+        BitmapValue bitmapValue9Dot1 = new BitmapValue();
+        bitmapValue9Dot1.add(2);
+        bitmapValue9Dot1.add(3);
+        bitmapValue9.and(bitmapValue9Dot1);
         Assert.assertTrue(bitmapValue9.getBitmapType() == BitmapValue.SINGLE_VALUE);
 
         bitmapValue9.clear();
         bitmapValue9.add(4);
         bitmapValue9.add(5);
-        bitmapValue9.and(bitmapValue9_1);
+        bitmapValue9.and(bitmapValue9Dot1);
         Assert.assertTrue(bitmapValue9.getBitmapType() == BitmapValue.EMPTY);
 
         bitmapValue9.clear();
         bitmapValue9.add(2);
         bitmapValue9.add(3);
         bitmapValue9.add(4);
-        bitmapValue9.and(bitmapValue9_1);
+        bitmapValue9.and(bitmapValue9Dot1);
         Assert.assertTrue(bitmapValue9.getBitmapType() == BitmapValue.BITMAP_VALUE);
-        Assert.assertTrue(bitmapValue9.equals(bitmapValue9_1));
+        Assert.assertTrue(bitmapValue9.equals(bitmapValue9Dot1));
 
     }
 
@@ -215,77 +215,77 @@ public void testBitmapValueAnd() {
     public void testBitmapValueOr() {
         // empty or empty
         BitmapValue bitmapValue1 = new BitmapValue();
-        BitmapValue bitmapValue1_1 = new BitmapValue();
-        bitmapValue1.or(bitmapValue1_1);
+        BitmapValue bitmapValue1Dot1 = new BitmapValue();
+        bitmapValue1.or(bitmapValue1Dot1);
         Assert.assertTrue(bitmapValue1.getBitmapType() == BitmapValue.EMPTY);
 
         // empty or single value
         BitmapValue bitmapValue2 = new BitmapValue();
-        BitmapValue bitmapValue2_1 = new BitmapValue();
-        bitmapValue2_1.add(1);
-        bitmapValue2.or(bitmapValue2_1);
+        BitmapValue bitmapValue2Dot1 = new BitmapValue();
+        bitmapValue2Dot1.add(1);
+        bitmapValue2.or(bitmapValue2Dot1);
         Assert.assertTrue(bitmapValue2.getBitmapType() == BitmapValue.SINGLE_VALUE);
 
         // empty or bitmap
         BitmapValue bitmapValue3 = new BitmapValue();
-        BitmapValue bitmapValue3_1 = new BitmapValue();
-        bitmapValue3_1.add(1);
-        bitmapValue3_1.add(2);
-        bitmapValue3.or(bitmapValue3_1);
+        BitmapValue bitmapValue3Dot1 = new BitmapValue();
+        bitmapValue3Dot1.add(1);
+        bitmapValue3Dot1.add(2);
+        bitmapValue3.or(bitmapValue3Dot1);
         Assert.assertTrue(bitmapValue3.getBitmapType() == BitmapValue.BITMAP_VALUE);
 
         // single or and empty
         BitmapValue bitmapValue4 = new BitmapValue();
-        BitmapValue bitmapValue4_1 = new BitmapValue();
+        BitmapValue bitmapValue4Dot1 = new BitmapValue();
         bitmapValue4.add(1);
-        bitmapValue4.or(bitmapValue4_1);
+        bitmapValue4.or(bitmapValue4Dot1);
         Assert.assertTrue(bitmapValue4.getBitmapType() == BitmapValue.SINGLE_VALUE);
 
         // single or and single value
         BitmapValue bitmapValue5 = new BitmapValue();
-        BitmapValue bitmapValue5_1 = new BitmapValue();
+        BitmapValue bitmapValue5Dot1 = new BitmapValue();
         bitmapValue5.add(1);
-        bitmapValue5_1.add(1);
-        bitmapValue5.or(bitmapValue5_1);
+        bitmapValue5Dot1.add(1);
+        bitmapValue5.or(bitmapValue5Dot1);
         Assert.assertTrue(bitmapValue5.getBitmapType() == BitmapValue.SINGLE_VALUE);
 
         bitmapValue5.clear();
         bitmapValue5.add(2);
-        bitmapValue5.or(bitmapValue5_1);
+        bitmapValue5.or(bitmapValue5Dot1);
         Assert.assertTrue(bitmapValue5.getBitmapType() == BitmapValue.BITMAP_VALUE);
 
         // single or and bitmap
         BitmapValue bitmapValue6 = new BitmapValue();
-        BitmapValue bitmapValue6_1 = new BitmapValue();
+        BitmapValue bitmapValue6Dot1 = new BitmapValue();
         bitmapValue6.add(1);
-        bitmapValue6_1.add(1);
-        bitmapValue6_1.add(2);
-        bitmapValue6.or(bitmapValue6_1);
+        bitmapValue6Dot1.add(1);
+        bitmapValue6Dot1.add(2);
+        bitmapValue6.or(bitmapValue6Dot1);
         Assert.assertTrue(bitmapValue6.getBitmapType() == BitmapValue.BITMAP_VALUE);
 
         // bitmap or empty
         BitmapValue bitmapValue7 = new BitmapValue();
         bitmapValue7.add(1);
         bitmapValue7.add(2);
-        BitmapValue bitmapValue7_1 =new BitmapValue();
-        bitmapValue7.or(bitmapValue7_1);
+        BitmapValue bitmapValue7Dot1 =new BitmapValue();
+        bitmapValue7.or(bitmapValue7Dot1);
         Assert.assertTrue(bitmapValue7.getBitmapType() == BitmapValue.BITMAP_VALUE);
 
         // bitmap or single value
         BitmapValue bitmapValue8 = new BitmapValue();
         bitmapValue8.add(1);
         bitmapValue8.add(2);
-        BitmapValue bitmapValue8_1 =new BitmapValue();
-        bitmapValue8_1.add(1);
-        bitmapValue8.or(bitmapValue8_1);
+        BitmapValue bitmapValue8Dot1 =new BitmapValue();
+        bitmapValue8Dot1.add(1);
+        bitmapValue8.or(bitmapValue8Dot1);
         Assert.assertTrue(bitmapValue8.getBitmapType() == BitmapValue.BITMAP_VALUE);
 
         // bitmap or bitmap
         BitmapValue bitmapValue9 = new BitmapValue();
         bitmapValue9.add(1);
         bitmapValue9.add(2);
-        BitmapValue bitmapValue9_1 =new BitmapValue();
-        bitmapValue9.or(bitmapValue9_1);
+        BitmapValue bitmapValue9Dot1 =new BitmapValue();
+        bitmapValue9.or(bitmapValue9Dot1);
         Assert.assertTrue(bitmapValue9.getBitmapType() == BitmapValue.BITMAP_VALUE);
     }
 
diff --git a/fe/fe-common/src/test/java/org/apache/doris/common/io/HllTest.java b/fe/fe-common/src/test/java/org/apache/doris/common/io/HllTest.java
index eecf3ecb94c227..78ba33b6929f8c 100644
--- a/fe/fe-common/src/test/java/org/apache/doris/common/io/HllTest.java
+++ b/fe/fe-common/src/test/java/org/apache/doris/common/io/HllTest.java
@@ -38,7 +38,7 @@ public void testFindFirstNonZeroBitPosition() {
     }
 
     @Test
-    public void HllBasicTest() throws IOException {
+    public void hllBasicTest() throws IOException {
         // test empty
         Hll emptyHll = new Hll();
 
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 7cdd1d3a5e2fec..23a66a3678e974 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
@@ -76,8 +76,8 @@ public AlterHandler(String name) {
         this(name, FeConstants.default_scheduler_interval_millisecond);
     }
 
-    public AlterHandler(String name, int scheduler_interval_millisecond) {
-        super(name, scheduler_interval_millisecond);
+    public AlterHandler(String name, int schedulerIntervalMillisecond) {
+        super(name, schedulerIntervalMillisecond);
     }
 
     protected void addAlterJobV2(AlterJobV2 alterJob) {
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 a2d04a12c66c97..4d7eb8f5a5ba6e 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
@@ -1050,8 +1050,9 @@ public void cancel(CancelStmt stmt) throws DdlException {
             if (cancelAlterTableStmt.getAlterJobIdList() != null) {
                 for (Long jobId : cancelAlterTableStmt.getAlterJobIdList()) {
                     AlterJobV2 alterJobV2 = getUnfinishedAlterJobV2ByJobId(jobId);
-                    if (alterJobV2 == null)
+                    if (alterJobV2 == null) {
                         continue;
+                    }
                     rollupJobV2List.add(getUnfinishedAlterJobV2ByJobId(jobId));
                 }
             } else {
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 6040850916e0b1..988dff558439de 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
@@ -81,41 +81,41 @@ public enum AggPhase {
     };
 
     // created by createMergeAggInfo()
-    private AggregateInfo mergeAggInfo_;
+    private AggregateInfo mergeAggInfo;
 
     // created by createDistinctAggInfo()
-    private AggregateInfo secondPhaseDistinctAggInfo_;
+    private AggregateInfo secondPhaseDistinctAggInfo;
 
-    private final AggPhase aggPhase_;
+    private final AggPhase aggPhase;
 
     // Map from all grouping and aggregate exprs to a SlotRef referencing the corresp. slot
     // in the intermediate tuple. Identical to outputTupleSmap_ if no aggregateExpr has an
     // output type that is different from its intermediate type.
-    protected ExprSubstitutionMap intermediateTupleSmap_ = new ExprSubstitutionMap();
+    protected ExprSubstitutionMap intermediateTupleSmap = new ExprSubstitutionMap();
 
     // Map from all grouping and aggregate exprs to a SlotRef referencing the corresp. slot
     // in the output tuple.
-    protected ExprSubstitutionMap outputTupleSmap_ = new ExprSubstitutionMap();
+    protected ExprSubstitutionMap outputTupleSmap = new ExprSubstitutionMap();
 
     // Map from slots of outputTupleSmap_ to the corresponding slot in
     // intermediateTupleSmap_.
-    protected ExprSubstitutionMap outputToIntermediateTupleSmap_ =
+    protected ExprSubstitutionMap outputToIntermediateTupleSmap =
             new ExprSubstitutionMap();
 
     // if set, a subset of groupingExprs_; set and used during planning
-    private List<Expr> partitionExprs_;
+    private List<Expr> partitionExprs;
 
     // indices into aggregateExprs for those that need to be materialized;
     // shared between this, mergeAggInfo and secondPhaseDistinctAggInfo
-    private ArrayList<Integer> materializedAggregateSlots_ = Lists.newArrayList();
+    private ArrayList<Integer> materializedAggregateSlots = Lists.newArrayList();
     // if true, this AggregateInfo is the first phase of a 2-phase DISTINCT computation
     private boolean isDistinctAgg = false;
     // If true, the sql has MultiDistinct
-    private boolean isMultiDistinct_;
+    private boolean isMultiDistinct;
 
     // the multi distinct's begin pos  and end pos in groupby exprs
-    private ArrayList<Integer> firstIdx_ = Lists.newArrayList();
-    private ArrayList<Integer> lastIdx_ = Lists.newArrayList();
+    private ArrayList<Integer> firstIdx = Lists.newArrayList();
+    private ArrayList<Integer> lastIdx = Lists.newArrayList();
 
     // C'tor creates copies of groupingExprs and aggExprs.
     private AggregateInfo(ArrayList<Expr> groupingExprs,
@@ -126,8 +126,8 @@ private AggregateInfo(ArrayList<Expr> groupingExprs,
     private AggregateInfo(ArrayList<Expr> groupingExprs,
                           ArrayList<FunctionCallExpr> aggExprs, AggPhase aggPhase, boolean isMultiDistinct)  {
         super(groupingExprs, aggExprs);
-        aggPhase_ = aggPhase;
-        isMultiDistinct_ = isMultiDistinct;
+        this.aggPhase = aggPhase;
+        this.isMultiDistinct = isMultiDistinct;
     }
 
     /**
@@ -135,26 +135,26 @@ private AggregateInfo(ArrayList<Expr> groupingExprs,
      */
     private AggregateInfo(AggregateInfo other) {
         super(other);
-        if (other.mergeAggInfo_ != null) {
-            mergeAggInfo_ = other.mergeAggInfo_.clone();
+        if (other.mergeAggInfo != null) {
+            mergeAggInfo = other.mergeAggInfo.clone();
         }
-        if (other.secondPhaseDistinctAggInfo_ != null) {
-            secondPhaseDistinctAggInfo_ = other.secondPhaseDistinctAggInfo_.clone();
+        if (other.secondPhaseDistinctAggInfo != null) {
+            secondPhaseDistinctAggInfo = other.secondPhaseDistinctAggInfo.clone();
         }
-        aggPhase_ = other.aggPhase_;
-        outputTupleSmap_ = other.outputTupleSmap_.clone();
+        aggPhase = other.aggPhase;
+        outputTupleSmap = other.outputTupleSmap.clone();
         if (other.requiresIntermediateTuple()) {
-            intermediateTupleSmap_ = other.intermediateTupleSmap_.clone();
+            intermediateTupleSmap = other.intermediateTupleSmap.clone();
         } else {
-            Preconditions.checkState(other.intermediateTupleDesc_ == other.outputTupleDesc_);
-            intermediateTupleSmap_ = outputTupleSmap_;
+            Preconditions.checkState(other.intermediateTupleDesc == other.outputTupleDesc);
+            intermediateTupleSmap = outputTupleSmap;
         }
-        partitionExprs_ =
-                (other.partitionExprs_ != null) ? Expr.cloneList(other.partitionExprs_) : null;
+        partitionExprs =
+                (other.partitionExprs != null) ? Expr.cloneList(other.partitionExprs) : null;
     }
 
-    public List<Expr> getPartitionExprs() { return partitionExprs_; }
-    public void setPartitionExprs(List<Expr> exprs) { partitionExprs_ = exprs; }
+    public List<Expr> getPartitionExprs() { return partitionExprs; }
+    public void setPartitionExprs(List<Expr> exprs) { partitionExprs = exprs; }
 
     /**
      * Creates complete AggregateInfo for groupingExprs and aggExprs, including
@@ -201,8 +201,8 @@ static public AggregateInfo create(
             } else {
                 // A tupleDesc should only be given for UNION DISTINCT.
                 Preconditions.checkState(aggExprs == null);
-                result.outputTupleDesc_ = tupleDesc;
-                result.intermediateTupleDesc_ = tupleDesc;
+                result.outputTupleDesc = tupleDesc;
+                result.intermediateTupleDesc = tupleDesc;
             }
             result.createMergeAggInfo(analyzer);
         } else {
@@ -212,7 +212,9 @@ static public AggregateInfo create(
             Preconditions.checkState(tupleDesc == null);
             result.createDistinctAggInfo(groupingExprs, distinctAggExprs, analyzer);
         }
-        if (LOG.isDebugEnabled())  LOG.debug("agg info:\n{}", result.debugString());
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("agg info:\n{}", result.debugString());
+        }
         return result;
     }
 
@@ -309,16 +311,16 @@ private void createDistinctAggInfo(
             }
         }
 
-        this.isMultiDistinct_= estimateIfContainsMultiDistinct(distinctAggExprs);
+        this.isMultiDistinct = estimateIfContainsMultiDistinct(distinctAggExprs);
         isDistinctAgg = true;
 
         // add DISTINCT parameters to grouping exprs
-        if (!isMultiDistinct_) {
-            groupingExprs_.addAll(expr0Children);
+        if (!isMultiDistinct) {
+            groupingExprs.addAll(expr0Children);
         }
 
         // remove DISTINCT aggregate functions from aggExprs
-        aggregateExprs_.removeAll(distinctAggExprs);
+        aggregateExprs.removeAll(distinctAggExprs);
 
         createTupleDescs(analyzer);
         createSmaps(analyzer);
@@ -328,47 +330,49 @@ private void createDistinctAggInfo(
 
     public ArrayList<FunctionCallExpr> getMaterializedAggregateExprs() {
         ArrayList<FunctionCallExpr> result = Lists.newArrayList();
-        for (Integer i: materializedSlots_) {
-          result.add(aggregateExprs_.get(i));
+        for (Integer i: materializedSlots) {
+          result.add(aggregateExprs.get(i));
         }
         return result;
     }
 
     public AggregateInfo getMergeAggInfo() {
-        return mergeAggInfo_;
+        return mergeAggInfo;
     }
 
-    public boolean isMerge() { return aggPhase_.isMerge(); }
-    public boolean isDistinctAgg() { return secondPhaseDistinctAggInfo_ != null; }
-    public ExprSubstitutionMap getIntermediateSmap() { return intermediateTupleSmap_; }
-    public ExprSubstitutionMap getOutputSmap() { return outputTupleSmap_; }
+    public boolean isMerge() { return aggPhase.isMerge(); }
+    public boolean isDistinctAgg() { return secondPhaseDistinctAggInfo != null; }
+    public ExprSubstitutionMap getIntermediateSmap() { return intermediateTupleSmap; }
+    public ExprSubstitutionMap getOutputSmap() { return outputTupleSmap; }
     public ExprSubstitutionMap getOutputToIntermediateSmap() {
-        return outputToIntermediateTupleSmap_;
+        return outputToIntermediateTupleSmap;
     }
 
     public boolean hasAggregateExprs() {
-        return !aggregateExprs_.isEmpty() ||
-                (secondPhaseDistinctAggInfo_ != null &&
-                        !secondPhaseDistinctAggInfo_.getAggregateExprs().isEmpty());
+        return !aggregateExprs.isEmpty() ||
+                (secondPhaseDistinctAggInfo != null &&
+                        !secondPhaseDistinctAggInfo.getAggregateExprs().isEmpty());
     }
 
     public void setIsMultiDistinct(boolean value) {
-        this.isMultiDistinct_ = value;
+        this.isMultiDistinct = value;
     }
 
     public boolean isMultiDistinct() {
-        return isMultiDistinct_;
+        return isMultiDistinct;
     }
 
     public AggregateInfo getSecondPhaseDistinctAggInfo() {
-        return secondPhaseDistinctAggInfo_;
+        return secondPhaseDistinctAggInfo;
     }
 
     /**
      * Return the tuple id produced in the final aggregation step.
      */
     public TupleId getResultTupleId() {
-        if (isDistinctAgg()) return secondPhaseDistinctAggInfo_.getOutputTupleId();
+        if (isDistinctAgg()) {
+            return secondPhaseDistinctAggInfo.getOutputTupleId();
+        }
         return getOutputTupleId();
     }
 
@@ -377,14 +381,14 @@ public TupleId getResultTupleId() {
      * of performing the aggregate computation described by this AggregateInfo.
      */
     public void getRefdSlots(List<SlotId> ids) {
-        Preconditions.checkState(outputTupleDesc_ != null);
-        if (groupingExprs_ != null) {
-            Expr.getIds(groupingExprs_, null, ids);
+        Preconditions.checkState(outputTupleDesc != null);
+        if (groupingExprs != null) {
+            Expr.getIds(groupingExprs, null, ids);
         }
-        Expr.getIds(aggregateExprs_, null, ids);
+        Expr.getIds(aggregateExprs, null, ids);
         // The backend assumes that the entire aggTupleDesc is materialized
-        for (int i = 0; i < outputTupleDesc_.getSlots().size(); ++i) {
-            ids.add(outputTupleDesc_.getSlots().get(i).getId());
+        for (int i = 0; i < outputTupleDesc.getSlots().size(); ++i) {
+            ids.add(outputTupleDesc.getSlots().get(i).getId());
         }
     }
 
@@ -408,24 +412,24 @@ public void getRefdSlots(List<SlotId> ids) {
      *     aggTupleDesc
      */
     public void substitute(ExprSubstitutionMap smap, Analyzer analyzer) {
-        groupingExprs_ = Expr.substituteList(groupingExprs_, smap, analyzer, true);
+        groupingExprs = Expr.substituteList(groupingExprs, smap, analyzer, true);
         if (LOG.isTraceEnabled()) {
-            LOG.trace("AggInfo: grouping_exprs=" + Expr.debugString(groupingExprs_));
+            LOG.trace("AggInfo: grouping_exprs=" + Expr.debugString(groupingExprs));
         }
 
         // The smap in this case should not substitute the aggs themselves, only
         // their subexpressions.
         List<Expr> substitutedAggs =
-            Expr.substituteList(aggregateExprs_, smap, analyzer, false);
-        aggregateExprs_.clear();
+            Expr.substituteList(aggregateExprs, smap, analyzer, false);
+        aggregateExprs.clear();
         for (Expr substitutedAgg: substitutedAggs) {
-            aggregateExprs_.add((FunctionCallExpr) substitutedAgg);
+            aggregateExprs.add((FunctionCallExpr) substitutedAgg);
         }
 
-        outputTupleSmap_.substituteLhs(smap, analyzer);
-        intermediateTupleSmap_.substituteLhs(smap, analyzer);
-        if (secondPhaseDistinctAggInfo_ != null) {
-            secondPhaseDistinctAggInfo_.substitute(smap, analyzer);
+        outputTupleSmap.substituteLhs(smap, analyzer);
+        intermediateTupleSmap.substituteLhs(smap, analyzer);
+        if (secondPhaseDistinctAggInfo != null) {
+            secondPhaseDistinctAggInfo.substitute(smap, analyzer);
         }
     }
 
@@ -441,8 +445,8 @@ public void substitute(ExprSubstitutionMap smap, Analyzer analyzer) {
      * createAggTupleDesc() must not be called on it.
      */
     private void createMergeAggInfo(Analyzer analyzer)  {
-        Preconditions.checkState(mergeAggInfo_ == null);
-        TupleDescriptor inputDesc = intermediateTupleDesc_;
+        Preconditions.checkState(mergeAggInfo == null);
+        TupleDescriptor inputDesc = intermediateTupleDesc;
         // construct grouping exprs
         ArrayList<Expr> groupingExprs = Lists.newArrayList();
         for (int i = 0; i < getGroupingExprs().size(); ++i) {
@@ -470,13 +474,13 @@ private void createMergeAggInfo(Analyzer analyzer)  {
         }
 
         AggPhase aggPhase =
-                (aggPhase_ == AggPhase.FIRST) ? AggPhase.FIRST_MERGE : AggPhase.SECOND_MERGE;
-        mergeAggInfo_ = new AggregateInfo(groupingExprs, aggExprs, aggPhase, isMultiDistinct_);
-        mergeAggInfo_.intermediateTupleDesc_ = intermediateTupleDesc_;
-        mergeAggInfo_.outputTupleDesc_ = outputTupleDesc_;
-        mergeAggInfo_.intermediateTupleSmap_ = intermediateTupleSmap_;
-        mergeAggInfo_.outputTupleSmap_ = outputTupleSmap_;
-        mergeAggInfo_.materializedSlots_ = materializedSlots_;
+                (this.aggPhase == AggPhase.FIRST) ? AggPhase.FIRST_MERGE : AggPhase.SECOND_MERGE;
+        mergeAggInfo = new AggregateInfo(groupingExprs, aggExprs, aggPhase, isMultiDistinct);
+        mergeAggInfo.intermediateTupleDesc = intermediateTupleDesc;
+        mergeAggInfo.outputTupleDesc = outputTupleDesc;
+        mergeAggInfo.intermediateTupleSmap = intermediateTupleSmap;
+        mergeAggInfo.outputTupleSmap = outputTupleSmap;
+        mergeAggInfo.materializedSlots = materializedSlots;
     }
 
     /**
@@ -528,11 +532,11 @@ private Expr createCountDistinctAggExprParam(int firstIdx, int lastIdx,
     private void createSecondPhaseAggInfo(
             ArrayList<Expr> origGroupingExprs,
             ArrayList<FunctionCallExpr> distinctAggExprs, Analyzer analyzer) throws AnalysisException {
-        Preconditions.checkState(secondPhaseDistinctAggInfo_ == null);
+        Preconditions.checkState(secondPhaseDistinctAggInfo == null);
         Preconditions.checkState(!distinctAggExprs.isEmpty());
 
         // The output of the 1st phase agg is the 1st phase intermediate.
-        TupleDescriptor inputDesc = intermediateTupleDesc_;
+        TupleDescriptor inputDesc = intermediateTupleDesc;
 
         // construct agg exprs for original DISTINCT aggregate functions
         // (these aren't part of this.aggExprs)
@@ -541,7 +545,7 @@ private void createSecondPhaseAggInfo(
         for (FunctionCallExpr inputExpr : distinctAggExprs) {
             Preconditions.checkState(inputExpr.isAggregateFunction());
             FunctionCallExpr aggExpr = null;
-            if (!isMultiDistinct_) {
+            if (!isMultiDistinct) {
                 if (inputExpr.getFnName().getFunction().equalsIgnoreCase(FunctionSet.COUNT)) {
                     // COUNT(DISTINCT ...) ->
                     // COUNT(IF(IsNull(<agg slot 1>), NULL, IF(IsNull(<agg slot 2>), NULL, ...)))
@@ -561,7 +565,9 @@ private void createSecondPhaseAggInfo(
                     // tuple reference is correct.
                     exprList.add(new SlotRef(inputDesc.getSlots().get(origGroupingExprs.size())));
                     // Check if user provided a custom separator
-                    if (inputExpr.getChildren().size() == 2) exprList.add(inputExpr.getChild(1));
+                    if (inputExpr.getChildren().size() == 2) {
+                        exprList.add(inputExpr.getChild(1));
+                    }
                     aggExpr = new FunctionCallExpr(inputExpr.getFnName(), exprList);
                 } else {
                     // SUM(DISTINCT <expr>) -> SUM(<last grouping slot>);
@@ -578,8 +584,8 @@ private void createSecondPhaseAggInfo(
         }
 
         // map all the remaining agg fns
-        for (int i = 0; i < aggregateExprs_.size(); ++i) {
-            FunctionCallExpr inputExpr = aggregateExprs_.get(i);
+        for (int i = 0; i < aggregateExprs.size(); ++i) {
+            FunctionCallExpr inputExpr = aggregateExprs.get(i);
             Preconditions.checkState(inputExpr.isAggregateFunction());
             // we're aggregating an output slot of the 1st agg phase
             Expr aggExprParam =
@@ -589,7 +595,7 @@ private void createSecondPhaseAggInfo(
             secondPhaseAggExprs.add(aggExpr);
         }
         Preconditions.checkState(
-                secondPhaseAggExprs.size() == aggregateExprs_.size() + distinctAggExprs.size());
+                secondPhaseAggExprs.size() == aggregateExprs.size() + distinctAggExprs.size());
 
         for (FunctionCallExpr aggExpr : secondPhaseAggExprs) {
             aggExpr.analyzeNoThrow(analyzer);
@@ -597,12 +603,12 @@ private void createSecondPhaseAggInfo(
         }
 
         ArrayList<Expr> substGroupingExprs =
-                Expr.substituteList(origGroupingExprs, intermediateTupleSmap_, analyzer, false);
-        secondPhaseDistinctAggInfo_ =
-                new AggregateInfo(substGroupingExprs, secondPhaseAggExprs, AggPhase.SECOND, isMultiDistinct_);
-        secondPhaseDistinctAggInfo_.createTupleDescs(analyzer);
-        secondPhaseDistinctAggInfo_.createSecondPhaseAggSMap(this, distinctAggExprs);
-        secondPhaseDistinctAggInfo_.createMergeAggInfo(analyzer);
+                Expr.substituteList(origGroupingExprs, intermediateTupleSmap, analyzer, false);
+        secondPhaseDistinctAggInfo =
+                new AggregateInfo(substGroupingExprs, secondPhaseAggExprs, AggPhase.SECOND, isMultiDistinct);
+        secondPhaseDistinctAggInfo.createTupleDescs(analyzer);
+        secondPhaseDistinctAggInfo.createSecondPhaseAggSMap(this, distinctAggExprs);
+        secondPhaseDistinctAggInfo.createMergeAggInfo(analyzer);
     }
 
     /**
@@ -611,12 +617,12 @@ private void createSecondPhaseAggInfo(
      */
     private void createSecondPhaseAggSMap(
             AggregateInfo inputAggInfo, ArrayList<FunctionCallExpr> distinctAggExprs) {
-        outputTupleSmap_.clear();
+        outputTupleSmap.clear();
         int slotIdx = 0;
-        ArrayList<SlotDescriptor> slotDescs = outputTupleDesc_.getSlots();
+        ArrayList<SlotDescriptor> slotDescs = outputTupleDesc.getSlots();
 
         int numDistinctParams = 0;
-        if (!isMultiDistinct_) {
+        if (!isMultiDistinct) {
             numDistinctParams = distinctAggExprs.get(0).getChildren().size();
             // If we are counting distinct params of group_concat, we cannot include the custom
             // separator since it is not a distinct param.
@@ -638,20 +644,20 @@ private void createSecondPhaseAggSMap(
         // original grouping exprs -> first m slots
         for (int i = 0; i < numOrigGroupingExprs; ++i, ++slotIdx) {
             Expr groupingExpr = inputAggInfo.getGroupingExprs().get(i);
-            outputTupleSmap_.put(
+            outputTupleSmap.put(
                     groupingExpr.clone(), new SlotRef(slotDescs.get(slotIdx)));
         }
 
         // distinct agg exprs -> next n slots
         for (int i = 0; i < distinctAggExprs.size(); ++i, ++slotIdx) {
             Expr aggExpr = distinctAggExprs.get(i);
-            outputTupleSmap_.put(aggExpr.clone(), (new SlotRef(slotDescs.get(slotIdx))));
+            outputTupleSmap.put(aggExpr.clone(), (new SlotRef(slotDescs.get(slotIdx))));
         }
 
         // remaining agg exprs -> remaining slots
         for (int i = 0; i < inputAggInfo.getAggregateExprs().size(); ++i, ++slotIdx) {
             Expr aggExpr = inputAggInfo.getAggregateExprs().get(i);
-            outputTupleSmap_.put(aggExpr.clone(), new SlotRef(slotDescs.get(slotIdx)));
+            outputTupleSmap.put(aggExpr.clone(), new SlotRef(slotDescs.get(slotIdx)));
         }
     }
 
@@ -662,40 +668,44 @@ private void createSecondPhaseAggSMap(
      * predicates between the grouping slots of the two tuples.
      */
     public void createSmaps(Analyzer analyzer) {
-        Preconditions.checkNotNull(outputTupleDesc_);
-        Preconditions.checkNotNull(intermediateTupleDesc_);
+        Preconditions.checkNotNull(outputTupleDesc);
+        Preconditions.checkNotNull(intermediateTupleDesc);
 
         List<Expr> exprs = Lists.newArrayListWithCapacity(
-                groupingExprs_.size() + aggregateExprs_.size());
-        exprs.addAll(groupingExprs_);
-        exprs.addAll(aggregateExprs_);
+                groupingExprs.size() + aggregateExprs.size());
+        exprs.addAll(groupingExprs);
+        exprs.addAll(aggregateExprs);
         for (int i = 0; i < exprs.size(); ++i) {
             Expr expr = exprs.get(i);
             if (expr.isImplicitCast()) {
-                outputTupleSmap_.put(expr.getChild(0).clone(),
-                        new SlotRef(outputTupleDesc_.getSlots().get(i)));
+                outputTupleSmap.put(expr.getChild(0).clone(),
+                        new SlotRef(outputTupleDesc.getSlots().get(i)));
             } else {
-                outputTupleSmap_.put(expr.clone(),
-                        new SlotRef(outputTupleDesc_.getSlots().get(i)));
+                outputTupleSmap.put(expr.clone(),
+                        new SlotRef(outputTupleDesc.getSlots().get(i)));
+            }
+            if (!requiresIntermediateTuple()) {
+                continue;
             }
-            if (!requiresIntermediateTuple()) continue;
-
-            intermediateTupleSmap_.put(expr.clone(),
-                    new SlotRef(intermediateTupleDesc_.getSlots().get(i)));
-            outputToIntermediateTupleSmap_.put(
-                    new SlotRef(outputTupleDesc_.getSlots().get(i)),
-                    new SlotRef(intermediateTupleDesc_.getSlots().get(i)));
-            if (i < groupingExprs_.size()) {
+
+            intermediateTupleSmap.put(expr.clone(),
+                    new SlotRef(intermediateTupleDesc.getSlots().get(i)));
+            outputToIntermediateTupleSmap.put(
+                    new SlotRef(outputTupleDesc.getSlots().get(i)),
+                    new SlotRef(intermediateTupleDesc.getSlots().get(i)));
+            if (i < groupingExprs.size()) {
                 analyzer.createAuxEquivPredicate(
-                        new SlotRef(outputTupleDesc_.getSlots().get(i)),
-                        new SlotRef(intermediateTupleDesc_.getSlots().get(i)));
+                        new SlotRef(outputTupleDesc.getSlots().get(i)),
+                        new SlotRef(intermediateTupleDesc.getSlots().get(i)));
             }
         }
-        if (!requiresIntermediateTuple()) intermediateTupleSmap_ = outputTupleSmap_;
+        if (!requiresIntermediateTuple()) {
+            intermediateTupleSmap = outputTupleSmap;
+        }
 
         if (LOG.isTraceEnabled()) {
-            LOG.trace("output smap=" + outputTupleSmap_.debugString());
-            LOG.trace("intermediate smap=" + intermediateTupleSmap_.debugString());
+            LOG.trace("output smap=" + outputTupleSmap.debugString());
+            LOG.trace("intermediate smap=" + intermediateTupleSmap.debugString());
         }
     }
 
@@ -712,7 +722,7 @@ public void createSmaps(Analyzer analyzer) {
      * - Currently only the sum function will involve this problem.
      */
     public void updateTypeOfAggregateExprs() {
-        for (FunctionCallExpr functionCallExpr : aggregateExprs_) {
+        for (FunctionCallExpr functionCallExpr : aggregateExprs) {
             if (!functionCallExpr.getFnName().getFunction().equalsIgnoreCase("sum")) {
                 continue;
             }
@@ -744,43 +754,45 @@ public void updateTypeOfAggregateExprs() {
      */
     @Override
     public void materializeRequiredSlots(Analyzer analyzer, ExprSubstitutionMap smap) {
-        for (int i = 0; i < groupingExprs_.size(); ++i) {
-            outputTupleDesc_.getSlots().get(i).setIsMaterialized(true);
-            intermediateTupleDesc_.getSlots().get(i).setIsMaterialized(true);
+        for (int i = 0; i < groupingExprs.size(); ++i) {
+            outputTupleDesc.getSlots().get(i).setIsMaterialized(true);
+            intermediateTupleDesc.getSlots().get(i).setIsMaterialized(true);
         }
 
         // collect input exprs: grouping exprs plus aggregate exprs that need to be
         // materialized
-        materializedSlots_.clear();
+        materializedSlots.clear();
         List<Expr> exprs = Lists.newArrayList();
-        exprs.addAll(groupingExprs_);
+        exprs.addAll(groupingExprs);
 
-        int aggregateExprsSize = aggregateExprs_.size();
-        int groupExprsSize = groupingExprs_.size();
+        int aggregateExprsSize = aggregateExprs.size();
+        int groupExprsSize = groupingExprs.size();
         boolean isDistinctAgg = isDistinctAgg();
         for (int i = 0; i < aggregateExprsSize; ++i) {
-            FunctionCallExpr functionCallExpr = aggregateExprs_.get(i);
+            FunctionCallExpr functionCallExpr = aggregateExprs.get(i);
             SlotDescriptor slotDesc =
-                    outputTupleDesc_.getSlots().get(groupExprsSize + i);
+                    outputTupleDesc.getSlots().get(groupExprsSize + i);
             SlotDescriptor intermediateSlotDesc =
-                    intermediateTupleDesc_.getSlots().get(groupExprsSize + i);
-            if (isDistinctAgg || isMultiDistinct_) {
+                    intermediateTupleDesc.getSlots().get(groupExprsSize + i);
+            if (isDistinctAgg || isMultiDistinct) {
                 slotDesc.setIsMaterialized(true);
                 intermediateSlotDesc.setIsMaterialized(true);
             }
 
-            if (!slotDesc.isMaterialized()) continue;
+            if (!slotDesc.isMaterialized()) {
+                continue;
+            }
 
             intermediateSlotDesc.setIsMaterialized(true);
             exprs.add(functionCallExpr);
-            materializedSlots_.add(i);
+            materializedSlots.add(i);
         }
 
         List<Expr> resolvedExprs = Expr.substituteList(exprs, smap, analyzer, false);
         analyzer.materializeSlots(resolvedExprs);
 
         if (isDistinctAgg()) {
-            secondPhaseDistinctAggInfo_.materializeRequiredSlots(analyzer, null);
+            secondPhaseDistinctAggInfo.materializeRequiredSlots(analyzer, null);
         }
     }
 
@@ -791,26 +803,26 @@ public void materializeRequiredSlots(Analyzer analyzer, ExprSubstitutionMap smap
      * because we could derive both hash and order-based partitions
      */
     public DataPartition getPartition() {
-        if (groupingExprs_.isEmpty()) {
+        if (groupingExprs.isEmpty()) {
             return DataPartition.UNPARTITIONED;
         } else {
-            return new DataPartition(TPartitionType.HASH_PARTITIONED, groupingExprs_);
+            return new DataPartition(TPartitionType.HASH_PARTITIONED, groupingExprs);
         }
     }
 
     public String debugString() {
         StringBuilder out = new StringBuilder(super.debugString());
         out.append(MoreObjects.toStringHelper(this)
-                .add("phase", aggPhase_)
-                .add("intermediate_smap", intermediateTupleSmap_.debugString())
-                .add("output_smap", outputTupleSmap_.debugString())
+                .add("phase", aggPhase)
+                .add("intermediate_smap", intermediateTupleSmap.debugString())
+                .add("output_smap", outputTupleSmap.debugString())
                 .toString());
-        if (mergeAggInfo_ != this && mergeAggInfo_ != null) {
-            out.append("\nmergeAggInfo:\n" + mergeAggInfo_.debugString());
+        if (mergeAggInfo != this && mergeAggInfo != null) {
+            out.append("\nmergeAggInfo:\n" + mergeAggInfo.debugString());
         }
-        if (secondPhaseDistinctAggInfo_ != null) {
+        if (secondPhaseDistinctAggInfo != null) {
             out.append("\nsecondPhaseDistinctAggInfo:\n"
-                    + secondPhaseDistinctAggInfo_.debugString());
+                    + secondPhaseDistinctAggInfo.debugString());
         }
         return out.toString();
     }
@@ -826,6 +838,6 @@ public AggregateInfo clone() {
     }
 
     public List<Expr> getInputPartitionExprs() {
-        return partitionExprs_ != null ? partitionExprs_ : groupingExprs_;
+        return partitionExprs != null ? partitionExprs : groupingExprs;
     }
 }
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 9961931b299def..7fa14b758d0e6b 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
@@ -43,12 +43,12 @@ public abstract class AggregateInfoBase {
 
     // For aggregations: All unique grouping expressions from a select block.
     // For analytics: Empty.
-    protected ArrayList<Expr> groupingExprs_;
+    protected ArrayList<Expr> groupingExprs;
 
     // For aggregations: All unique aggregate expressions from a select block.
     // For analytics: The results of AnalyticExpr.getFnCall() for the unique
     // AnalyticExprs of a select block.
-    protected ArrayList<FunctionCallExpr> aggregateExprs_;
+    protected ArrayList<FunctionCallExpr> aggregateExprs;
 
     // The tuple into which the intermediate output of an aggregation is materialized.
     // Contains groupingExprs.size() + aggregateExprs.size() slots, the first of which
@@ -57,28 +57,28 @@ public abstract class AggregateInfoBase {
     // of the aggregate functions' intermediate types.
     // Identical to outputTupleDesc_ if no aggregateExpr has an output type that is
     // different from its intermediate type.
-    protected TupleDescriptor intermediateTupleDesc_;
+    protected TupleDescriptor intermediateTupleDesc;
 
     // The tuple into which the final output of the aggregation is materialized.
     // Contains groupingExprs.size() + aggregateExprs.size() slots, the first of which
     // contain the values of the grouping exprs, followed by slots into which the
     // aggregateExprs' finalize() symbol write its result, i.e., slots of the aggregate
     // functions' output types.
-    protected TupleDescriptor outputTupleDesc_;
+    protected TupleDescriptor outputTupleDesc;
 
     // For aggregation: indices into aggregate exprs for that need to be materialized
     // For analytics: indices into the analytic exprs and their corresponding aggregate
     // exprs that need to be materialized.
     // Populated in materializeRequiredSlots() which must be implemented by subclasses.
-    protected ArrayList<Integer> materializedSlots_ = Lists.newArrayList();
+    protected ArrayList<Integer> materializedSlots = Lists.newArrayList();
 
     protected AggregateInfoBase(ArrayList<Expr> groupingExprs,
                                 ArrayList<FunctionCallExpr> aggExprs)  {
         Preconditions.checkState(groupingExprs != null || aggExprs != null);
-        groupingExprs_ =
+        this.groupingExprs =
                 groupingExprs != null ? Expr.cloneList(groupingExprs) : new ArrayList<Expr>();
         Preconditions.checkState(aggExprs != null || !(this instanceof AnalyticInfo));
-        aggregateExprs_ =
+        aggregateExprs =
                 aggExprs != null ? Expr.cloneList(aggExprs) : new ArrayList<FunctionCallExpr>();
     }
 
@@ -86,13 +86,13 @@ protected AggregateInfoBase(ArrayList<Expr> groupingExprs,
      * C'tor for cloning.
      */
     protected AggregateInfoBase(AggregateInfoBase other) {
-        groupingExprs_ =
-                (other.groupingExprs_ != null) ? Expr.cloneList(other.groupingExprs_) : null;
-        aggregateExprs_ =
-                (other.aggregateExprs_ != null) ? Expr.cloneList(other.aggregateExprs_) : null;
-        intermediateTupleDesc_ = other.intermediateTupleDesc_;
-        outputTupleDesc_ = other.outputTupleDesc_;
-        materializedSlots_ = Lists.newArrayList(other.materializedSlots_);
+        groupingExprs =
+                (other.groupingExprs != null) ? Expr.cloneList(other.groupingExprs) : null;
+        aggregateExprs =
+                (other.aggregateExprs != null) ? Expr.cloneList(other.aggregateExprs) : null;
+        intermediateTupleDesc = other.intermediateTupleDesc;
+        outputTupleDesc = other.outputTupleDesc;
+        materializedSlots = Lists.newArrayList(other.materializedSlots);
     }
 
     /**
@@ -103,11 +103,11 @@ protected AggregateInfoBase(AggregateInfoBase other) {
     protected void createTupleDescs(Analyzer analyzer) {
         // Create the intermediate tuple desc first, so that the tuple ids are increasing
         // from bottom to top in the plan tree.
-        intermediateTupleDesc_ = createTupleDesc(analyzer, false);
-        if (requiresIntermediateTuple(aggregateExprs_, groupingExprs_.size() == 0)) {
-            outputTupleDesc_ = createTupleDesc(analyzer, true);
+        intermediateTupleDesc = createTupleDesc(analyzer, false);
+        if (requiresIntermediateTuple(aggregateExprs, groupingExprs.size() == 0)) {
+            outputTupleDesc = createTupleDesc(analyzer, true);
         } else {
-            outputTupleDesc_ = intermediateTupleDesc_;
+            outputTupleDesc = intermediateTupleDesc;
         }
     }
 
@@ -122,15 +122,15 @@ private TupleDescriptor createTupleDesc(Analyzer analyzer, boolean isOutputTuple
                 analyzer.getDescTbl().createTupleDescriptor(
                         tupleDebugName() + (isOutputTuple ? "-out" : "-intermed"));
         List<Expr> exprs = Lists.newArrayListWithCapacity(
-                groupingExprs_.size() + aggregateExprs_.size());
-        exprs.addAll(groupingExprs_);
-        exprs.addAll(aggregateExprs_);
+                groupingExprs.size() + aggregateExprs.size());
+        exprs.addAll(groupingExprs);
+        exprs.addAll(aggregateExprs);
 
-        int aggregateExprStartIndex = groupingExprs_.size();
+        int aggregateExprStartIndex = groupingExprs.size();
         // if agg is grouping set, so we should set all groupingExpr unless last groupingExpr
         // must set be be nullable
-        boolean isGroupingSet = !groupingExprs_.isEmpty() &&
-                groupingExprs_.get(groupingExprs_.size() - 1) instanceof VirtualSlotRef;
+        boolean isGroupingSet = !groupingExprs.isEmpty() &&
+                groupingExprs.get(groupingExprs.size() - 1) instanceof VirtualSlotRef;
 
         for (int i = 0; i < exprs.size(); ++i) {
             Expr expr = exprs.get(i);
@@ -160,7 +160,7 @@ private TupleDescriptor createTupleDesc(Analyzer analyzer, boolean isOutputTuple
                 }
 
                 if (isOutputTuple && aggExpr.getFn().getNullableMode().equals(Function.NullableMode.DEPEND_ON_ARGUMENT) &&
-                        groupingExprs_.size() == 0) {
+                        groupingExprs.size() == 0) {
                     slotDesc.setIsNullable(true);
                 }
 
@@ -193,16 +193,16 @@ private TupleDescriptor createTupleDesc(Analyzer analyzer, boolean isOutputTuple
     public abstract void materializeRequiredSlots(Analyzer analyzer,
                                                   ExprSubstitutionMap smap);
 
-    public ArrayList<Expr> getGroupingExprs() { return groupingExprs_; }
-    public ArrayList<FunctionCallExpr> getAggregateExprs() { return aggregateExprs_; }
-    public TupleDescriptor getOutputTupleDesc() { return outputTupleDesc_; }
-    public TupleDescriptor getIntermediateTupleDesc() { return intermediateTupleDesc_; }
-    public TupleId getIntermediateTupleId() { return intermediateTupleDesc_.getId(); }
-    public TupleId getOutputTupleId() { return outputTupleDesc_.getId(); }
+    public ArrayList<Expr> getGroupingExprs() { return groupingExprs; }
+    public ArrayList<FunctionCallExpr> getAggregateExprs() { return aggregateExprs; }
+    public TupleDescriptor getOutputTupleDesc() { return outputTupleDesc; }
+    public TupleDescriptor getIntermediateTupleDesc() { return intermediateTupleDesc; }
+    public TupleId getIntermediateTupleId() { return intermediateTupleDesc.getId(); }
+    public TupleId getOutputTupleId() { return outputTupleDesc.getId(); }
     public boolean requiresIntermediateTuple() {
-        Preconditions.checkNotNull(intermediateTupleDesc_);
-        Preconditions.checkNotNull(outputTupleDesc_);
-        return intermediateTupleDesc_ != outputTupleDesc_;
+        Preconditions.checkNotNull(intermediateTupleDesc);
+        Preconditions.checkNotNull(outputTupleDesc);
+        return intermediateTupleDesc != outputTupleDesc;
     }
 
     /**
@@ -213,7 +213,9 @@ public boolean requiresIntermediateTuple() {
     public static <T extends Expr> boolean requiresIntermediateTuple(List<T> aggExprs) {
         for (Expr aggExpr: aggExprs) {
             Type intermediateType = ((AggregateFunction) aggExpr.fn).getIntermediateType();
-            if (intermediateType != null) return true;
+            if (intermediateType != null) {
+                return true;
+            }
         }
         return false;
     }
@@ -225,7 +227,9 @@ public static <T extends Expr> boolean requiresIntermediateTuple(List<T> aggExpr
     public static <T extends Expr> boolean requiresIntermediateTuple(List<T> aggExprs, boolean noGrouping) {
         for (Expr aggExpr: aggExprs) {
             Type intermediateType = ((AggregateFunction) aggExpr.fn).getIntermediateType();
-            if (intermediateType != null) return true;
+            if (intermediateType != null) {
+                return true;
+            }
             if (noGrouping && ((AggregateFunction) aggExpr.fn).getNullableMode().equals(Function.NullableMode.DEPEND_ON_ARGUMENT)) {
                 return true;
             }
@@ -236,12 +240,12 @@ public static <T extends Expr> boolean requiresIntermediateTuple(List<T> aggExpr
     public String debugString() {
         StringBuilder out = new StringBuilder();
         out.append(MoreObjects.toStringHelper(this)
-                .add("grouping_exprs", Expr.debugString(groupingExprs_))
-                .add("aggregate_exprs", Expr.debugString(aggregateExprs_))
-                .add("intermediate_tuple", (intermediateTupleDesc_ == null)
-                        ? "null" : intermediateTupleDesc_.debugString())
-                .add("output_tuple", (outputTupleDesc_ == null)
-                        ? "null" : outputTupleDesc_.debugString())
+                .add("grouping_exprs", Expr.debugString(groupingExprs))
+                .add("aggregate_exprs", Expr.debugString(aggregateExprs))
+                .add("intermediate_tuple", (intermediateTupleDesc == null)
+                        ? "null" : intermediateTupleDesc.debugString())
+                .add("output_tuple", (outputTupleDesc == null)
+                        ? "null" : outputTupleDesc.debugString())
                 .toString());
         return out.toString();
     }
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 5279ba2b1f37fc..bb3cf7730fc3a5 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
@@ -41,6 +41,7 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Representation of an analytic function call with OVER clause.
@@ -142,6 +143,11 @@ public AnalyticWindow getWindow() {
         return window;
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), fnCall, orderByElements, window);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (!super.equals(obj)) {
@@ -868,8 +874,9 @@ public String toDigestImpl() {
     }
 
     private String exprListToSql(List<? extends Expr> exprs) {
-        if (exprs == null || exprs.isEmpty())
+        if (exprs == null || exprs.isEmpty()) {
             return "";
+        }
         List<String> strings = Lists.newArrayList();
         for (Expr expr : exprs) {
             strings.add(expr.toSql());
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 4e84643917d1a9..0b3cf4f1bc6b7e 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
@@ -41,23 +41,23 @@ public final class AnalyticInfo extends AggregateInfoBase {
     // All unique analytic exprs of a select block. Used to populate
     // super.aggregateExprs_ based on AnalyticExpr.getFnCall() for each analytic expr
     // in this list.
-    private final ArrayList<Expr> analyticExprs_;
+    private final ArrayList<Expr> analyticExprs;
 
     // Intersection of the partition exps of all the analytic functions.
-    private final List<Expr> commonPartitionExprs_;
+    private final List<Expr> commonPartitionExprs;
 
     // map from analyticExprs_ to their corresponding analytic tuple slotrefs
-    private final ExprSubstitutionMap analyticTupleSmap_;
+    private final ExprSubstitutionMap analyticTupleSmap;
 
     private AnalyticInfo(ArrayList<Expr> analyticExprs) {
         super(new ArrayList<Expr>(), new ArrayList<FunctionCallExpr>());
-        analyticExprs_ = Expr.cloneList(analyticExprs);
+        this.analyticExprs = Expr.cloneList(analyticExprs);
         // Extract the analytic function calls for each analytic expr.
         for (Expr analyticExpr: analyticExprs) {
-            aggregateExprs_.add(((AnalyticExpr) analyticExpr).getFnCall());
+            aggregateExprs.add(((AnalyticExpr) analyticExpr).getFnCall());
         }
-        analyticTupleSmap_ = new ExprSubstitutionMap();
-        commonPartitionExprs_ = computeCommonPartitionExprs();
+        analyticTupleSmap = new ExprSubstitutionMap();
+        commonPartitionExprs = computeCommonPartitionExprs();
     }
 
     /**
@@ -65,15 +65,15 @@ private AnalyticInfo(ArrayList<Expr> analyticExprs) {
      */
     private AnalyticInfo(AnalyticInfo other) {
         super(other);
-        analyticExprs_ =
-                (other.analyticExprs_ != null) ? Expr.cloneList(other.analyticExprs_) : null;
-        analyticTupleSmap_ = other.analyticTupleSmap_.clone();
-        commonPartitionExprs_ = Expr.cloneList(other.commonPartitionExprs_);
+        analyticExprs =
+                (other.analyticExprs != null) ? Expr.cloneList(other.analyticExprs) : null;
+        analyticTupleSmap = other.analyticTupleSmap.clone();
+        commonPartitionExprs = Expr.cloneList(other.commonPartitionExprs);
     }
 
-    public ArrayList<Expr> getAnalyticExprs() { return analyticExprs_; }
-    public ExprSubstitutionMap getSmap() { return analyticTupleSmap_; }
-    public List<Expr> getCommonPartitionExprs() { return commonPartitionExprs_; }
+    public ArrayList<Expr> getAnalyticExprs() { return analyticExprs; }
+    public ExprSubstitutionMap getSmap() { return analyticTupleSmap; }
+    public List<Expr> getCommonPartitionExprs() { return commonPartitionExprs; }
 
     /**
      * Creates complete AnalyticInfo for analyticExprs, including tuple descriptors and
@@ -88,20 +88,20 @@ static public AnalyticInfo create(
 
         // The tuple descriptors are logical. Their slots are remapped to physical tuples
         // during plan generation.
-        result.outputTupleDesc_.setIsMaterialized(false);
-        result.intermediateTupleDesc_.setIsMaterialized(false);
+        result.outputTupleDesc.setIsMaterialized(false);
+        result.intermediateTupleDesc.setIsMaterialized(false);
 
         // Populate analyticTupleSmap_
-        Preconditions.checkState(analyticExprs.size() == result.outputTupleDesc_.getSlots().size());
+        Preconditions.checkState(analyticExprs.size() == result.outputTupleDesc.getSlots().size());
         for (int i = 0; i < analyticExprs.size(); ++i) {
-            result.analyticTupleSmap_.put(result.analyticExprs_.get(i),
-                    new SlotRef(result.outputTupleDesc_.getSlots().get(i)));
-            result.outputTupleDesc_.getSlots().get(i).setSourceExpr(result.analyticExprs_.get(i));
+            result.analyticTupleSmap.put(result.analyticExprs.get(i),
+                    new SlotRef(result.outputTupleDesc.getSlots().get(i)));
+            result.outputTupleDesc.getSlots().get(i).setSourceExpr(result.analyticExprs.get(i));
         }
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("analytictuple=" + result.outputTupleDesc_.debugString());
-            LOG.debug("analytictuplesmap=" + result.analyticTupleSmap_.debugString());
+            LOG.debug("analytictuple=" + result.outputTupleDesc.debugString());
+            LOG.debug("analytictuplesmap=" + result.analyticTupleSmap.debugString());
             LOG.debug("analytic info:\n" + result.debugString());
         }
         return result;
@@ -113,15 +113,19 @@ static public AnalyticInfo create(
      */
     private List<Expr> computeCommonPartitionExprs() {
         List<Expr> result = Lists.newArrayList();
-        for (Expr analyticExpr: analyticExprs_) {
+        for (Expr analyticExpr: analyticExprs) {
             Preconditions.checkState(analyticExpr.isAnalyzed());
             List<Expr> partitionExprs = ((AnalyticExpr) analyticExpr).getPartitionExprs();
-            if (partitionExprs == null) continue;
+            if (partitionExprs == null) {
+                continue;
+            }
             if (result.isEmpty()) {
                 result.addAll(partitionExprs);
             } else {
                 result.retainAll(partitionExprs);
-                if (result.isEmpty()) break;
+                if (result.isEmpty()) {
+                    break;
+                }
             }
         }
         return result;
@@ -129,14 +133,16 @@ private List<Expr> computeCommonPartitionExprs() {
 
     @Override
     public void materializeRequiredSlots(Analyzer analyzer, ExprSubstitutionMap smap) {
-        materializedSlots_.clear();
+        materializedSlots.clear();
         List<Expr> exprs = Lists.newArrayList();
-        for (int i = 0; i < analyticExprs_.size(); ++i) {
-            SlotDescriptor outputSlotDesc = outputTupleDesc_.getSlots().get(i);
-            if (!outputSlotDesc.isMaterialized()) continue;
-            intermediateTupleDesc_.getSlots().get(i).setIsMaterialized(true);
-            exprs.add(analyticExprs_.get(i));
-            materializedSlots_.add(i);
+        for (int i = 0; i < analyticExprs.size(); ++i) {
+            SlotDescriptor outputSlotDesc = outputTupleDesc.getSlots().get(i);
+            if (!outputSlotDesc.isMaterialized()) {
+                continue;
+            }
+            intermediateTupleDesc.getSlots().get(i).setIsMaterialized(true);
+            exprs.add(analyticExprs.get(i));
+            materializedSlots.add(i);
         }
         List<Expr> resolvedExprs = Expr.substituteList(exprs, smap, analyzer, false);
         analyzer.materializeSlots(resolvedExprs);
@@ -149,20 +155,22 @@ public void materializeRequiredSlots(Analyzer analyzer, ExprSubstitutionMap smap
      * analytic tuple.
      */
     public void checkConsistency() {
-        ArrayList<SlotDescriptor> slots = intermediateTupleDesc_.getSlots();
+        ArrayList<SlotDescriptor> slots = intermediateTupleDesc.getSlots();
 
         // Check materialized slots.
         int numMaterializedSlots = 0;
         for (SlotDescriptor slotDesc: slots) {
-            if (slotDesc.isMaterialized()) ++numMaterializedSlots;
+            if (slotDesc.isMaterialized()) {
+                ++numMaterializedSlots;
+            }
         }
         Preconditions.checkState(numMaterializedSlots ==
-                materializedSlots_.size());
+                materializedSlots.size());
 
         // Check that analytic expr return types match the slot descriptors.
         int slotIdx = 0;
-        for (int i = 0; i < analyticExprs_.size(); ++i) {
-            Expr analyticExpr = analyticExprs_.get(i);
+        for (int i = 0; i < analyticExprs.size(); ++i) {
+            Expr analyticExpr = analyticExprs.get(i);
             Type slotType = slots.get(slotIdx).getType();
             Preconditions.checkState(analyticExpr.getType().equals(slotType),
                     String.format("Analytic expr %s returns type %s but its analytic tuple " +
@@ -176,8 +184,8 @@ public void checkConsistency() {
     public String debugString() {
         StringBuilder out = new StringBuilder(super.debugString());
         out.append(MoreObjects.toStringHelper(this)
-                .add("analytic_exprs", Expr.debugString(analyticExprs_))
-                .add("smap", analyticTupleSmap_.debugString())
+                .add("analytic_exprs", Expr.debugString(analyticExprs))
+                .add("smap", analyticTupleSmap.debugString())
                 .toString());
         return out.toString();
     }
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 b148a45960aa9c..53265089b4be6c 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
@@ -29,6 +29,7 @@
 import com.google.common.base.Preconditions;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * Windowing clause of an analytic expr
@@ -44,15 +45,15 @@ enum Type {
         ROWS("ROWS"),
         RANGE("RANGE");
 
-        private final String description_;
+        private final String description;
 
         private Type(String d) {
-            description_ = d;
+            description = d;
         }
 
         @Override
         public String toString() {
-            return description_;
+            return description;
         }
         public TAnalyticWindowType toThrift() {
             return this == ROWS ? TAnalyticWindowType.ROWS : TAnalyticWindowType.RANGE;
@@ -190,6 +191,11 @@ public TAnalyticWindowBoundary toThrift(Type windowType) {
             return result;
         }
 
+        @Override
+        public int hashCode() {
+            return Objects.hash(type, expr);
+        }
+
         @Override
         public boolean equals(Object obj) {
             if (obj == null) {
@@ -229,80 +235,80 @@ public void analyze(Analyzer analyzer) throws AnalysisException {
         }
     }
 
-    private final Type type_;
-    private final Boundary leftBoundary_;
-    private Boundary rightBoundary_;  // may be null before analyze()
-    private String toSqlString_;  // cached after analysis
+    private final Type type;
+    private final Boundary leftBoundary;
+    private Boundary rightBoundary;  // may be null before analyze()
+    private String toSqlString;  // cached after analysis
 
     public Type getType() {
-        return type_;
+        return type;
     }
     public Boundary getLeftBoundary() {
-        return leftBoundary_;
+        return leftBoundary;
     }
     public Boundary getRightBoundary() {
-        return rightBoundary_;
+        return rightBoundary;
     }
     public Boundary setRightBoundary(Boundary b) {
-        return rightBoundary_ = b;
+        return rightBoundary = b;
     }
 
     public AnalyticWindow(Type type, Boundary b) {
-        type_ = type;
+        this.type = type;
         Preconditions.checkNotNull(b);
-        leftBoundary_ = b;
-        rightBoundary_ = null;
+        leftBoundary = b;
+        rightBoundary = null;
     }
 
     public AnalyticWindow(Type type, Boundary l, Boundary r) {
-        type_ = type;
+        this.type = type;
         Preconditions.checkNotNull(l);
-        leftBoundary_ = l;
+        leftBoundary = l;
         Preconditions.checkNotNull(r);
-        rightBoundary_ = r;
+        rightBoundary = r;
     }
 
     /**
      * Clone c'tor
      */
     private AnalyticWindow(AnalyticWindow other) {
-        type_ = other.type_;
-        Preconditions.checkNotNull(other.leftBoundary_);
-        leftBoundary_ = other.leftBoundary_.clone();
+        type = other.type;
+        Preconditions.checkNotNull(other.leftBoundary);
+        leftBoundary = other.leftBoundary.clone();
 
-        if (other.rightBoundary_ != null) {
-            rightBoundary_ = other.rightBoundary_.clone();
+        if (other.rightBoundary != null) {
+            rightBoundary = other.rightBoundary.clone();
         }
 
-        toSqlString_ = other.toSqlString_;  // safe to share
+        toSqlString = other.toSqlString;  // safe to share
     }
 
     public AnalyticWindow reverse() {
-        Boundary newRightBoundary = leftBoundary_.converse();
+        Boundary newRightBoundary = leftBoundary.converse();
         Boundary newLeftBoundary = null;
 
-        if (rightBoundary_ == null) {
-            newLeftBoundary = new Boundary(leftBoundary_.getType(), null);
+        if (rightBoundary == null) {
+            newLeftBoundary = new Boundary(leftBoundary.getType(), null);
         } else {
-            newLeftBoundary = rightBoundary_.converse();
+            newLeftBoundary = rightBoundary.converse();
         }
 
-        return new AnalyticWindow(type_, newLeftBoundary, newRightBoundary);
+        return new AnalyticWindow(type, newLeftBoundary, newRightBoundary);
     }
 
     public String toSql() {
-        if (toSqlString_ != null) {
-            return toSqlString_;
+        if (toSqlString != null) {
+            return toSqlString;
         }
 
         StringBuilder sb = new StringBuilder();
-        sb.append(type_.toString()).append(" ");
+        sb.append(type.toString()).append(" ");
 
-        if (rightBoundary_ == null) {
-            sb.append(leftBoundary_.toSql());
+        if (rightBoundary == null) {
+            sb.append(leftBoundary.toSql());
         } else {
-            sb.append("BETWEEN ").append(leftBoundary_.toSql()).append(" AND ");
-            sb.append(rightBoundary_.toSql());
+            sb.append("BETWEEN ").append(leftBoundary.toSql()).append(" AND ");
+            sb.append(rightBoundary.toSql());
         }
 
         return sb.toString();
@@ -310,13 +316,13 @@ public String toSql() {
 
     public String toDigest() {
         StringBuilder sb = new StringBuilder();
-        sb.append(type_.toString()).append(" ");
+        sb.append(type.toString()).append(" ");
 
-        if (rightBoundary_ == null) {
-            sb.append(leftBoundary_.toDigest());
+        if (rightBoundary == null) {
+            sb.append(leftBoundary.toDigest());
         } else {
-            sb.append("BETWEEN ").append(leftBoundary_.toDigest()).append(" AND ");
-            sb.append(rightBoundary_.toDigest());
+            sb.append("BETWEEN ").append(leftBoundary.toDigest()).append(" AND ");
+            sb.append(rightBoundary.toDigest());
         }
 
         return sb.toString();
@@ -324,21 +330,26 @@ public String toDigest() {
 
 
     public TAnalyticWindow toThrift() {
-        TAnalyticWindow result = new TAnalyticWindow(type_.toThrift());
+        TAnalyticWindow result = new TAnalyticWindow(type.toThrift());
 
-        if (leftBoundary_.getType() != BoundaryType.UNBOUNDED_PRECEDING) {
-            result.setWindowStart(leftBoundary_.toThrift(type_));
+        if (leftBoundary.getType() != BoundaryType.UNBOUNDED_PRECEDING) {
+            result.setWindowStart(leftBoundary.toThrift(type));
         }
 
-        Preconditions.checkNotNull(rightBoundary_);
+        Preconditions.checkNotNull(rightBoundary);
 
-        if (rightBoundary_.getType() != BoundaryType.UNBOUNDED_FOLLOWING) {
-            result.setWindowEnd(rightBoundary_.toThrift(type_));
+        if (rightBoundary.getType() != BoundaryType.UNBOUNDED_FOLLOWING) {
+            result.setWindowEnd(rightBoundary.toThrift(type));
         }
 
         return result;
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(type, leftBoundary, rightBoundary);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == null) {
@@ -351,14 +362,14 @@ public boolean equals(Object obj) {
 
         AnalyticWindow o = (AnalyticWindow)obj;
         boolean rightBoundaryEqual =
-            (rightBoundary_ == null) == (o.rightBoundary_ == null);
+            (rightBoundary == null) == (o.rightBoundary == null);
 
-        if (rightBoundaryEqual && rightBoundary_ != null) {
-            rightBoundaryEqual = rightBoundary_.equals(o.rightBoundary_);
+        if (rightBoundaryEqual && rightBoundary != null) {
+            rightBoundaryEqual = rightBoundary.equals(o.rightBoundary);
         }
 
-        return type_ == o.type_
-               && leftBoundary_.equals(o.leftBoundary_)
+        return type == o.type
+               && leftBoundary.equals(o.leftBoundary)
                && rightBoundaryEqual;
     }
 
@@ -393,7 +404,7 @@ private void checkOffsetExpr(Analyzer analyzer, Boundary boundary)
             }
         }
 
-        if (type_ == Type.ROWS) {
+        if (type == Type.ROWS) {
             if (!e.isConstant() || !e.getType().isFixedPointType() || !isPos) {
                 throw new AnalysisException(
                         "For ROWS window, the value of a PRECEDING/FOLLOWING offset must be a "
@@ -445,84 +456,84 @@ private void checkOffsetBoundaries(Analyzer analyzer, Boundary b1, Boundary b2)
     }
 
     public void analyze(Analyzer analyzer) throws AnalysisException {
-        leftBoundary_.analyze(analyzer);
+        leftBoundary.analyze(analyzer);
 
-        if (rightBoundary_ != null) {
-            rightBoundary_.analyze(analyzer);
+        if (rightBoundary != null) {
+            rightBoundary.analyze(analyzer);
         }
 
-        if (leftBoundary_.getType() == BoundaryType.UNBOUNDED_FOLLOWING) {
+        if (leftBoundary.getType() == BoundaryType.UNBOUNDED_FOLLOWING) {
             throw new AnalysisException(
-                    leftBoundary_.getType().toString() + " is only allowed for upper bound of "
+                    leftBoundary.getType().toString() + " is only allowed for upper bound of "
                     + "BETWEEN");
         }
 
-        if (rightBoundary_ != null
-                && rightBoundary_.getType() == BoundaryType.UNBOUNDED_PRECEDING) {
+        if (rightBoundary != null
+                && rightBoundary.getType() == BoundaryType.UNBOUNDED_PRECEDING) {
             throw new AnalysisException(
-                    rightBoundary_.getType().toString() + " is only allowed for lower bound of "
+                    rightBoundary.getType().toString() + " is only allowed for lower bound of "
                     + "BETWEEN");
         }
 
         // TODO: Remove when RANGE windows with offset boundaries are supported.
-        if (type_ == Type.RANGE) {
-            if (leftBoundary_.type.isOffset()
-                    || (rightBoundary_ != null && rightBoundary_.type.isOffset())
-                    || (leftBoundary_.type == BoundaryType.CURRENT_ROW
-                            && (rightBoundary_ == null
-                                    || rightBoundary_.type == BoundaryType.CURRENT_ROW))) {
+        if (type == Type.RANGE) {
+            if (leftBoundary.type.isOffset()
+                    || (rightBoundary != null && rightBoundary.type.isOffset())
+                    || (leftBoundary.type == BoundaryType.CURRENT_ROW
+                            && (rightBoundary == null
+                                    || rightBoundary.type == BoundaryType.CURRENT_ROW))) {
                 throw new AnalysisException(
                         "RANGE is only supported with both the lower and upper bounds UNBOUNDED or"
                         + " one UNBOUNDED and the other CURRENT ROW.");
             }
         }
 
-        if (rightBoundary_ == null && leftBoundary_.getType() == BoundaryType.FOLLOWING) {
+        if (rightBoundary == null && leftBoundary.getType() == BoundaryType.FOLLOWING) {
             throw new AnalysisException(
-                    leftBoundary_.getType().toString() + " requires a BETWEEN clause");
+                    leftBoundary.getType().toString() + " requires a BETWEEN clause");
         }
 
-        if (leftBoundary_.getType().isOffset()) {
-            checkOffsetExpr(analyzer, leftBoundary_);
+        if (leftBoundary.getType().isOffset()) {
+            checkOffsetExpr(analyzer, leftBoundary);
         }
 
-        if (rightBoundary_ == null) {
+        if (rightBoundary == null) {
             // set right boundary to implied value, but make sure to cache toSql string
             // beforehand
-            toSqlString_ = toSql();
-            rightBoundary_ = new Boundary(BoundaryType.CURRENT_ROW, null);
+            toSqlString = toSql();
+            rightBoundary = new Boundary(BoundaryType.CURRENT_ROW, null);
             return;
         }
 
-        if (rightBoundary_.getType().isOffset()) {
-            checkOffsetExpr(analyzer, rightBoundary_);
+        if (rightBoundary.getType().isOffset()) {
+            checkOffsetExpr(analyzer, rightBoundary);
         }
 
-        if (leftBoundary_.getType() == BoundaryType.FOLLOWING) {
-            if (rightBoundary_.getType() != BoundaryType.FOLLOWING
-                    && rightBoundary_.getType() != BoundaryType.UNBOUNDED_FOLLOWING) {
+        if (leftBoundary.getType() == BoundaryType.FOLLOWING) {
+            if (rightBoundary.getType() != BoundaryType.FOLLOWING
+                    && rightBoundary.getType() != BoundaryType.UNBOUNDED_FOLLOWING) {
                 throw new AnalysisException(
                         "A lower window bound of " + BoundaryType.FOLLOWING.toString()
                         + " requires that the upper bound also be "
                         + BoundaryType.FOLLOWING.toString());
             }
 
-            if (rightBoundary_.getType() != BoundaryType.UNBOUNDED_FOLLOWING) {
-                checkOffsetBoundaries(analyzer, leftBoundary_, rightBoundary_);
+            if (rightBoundary.getType() != BoundaryType.UNBOUNDED_FOLLOWING) {
+                checkOffsetBoundaries(analyzer, leftBoundary, rightBoundary);
             }
         }
 
-        if (rightBoundary_.getType() == BoundaryType.PRECEDING) {
-            if (leftBoundary_.getType() != BoundaryType.PRECEDING
-                    && leftBoundary_.getType() != BoundaryType.UNBOUNDED_PRECEDING) {
+        if (rightBoundary.getType() == BoundaryType.PRECEDING) {
+            if (leftBoundary.getType() != BoundaryType.PRECEDING
+                    && leftBoundary.getType() != BoundaryType.UNBOUNDED_PRECEDING) {
                 throw new AnalysisException(
                         "An upper window bound of " + BoundaryType.PRECEDING.toString()
                         + " requires that the lower bound also be "
                         + BoundaryType.PRECEDING.toString());
             }
 
-            if (leftBoundary_.getType() != BoundaryType.UNBOUNDED_PRECEDING) {
-                checkOffsetBoundaries(analyzer, rightBoundary_, leftBoundary_);
+            if (leftBoundary.getType() != BoundaryType.UNBOUNDED_PRECEDING) {
+                checkOffsetBoundaries(analyzer, rightBoundary, leftBoundary);
             }
         }
     }
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 a47e8a9b5e9b9d..0232f1178ff660 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
@@ -102,7 +102,7 @@ public class Analyzer {
     // NOTE: Alias of table is case sensitive
     // UniqueAlias used to check whether the table ref or the alias is unique
     // table/view used db.table, inline use alias
-    private final Set<String> uniqueTableAliasSet_ = Sets.newHashSet();
+    private final Set<String> uniqueTableAliasSet = Sets.newHashSet();
     private final Multimap<String, TupleDescriptor> tupleByAlias = ArrayListMultimap.create();
 
     // NOTE: Alias of column is case ignorance
@@ -135,7 +135,7 @@ public class Analyzer {
     private String schemaTable; // table used in DESCRIBE Table
 
     // True if the corresponding select block has a limit and/or offset clause.
-    private boolean hasLimitOffsetClause_ = false;
+    private boolean hasLimitOffsetClause = false;
 
     // Current depth of nested analyze() calls. Used for enforcing a
     // maximum expr-tree depth. Needs to be manually maintained by the user
@@ -146,7 +146,7 @@ public class Analyzer {
     private boolean isSubquery = false;
 
     // Flag indicating whether this analyzer belongs to a WITH clause view.
-    private boolean isWithClause_ = false;
+    private boolean isWithClause = false;
 
     // By default, all registered semi-joined tuples are invisible, i.e., their slots
     // cannot be referenced. If set, this semi-joined tuple is made visible. Such a tuple
@@ -154,7 +154,7 @@ public class Analyzer {
     // In particular, if there are multiple semi-joins in the same query block, then the
     // On-clause of any such semi-join is not allowed to reference other semi-joined tuples
     // except its own. Therefore, only a single semi-joined tuple can be visible at a time.
-    private TupleId visibleSemiJoinedTupleId_ = null;
+    private TupleId visibleSemiJoinedTupleId = null;
     // for some situation that udf is not allowed.
     private boolean isUDFAllowed = true;
     // timezone specified for some operation, such as broker load
@@ -169,8 +169,8 @@ public void setIsSubquery() {
     }
     public boolean setHasPlanHints() { return globalState.hasPlanHints = true; }
     public boolean hasPlanHints() { return globalState.hasPlanHints; }
-    public void setIsWithClause() { isWithClause_ = true; }
-    public boolean isWithClause() { return isWithClause_; }
+    public void setIsWithClause() { isWithClause = true; }
+    public boolean isWithClause() { return isWithClause; }
 
     public void setUDFAllowed(boolean val) { this.isUDFAllowed = val; }
     public boolean isUDFAllowed() { return this.isUDFAllowed; }
@@ -294,7 +294,7 @@ private static class GlobalState {
         public final Map<SlotId, Analyzer> blockBySlot = Maps.newHashMap();
 
         // Expr rewriter for normalizing and rewriting expressions.
-        private final ExprRewriter exprRewriter_;
+        private final ExprRewriter exprRewriter;
 
         private final ExprRewriter mvExprRewriter;
 
@@ -322,7 +322,7 @@ public GlobalState(Catalog catalog, ConnectContext context) {
             List<ExprRewriteRule> onceRules = Lists.newArrayList();
             onceRules.add(ExtractCommonFactorsRule.INSTANCE);
             onceRules.add(InferFiltersRule.INSTANCE);
-            exprRewriter_ = new ExprRewriter(rules, onceRules);
+            exprRewriter = new ExprRewriter(rules, onceRules);
             // init mv rewriter
             List<ExprRewriteRule> mvRewriteRules = Lists.newArrayList();
             mvRewriteRules.add(ToBitmapToSlotRefRule.INSTANCE);
@@ -362,29 +362,29 @@ public GlobalState(Catalog catalog, ConnectContext context) {
     private final ArrayList<Analyzer> ancestors;
 
     // map from lowercase table alias to a view definition in this analyzer's scope
-    private final Map<String, View> localViews_ = Maps.newHashMap();
+    private final Map<String, View> localViews = Maps.newHashMap();
 
     // Map from lowercase table alias to descriptor. Tables without an explicit alias
     // are assigned two implicit aliases: the unqualified and fully-qualified table name.
     // Such tables have two entries pointing to the same descriptor. If an alias is
     // ambiguous, then this map retains the first entry with that alias to simplify error
     // checking (duplicate vs. ambiguous alias).
-    private final Map<String, TupleDescriptor> aliasMap_ = Maps.newHashMap();
+    private final Map<String, TupleDescriptor> aliasMap = Maps.newHashMap();
 
     // Map from tuple id to its corresponding table ref.
-    private final Map<TupleId, TableRef> tableRefMap_ = Maps.newHashMap();
+    private final Map<TupleId, TableRef> tableRefMap = Maps.newHashMap();
 
     // Set of lowercase ambiguous implicit table aliases.
-    private final Set<String> ambiguousAliases_ = Sets.newHashSet();
+    private final Set<String> ambiguousAliases = Sets.newHashSet();
 
     // Indicates whether this analyzer/block is guaranteed to have an empty result set
     // due to a limit 0 or constant conjunct evaluating to false.
-    private boolean hasEmptyResultSet_ = false;
+    private boolean hasEmptyResultSet = false;
 
     // Indicates whether the select-project-join (spj) portion of this query block
     // is guaranteed to return an empty result set. Set due to a constant non-Having
     // conjunct evaluating to false.
-    private boolean hasEmptySpjResultSet_ = false;
+    private boolean hasEmptySpjResultSet = false;
 
     public Analyzer(Catalog catalog, ConnectContext context) {
         ancestors = Lists.newArrayList();
@@ -454,7 +454,7 @@ public void registerLocalView(View view) throws AnalysisException {
                         "labels must be smaller or equal to the number of returned columns.");
             }
         }
-        if (localViews_.put(view.getName(), view) != null) {
+        if (localViews.put(view.getName(), view) != null) {
             throw new AnalysisException(
                     String.format("Duplicate table alias: '%s'", view.getName()));
         }
@@ -498,10 +498,10 @@ public void substitute(ExprSubstitutionMap sMap) {
      */
     public TupleDescriptor registerTableRef(TableRef ref) throws AnalysisException {
         String uniqueAlias = ref.getUniqueAlias();
-        if (uniqueTableAliasSet_.contains(uniqueAlias)) {
+        if (uniqueTableAliasSet.contains(uniqueAlias)) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_NONUNIQ_TABLE, uniqueAlias);
         }
-        uniqueTableAliasSet_.add(uniqueAlias);
+        uniqueTableAliasSet.add(uniqueAlias);
 
         // If ref has no explicit alias, then the unqualified and the fully-qualified table
         // names are legal implicit aliases. Column references against unqualified implicit
@@ -510,12 +510,12 @@ public TupleDescriptor registerTableRef(TableRef ref) throws AnalysisException {
         String[] aliases = ref.getAliases();
         if (aliases.length > 1) {
             unqualifiedAlias = aliases[1];
-            TupleDescriptor tupleDesc = aliasMap_.get(unqualifiedAlias);
+            TupleDescriptor tupleDesc = aliasMap.get(unqualifiedAlias);
             if (tupleDesc != null) {
                 if (tupleDesc.hasExplicitAlias()) {
                     ErrorReport.reportAnalysisException(ErrorCode.ERR_NONUNIQ_TABLE, uniqueAlias);
                 } else {
-                    ambiguousAliases_.add(unqualifiedAlias);
+                    ambiguousAliases.add(unqualifiedAlias);
                 }
             }
         }
@@ -532,7 +532,7 @@ public TupleDescriptor registerTableRef(TableRef ref) throws AnalysisException {
             tupleByAlias.put(alias, result);
         }
 
-        tableRefMap_.put(result.getId(), ref);
+        tableRefMap.put(result.getId(), ref);
 
         return result;
     }
@@ -553,11 +553,11 @@ public TupleDescriptor registerOlapTable(Table table, TableName tableName, List<
             slot.setIsMaterialized(true);
             slot.setColumn(col);
             slot.setIsNullable(col.isAllowNull());
-            String key = tableRef.aliases_[0] + "." + col.getName();
+            String key = tableRef.aliases[0] + "." + col.getName();
             slotRefMap.put(key, slot);
         }
         globalState.descTbl.computeStatAndMemLayout();
-        tableRefMap_.put(result.getId(), ref);
+        tableRefMap.put(result.getId(), ref);
         for (String alias : tableRef.getAliases()) {
             tupleByAlias.put(alias, result);
         }
@@ -565,7 +565,7 @@ public TupleDescriptor registerOlapTable(Table table, TableName tableName, List<
     }
 
     public List<TupleId> getAllTupleIds() {
-        return new ArrayList<>(tableRefMap_.keySet());
+        return new ArrayList<>(tableRefMap.keySet());
     }
 
     /**
@@ -581,7 +581,9 @@ public List<TupleId> getAllTupleIds() {
      */
     public TableRef resolveTableRef(TableRef tableRef) throws AnalysisException {
         // Return the table if it is already resolved.
-        if (tableRef.isResolved()) return tableRef;
+        if (tableRef.isResolved()) {
+            return tableRef;
+        }
         // Try to find a matching local view.
         TableName tableName = tableRef.getName();
         if (!tableName.isFullyQualified()) {
@@ -590,8 +592,10 @@ public TableRef resolveTableRef(TableRef tableRef) throws AnalysisException {
             String viewAlias = tableName.getTbl();
             Analyzer analyzer = this;
             do {
-                View localView = analyzer.localViews_.get(viewAlias);
-                if (localView != null) return new InlineViewRef(localView, tableRef);
+                View localView = analyzer.localViews.get(viewAlias);
+                if (localView != null) {
+                    return new InlineViewRef(localView, tableRef);
+                }
                 analyzer = (analyzer.ancestors.isEmpty() ? null : analyzer.ancestors.get(0));
             } while (analyzer != null);
         }
@@ -647,7 +651,7 @@ public Table getTableOrAnalysisException(TableName tblName) throws AnalysisExcep
     }
 
     public ExprRewriter getExprRewriter() {
-        return globalState.exprRewriter_;
+        return globalState.exprRewriter;
     }
 
     public ExprRewriter getMVExprRewriter() {
@@ -853,7 +857,9 @@ public void registerFullOuterJoinedConjunct(Expr e) {
         List<TupleId> tids = Lists.newArrayList();
         e.getIds(tids, null);
         for (TupleId tid: tids) {
-            if (!globalState.fullOuterJoinedTupleIds.containsKey(tid)) continue;
+            if (!globalState.fullOuterJoinedTupleIds.containsKey(tid)) {
+                continue;
+            }
             TableRef currentOuterJoin = globalState.fullOuterJoinedTupleIds.get(tid);
             globalState.fullOuterJoinedConjuncts.put(e.getId(), currentOuterJoin);
             break;
@@ -1170,7 +1176,9 @@ public void setAssignedConjuncts(Set<ExprId> assigned) {
     public List<Expr> getUnassignedConjuncts(List<TupleId> tupleIds) {
         List<Expr> result = Lists.newArrayList();
         for (Expr e : getUnassignedConjuncts(tupleIds, true)) {
-            if (canEvalPredicate(tupleIds, e)) result.add(e);
+            if (canEvalPredicate(tupleIds, e)) {
+                result.add(e);
+            }
         }
         return result;
     }
@@ -1280,7 +1288,9 @@ public List<Expr> getUnassignedOjConjuncts(TableRef ref) {
     public boolean evalAfterJoin(Expr e) {
         List<TupleId> tids = Lists.newArrayList();
         e.getIds(tids, null);
-        if (tids.isEmpty()) return false;
+        if (tids.isEmpty()) {
+            return false;
+        }
         if (tids.size() > 1 || isOjConjunct(e) || isFullOuterJoined(e)
                 || (isOuterJoined(tids.get(0))
                 && (!e.isOnClauseConjunct() || isIjConjunct(e)))
@@ -1337,7 +1347,9 @@ public boolean isAntiJoinedConjunct(Expr e) {
 
     public TableRef getAntiJoinRef(Expr e) {
         TableRef tblRef = globalState.sjClauseByConjunct.get(e.getId());
-        if (tblRef == null) return null;
+        if (tblRef == null) {
+            return null;
+        }
         return (tblRef.getJoinOp().isAntiJoin()) ? tblRef : null;
     }
 
@@ -1354,12 +1366,14 @@ public boolean isFullOuterJoined(SlotId sid) {
     }
 
     public boolean isVisible(TupleId tid) {
-        return tid == visibleSemiJoinedTupleId_ || !isSemiJoined(tid);
+        return tid == visibleSemiJoinedTupleId || !isSemiJoined(tid);
     }
 
     public boolean containsOuterJoinedTid(List<TupleId> tids) {
         for (TupleId tid: tids) {
-            if (isOuterJoined(tid)) return true;
+            if (isOuterJoined(tid)) {
+                return true;
+            }
         }
         return false;
     }
@@ -1373,7 +1387,7 @@ public Catalog getCatalog() {
     }
 
     public Set<String> getAliases() {
-        return uniqueTableAliasSet_;
+        return uniqueTableAliasSet;
     }
 
     public List<Expr> getAllConjuncts(TupleId id) {
@@ -1455,8 +1469,8 @@ public Set<Expr> getOnIsNullDeDuplication() {
     public void setVisibleSemiJoinedTuple(TupleId tid) {
         Preconditions.checkState(tid == null
                 || globalState.semiJoinedTupleIds.containsKey(tid));
-        Preconditions.checkState(tid == null || visibleSemiJoinedTupleId_ == null);
-        visibleSemiJoinedTupleId_ = tid;
+        Preconditions.checkState(tid == null || visibleSemiJoinedTupleId == null);
+        visibleSemiJoinedTupleId = tid;
     }
 
     /**
@@ -1475,13 +1489,13 @@ public Analyzer getParentAnalyzer() {
      * to return an empty result set, e.g., due to a limit 0 or a constant predicate
      * that evaluates to false.
      */
-    public boolean hasEmptyResultSet() { return hasEmptyResultSet_; }
-    public void setHasEmptyResultSet() { hasEmptyResultSet_ = true; }
+    public boolean hasEmptyResultSet() { return hasEmptyResultSet; }
+    public void setHasEmptyResultSet() { hasEmptyResultSet = true; }
 
-    public boolean hasEmptySpjResultSet() { return hasEmptySpjResultSet_; }
+    public boolean hasEmptySpjResultSet() { return hasEmptySpjResultSet; }
 
     public void setHasLimitOffsetClause(boolean hasLimitOffset) {
-        this.hasLimitOffsetClause_ = hasLimitOffset;
+        this.hasLimitOffsetClause = hasLimitOffset;
     }
 
     /**
@@ -1530,9 +1544,11 @@ public void registerOnClauseConjuncts(List<Expr> conjuncts, TableRef rhsRef)
      */
     private void markConstantConjunct(Expr conjunct, boolean fromHavingClause)
             throws AnalysisException {
-        if (!conjunct.isConstant() || isOjConjunct(conjunct)) return;
-        if ((!fromHavingClause && !hasEmptySpjResultSet_)
-                || (fromHavingClause && !hasEmptyResultSet_)) {
+        if (!conjunct.isConstant() || isOjConjunct(conjunct)) {
+            return;
+        }
+        if ((!fromHavingClause && !hasEmptySpjResultSet)
+                || (fromHavingClause && !hasEmptyResultSet)) {
             try {
                 if (conjunct instanceof BetweenPredicate) {
                     // Rewrite the BetweenPredicate into a CompoundPredicate so we can evaluate it
@@ -1549,18 +1565,18 @@ private void markConstantConjunct(Expr conjunct, boolean fromHavingClause)
                     final BoolLiteral value = (BoolLiteral) newConjunct;
                     if (!value.getValue()) {
                         if (fromHavingClause) {
-                            hasEmptyResultSet_ = true;
+                            hasEmptyResultSet = true;
                         } else {
-                            hasEmptySpjResultSet_ = true;
+                            hasEmptySpjResultSet = true;
                         }
                     }
                     markConjunctAssigned(conjunct);
                 }
                 if (newConjunct instanceof NullLiteral) {
                     if (fromHavingClause) {
-                        hasEmptyResultSet_ = true;
+                        hasEmptyResultSet = true;
                     } else {
-                        hasEmptySpjResultSet_ = true;
+                        hasEmptySpjResultSet = true;
                     }
                     markConjunctAssigned(conjunct);
                 }
@@ -1600,7 +1616,9 @@ public TableRef getOjRef(Expr e) {
      */
     public boolean canEvalOuterJoinedConjunct(Expr e, List<TupleId> tids) {
         TableRef outerJoin = getOjRef(e);
-        if (outerJoin == null) return true;
+        if (outerJoin == null) {
+            return true;
+        }
         return tids.containsAll(outerJoin.getAllTableRefIds());
     }
 
@@ -1618,9 +1636,13 @@ public List<Expr> getEqJoinConjuncts(List<TupleId> lhsTblRefIds,
         List<ExprId> conjunctIds = Lists.newArrayList();
         for (TupleId rhsId: rhsTblRefIds) {
             List<ExprId> cids = globalState.eqJoinConjuncts.get(rhsId);
-            if (cids == null) continue;
+            if (cids == null) {
+                continue;
+            }
             for (ExprId eid: cids) {
-                if (!conjunctIds.contains(eid)) conjunctIds.add(eid);
+                if (!conjunctIds.contains(eid)) {
+                    conjunctIds.add(eid);
+                }
             }
         }
 
@@ -1645,7 +1667,9 @@ public List<Expr> getEqJoinConjuncts(List<TupleId> lhsTblRefIds,
                 continue;
             }
 
-            if (ojClauseConjuncts != null && !ojClauseConjuncts.contains(conjunctId)) continue;
+            if (ojClauseConjuncts != null && !ojClauseConjuncts.contains(conjunctId)) {
+                continue;
+            }
             result.add(e);
         }
         return result;
@@ -1799,7 +1823,9 @@ public Type castAllToCompatibleType(List<Expr> exprs) throws AnalysisException {
      */
     public void castToSetOpsCompatibleTypes(List<List<Expr>> exprLists)
             throws AnalysisException {
-        if (exprLists == null || exprLists.size() < 2) return;
+        if (exprLists == null || exprLists.size() < 2) {
+            return;
+        }
 
         // Determine compatible types for exprs, position by position.
         List<Expr> firstList = exprLists.get(0);
@@ -1982,9 +2008,13 @@ public boolean canEvalPredicate(List<TupleId> tupleIds, Expr e) {
 
         if (e.isOnClauseConjunct()) {
 
-            if (isAntiJoinedConjunct(e)) return canEvalAntiJoinedConjunct(e, tupleIds);
+            if (isAntiJoinedConjunct(e)) {
+                return canEvalAntiJoinedConjunct(e, tupleIds);
+            }
             if (isIjConjunct(e) || isSjConjunct(e)) {
-                if (!containsOuterJoinedTid(tids)) return true;
+                if (!containsOuterJoinedTid(tids)) {
+                    return true;
+                }
                 // If the predicate references an outer-joined tuple, then evaluate it at
                 // the join that the On-clause belongs to.
                 TableRef onClauseTableRef = null;
@@ -1997,11 +2027,15 @@ public boolean canEvalPredicate(List<TupleId> tupleIds, Expr e) {
                 return tupleIds.containsAll(onClauseTableRef.getAllTableRefIds());
             }
 
-            if (isFullOuterJoined(e)) return canEvalFullOuterJoinedConjunct(e, tupleIds);
+            if (isFullOuterJoined(e)) {
+                return canEvalFullOuterJoinedConjunct(e, tupleIds);
+            }
             if (isOjConjunct(e)) {
                 // Force this predicate to be evaluated by the corresponding outer join node.
                 // The join node will pick up the predicate later via getUnassignedOjConjuncts().
-                if (tids.size() > 1) return false;
+                if (tids.size() > 1) {
+                    return false;
+                }
                 // Optimization for single-tid predicates: Legal to assign below the outer join
                 // if the predicate is from the same On-clause that makes tid nullable
                 // (otherwise e needn't be true when that tuple is set).
@@ -2031,7 +2065,9 @@ public boolean canEvalPredicate(List<TupleId> tupleIds, Expr e) {
      */
     public boolean canEvalAntiJoinedConjunct(Expr e, List<TupleId> nodeTupleIds) {
         TableRef antiJoinRef = getAntiJoinRef(e);
-        if (antiJoinRef == null) return true;
+        if (antiJoinRef == null) {
+            return true;
+        }
         List<TupleId> tids = Lists.newArrayList();
         e.getIds(tids, null);
         if (tids.size() > 1) {
@@ -2049,7 +2085,9 @@ public boolean canEvalAntiJoinedConjunct(Expr e, List<TupleId> nodeTupleIds) {
      */
     public boolean canEvalFullOuterJoinedConjunct(Expr e, List<TupleId> tids) {
         TableRef fullOuterJoin = getFullOuterJoinRef(e);
-        if (fullOuterJoin == null) return true;
+        if (fullOuterJoin == null) {
+            return true;
+        }
         return tids.containsAll(fullOuterJoin.getAllTableRefIds());
     }
 
@@ -2100,7 +2138,7 @@ public void materializeSlots(List<Expr> exprs) {
         }
     }
 
-    public Map<String, View> getLocalViews() { return localViews_; }
+    public Map<String, View> getLocalViews() { return localViews; }
 
     public boolean isOuterJoined(TupleId tid) {
         return globalState.outerJoinedTupleIds.containsKey(tid);
@@ -2187,7 +2225,9 @@ public List<SlotId> getValueTransferTargets(SlotId srcSid) {
     public boolean hasOuterJoinedValueTransferTarget(List<SlotId> sids) {
         for (SlotId srcSid : sids) {
             for (SlotId dstSid : getValueTransferTargets(srcSid)) {
-                if (isOuterJoined(getTupleId(dstSid))) return true;
+                if (isOuterJoined(getTupleId(dstSid))) {
+                    return true;
+                }
             }
         }
         return false;
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 361d8c4cf6670b..bd1ac2d0b7e702 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
@@ -361,6 +361,7 @@ public void analyzeImpl(Analyzer analyzer) throws AnalysisException {
                     if (isConstant()) {
                         castUpperInteger(t1, t2);
                     }
+                    break;
                 case MOD:
                     if (t1.isDecimalV2() || t2.isDecimalV2()) {
                         castBinaryOp(findCommonType(t1, t2));
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 09269f37f82a84..39f722a92a5222 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
@@ -37,8 +37,10 @@ public BaseTableRef(TableRef ref, Table table, TableName tableName) {
         this.table = table;
         this.name = tableName;
         // Set implicit aliases if no explicit one was given.
-        if (hasExplicitAlias()) return;
-        aliases_ = new String[] { name.toString(), tableName.getNoClusterString(), tableName.getTbl() };
+        if (hasExplicitAlias()) {
+            return;
+        }
+        aliases = new String[] { name.toString(), tableName.getNoClusterString(), tableName.getTbl() };
     }
 
     protected BaseTableRef(BaseTableRef other) {
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 d3787c26bbc86c..5dc2e4c5a9fb01 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
@@ -110,6 +110,21 @@ public String toDigestImpl() {
     @Override
     public Expr clone(ExprSubstitutionMap sMap) { return new BetweenPredicate(this); }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        BetweenPredicate that = (BetweenPredicate) o;
+        return isNotBetween == that.isNotBetween;
+    }
+
     @Override
     public int hashCode() {
         return 31 * super.hashCode() + Boolean.hashCode(isNotBetween);
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 cc1c4cc29c9e38..271c8d22603146 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
@@ -52,7 +52,7 @@ public class BinaryPredicate extends Predicate implements Writable {
     private final static Logger LOG = LogManager.getLogger(BinaryPredicate.class);
 
     // true if this BinaryPredicate is inferred from slot equivalences, false otherwise.
-    private boolean isInferred_ = false;
+    private boolean isInferred = false;
 
     public enum Operator {
         EQ("=", "eq", TExprOpcode.EQ),
@@ -104,8 +104,9 @@ public Operator commutative() {
                     return LE;
                 case EQ_FOR_NULL:
                     return this;
+                default:
+                    return null;
             }
-            return null;
         }
 
         public Operator converse() {
@@ -163,15 +164,17 @@ protected BinaryPredicate(BinaryPredicate other) {
         super(other);
         op = other.op;
         slotIsleft= other.slotIsleft;
-        isInferred_ = other.isInferred_;
+        isInferred = other.isInferred;
     }
 
-    public boolean isInferred() { return isInferred_; }
-    public void setIsInferred() { isInferred_ = true; }
+    public boolean isInferred() { return isInferred; }
+    public void setIsInferred() { isInferred = true; }
 
     public static void initBuiltins(FunctionSet functionSet) {
         for (Type t: Type.getSupportedTypes()) {
-            if (t.isNull()) continue; // NULL is handled through type promotion.
+            if (t.isNull()) {
+                continue; // NULL is handled through type promotion.
+            }
             functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
                     Operator.EQ.getName(), Lists.newArrayList(t, t), Type.BOOLEAN));
             functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltinOperator(
@@ -455,7 +458,9 @@ public Expr getSlotBinding(SlotId id) {
      * casts, returns those two slots; otherwise returns null.
      */
     public static Pair<SlotId, SlotId> getEqSlots(Expr e) {
-        if (!(e instanceof BinaryPredicate)) return null;
+        if (!(e instanceof BinaryPredicate)) {
+            return null;
+        }
         return ((BinaryPredicate) e).getEqSlots();
     }
 
@@ -465,11 +470,17 @@ public static Pair<SlotId, SlotId> getEqSlots(Expr e) {
      */
     @Override
     public Pair<SlotId, SlotId> getEqSlots() {
-        if (op != Operator.EQ) return null;
+        if (op != Operator.EQ) {
+            return null;
+        }
         SlotRef lhs = getChild(0).unwrapSlotRef(true);
-        if (lhs == null) return null;
+        if (lhs == null) {
+            return null;
+        }
         SlotRef rhs = getChild(1).unwrapSlotRef(true);
-        if (rhs == null) return null;
+        if (rhs == null) {
+            return null;
+        }
         return new Pair<SlotId, SlotId>(lhs.getSlotId(), rhs.getSlotId());
     }
 
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 4a6ef66c0face8..e434668286ae9f 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
@@ -152,4 +152,19 @@ public static BoolLiteral read(DataInput in) throws IOException {
     public int hashCode() {
         return 31 * super.hashCode() + Boolean.hashCode(value);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        BoolLiteral that = (BoolLiteral) o;
+        return value == that.value;
+    }
 }
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 bef35e2b066138..ff66fb29e4078f 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
@@ -34,7 +34,7 @@
  * Internal representation of a builtin aggregate function.
  */
 public class BuiltinAggregateFunction extends Function {
-    private final Operator                          op_;
+    private final Operator op;
     // this is to judge the analytic function
     private boolean isAnalyticFn = false;
 
@@ -42,7 +42,7 @@ public boolean isAnalyticFn() {
         return isAnalyticFn;
     }
     // TODO: this is not used yet until the planner understand this.
-    private org.apache.doris.catalog.Type intermediateType_;
+    private org.apache.doris.catalog.Type intermediateType;
     private boolean reqIntermediateTuple = false;
 
     public boolean isReqIntermediateTuple() {
@@ -58,8 +58,8 @@ public BuiltinAggregateFunction(Operator op, ArrayList<Type> argTypes,
         Preconditions.checkState(op != null);
         // may be no need to analyze
         // intermediateType.analyze();
-        op_ = op;
-        intermediateType_ = intermediateType;
+        this.op = op;
+        this.intermediateType = intermediateType;
         if (isAnalyticFn && !intermediateType.equals(retType)) {
             reqIntermediateTuple = true;
         }
@@ -71,25 +71,25 @@ public BuiltinAggregateFunction(Operator op, ArrayList<Type> argTypes,
     public TFunction toThrift() {
         TFunction fn = super.toThrift();
         // TODO: for now, just put the op_ enum as the id.
-        if (op_ == BuiltinAggregateFunction.Operator.FIRST_VALUE_REWRITE) {
+        if (op == BuiltinAggregateFunction.Operator.FIRST_VALUE_REWRITE) {
             fn.setId(0);
         } else {
-            fn.setId(op_.thriftOp.ordinal());
+            fn.setId(op.thriftOp.ordinal());
         }
-        fn.setAggregateFn(new TAggregateFunction(intermediateType_.toThrift()));
+        fn.setAggregateFn(new TAggregateFunction(intermediateType.toThrift()));
         return fn;
     }
 
     public Operator op() {
-        return op_;
+        return op;
     }
 
     public org.apache.doris.catalog.Type getIntermediateType() {
-        return intermediateType_;
+        return intermediateType;
     }
 
     public void setIntermediateType(org.apache.doris.catalog.Type t) {
-        intermediateType_ = t;
+        intermediateType = t;
     }
 
     // TODO: this is effectively a catalog of builtin aggregate functions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CaseExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CaseExpr.java
index 8a41e91d35f2ca..e74dab7b182949 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CaseExpr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CaseExpr.java
@@ -32,6 +32,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * CASE and DECODE are represented using this class. The backend implementation is
@@ -98,6 +99,11 @@ public Expr clone() {
         return new CaseExpr(this);
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), hasCaseExpr, hasElseExpr);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (!super.equals(obj)) {
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 cca6217816ff0d..d2e9691bf2a04c 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
@@ -313,6 +313,11 @@ public void analyzeImpl(Analyzer analyzer) throws AnalysisException {
         analyze();
     }
 
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (!super.equals(obj)) {
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 29e3aed56da863..86a818ff8e159f 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
@@ -280,6 +280,7 @@ public static void validateDefaultValue(Type type, String defaultValue) throws A
                 if (floatLiteral.getType().equals(Type.DOUBLE)) {
                     throw new AnalysisException("Default value will loose precision: " + defaultValue);
                 }
+                break;
             case DOUBLE:
                 FloatLiteral doubleLiteral = new FloatLiteral(defaultValue);
                 break;
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 8b454ce533c6e4..87b0dfd8830521 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
@@ -145,6 +145,8 @@ public void analyzeImpl(Analyzer analyzer) throws AnalysisException {
             case NOT:
                 selectivity = 1.0 - getChild(0).selectivity;
                 break;
+            default:
+                throw new AnalysisException("not support operator: " + op);
         }
         selectivity = Math.max(0.0, Math.min(1.0, selectivity));
         if (LOG.isDebugEnabled()) {
@@ -180,7 +182,9 @@ public TExprOpcode toThrift() {
      */
     @Override
     public Expr negate() {
-        if (op == Operator.NOT) return getChild(0);
+        if (op == Operator.NOT) {
+            return getChild(0);
+        }
         Expr negatedLeft = getChild(0).negate();
         Expr negatedRight = getChild(1).negate();
         Operator newOp = (op == Operator.OR) ? Operator.AND : Operator.OR;
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 09dd6b1f8dda19..75fcb05f2a117d 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
@@ -428,8 +428,8 @@ public void castToDate() {
     private long makePackedDatetime() {
         long ymd = ((year * 13 + month) << 5) | day;
         long hms = (hour << 12) | (minute << 6) | second;
-        long packed_datetime = ((ymd << 17) | hms) << 24 + microsecond;
-        return packed_datetime;
+        long packedDatetime = ((ymd << 17) | hms) << 24 + microsecond;
+        return packedDatetime;
     }
 
     @Override
@@ -446,9 +446,9 @@ public void write(DataOutput out) throws IOException {
         out.writeLong(makePackedDatetime());
     }
 
-    private void fromPackedDatetime(long packed_time) {
-        microsecond = (packed_time % (1L << 24));
-        long ymdhms = (packed_time >> 24);
+    private void fromPackedDatetime(long packedTime) {
+        microsecond = (packedTime % (1L << 24));
+        long ymdhms = (packedTime >> 24);
         long ymd = ymdhms >> 17;
         long hms = ymdhms % (1 << 17);
 
@@ -467,11 +467,11 @@ private void fromPackedDatetime(long packed_time) {
 
     public void readFields(DataInput in) throws IOException {
         super.readFields(in);
-        short date_literal_type = in.readShort();
+        short dateLiteralType = in.readShort();
         fromPackedDatetime(in.readLong());
-        if (date_literal_type == DateLiteralType.DATETIME.value()) {
+        if (dateLiteralType == DateLiteralType.DATETIME.value()) {
             this.type = Type.DATETIME;
-        } else if (date_literal_type == DateLiteralType.DATE.value()) {
+        } else if (dateLiteralType == DateLiteralType.DATE.value()) {
             this.type = Type.DATE;
         } else {
             throw new IOException("Error date literal type : " + type);
@@ -815,8 +815,7 @@ public int fromDateFormatStr(String format, String value, boolean hasSubVal) thr
                     case 'I':
                     case 'l':
                         usaTime = true;
-                        // Fall through
-                    case 'k':
+                    case 'k': // CHECKSTYLE IGNORE THIS LINE: Fall through
                     case 'H':
                         tmp = findNumber(value, vp, 2);
                         intValue = strToLong(value.substring(vp, tmp));
@@ -1024,12 +1023,12 @@ public int fromDateFormatStr(String format, String value, boolean hasSubVal) thr
             }
             long days = calcDaynr(strictWeekNumber ? strictWeekNumberYear : this.year, 1, 1);
 
-            long weekday_b = calcWeekday(days, sundayFirst);
+            long weekdayB = calcWeekday(days, sundayFirst);
 
             if (sundayFirst) {
-                days += ((weekday_b == 0) ? 0 : 7) - weekday_b + (weekNum - 1) * 7 + weekday % 7;
+                days += ((weekdayB == 0) ? 0 : 7) - weekdayB + (weekNum - 1) * 7 + weekday % 7;
             } else {
-                days += ((weekday_b <= 3) ? 0 : 7) - weekday_b + (weekNum - 1) * 7 + weekday - 1;
+                days += ((weekdayB <= 3) ? 0 : 7) - weekdayB + (weekNum - 1) * 7 + weekday - 1;
             }
             getDateFromDaynr(days);
         }
@@ -1194,12 +1193,12 @@ public void fromDateStr(String dateStr) throws AnalysisException {
         int fieldLen = yearLen;
         while (pre < dateStr.length() && Character.isDigit(dateStr.charAt(pre)) && fieldIdx < MAX_DATE_PARTS - 1) {
             int start = pre;
-            int temp_val = 0;
+            int tempVal = 0;
             boolean scanToDelim = (!isIntervalFormat) && (fieldIdx != 6);
             while (pre < dateStr.length() && Character.isDigit(dateStr.charAt(pre)) && (scanToDelim || fieldLen-- != 0)) {
-                temp_val = temp_val * 10 + (dateStr.charAt(pre++) - '0');
+                tempVal = tempVal * 10 + (dateStr.charAt(pre++) - '0');
             }
-            dateVal[fieldIdx] = temp_val;
+            dateVal[fieldIdx] = tempVal;
             dateLen[fieldIdx] = pre - start;
             fieldLen = 2;
 
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 148c93fb915e03..e2f933291f9a0a 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,27 +47,27 @@ public class DescriptorTable {
     // 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 IdGenerator<TupleId> tupleIdGenerator_ = TupleId.createGenerator();
-    private final IdGenerator<SlotId> slotIdGenerator_ = SlotId.createGenerator();
+    private final IdGenerator<TupleId> tupleIdGenerator = TupleId.createGenerator();
+    private final IdGenerator<SlotId> slotIdGenerator = SlotId.createGenerator();
     private final HashMap<SlotId, SlotDescriptor> slotDescs = Maps.newHashMap();
 
     public DescriptorTable() {
     }
 
     public TupleDescriptor createTupleDescriptor() {
-        TupleDescriptor d = new TupleDescriptor(tupleIdGenerator_.getNextId());
+        TupleDescriptor d = new TupleDescriptor(tupleIdGenerator.getNextId());
         tupleDescs.put(d.getId(), d);
         return d;
     }
 
     public TupleDescriptor createTupleDescriptor(String debugName) {
-        TupleDescriptor d = new TupleDescriptor(tupleIdGenerator_.getNextId(), debugName);
+        TupleDescriptor d = new TupleDescriptor(tupleIdGenerator.getNextId(), debugName);
         tupleDescs.put(d.getId(), d);
         return d;
     }
 
     public SlotDescriptor addSlotDescriptor(TupleDescriptor d) {
-        SlotDescriptor result = new SlotDescriptor(slotIdGenerator_.getNextId(), d);
+        SlotDescriptor result = new SlotDescriptor(slotIdGenerator.getNextId(), d);
         d.addSlot(result);
         slotDescs.put(result.getId(), result);
         return result;
@@ -78,7 +78,7 @@ public SlotDescriptor addSlotDescriptor(TupleDescriptor d) {
      * computed.
      */
     public TupleDescriptor copyTupleDescriptor(TupleId srcId, String debugName) {
-        TupleDescriptor d = new TupleDescriptor(tupleIdGenerator_.getNextId(), debugName);
+        TupleDescriptor d = new TupleDescriptor(tupleIdGenerator.getNextId(), debugName);
         tupleDescs.put(d.getId(), d);
         // create copies of slots
         TupleDescriptor src = tupleDescs.get(srcId);
@@ -93,7 +93,7 @@ public TupleDescriptor copyTupleDescriptor(TupleId srcId, String debugName) {
      * Append copy of src to dest.
      */
     public SlotDescriptor copySlotDescriptor(TupleDescriptor dest, SlotDescriptor src) {
-        SlotDescriptor result = new SlotDescriptor(slotIdGenerator_.getNextId(), dest, src);
+        SlotDescriptor result = new SlotDescriptor(slotIdGenerator.getNextId(), dest, src);
         dest.addSlot(result);
         slotDescs.put(result.getId(), result);
         return result;
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 c125e742fccec2..82130639657979 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
@@ -240,7 +240,7 @@ public boolean apply(Expr arg) {
 
     protected Type type;  // result of analysis
 
-    protected boolean isOnClauseConjunct_; // set by analyzer
+    protected boolean isOnClauseConjunct; // set by analyzer
 
     protected boolean isAnalyzed = false;  // true after analyze() has been called
 
@@ -267,7 +267,7 @@ public boolean apply(Expr arg) {
     protected Function fn;
 
     // Cached value of IsConstant(), set during analyze() and valid if isAnalyzed_ is true.
-    private boolean isConstant_;
+    private boolean isConstant;
 
     // Flag to indicate whether to wrap this expr's toSql() in parenthesis. Set by parser.
     // Needed for properly capturing expr precedences in the SQL string.
@@ -292,7 +292,7 @@ protected Expr(Expr other) {
         numDistinctValues = other.numDistinctValues;
         opcode = other.opcode;
         outputScale = other.outputScale;
-        isConstant_ = other.isConstant_;
+        isConstant = other.isConstant;
         fn = other.fn;
         printSqlInParens = other.printSqlInParens;
         children = Expr.cloneList(other.children);
@@ -357,8 +357,8 @@ public void setIsFilter(boolean v) {
         isFilter = v;
     }
 
-    public boolean isOnClauseConjunct() { return isOnClauseConjunct_; }
-    public void setIsOnClauseConjunct(boolean b) { isOnClauseConjunct_ = b; }
+    public boolean isOnClauseConjunct() { return isOnClauseConjunct; }
+    public void setIsOnClauseConjunct(boolean b) { isOnClauseConjunct = b; }
     public boolean isAuxExpr() { return isAuxExpr; }
     public void setIsAuxExpr() { isAuxExpr = true; }
     public Function getFn() {
@@ -378,7 +378,9 @@ public void setPrintSqlInParens(boolean b) {
      * Throws exception if any errors found.
      */
     public final void analyze(Analyzer analyzer) throws AnalysisException {
-        if (isAnalyzed()) return;
+        if (isAnalyzed()) {
+            return;
+        }
 
         // Check the expr child limit.
         if (children.size() > Config.expr_children_limit) {
@@ -401,7 +403,9 @@ public final void analyze(Analyzer analyzer) throws AnalysisException {
         for (Expr child: children) {
             child.analyze(analyzer);
         }
-        if (analyzer != null) analyzer.decrementCallDepth();
+        if (analyzer != null) {
+            analyzer.decrementCallDepth();
+        }
         computeNumDistinctValues();
 
         // Do all the analysis for the expr subclass before marking the Expr analyzed.
@@ -424,7 +428,7 @@ protected void analysisDone() {
         Preconditions.checkState(!isAnalyzed);
         // We need to compute the const-ness as the last step, since analysis may change
         // the result, e.g. by resolving function.
-        isConstant_ = isConstantImpl();
+        isConstant = isConstantImpl();
         isAnalyzed = true;
     }
 
@@ -691,10 +695,14 @@ public Expr trySubstitute(ExprSubstitutionMap smap, Analyzer analyzer,
                               boolean preserveRootType) throws AnalysisException {
         Expr result = clone();
         // Return clone to avoid removing casts.
-        if (smap == null) return result;
+        if (smap == null) {
+            return result;
+        }
         result = result.substituteImpl(smap, analyzer);
         result.analyze(analyzer);
-        if (preserveRootType && !type.equals(result.getType())) result = result.castTo(type);
+        if (preserveRootType && !type.equals(result.getType())) {
+            result = result.castTo(type);
+        }
         return result;
     }
 
@@ -751,10 +759,14 @@ public static ArrayList<Expr> substituteList(
      */
     protected Expr substituteImpl(ExprSubstitutionMap smap, Analyzer analyzer)
             throws AnalysisException {
-        if (isImplicitCast()) return getChild(0).substituteImpl(smap, analyzer);
+        if (isImplicitCast()) {
+            return getChild(0).substituteImpl(smap, analyzer);
+        }
         if (smap != null) {
             Expr substExpr = smap.get(this);
-            if (substExpr != null) return substExpr.clone();
+            if (substExpr != null) {
+                return substExpr.clone();
+            }
         }
         for (int i = 0; i < children.size(); ++i) {
             children.set(i, children.get(i).substituteImpl(smap, analyzer));
@@ -762,7 +774,9 @@ protected Expr substituteImpl(ExprSubstitutionMap smap, Analyzer analyzer)
         // SlotRefs must remain analyzed to support substitution across query blocks. All
         // other exprs must be analyzed again after the substitution to add implicit casts
         // and for resolving their correct function signature.
-        if (!(this instanceof SlotRef)) resetAnalysisState();
+        if (!(this instanceof SlotRef)) {
+            resetAnalysisState();
+        }
         return this;
     }
 
@@ -824,7 +838,9 @@ public void markAgg() {
      * the exprs have an invalid number of distinct values.
      */
     public static long getNumDistinctValues(List<Expr> exprs) {
-      if (exprs == null || exprs.isEmpty()) return 0;
+      if (exprs == null || exprs.isEmpty()) {
+          return 0;
+      }
       long numDistinctValues = 1;
       for (Expr expr: exprs) {
         if (expr.getNumDistinctValues() == -1) {
@@ -1012,7 +1028,9 @@ public String debugString() {
      * Resets the internal analysis state of this expr tree. Removes implicit casts.
      */
     public Expr reset() {
-      if (isImplicitCast()) return getChild(0).reset();
+      if (isImplicitCast()) {
+          return getChild(0).reset();
+      }
       for (int i = 0; i < children.size(); ++i) {
         children.set(i, children.get(i).reset());
       }
@@ -1172,7 +1190,9 @@ public boolean isBound(TupleId tid) {
      */
     public boolean isBoundByTupleIds(List<TupleId> tids) {
         for (Expr child: children) {
-            if (!child.isBoundByTupleIds(tids)) return false;
+            if (!child.isBoundByTupleIds(tids)) {
+                return false;
+            }
         }
         return true;
     }
@@ -1241,7 +1261,9 @@ public boolean isLiteral() {
      * FunctionCallExpr.isConstant()).
      */
     public final boolean isConstant() {
-        if (isAnalyzed) return isConstant_;
+        if (isAnalyzed) {
+            return isConstant;
+        }
         return isConstantImpl();
     }
 
@@ -1250,7 +1272,9 @@ public final boolean isConstant() {
      */
     protected boolean isConstantImpl() {
         for (Expr expr : children) {
-            if (!expr.isConstant()) return false;
+            if (!expr.isConstant()) {
+                return false;
+            }
         }
         return true;
     }
@@ -1518,7 +1542,9 @@ public SlotRef unwrapSlotRef() {
      */
     public SlotRef unwrapSlotRef(boolean implicitOnly) {
         Expr unwrappedExpr = unwrapExpr(implicitOnly);
-        if (unwrappedExpr instanceof SlotRef) return (SlotRef) unwrappedExpr;
+        if (unwrappedExpr instanceof SlotRef) {
+            return (SlotRef) unwrappedExpr;
+        }
         return null;
     }
 
@@ -1870,7 +1896,9 @@ public String getStringValue() {
 
     public static Expr getFirstBoundChild(Expr expr, List<TupleId> tids) {
         for (Expr child: expr.getChildren()) {
-            if (child.isBoundByTupleIds(tids)) return child;
+            if (child.isBoundByTupleIds(tids)) {
+                return child;
+            }
         }
         return null;
     }
@@ -1879,10 +1907,16 @@ public static Expr getFirstBoundChild(Expr expr, List<TupleId> tids) {
      * Returns true if expr contains specify function, otherwise false.
      */
     public boolean isContainsFunction(String functionName) {
-        if (fn == null) return false;
-        if (fn.functionName().equalsIgnoreCase(functionName))  return true;
+        if (fn == null) {
+            return false;
+        }
+        if (fn.functionName().equalsIgnoreCase(functionName))  {
+            return true;
+        }
         for (Expr child: children) {
-            if (child.isContainsFunction(functionName)) return true;
+            if (child.isContainsFunction(functionName)) {
+                return true;
+            }
         }
         return false;
     }
@@ -1891,16 +1925,22 @@ public boolean isContainsFunction(String functionName) {
      * Returns true if expr contains specify className, otherwise false.
      */
     public boolean isContainsClass(String className) {
-        if (this.getClass().getName().equalsIgnoreCase(className)) return true;
+        if (this.getClass().getName().equalsIgnoreCase(className)) {
+            return true;
+        }
         for (Expr child: children) {
-            if (child.isContainsClass(className)) return true;
+            if (child.isContainsClass(className)) {
+                return true;
+            }
         }
         return false;
     }
 
     protected boolean hasNullableChild() {
         for (Expr expr : children) {
-            if (expr.isNullable()) return true;
+            if (expr.isNullable()) {
+                return true;
+            }
         }
         return false;
     }
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 dc8af2cd53c50c..8507fd26a52b88 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
@@ -37,9 +37,9 @@ public ExprId(int id) {
     public static IdGenerator<ExprId> createGenerator() {
         return new IdGenerator<ExprId>() {
             @Override
-            public ExprId getNextId() { return new ExprId(nextId_++); }
+            public ExprId getNextId() { return new ExprId(nextId++); }
             @Override
-            public ExprId getMaxId() { return new ExprId(nextId_ - 1); }
+            public ExprId getMaxId() { return new ExprId(nextId - 1); }
         };
     }
 }
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 20eccffb4f0012..b7d44fe501a324 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
@@ -39,9 +39,9 @@
 public final class ExprSubstitutionMap {
     private final static Logger LOG = LoggerFactory.getLogger(ExprSubstitutionMap.class);
 
-    private boolean checkAnalyzed_ = true;
-    private List<Expr> lhs_; // left-hand side
-    private List<Expr> rhs_; // right-hand side
+    private boolean checkAnalyzed = true;
+    private List<Expr> lhs; // left-hand side
+    private List<Expr> rhs; // right-hand side
 
     public ExprSubstitutionMap() {
         this(Lists.<Expr>newArrayList(), Lists.<Expr>newArrayList());
@@ -50,12 +50,12 @@ public ExprSubstitutionMap() {
     // Only used to convert show statement to select statement
     public ExprSubstitutionMap(boolean checkAnalyzed) {
         this(Lists.<Expr>newArrayList(), Lists.<Expr>newArrayList());
-        this.checkAnalyzed_ = checkAnalyzed;
+        this.checkAnalyzed = checkAnalyzed;
     }
 
     public ExprSubstitutionMap(List<Expr> lhs, List<Expr> rhs) {
-        lhs_ = lhs;
-        rhs_ = rhs;
+        this.lhs = lhs;
+        this.rhs = rhs;
     }
 
     /**
@@ -63,18 +63,20 @@ public ExprSubstitutionMap(List<Expr> lhs, List<Expr> rhs) {
      * across query blocks. It is not required that the lhsExpr is analyzed.
      */
     public void put(Expr lhsExpr, Expr rhsExpr) {
-        Preconditions.checkState(!checkAnalyzed_ || rhsExpr.isAnalyzed(),
+        Preconditions.checkState(!checkAnalyzed || rhsExpr.isAnalyzed(),
                 "Rhs expr must be analyzed.");
-        lhs_.add(lhsExpr);
-        rhs_.add(rhsExpr);
+        lhs.add(lhsExpr);
+        rhs.add(rhsExpr);
     }
 
     /**
      * Returns the expr mapped to lhsExpr or null if no mapping to lhsExpr exists.
      */
     public Expr get(Expr lhsExpr) {
-        for (int i = 0; i < lhs_.size(); ++i) {
-            if (lhsExpr.equals(lhs_.get(i))) return rhs_.get(i);
+        for (int i = 0; i < lhs.size(); ++i) {
+            if (lhsExpr.equals(lhs.get(i))) {
+                return rhs.get(i);
+            }
         }
         return null;
     }
@@ -83,7 +85,7 @@ public Expr get(Expr lhsExpr) {
      * Returns true if the smap contains a mapping for lhsExpr.
      */
     public boolean containsMappingFor(Expr lhsExpr) {
-        return lhs_.contains(lhsExpr);
+        return lhs.contains(lhsExpr);
     }
 
     /**
@@ -93,17 +95,23 @@ public boolean containsMappingFor(Expr lhsExpr) {
      */
     public static ExprSubstitutionMap compose(ExprSubstitutionMap f, ExprSubstitutionMap g,
                                               Analyzer analyzer) {
-        if (f == null && g == null) return new ExprSubstitutionMap();
-        if (f == null) return g;
-        if (g == null) return f;
+        if (f == null && g == null) {
+            return new ExprSubstitutionMap();
+        }
+        if (f == null) {
+            return g;
+        }
+        if (g == null) {
+            return f;
+        }
         ExprSubstitutionMap result = new ExprSubstitutionMap();
         // f's substitution targets need to be substituted via g
-        result.lhs_ = Expr.cloneList(f.lhs_);
-        result.rhs_ = Expr.substituteList(f.rhs_, g, analyzer, false);
+        result.lhs = Expr.cloneList(f.lhs);
+        result.rhs = Expr.substituteList(f.rhs, g, analyzer, false);
 
         // substitution maps are cumulative: the combined map contains all
         // substitutions from f and g.
-        for (int i = 0; i < g.lhs_.size(); i++) {
+        for (int i = 0; i < g.lhs.size(); i++) {
             // If f contains expr1->fn(expr2) and g contains expr2->expr3,
             // then result must contain expr1->fn(expr3).
             // The check before adding to result.lhs is to ensure that cases
@@ -112,9 +120,9 @@ public static ExprSubstitutionMap compose(ExprSubstitutionMap f, ExprSubstitutio
             // and g: count(*) -> slotref
             // result.lhs must only have: count(*) -> zeroifnull(slotref) from f above,
             // and not count(*) -> slotref from g as well.
-            if (!result.lhs_.contains(g.lhs_.get(i))) {
-                result.lhs_.add(g.lhs_.get(i).clone());
-                result.rhs_.add(g.rhs_.get(i).clone());
+            if (!result.lhs.contains(g.lhs.get(i))) {
+                result.lhs.add(g.lhs.get(i).clone());
+                result.rhs.add(g.rhs.get(i).clone());
             }
         }
 
@@ -127,33 +135,39 @@ public static ExprSubstitutionMap compose(ExprSubstitutionMap f, ExprSubstitutio
      */
     public static ExprSubstitutionMap combine(ExprSubstitutionMap f,
                                               ExprSubstitutionMap g) {
-        if (f == null && g == null) return new ExprSubstitutionMap();
-        if (f == null) return g;
-        if (g == null) return f;
+        if (f == null && g == null) {
+            return new ExprSubstitutionMap();
+        }
+        if (f == null) {
+            return g;
+        }
+        if (g == null) {
+            return f;
+        }
         ExprSubstitutionMap result = new ExprSubstitutionMap();
-        result.lhs_ = Lists.newArrayList(f.lhs_);
-        result.lhs_.addAll(g.lhs_);
-        result.rhs_ = Lists.newArrayList(f.rhs_);
-        result.rhs_.addAll(g.rhs_);
+        result.lhs = Lists.newArrayList(f.lhs);
+        result.lhs.addAll(g.lhs);
+        result.rhs = Lists.newArrayList(f.rhs);
+        result.rhs.addAll(g.rhs);
         result.verify();
         return result;
     }
 
     public void substituteLhs(ExprSubstitutionMap lhsSmap, Analyzer analyzer) {
-        lhs_ = Expr.substituteList(lhs_, lhsSmap, analyzer, false);
+        lhs = Expr.substituteList(lhs, lhsSmap, analyzer, false);
     }
 
-    public List<Expr> getLhs() { return lhs_; }
-    public List<Expr> getRhs() { return rhs_; }
+    public List<Expr> getLhs() { return lhs; }
+    public List<Expr> getRhs() { return rhs; }
 
-    public int size() { return lhs_.size(); }
+    public int size() { return lhs.size(); }
 
     public String debugString() {
-        Preconditions.checkState(lhs_.size() == rhs_.size());
+        Preconditions.checkState(lhs.size() == rhs.size());
         List<String> output = Lists.newArrayList();
-        for (int i = 0; i < lhs_.size(); ++i) {
-            output.add(lhs_.get(i).toSql() + ":" + rhs_.get(i).toSql());
-            output.add("(" + lhs_.get(i).debugString() + ":" + rhs_.get(i).debugString() + ")");
+        for (int i = 0; i < lhs.size(); ++i) {
+            output.add(lhs.get(i).toSql() + ":" + rhs.get(i).toSql());
+            output.add("(" + lhs.get(i).debugString() + ":" + rhs.get(i).debugString() + ")");
         }
         return "smap(" + Joiner.on(" ").join(output) + ")";
     }
@@ -163,9 +177,9 @@ public String debugString() {
      * and that all rhs exprs are analyzed.
      */
     private void verify() {
-        for (int i = 0; i < lhs_.size(); ++i) {
-            for (int j = i + 1; j < lhs_.size(); ++j) {
-                if (lhs_.get(i).equals(lhs_.get(j))) {
+        for (int i = 0; i < lhs.size(); ++i) {
+            for (int j = i + 1; j < lhs.size(); ++j) {
+                if (lhs.get(i).equals(lhs.get(j))) {
                     if (LOG.isTraceEnabled()) {
                         LOG.trace("verify: smap=" + this.debugString());
                     }
@@ -173,17 +187,17 @@ private void verify() {
                     // Preconditions.checkState(false);
                 }
             }
-            Preconditions.checkState(!checkAnalyzed_ || rhs_.get(i).isAnalyzed());
+            Preconditions.checkState(!checkAnalyzed || rhs.get(i).isAnalyzed());
         }
     }
 
     public void clear() {
-        lhs_.clear();
-        rhs_.clear();
+        lhs.clear();
+        rhs.clear();
     }
 
     @Override
     public ExprSubstitutionMap clone() {
-        return new ExprSubstitutionMap(Expr.cloneList(lhs_), Expr.cloneList(rhs_));
+        return new ExprSubstitutionMap(Expr.cloneList(lhs), Expr.cloneList(rhs));
     }
 }
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 2557ad89a845df..7789202e884ede 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
@@ -288,10 +288,12 @@ public String toString() {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o)
+            if (this == o) {
                 return true;
-            if (o == null || getClass() != o.getClass())
+            }
+            if (o == null || getClass() != o.getClass()) {
                 return false;
+            }
             FEFunctionSignature signature = (FEFunctionSignature) o;
             return Objects.equals(name, signature.name) && Arrays.equals(argTypes, signature.argTypes)
                     && Objects.equals(returnType, signature.returnType);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FromClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FromClause.java
index 8c1ab2c0eec7c4..4906de085a000c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FromClause.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FromClause.java
@@ -46,27 +46,27 @@
  */
 public class FromClause implements ParseNode, Iterable<TableRef> {
 
-    private final ArrayList<TableRef> tableRefs_;
+    private final ArrayList<TableRef> tablerefs;
 
-    private boolean analyzed_ = false;
+    private boolean analyzed = false;
     private boolean needToSql = false;
 
     public FromClause(List<TableRef> tableRefs) {
-        tableRefs_ = Lists.newArrayList(tableRefs);
+        tablerefs = Lists.newArrayList(tableRefs);
         // Set left table refs to ensure correct toSql() before analysis.
-        for (int i = 1; i < tableRefs_.size(); ++i) {
-            tableRefs_.get(i).setLeftTblRef(tableRefs_.get(i - 1));
+        for (int i = 1; i < tablerefs.size(); ++i) {
+            tablerefs.get(i).setLeftTblRef(tablerefs.get(i - 1));
         }
     }
 
-    public FromClause() { tableRefs_ = Lists.newArrayList(); }
-    public List<TableRef> getTableRefs() { return tableRefs_; }
+    public FromClause() { tablerefs = Lists.newArrayList(); }
+    public List<TableRef> getTableRefs() { return tablerefs; }
     public void setNeedToSql(boolean needToSql) {
         this.needToSql = needToSql;
     }
 
     private void checkFromHiveTable(Analyzer analyzer) throws AnalysisException {
-        for (TableRef tblRef : tableRefs_) {
+        for (TableRef tblRef : tablerefs) {
             if (!(tblRef instanceof BaseTableRef)) {
                 continue;
             }
@@ -99,7 +99,7 @@ private void checkFromHiveTable(Analyzer analyzer) throws AnalysisException {
      * because the table t1 in the on clause cannot be recognized.
      */
     private void sortTableRefKeepSequenceOfOnClause() {
-        Collections.sort(this.tableRefs_, new Comparator<TableRef>() {
+        Collections.sort(this.tablerefs, new Comparator<TableRef>() {
             @Override
             public int compare(TableRef tableref1, TableRef tableref2) {
                 int i1 = 0;
@@ -117,10 +117,12 @@ public int compare(TableRef tableref1, TableRef tableref2) {
 
     @Override
     public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
-        if (analyzed_) return;
+        if (analyzed) {
+            return;
+        }
 
-        if (tableRefs_.isEmpty()) {
-            analyzed_ = true;
+        if (tablerefs.isEmpty()) {
+            analyzed = true;
             return;
         }
 
@@ -135,11 +137,11 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
 
         // Start out with table refs to establish aliases.
         TableRef leftTblRef = null;  // the one to the left of tblRef
-        for (int i = 0; i < tableRefs_.size(); ++i) {
+        for (int i = 0; i < tablerefs.size(); ++i) {
             // Resolve and replace non-InlineViewRef table refs with a BaseTableRef or ViewRef.
-            TableRef tblRef = tableRefs_.get(i);
+            TableRef tblRef = tablerefs.get(i);
             tblRef = analyzer.resolveTableRef(tblRef);
-            tableRefs_.set(i, Preconditions.checkNotNull(tblRef));
+            tablerefs.set(i, Preconditions.checkNotNull(tblRef));
             tblRef.setLeftTblRef(leftTblRef);
             if (tblRef instanceof InlineViewRef) {
                 ((InlineViewRef) tblRef).setNeedToSql(needToSql);
@@ -151,12 +153,14 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
         // TODO: remove when query from hive table is supported
         checkFromHiveTable(analyzer);
 
-        analyzed_ = true;
+        analyzed = true;
     }
 
     public FromClause clone() {
         ArrayList<TableRef> clone = Lists.newArrayList();
-        for (TableRef tblRef: tableRefs_) clone.add(tblRef.clone());
+        for (TableRef tblRef: tablerefs) {
+            clone.add(tblRef.clone());
+        }
         return new FromClause(clone);
     }
 
@@ -178,16 +182,16 @@ public void reset() {
             // }
             get(i).reset();
         }
-        this.analyzed_ = false;
+        this.analyzed = false;
     }
 
     @Override
     public String toSql() {
         StringBuilder builder = new StringBuilder();
-        if (!tableRefs_.isEmpty()) {
+        if (!tablerefs.isEmpty()) {
             builder.append(" FROM");
-            for (int i = 0; i < tableRefs_.size(); ++i) {
-                builder.append(" " + tableRefs_.get(i).toSql());
+            for (int i = 0; i < tablerefs.size(); ++i) {
+                builder.append(" " + tablerefs.get(i).toSql());
             }
         }
         return builder.toString();
@@ -195,23 +199,23 @@ public String toSql() {
 
     public String toDigest() {
         StringBuilder builder = new StringBuilder();
-        if (!tableRefs_.isEmpty()) {
+        if (!tablerefs.isEmpty()) {
             builder.append(" FROM");
-            for (int i = 0; i < tableRefs_.size(); ++i) {
-                builder.append(" " + tableRefs_.get(i).toDigest());
+            for (int i = 0; i < tablerefs.size(); ++i) {
+                builder.append(" " + tablerefs.get(i).toDigest());
             }
         }
         return builder.toString();
     }
 
-    public boolean isEmpty() { return tableRefs_.isEmpty(); }
+    public boolean isEmpty() { return tablerefs.isEmpty(); }
 
     @Override
-    public Iterator<TableRef> iterator() { return tableRefs_.iterator(); }
-    public int size() { return tableRefs_.size(); }
-    public TableRef get(int i) { return tableRefs_.get(i); }
-    public void set(int i, TableRef tableRef) { tableRefs_.set(i, tableRef); }
-    public void add(TableRef t) { tableRefs_.add(t); }
-    public void addAll(List<TableRef> t) { tableRefs_.addAll(t); }
-    public void clear() { tableRefs_.clear(); }
+    public Iterator<TableRef> iterator() { return tablerefs.iterator(); }
+    public int size() { return tablerefs.size(); }
+    public TableRef get(int i) { return tablerefs.get(i); }
+    public void set(int i, TableRef tableRef) { tablerefs.set(i, tableRef); }
+    public void add(TableRef t) { tablerefs.add(t); }
+    public void addAll(List<TableRef> t) { tablerefs.addAll(t); }
+    public void clear() { tablerefs.clear(); }
 }
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 7f55d59fe4dbec..e5f45317bd3b03 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
@@ -1158,7 +1158,9 @@ protected boolean isConstantImpl() {
         // TODO: we can't correctly determine const-ness before analyzing 'fn_'. We should
         // rework logic so that we do not call this function on unanalyzed exprs.
         // Aggregate functions are never constant.
-        if (fn instanceof AggregateFunction || fn == null) return false;
+        if (fn instanceof AggregateFunction || fn == null) {
+            return false;
+        }
 
         final String fnName = this.fnName.getFunction();
         // Non-deterministic functions are never constant.
@@ -1166,7 +1168,9 @@ protected boolean isConstantImpl() {
             return false;
         }
         // Sleep is a special function for testing.
-        if (fnName.equalsIgnoreCase("sleep")) return false;
+        if (fnName.equalsIgnoreCase("sleep")) {
+            return false;
+        }
         return super.isConstantImpl();
     }
 
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 b9aadd3265559d..754a9cf924b928 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
@@ -44,35 +44,35 @@
 public class FunctionName implements Writable {
     private static final Logger LOG = LogManager.getLogger(FunctionName.class);
 
-    private String db_;
-    private String fn_;
+    private String db;
+    private String fn;
 
     private FunctionName() {
     }
 
     public FunctionName(String db, String fn) {
-        db_ = db;
-        fn_ = fn.toLowerCase();
-        if (db_ != null) {
-            db_ = db_.toLowerCase();
+        this.db = db;
+        this.fn = fn.toLowerCase();
+        if (this.db != null) {
+            this.db = this.db.toLowerCase();
         }
     }
 
     public FunctionName(String fn) {
-        db_ = null;
-        fn_ = fn.toLowerCase();
+        db = null;
+        this.fn = fn.toLowerCase();
     }
 
     public FunctionName(TFunctionName thriftName) {
-        db_ = thriftName.db_name.toLowerCase();
-        fn_ = thriftName.function_name.toLowerCase();
+        db = thriftName.db_name.toLowerCase();
+        fn = thriftName.function_name.toLowerCase();
     }
 
     // Same as FunctionName but for builtins and we'll leave the case
     // as is since we aren't matching by string.
     public static FunctionName createBuiltinName(String fn) {
         FunctionName name = new FunctionName(fn);
-        name.fn_ = fn;
+        name.fn = fn;
         return name;
     }
 
@@ -86,47 +86,47 @@ public boolean equals(Object obj) {
             return false;
         }
         FunctionName o = (FunctionName) obj;
-        if ((db_ == null || o.db_ == null) && (db_ != o.db_)) {
-            if (db_ == null && o.db_ != null) {
+        if ((db == null || o.db == null) && (db != o.db)) {
+            if (db == null && o.db != null) {
                 return false;
             }
-            if (db_ != null && o.db_ == null) {
+            if (db != null && o.db == null) {
                 return false;
             }
-            if (!db_.equalsIgnoreCase(o.db_)) {
+            if (!db.equalsIgnoreCase(o.db)) {
                 return false;
             }
         }
-        return fn_.equalsIgnoreCase(o.fn_);
+        return fn.equalsIgnoreCase(o.fn);
     }
 
     public String getDb() {
-        return db_;
+        return db;
     }
 
     public void setDb(String db) {
-        db_ = db;
+        this.db = db;
     }
 
     public String getFunction() {
-        return fn_;
+        return fn;
     }
 
     public boolean isFullyQualified() {
-        return db_ != null;
+        return db != null;
     }
 
     @Override
     public String toString() {
-        if (db_ == null) {
-            return fn_;
+        if (db == null) {
+            return fn;
         }
-        return db_ + "." + fn_;
+        return db + "." + fn;
     }
 
     // used to analyze db element in function name, add cluster
     public String analyzeDb(Analyzer analyzer) throws AnalysisException {
-        String db = db_;
+        String db = this.db;
         if (db == null) {
             db = analyzer.getDefaultDb();
         } else {
@@ -139,29 +139,29 @@ public String analyzeDb(Analyzer analyzer) throws AnalysisException {
     }
 
     public void analyze(Analyzer analyzer) throws AnalysisException {
-        if (fn_.length() == 0) {
+        if (fn.length() == 0) {
             throw new AnalysisException("Function name can not be empty.");
         }
-        for (int i = 0; i < fn_.length(); ++i) {
-            if (!isValidCharacter(fn_.charAt(i))) {
+        for (int i = 0; i < fn.length(); ++i) {
+            if (!isValidCharacter(fn.charAt(i))) {
                 throw new AnalysisException(
                   "Function names must be all alphanumeric or underscore. " +
-                    "Invalid name: " + fn_);
+                    "Invalid name: " + fn);
             }
         }
-        if (Character.isDigit(fn_.charAt(0))) {
-            throw new AnalysisException("Function cannot start with a digit: " + fn_);
+        if (Character.isDigit(fn.charAt(0))) {
+            throw new AnalysisException("Function cannot start with a digit: " + fn);
         }
-        if (db_ == null) {
-            db_ = analyzer.getDefaultDb();
-            if (Strings.isNullOrEmpty(db_)) {
+        if (db == null) {
+            db = analyzer.getDefaultDb();
+            if (Strings.isNullOrEmpty(db)) {
                 ErrorReport.reportAnalysisException(ErrorCode.ERR_NO_DB_ERROR);
             }
         } else {
             if (Strings.isNullOrEmpty(analyzer.getClusterName())) {
                 ErrorReport.reportAnalysisException(ErrorCode.ERR_CLUSTER_NAME_NULL);
             }
-            db_ = ClusterNamespace.getFullName(analyzer.getClusterName(), db_);
+            db = ClusterNamespace.getFullName(analyzer.getClusterName(), db);
         }
 
         // If the function name is not fully qualified, it must not be the same as a builtin
@@ -177,28 +177,28 @@ private boolean isValidCharacter(char c) {
     }
 
     public TFunctionName toThrift() {
-        TFunctionName name = new TFunctionName(fn_);
-        name.setDbName(db_);
-        name.setFunctionName(fn_);
+        TFunctionName name = new TFunctionName(fn);
+        name.setDbName(db);
+        name.setFunctionName(fn);
         return name;
     }
 
     @Override
     public void write(DataOutput out) throws IOException {
-        if (db_ != null) {
+        if (db != null) {
             out.writeBoolean(true);
-            Text.writeString(out, db_);
+            Text.writeString(out, db);
         } else {
             out.writeBoolean(false);
         }
-        Text.writeString(out, fn_);
+        Text.writeString(out, fn);
     }
 
     public void readFields(DataInput in) throws IOException {
         if (in.readBoolean()) {
-            db_ = Text.readString(in);
+            db = Text.readString(in);
         }
-        fn_ = Text.readString(in);
+        fn = Text.readString(in);
     }
 
     public static FunctionName read(DataInput in) throws IOException{
@@ -209,6 +209,6 @@ public static FunctionName read(DataInput in) throws IOException{
 
     @Override
     public int hashCode() {
-        return 31 * Objects.hashCode(db_) + Objects.hashCode(fn_);
+        return 31 * Objects.hashCode(db) + Objects.hashCode(fn);
     }
 }
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 302242bd1db44b..d74218c69e2cfc 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
@@ -50,7 +50,7 @@ public class GroupByClause implements ParseNode {
     // max num of distinct sets in grouping sets clause
     private final static int MAX_GROUPING_SETS_NUM = 64;
     // max num of distinct expressions
-    private boolean analyzed_ = false;
+    private boolean analyzed = false;
     private boolean exprGenerated = false;
     private GroupingType groupingType;
     private ArrayList<Expr> groupingExprs;
@@ -96,7 +96,7 @@ public GroupingType getGroupingType() {
 
     public void reset() {
         groupingExprs = new ArrayList<>();
-        analyzed_ = false;
+        analyzed = false;
         exprGenerated = false;
         if (oriGroupingExprs != null) {
             Expr.resetList(oriGroupingExprs);
@@ -169,7 +169,7 @@ public void genGroupingExprs() throws AnalysisException {
 
     @Override
     public void analyze(Analyzer analyzer) throws AnalysisException {
-        if (analyzed_) {
+        if (analyzed) {
             return;
         }
         genGroupingExprs();
@@ -206,7 +206,7 @@ public void analyze(Analyzer analyzer) throws AnalysisException {
             throw new AnalysisException("Too many sets in GROUP BY clause, the max grouping sets item is "
                     + MAX_GROUPING_SETS_NUM);
         }
-        analyzed_ = true;
+        analyzed = true;
     }
 
     // check if group by clause is contain grouping set/rollup/cube
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 575ce07aa1cb31..de9d7ffad7d37a 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
@@ -60,12 +60,16 @@ public class InPredicate extends Predicate {
 
     public static void initBuiltins(FunctionSet functionSet) {
         for (Type t: Type.getSupportedTypes()) {
-            if (t.isNull()) continue;
+            if (t.isNull()) {
+                continue;
+            }
             // TODO we do not support codegen for CHAR and the In predicate must be codegened
             // because it has variable number of arguments. This will force CHARs to be
             // cast up to strings; meaning that "in" comparisons will not have CHAR comparison
             // semantics.
-            if (t.getPrimitiveType() == PrimitiveType.CHAR) continue;
+            if (t.getPrimitiveType() == PrimitiveType.CHAR) {
+                continue;
+            }
 
             String typeString = Function.getUdfTypeName(t.getPrimitiveType());
 
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 f576f02bd8fde9..835fd21f5e4f3f 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
@@ -99,20 +99,24 @@ public InlineViewRef(String alias, QueryStmt queryStmt, List<String> colLabels)
     public InlineViewRef(View view, TableRef origTblRef) {
         super(origTblRef.getName(), origTblRef.getExplicitAlias());
         queryStmt = view.getQueryStmt().clone();
-        if (view.isLocalView()) queryStmt.reset();
+        if (view.isLocalView()) {
+            queryStmt.reset();
+        }
         this.view = view;
         sMap = new ExprSubstitutionMap();
         baseTblSmap = new ExprSubstitutionMap();
         setJoinAttrs(origTblRef);
         explicitColLabels = view.getColLabels();
         // Set implicit aliases if no explicit one was given.
-        if (hasExplicitAlias()) return;
+        if (hasExplicitAlias()) {
+            return;
+        }
         // TODO(zc)
         // view_.getTableName().toString().toLowerCase(), view.getName().toLowerCase()
         if (view.isLocalView()) {
-            aliases_ = new String[]{view.getName()};
+            aliases = new String[]{view.getName()};
         } else {
-            aliases_ = new String[]{name.toString(), view.getName()};
+            aliases = new String[]{name.toString(), view.getName()};
         }
         if (origTblRef.getLateralViewRefs() != null) {
             lateralViewRefs = (ArrayList<LateralViewRef>) origTblRef.getLateralViewRefs().clone();
@@ -181,12 +185,12 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
         inlineViewAnalyzer = new Analyzer(analyzer);
 
         queryStmt.analyze(inlineViewAnalyzer);
-        correlatedTupleIds_.addAll(queryStmt.getCorrelatedTupleIds(inlineViewAnalyzer));
+        correlatedTupleIds.addAll(queryStmt.getCorrelatedTupleIds(inlineViewAnalyzer));
 
         queryStmt.getMaterializedTupleIds(materializedTupleIds);
         if (view != null && !hasExplicitAlias() && !view.isLocalView()) {
             name = analyzer.getFqTableName(name);
-            aliases_ = new String[] { name.toString(), view.getName() };
+            aliases = new String[] { name.toString(), view.getName() };
         }
         //TODO(chenhao16): fix TableName in Db.Table style
         // name.analyze(analyzer);
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 f6643720b81f36..619fe484e099cb 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
@@ -40,7 +40,9 @@ public class IsNullPredicate extends Predicate {
 
     public static void initBuiltins(FunctionSet functionSet) {
         for (Type t: Type.getSupportedTypes()) {
-            if (t.isNull()) continue;
+            if (t.isNull()) {
+                continue;
+            }
             String isNullSymbol;
             if (t == Type.BOOLEAN) {
                 isNullSymbol = "_ZN5doris15IsNullPredicate7is_nullIN9doris_udf10BooleanValE" +
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 a7d4a5120fdda0..8ddeb452ec6995 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
@@ -109,7 +109,9 @@ public String toDigest() {
     }
 
     public void analyze(Analyzer analyzer) {
-        if (limit == 0) analyzer.setHasEmptyResultSet();
+        if (limit == 0) {
+            analyzer.setHasEmptyResultSet();
+        }
     }
 
     public void reset() {
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 9f3a8973f06481..9aa8253dabb434 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
@@ -17,7 +17,7 @@
 
 package org.apache.doris.analysis;
 
-import org.apache.doris.backup.HDFSStorage;
+import org.apache.doris.backup.HdfsStorage;
 import org.apache.doris.backup.S3Storage;
 import org.apache.doris.catalog.PrimitiveType;
 import org.apache.doris.catalog.Type;
@@ -319,6 +319,7 @@ private void genParquetSchema(List<Expr> resultExprs) throws AnalysisException {
                     if (ConnectContext.get() != null && ConnectContext.get().getSessionVariable().isReturnObjectDataAsBinary()) {
                         column.add("byte_array");
                     }
+                    break;
                 default:
                     throw new AnalysisException("currently parquet do not support column type: " + expr.getType().getPrimitiveType());
             }
@@ -438,7 +439,7 @@ private void analyzeBrokerDesc(Set<String> processedPropKeys) throws UserExcepti
         if (storageType == StorageBackend.StorageType.S3) {
             S3Storage.checkS3(new CaseInsensitiveMap(brokerProps));
         } else if (storageType == StorageBackend.StorageType.HDFS) {
-            HDFSStorage.checkHDFS(new CaseInsensitiveMap(brokerProps));
+            HdfsStorage.checkHDFS(new CaseInsensitiveMap(brokerProps));
         }
 
         brokerDesc = new BrokerDesc(brokerName, storageType, brokerProps);
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 c6fc843b7c50f4..7e767a994fec72 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
@@ -56,7 +56,7 @@ public abstract class QueryStmt extends StatementBase {
     /////////////////////////////////////////
     // BEGIN: Members that need to be reset()
 
-    protected WithClause withClause_;
+    protected WithClause withClause;
 
     protected ArrayList<OrderByElement> orderByElements;
     // Limit element could not be null, the default limit element is NO_LIMIT
@@ -173,10 +173,14 @@ public abstract class QueryStmt extends StatementBase {
 
     @Override
     public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
-        if (isAnalyzed()) return;
+        if (isAnalyzed()) {
+            return;
+        }
         super.analyze(analyzer);
         analyzeLimit(analyzer);
-        if (hasWithClause()) withClause_.analyze(analyzer);
+        if (hasWithClause()) {
+            withClause.analyze(analyzer);
+        }
     }
 
     private void analyzeLimit(Analyzer analyzer) throws AnalysisException {
@@ -218,7 +222,9 @@ public List<TupleId> getCorrelatedTupleIds(Analyzer analyzer) throws AnalysisExc
         List<TableRef> tblRefs = Lists.newArrayList();
         collectTableRefs(tblRefs);
         for (TableRef tblRef : tblRefs) {
-            if (absoluteRef == null && !tblRef.isRelative()) absoluteRef = tblRef;
+            if (absoluteRef == null && !tblRef.isRelative()) {
+                absoluteRef = tblRef;
+            }
             /*if (tblRef.isCorrelated()) {
              *
              *   // Check if the correlated table ref is rooted at a tuple descriptor from within
@@ -385,7 +391,9 @@ protected void createSortTupleInfo(Analyzer analyzer) throws AnalysisException {
      */
     protected Expr getFirstAmbiguousAlias(List<Expr> exprs) {
         for (Expr exp : exprs) {
-            if (ambiguousAliasList.contains(exp)) return exp;
+            if (ambiguousAliasList.contains(exp)) {
+                return exp;
+            }
         }
         return null;
     }
@@ -425,9 +433,13 @@ protected void substituteOrdinalsAliases(List<Expr> exprs, String errorPrefix,
     // select list items.  Return null if not an ordinal expression.
     private Expr trySubstituteOrdinal(Expr expr, String errorPrefix,
                                       Analyzer analyzer) throws AnalysisException {
-        if (!(expr instanceof IntLiteral)) return null;
+        if (!(expr instanceof IntLiteral)) {
+            return null;
+        }
         expr.analyze(analyzer);
-        if (!expr.getType().isIntegerType()) return null;
+        if (!expr.getType().isIntegerType()) {
+            return null;
+        }
         long pos = ((IntLiteral) expr).getLongValue();
         if (pos < 1) {
             throw new AnalysisException(
@@ -444,14 +456,14 @@ private Expr trySubstituteOrdinal(Expr expr, String errorPrefix,
     }
 
     public void getWithClauseTables(Analyzer analyzer, Map<Long, Table> tableMap, Set<String> parentViewNameSet) throws AnalysisException {
-        if (withClause_ != null) {
-            withClause_.getTables(analyzer, tableMap, parentViewNameSet);
+        if (withClause != null) {
+            withClause.getTables(analyzer, tableMap, parentViewNameSet);
         }
     }
 
     public void getWithClauseTableRefs(Analyzer analyzer, List<TableRef> tblRefs, Set<String> parentViewNameSet) {
-        if (withClause_ != null) {
-            withClause_.getTableRefs(analyzer, tblRefs, parentViewNameSet);
+        if (withClause != null) {
+            withClause.getTableRefs(analyzer, tblRefs, parentViewNameSet);
         }
     }
 
@@ -560,15 +572,15 @@ public void removeOrderByElements() {
     }
 
     public void setWithClause(WithClause withClause) {
-        this.withClause_ = withClause;
+        this.withClause = withClause;
     }
 
     public boolean hasWithClause() {
-        return withClause_ != null;
+        return withClause != null;
     }
 
     public WithClause getWithClause() {
-        return withClause_;
+        return withClause;
     }
 
     public boolean hasOrderByClause() {
@@ -689,15 +701,19 @@ public RedirectStatus getRedirectStatus() {
     }
 
     public ArrayList<OrderByElement> cloneOrderByElements() {
-        if (orderByElements == null) return null;
+        if (orderByElements == null) {
+            return null;
+        }
         ArrayList<OrderByElement> result =
                 Lists.newArrayListWithCapacity(orderByElements.size());
-        for (OrderByElement o : orderByElements) result.add(o.clone());
+        for (OrderByElement o : orderByElements) {
+            result.add(o.clone());
+        }
         return result;
     }
 
     public WithClause cloneWithClause() {
-        return withClause_ != null ? withClause_.clone() : null;
+        return withClause != null ? withClause.clone() : null;
     }
 
     public OutFileClause cloneOutfileCluse() {
@@ -713,7 +729,7 @@ public String toDigest() {
      */
     protected QueryStmt(QueryStmt other) {
         super(other);
-        withClause_ = other.cloneWithClause();
+        withClause = other.cloneWithClause();
         outFileClause = other.cloneOutfileCluse();
         orderByElements = other.cloneOrderByElements();
         limitElement = other.limitElement.clone();
@@ -730,8 +746,9 @@ protected QueryStmt(QueryStmt other) {
     public void reset() {
         super.reset();
         if (orderByElements != null) {
-            for (OrderByElement o : orderByElements)
+            for (OrderByElement o : orderByElements) {
                 o.getExpr().reset();
+            }
         }
         limitElement.reset();
         resultExprs.clear();
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 c2f3d32c357102..d861d63d2b0e37 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
@@ -79,7 +79,7 @@ public class SelectStmt extends QueryStmt {
 
     protected SelectList selectList;
     private final ArrayList<String> colLabels; // lower case column labels
-    protected final FromClause fromClause_;
+    protected final FromClause fromClause;
     protected GroupByClause groupByClause;
     private List<Expr> originalExpr;
     //
@@ -111,7 +111,7 @@ public class SelectStmt extends QueryStmt {
 
     // SQL string of this SelectStmt before inline-view expression substitution.
     // Set in analyze().
-    protected String sqlString_;
+    protected String sqlString;
 
     // Table alias generator used during query rewriting.
     private TableAliasGenerator tableAliasGenerator = null;
@@ -123,7 +123,7 @@ public SelectStmt(ValueList valueList, ArrayList<OrderByElement> orderByElement,
         super(orderByElement, limitElement);
         this.valueList = valueList;
         this.selectList = new SelectList();
-        this.fromClause_ = new FromClause();
+        this.fromClause = new FromClause();
         this.colLabels = Lists.newArrayList();
     }
 
@@ -139,9 +139,9 @@ public SelectStmt(ValueList valueList, ArrayList<OrderByElement> orderByElement,
         this.selectList = selectList;
         this.originSelectList = selectList.clone();
         if (fromClause == null) {
-            fromClause_ = new FromClause();
+            this.fromClause = new FromClause();
         } else {
-            fromClause_ = fromClause;
+            this.fromClause = fromClause;
         }
         this.whereClause = wherePredicate;
         this.groupByClause = groupByClause;
@@ -158,7 +158,7 @@ protected SelectStmt(SelectStmt other) {
         super(other);
         this.id = other.id;
         selectList = other.selectList.clone();
-        fromClause_ = other.fromClause_.clone();
+        fromClause = other.fromClause.clone();
         whereClause = (other.whereClause != null) ? other.whereClause.clone() : null;
         groupByClause = (other.groupByClause != null) ? other.groupByClause.clone() : null;
         havingClause = (other.havingClause != null) ? other.havingClause.clone() : null;
@@ -166,7 +166,7 @@ protected SelectStmt(SelectStmt other) {
         colLabels = Lists.newArrayList(other.colLabels);
         aggInfo = (other.aggInfo != null) ? other.aggInfo.clone() : null;
         analyticInfo = (other.analyticInfo != null) ? other.analyticInfo.clone() : null;
-        sqlString_ = (other.sqlString_ != null) ? other.sqlString_ : null;
+        sqlString = (other.sqlString != null) ? other.sqlString : null;
         baseTblSmap = other.baseTblSmap.clone();
         groupingInfo = null;
     }
@@ -176,7 +176,7 @@ public void reset() {
         super.reset();
         selectList.reset();
         colLabels.clear();
-        fromClause_.reset();
+        fromClause.reset();
         if (whereClause != null) {
             whereClause.reset();
         }
@@ -237,7 +237,7 @@ public Expr getHavingClauseAfterAnaylzed() {
     }
 
     public List<TableRef> getTableRefs() {
-        return fromClause_.getTableRefs();
+        return fromClause.getTableRefs();
     }
 
     public Expr getWhereClause() {
@@ -293,7 +293,7 @@ public ExprSubstitutionMap getBaseTblSmap() {
     @Override
     public void getTables(Analyzer analyzer, Map<Long, Table> tableMap, Set<String> parentViewNameSet) throws AnalysisException {
         getWithClauseTables(analyzer, tableMap, parentViewNameSet);
-        for (TableRef tblRef : fromClause_) {
+        for (TableRef tblRef : fromClause) {
             if (tblRef instanceof InlineViewRef) {
                 // Inline view reference
                 QueryStmt inlineStmt = ((InlineViewRef) tblRef).getViewStmt();
@@ -335,7 +335,7 @@ public void getTables(Analyzer analyzer, Map<Long, Table> tableMap, Set<String>
     @Override
     public void getTableRefs(Analyzer analyzer, List<TableRef> tblRefs, Set<String> parentViewNameSet) {
         getWithClauseTableRefs(analyzer, tblRefs, parentViewNameSet);
-        for (TableRef tblRef : fromClause_) {
+        for (TableRef tblRef : fromClause) {
             try {
                 TableRef tmpTblRef = analyzer.resolveTableRef(tblRef);
                 if (tmpTblRef instanceof InlineViewRef) {
@@ -360,8 +360,8 @@ private boolean isViewTableRef(String tblName, Set<String> parentViewNameSet) {
             return true;
         }
 
-        if (withClause_ != null) {
-            List<View> views = withClause_.getViews();
+        if (withClause != null) {
+            List<View> views = withClause.getViews();
             for (View view : views) {
                 if (view.getName().equals(tblName)) {
                     return true;
@@ -398,8 +398,8 @@ public void analyze(Analyzer analyzer) throws UserException {
             return;
         }
         super.analyze(analyzer);
-        fromClause_.setNeedToSql(needToSql);
-        fromClause_.analyze(analyzer);
+        fromClause.setNeedToSql(needToSql);
+        fromClause.analyze(analyzer);
 
         // Generate !empty() predicates to filter out empty collections.
         // Skip this step when analyzing a WITH-clause because CollectionTableRefs
@@ -483,7 +483,7 @@ public void analyze(Analyzer analyzer) throws UserException {
         // analyze selectListExprs
         Expr.analyze(resultExprs, analyzer);
         if (TreeNode.contains(resultExprs, AnalyticExpr.class)) {
-            if (fromClause_.isEmpty()) {
+            if (fromClause.isEmpty()) {
                 throw new AnalysisException("Analytic expressions require FROM clause.");
             }
 
@@ -539,7 +539,7 @@ public void analyze(Analyzer analyzer) throws UserException {
         }
 
         if (needToSql) {
-            sqlString_ = toSql();
+            sqlString = toSql();
         }
         if (analyzer.enableStarJoinReorder()) {
             LOG.debug("use old reorder logical in select stmt");
@@ -565,7 +565,7 @@ public void analyze(Analyzer analyzer) throws UserException {
     public List<TupleId> getTableRefIds() {
         List<TupleId> result = Lists.newArrayList();
 
-        for (TableRef ref : fromClause_) {
+        for (TableRef ref : fromClause) {
             result.add(ref.getId());
         }
 
@@ -575,7 +575,7 @@ public List<TupleId> getTableRefIds() {
     public List<TupleId> getTableRefIdsWithoutInlineView() {
         List<TupleId> result = Lists.newArrayList();
 
-        for (TableRef ref : fromClause_) {
+        for (TableRef ref : fromClause) {
             if (ref instanceof InlineViewRef) {
                 continue;
             }
@@ -586,7 +586,7 @@ public List<TupleId> getTableRefIdsWithoutInlineView() {
     }
 
     public boolean hasInlineView() {
-        for (TableRef ref : fromClause_) {
+        for (TableRef ref : fromClause) {
             if (ref instanceof InlineViewRef) {
                 return true;
             }
@@ -724,7 +724,7 @@ public void materializeRequiredSlots(Analyzer analyzer) throws AnalysisException
         }
 
         // materialized all lateral view column and origin column
-        for (TableRef tableRef : fromClause_.getTableRefs()) {
+        for (TableRef tableRef : fromClause.getTableRefs()) {
             if (tableRef.lateralViewRefs != null) {
                 for (LateralViewRef lateralViewRef : tableRef.lateralViewRefs) {
                     lateralViewRef.materializeRequiredSlots(baseTblSmap, analyzer);
@@ -737,7 +737,7 @@ protected void reorderTable(Analyzer analyzer) throws AnalysisException {
         List<Pair<TableRef, Long>> candidates = Lists.newArrayList();
 
         // New pair of table ref and row count
-        for (TableRef tblRef : fromClause_) {
+        for (TableRef tblRef : fromClause) {
             if (tblRef.getJoinOp() != JoinOperator.INNER_JOIN || tblRef.hasJoinHints()) {
                 // Unsupported reorder outer join
                 return;
@@ -772,9 +772,9 @@ protected void reorderTable(Analyzer analyzer) throws AnalysisException {
         }
 
         // can not get AST only with equal join, MayBe cross join can help
-        fromClause_.clear();
+        fromClause.clear();
         for (Pair<TableRef, Long> candidate : candidates) {
-            fromClause_.add(candidate.first);
+            fromClause.add(candidate.first);
         }
     }
 
@@ -785,14 +785,14 @@ protected boolean reorderTable(Analyzer analyzer, TableRef firstRef)
         Map<TupleId, TableRef> tableRefMap = Maps.newHashMap();
 
         // set Map and push list
-        for (TableRef tblRef : fromClause_) {
+        for (TableRef tblRef : fromClause) {
             tableRefMap.put(tblRef.getId(), tblRef);
             tmpRefList.add(tblRef);
         }
         // clear tableRefList
-        fromClause_.clear();
+        fromClause.clear();
         // mark first table
-        fromClause_.add(firstRef);
+        fromClause.add(firstRef);
         tableRefMap.remove(firstRef.getId());
 
         // reserve TupleId has been added successfully
@@ -800,13 +800,13 @@ protected boolean reorderTable(Analyzer analyzer, TableRef firstRef)
         validTupleId.add(firstRef.getId());
         // find table
         int i = 0;
-        while (i < fromClause_.size()) {
-            TableRef tblRef = fromClause_.get(i);
+        while (i < fromClause.size()) {
+            TableRef tblRef = fromClause.get(i);
             // get all equal
             List<Expr> eqJoinPredicates = analyzer.getEqJoinConjuncts(tblRef.getId());
-            List<TupleId> tuple_list = Lists.newArrayList();
-            Expr.getIds(eqJoinPredicates, tuple_list, null);
-            for (TupleId tid : tuple_list) {
+            List<TupleId> tupleList = Lists.newArrayList();
+            Expr.getIds(eqJoinPredicates, tupleList, null);
+            for (TupleId tid : tupleList) {
                 if (validTupleId.contains(tid)) {
                     // tid has allreday in the list of validTupleId, ignore it
                     continue;
@@ -829,7 +829,7 @@ protected boolean reorderTable(Analyzer analyzer, TableRef firstRef)
                     }
 
                     if (count == 0) {
-                        fromClause_.add(candidateTableRef);
+                        fromClause.add(candidateTableRef);
                         validTupleId.add(tid);
                         tableRefMap.remove(tid);
                     }
@@ -839,8 +839,8 @@ protected boolean reorderTable(Analyzer analyzer, TableRef firstRef)
         }
         // find path failed.
         if (0 != tableRefMap.size()) {
-            fromClause_.clear();
-            fromClause_.addAll(tmpRefList);
+            fromClause.clear();
+            fromClause.addAll(tmpRefList);
             return false;
         }
         return true;
@@ -852,7 +852,7 @@ protected boolean reorderTable(Analyzer analyzer, TableRef firstRef)
      */
     protected void resolveInlineViewRefs(Analyzer analyzer) throws AnalysisException {
         // Gather the inline view substitution maps from the enclosed inline views
-        for (TableRef tblRef : fromClause_) {
+        for (TableRef tblRef : fromClause) {
             if (tblRef instanceof InlineViewRef) {
                 InlineViewRef inlineViewRef = (InlineViewRef) tblRef;
                 baseTblSmap = ExprSubstitutionMap.combine(baseTblSmap, inlineViewRef.getBaseTblSmap());
@@ -871,11 +871,11 @@ protected void resolveInlineViewRefs(Analyzer analyzer) throws AnalysisException
      * Expand "*" select list item.
      */
     private void expandStar(Analyzer analyzer) throws AnalysisException {
-        if (fromClause_.isEmpty()) {
+        if (fromClause.isEmpty()) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_NO_TABLES_USED);
         }
         // expand in From clause order
-        for (TableRef tableRef : fromClause_) {
+        for (TableRef tableRef : fromClause) {
             if (analyzer.isSemiJoined(tableRef.getId())) {
                 continue;
             }
@@ -976,7 +976,7 @@ private void analyzeAggregation(Analyzer analyzer) throws AnalysisException {
         }
 
         // If we're computing an aggregate, we must have a FROM clause.
-        if (fromClause_.size() == 0) {
+        if (fromClause.size() == 0) {
             throw new AnalysisException("Aggregation without a FROM clause is not allowed");
         }
 
@@ -1332,7 +1332,7 @@ private void createAnalyticInfo(Analyzer analyzer) throws AnalysisException {
     public void rewriteExprs(ExprRewriter rewriter) throws AnalysisException {
         Preconditions.checkState(isAnalyzed());
         rewriteSelectList(rewriter);
-        for (TableRef ref : fromClause_) {
+        for (TableRef ref : fromClause) {
             ref.rewriteExprs(rewriter, analyzer);
         }
         // Also equal exprs in the statements of subqueries.
@@ -1388,7 +1388,7 @@ public void collectExprs(Map<String, Expr> exprMap) {
         }
 
         // from clause
-        for (TableRef ref : fromClause_) {
+        for (TableRef ref : fromClause) {
             Preconditions.checkState(ref.isAnalyzed);
             if (ref.onClause != null) {
                 registerExprId(ref.onClause);
@@ -1499,7 +1499,7 @@ public void putBackExprs(Map<String, Expr> rewrittenExprMap) {
         }
 
         // from clause
-        for (TableRef ref : fromClause_) {
+        for (TableRef ref : fromClause) {
             if (ref.onClause != null) {
                 ref.setOnClause(rewrittenExprMap.get(ref.onClause.getId().toString()));
             }
@@ -1627,7 +1627,7 @@ private Expr rewriteSubquery(Expr expr, Analyzer analyzer)
             } catch (UserException e) {
                 throw new AnalysisException(e.getMessage());
             }
-            fromClause_.add(inlineViewRef);
+            fromClause.add(inlineViewRef);
             expr = new SlotRef(inlineViewRef.getAliasAsName(), colAlias);
         } else if (CollectionUtils.isNotEmpty(expr.getChildren())) {
             for (int i = 0; i < expr.getChildren().size(); ++i) {
@@ -1639,12 +1639,12 @@ private Expr rewriteSubquery(Expr expr, Analyzer analyzer)
 
     @Override
     public String toSql() {
-        if (sqlString_ != null) {
-            return sqlString_;
+        if (sqlString != null) {
+            return sqlString;
         }
         StringBuilder strBuilder = new StringBuilder();
-        if (withClause_ != null) {
-            strBuilder.append(withClause_.toSql());
+        if (withClause != null) {
+            strBuilder.append(withClause.toSql());
             strBuilder.append(" ");
         }
 
@@ -1668,8 +1668,8 @@ public String toSql() {
         }
 
         // From clause
-        if (!fromClause_.isEmpty()) {
-            strBuilder.append(fromClause_.toSql());
+        if (!fromClause.isEmpty()) {
+            strBuilder.append(fromClause.toSql());
         }
 
         // Where clause
@@ -1712,8 +1712,8 @@ public String toSql() {
     @Override
     public String toDigest() {
         StringBuilder strBuilder = new StringBuilder();
-        if (withClause_ != null) {
-            strBuilder.append(withClause_.toDigest());
+        if (withClause != null) {
+            strBuilder.append(withClause.toDigest());
             strBuilder.append(" ");
         }
 
@@ -1745,8 +1745,8 @@ public String toDigest() {
         }
 
         // From clause
-        if (!fromClause_.isEmpty()) {
-            strBuilder.append(fromClause_.toDigest());
+        if (!fromClause.isEmpty()) {
+            strBuilder.append(fromClause.toDigest());
         }
 
         // Where clause
@@ -1807,7 +1807,7 @@ public void getMaterializedTupleIds(ArrayList<TupleId> tupleIdList) {
                 tupleIdList.add(aggInfo.getOutputTupleId());
             }
         } else {
-            for (TableRef tblRef : fromClause_) {
+            for (TableRef tblRef : fromClause) {
                 tupleIdList.addAll(tblRef.getMaterializedTupleIds());
             }
         }
@@ -1824,16 +1824,16 @@ public void substituteSelectList(Analyzer analyzer, List<String> newColLabels)
             throws AnalysisException, UserException {
         // analyze with clause
         if (hasWithClause()) {
-            withClause_.analyze(analyzer);
+            withClause.analyze(analyzer);
         }
         // start out with table refs to establish aliases
         TableRef leftTblRef = null;  // the one to the left of tblRef
-        for (int i = 0; i < fromClause_.size(); ++i) {
+        for (int i = 0; i < fromClause.size(); ++i) {
             // Resolve and replace non-InlineViewRef table refs with a BaseTableRef or ViewRef.
-            TableRef tblRef = fromClause_.get(i);
+            TableRef tblRef = fromClause.get(i);
             tblRef = analyzer.resolveTableRef(tblRef);
             Preconditions.checkNotNull(tblRef);
-            fromClause_.set(i, tblRef);
+            fromClause.set(i, tblRef);
             tblRef.setLeftTblRef(leftTblRef);
             tblRef.analyze(analyzer);
             leftTblRef = tblRef;
@@ -1908,7 +1908,7 @@ public boolean returnsSingleRow() {
             return true;
         }
         // No from clause (base tables or inline views)
-        if (fromClause_.isEmpty()) {
+        if (fromClause.isEmpty()) {
             return true;
         }
         // Aggregation with no group by and no DISTINCT
@@ -1921,7 +1921,7 @@ public boolean returnsSingleRow() {
 
     @Override
     public void collectTableRefs(List<TableRef> tblRefs) {
-        for (TableRef tblRef : fromClause_) {
+        for (TableRef tblRef : fromClause) {
             if (tblRef instanceof InlineViewRef) {
                 InlineViewRef inlineViewRef = (InlineViewRef) tblRef;
                 inlineViewRef.getViewStmt().collectTableRefs(tblRefs);
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 976e13eb0c1295..5ffac6a0b71e27 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
@@ -71,12 +71,12 @@ public enum Qualifier {
 
     // filled during analyze(); contains all operands that need to go through
     // distinct aggregation
-    protected final List<SetOperand> distinctOperands_ = Lists.newArrayList();
+    protected final List<SetOperand> distinctOperands = Lists.newArrayList();
 
     // filled during analyze(); contains all operands that can be aggregated with
     // a simple merge without duplicate elimination (also needs to merge the output
     // of the DISTINCT operands)
-    protected final List<SetOperand> allOperands_ = Lists.newArrayList();
+    protected final List<SetOperand> allOperands = Lists.newArrayList();
 
     private AggregateInfo distinctAggInfo;  // only set if we have DISTINCT ops
 
@@ -89,11 +89,11 @@ public enum Qualifier {
     private String toSqlString;
 
     // true if any of the operands_ references an AnalyticExpr
-    private boolean hasAnalyticExprs_ = false;
+    private boolean hasAnalyticExprs = false;
 
     // List of output expressions produced by the set operation without the ORDER BY portion
     // (if any). Same as resultExprs_ if there is no ORDER BY.
-    private List<Expr> setOpsResultExprs_ = Lists.newArrayList();
+    private List<Expr> setOpsResultExprs = Lists.newArrayList();
 
     // END: Members that need to be reset()
     /////////////////////////////////////////
@@ -114,21 +114,27 @@ protected SetOperationStmt(SetOperationStmt other) {
                 (other.limitElement == null) ? null : other.limitElement.clone());
         operands = Lists.newArrayList();
         if (analyzer != null) {
-            for (SetOperand o: other.distinctOperands_) distinctOperands_.add(o.clone());
-            for (SetOperand o: other.allOperands_) allOperands_.add(o.clone());
-            operands.addAll(distinctOperands_);
-            operands.addAll(allOperands_);
+            for (SetOperand o: other.distinctOperands) {
+                distinctOperands.add(o.clone());
+            }
+            for (SetOperand o: other.allOperands) {
+                allOperands.add(o.clone());
+            }
+            operands.addAll(distinctOperands);
+            operands.addAll(allOperands);
         } else {
-            for (SetOperand operand: other.operands) operands.add(operand.clone());
+            for (SetOperand operand: other.operands) {
+                operands.add(operand.clone());
+            }
         }
         analyzer = other.analyzer;
         distinctAggInfo =
                 (other.distinctAggInfo != null) ? other.distinctAggInfo.clone() : null;
         tupleId = other.tupleId;
         toSqlString = (other.toSqlString != null) ? new String(other.toSqlString) : null;
-        hasAnalyticExprs_ = other.hasAnalyticExprs_;
-        withClause_ = (other.withClause_ != null) ? other.withClause_.clone() : null;
-        setOpsResultExprs_ = Expr.cloneList(other.setOpsResultExprs_);
+        hasAnalyticExprs = other.hasAnalyticExprs;
+        withClause = (other.withClause != null) ? other.withClause.clone() : null;
+        setOpsResultExprs = Expr.cloneList(other.setOpsResultExprs);
     }
 
     @Override
@@ -144,14 +150,16 @@ protected SetOperationStmt(SetOperationStmt other) {
     @Override
     public void reset() {
         super.reset();
-        for (SetOperand op: operands) op.reset();
-        distinctOperands_.clear();
-        allOperands_.clear();
+        for (SetOperand op: operands) {
+            op.reset();
+        }
+        distinctOperands.clear();
+        allOperands.clear();
         distinctAggInfo = null;
         tupleId = null;
         toSqlString = null;
-        hasAnalyticExprs_ = false;
-        setOpsResultExprs_.clear();
+        hasAnalyticExprs = false;
+        setOpsResultExprs.clear();
     }
 
     @Override
@@ -162,20 +170,20 @@ public void resetSelectList() {
     }
 
     public List<SetOperand> getOperands() { return operands; }
-    public List<SetOperand> getDistinctOperands() { return distinctOperands_; }
-    public boolean hasDistinctOps() { return !distinctOperands_.isEmpty(); }
-    public List<SetOperand> getAllOperands() { return allOperands_; }
-    public boolean hasAllOps() { return !allOperands_.isEmpty(); }
+    public List<SetOperand> getDistinctOperands() { return distinctOperands; }
+    public boolean hasDistinctOps() { return !distinctOperands.isEmpty(); }
+    public List<SetOperand> getAllOperands() { return allOperands; }
+    public boolean hasAllOps() { return !allOperands.isEmpty(); }
     public AggregateInfo getDistinctAggInfo() { return distinctAggInfo; }
-    public boolean hasAnalyticExprs() { return hasAnalyticExprs_; }
+    public boolean hasAnalyticExprs() { return hasAnalyticExprs; }
     public TupleId getTupleId() { return tupleId; }
 
     public void removeAllOperands() {
-        operands.removeAll(allOperands_);
-        allOperands_.clear();
+        operands.removeAll(allOperands);
+        allOperands.clear();
     }
 
-    public List<Expr> getSetOpsResultExprs() { return setOpsResultExprs_; }
+    public List<Expr> getSetOpsResultExprs() { return setOpsResultExprs; }
 
     @Override
     public void getTables(Analyzer analyzer, Map<Long, Table> tableMap, Set<String> parentViewNameSet) throws AnalysisException {
@@ -199,7 +207,9 @@ public void getTableRefs(Analyzer analyzer, List<TableRef> tblRefs, Set<String>
      */
     @Override
     public void analyze(Analyzer analyzer) throws UserException {
-        if (isAnalyzed()) return;
+        if (isAnalyzed()) {
+            return;
+        }
         super.analyze(analyzer);
         Preconditions.checkState(operands.size() > 0);
 
@@ -225,10 +235,10 @@ public void analyze(Analyzer analyzer) throws UserException {
         unnestOperands(analyzer);
 
         // Compute hasAnalyticExprs_
-        hasAnalyticExprs_ = false;
+        hasAnalyticExprs = false;
         for (SetOperand op: operands) {
             if (op.hasAnalyticExprs()) {
-                hasAnalyticExprs_ = true;
+                hasAnalyticExprs = true;
                 break;
             }
         }
@@ -246,10 +256,12 @@ public void analyze(Analyzer analyzer) throws UserException {
         createSortInfo(analyzer);
 
         // Create unnested operands' smaps.
-        for (SetOperand operand: operands) setOperandSmap(operand, analyzer);
+        for (SetOperand operand: operands) {
+            setOperandSmap(operand, analyzer);
+        }
 
         // Create distinctAggInfo, if necessary.
-        if (!distinctOperands_.isEmpty()) {
+        if (!distinctOperands.isEmpty()) {
             // Aggregate produces exactly the same tuple as the original setOp stmt.
             ArrayList<Expr> groupingExprs = Expr.cloneList(resultExprs);
             try {
@@ -261,11 +273,15 @@ public void analyze(Analyzer analyzer) throws UserException {
             }
         }
 
-        setOpsResultExprs_ = Expr.cloneList(resultExprs);
-        if (evaluateOrderBy) createSortTupleInfo(analyzer);
+        setOpsResultExprs = Expr.cloneList(resultExprs);
+        if (evaluateOrderBy) {
+            createSortTupleInfo(analyzer);
+        }
         baseTblResultExprs = resultExprs;
 
-        if (hasOutFileClause()) outFileClause.analyze(analyzer, resultExprs);
+        if (hasOutFileClause()) {
+            outFileClause.analyze(analyzer, resultExprs);
+        }
     }
 
     /**
@@ -296,7 +312,7 @@ private void analyzeOperands(Analyzer analyzer) throws AnalysisException, UserEx
     private void unnestOperands(Analyzer analyzer) throws AnalysisException {
         if (operands.size() == 1) {
             // ValuesStmt for a single row.
-            allOperands_.add(operands.get(0));
+            allOperands.add(operands.get(0));
             return;
         }
         // find index of first ALL operand
@@ -313,23 +329,27 @@ private void unnestOperands(Analyzer analyzer) throws AnalysisException {
         Preconditions.checkState(firstAllIdx != 1);
 
         // unnest DISTINCT operands
-        Preconditions.checkState(distinctOperands_.isEmpty());
+        Preconditions.checkState(distinctOperands.isEmpty());
         for (int i = 0; i < firstAllIdx; ++i) {
-            unnestOperand(distinctOperands_, Qualifier.DISTINCT, operands.get(i));
+            unnestOperand(distinctOperands, Qualifier.DISTINCT, operands.get(i));
         }
 
         // unnest ALL operands
-        Preconditions.checkState(allOperands_.isEmpty());
+        Preconditions.checkState(allOperands.isEmpty());
         for (int i = firstAllIdx; i < operands.size(); ++i) {
-            unnestOperand(allOperands_, Qualifier.ALL, operands.get(i));
+            unnestOperand(allOperands, Qualifier.ALL, operands.get(i));
         }
 
-        for (SetOperand op: distinctOperands_) op.setQualifier(Qualifier.DISTINCT);
-        for (SetOperand op: allOperands_) op.setQualifier(Qualifier.ALL);
+        for (SetOperand op: distinctOperands) {
+            op.setQualifier(Qualifier.DISTINCT);
+        }
+        for (SetOperand op: allOperands) {
+            op.setQualifier(Qualifier.ALL);
+        }
 
         operands.clear();
-        operands.addAll(distinctOperands_);
-        operands.addAll(allOperands_);
+        operands.addAll(distinctOperands);
+        operands.addAll(allOperands);
     }
 
     /**
@@ -487,10 +507,16 @@ private void createMetadata(Analyzer analyzer) throws AnalysisException {
                 if (slotRef == null) {
                     isNullable |= resultExpr.isNullable();
                 } else if (slotRef.getDesc().getIsNullable()
-                        || analyzer.isOuterJoined(slotRef.getDesc().getParent().getId())) isNullable = true;
-                if (op.hasAnalyticExprs()) continue;
+                        || analyzer.isOuterJoined(slotRef.getDesc().getParent().getId())) {
+                    isNullable = true;
+                }
+                if (op.hasAnalyticExprs()) {
+                    continue;
+                }
                 slotRef = resultExpr.unwrapSlotRef(true);
-                if (slotRef == null) continue;
+                if (slotRef == null) {
+                    continue;
+                }
                 // analyzer.registerValueTransfer(outputSlotRef.getSlotId(), slotRef.getSlotId());
             }
             // If all the child slots are not nullable, then the SetOps output slot should not
@@ -510,16 +536,22 @@ public void materializeRequiredSlots(Analyzer analyzer) throws AnalysisException
         TupleDescriptor tupleDesc = analyzer.getDescTbl().getTupleDesc(tupleId);
         // to keep things simple we materialize all grouping exprs = output slots,
         // regardless of what's being referenced externally
-        if (!distinctOperands_.isEmpty()) tupleDesc.materializeSlots();
+        if (!distinctOperands.isEmpty()) {
+            tupleDesc.materializeSlots();
+        }
 
-        if (evaluateOrderBy) sortInfo.materializeRequiredSlots(analyzer, null);
+        if (evaluateOrderBy) {
+            sortInfo.materializeRequiredSlots(analyzer, null);
+        }
 
         // collect operands' result exprs
         List<SlotDescriptor> outputSlots = tupleDesc.getSlots();
         List<Expr> exprs = Lists.newArrayList();
         for (int i = 0; i < outputSlots.size(); ++i) {
             SlotDescriptor slotDesc = outputSlots.get(i);
-            if (!slotDesc.isMaterialized()) continue;
+            if (!slotDesc.isMaterialized()) {
+                continue;
+            }
             for (SetOperand op: operands) {
                 exprs.add(op.getQueryStmt().getBaseTblResultExprs().get(i));
             }
@@ -574,7 +606,9 @@ public void putBackExprs(Map<String, Expr> rewrittenExprMap) {
 
     @Override
     public void rewriteExprs(ExprRewriter rewriter) throws AnalysisException {
-        for (SetOperand op: operands) op.getQueryStmt().rewriteExprs(rewriter);
+        for (SetOperand op: operands) {
+            op.getQueryStmt().rewriteExprs(rewriter);
+        }
         if (orderByElements != null) {
             for (OrderByElement orderByElem: orderByElements) {
                 orderByElem.setExpr(rewriter.rewrite(orderByElem.getExpr(), analyzer));
@@ -594,13 +628,17 @@ public void getMaterializedTupleIds(ArrayList<TupleId> tupleIdList) {
 
     @Override
     public void collectTableRefs(List<TableRef> tblRefs) {
-        for (SetOperand op: operands) op.getQueryStmt().collectTableRefs(tblRefs);
+        for (SetOperand op: operands) {
+            op.getQueryStmt().collectTableRefs(tblRefs);
+        }
     }
 
     @Override
     public List<TupleId> collectTupleIds() {
         List<TupleId> result = Lists.newArrayList();
-        for (SetOperand op: operands) result.addAll(op.getQueryStmt().collectTupleIds());
+        for (SetOperand op: operands) {
+            result.addAll(op.getQueryStmt().collectTupleIds());
+        }
         return result;
     }
 
@@ -610,8 +648,8 @@ public String toSql() {
             return toSqlString;
         }
         StringBuilder strBuilder = new StringBuilder();
-        if (withClause_ != null) {
-            strBuilder.append(withClause_.toSql());
+        if (withClause != null) {
+            strBuilder.append(withClause.toSql());
             strBuilder.append(" ");
         }
         Preconditions.checkState(operands.size() > 0);
@@ -661,8 +699,8 @@ public String toSql() {
     @Override
     public String toDigest() {
         StringBuilder strBuilder = new StringBuilder();
-        if (withClause_ != null) {
-            strBuilder.append(withClause_.toDigest());
+        if (withClause != null) {
+            strBuilder.append(withClause.toDigest());
             strBuilder.append(" ");
         }
 
@@ -744,7 +782,7 @@ public static class SetOperand {
 
         // Effective qualifier. Should not be reset() to preserve changes made during
         // distinct propagation and unnesting that are needed after rewriting Subqueries.
-        private Qualifier qualifier_;
+        private Qualifier qualifier;
 
         // ///////////////////////////////////////
         // BEGIN: Members that need to be reset()
@@ -756,7 +794,7 @@ public static class SetOperand {
         private Analyzer analyzer;
 
         // Map from SetOperationStmt's result slots to our resultExprs. Used during plan generation.
-        private final ExprSubstitutionMap smap_;
+        private final ExprSubstitutionMap smap;
 
         // END: Members that need to be reset()
         // ///////////////////////////////////////
@@ -764,8 +802,8 @@ public static class SetOperand {
         public SetOperand(QueryStmt queryStmt, Operation operation, Qualifier qualifier) {
             this.queryStmt = queryStmt;
             this.operation = operation;
-            qualifier_ = qualifier;
-            smap_ = new ExprSubstitutionMap();
+            this.qualifier = qualifier;
+            smap = new ExprSubstitutionMap();
         }
 
         public void analyze(Analyzer parent) throws AnalysisException, UserException {
@@ -774,7 +812,7 @@ public void analyze(Analyzer parent) throws AnalysisException, UserException {
             }
             // union statement support const expr, so not need to equal
             if (operation != Operation.UNION && queryStmt instanceof SelectStmt
-                    && ((SelectStmt) queryStmt).fromClause_.isEmpty()) {
+                    && ((SelectStmt) queryStmt).fromClause.isEmpty()) {
                 // equal select 1 to select * from (select 1) __DORIS_DUAL__ , because when using select 1 it will be
                 // transformed to a union node, select 1 is a literal, it doesn't have a tuple but will produce a slot,
                 // this will cause be core dump
@@ -792,14 +830,14 @@ public void analyze(Analyzer parent) throws AnalysisException, UserException {
                                 .set(i, new SelectListItem(item.getExpr(), col + "_" + count.toString()));
                     }
                 }
-                ((SelectStmt) queryStmt).fromClause_.add(new InlineViewRef("__DORIS_DUAL__", inlineQuery));
+                ((SelectStmt) queryStmt).fromClause.add(new InlineViewRef("__DORIS_DUAL__", inlineQuery));
                 List<SelectListItem> slist = ((SelectStmt) queryStmt).selectList.getItems();
                 slist.clear();
                 slist.add(SelectListItem.createStarItem(null));
             }
             // Oracle and ms-SQLServer do not support INTERSECT ALL and EXCEPT ALL, postgres support it,
             // but it is very ambiguous
-            if (qualifier_ == Qualifier.ALL && (operation == Operation.EXCEPT || operation == Operation.INTERSECT)) {
+            if (qualifier == Qualifier.ALL && (operation == Operation.EXCEPT || operation == Operation.INTERSECT)) {
                 throw new AnalysisException("INTERSECT and EXCEPT does not support ALL qualifier.");
             }
             analyzer = new Analyzer(parent);
@@ -808,12 +846,12 @@ public void analyze(Analyzer parent) throws AnalysisException, UserException {
 
         public boolean isAnalyzed() { return analyzer != null; }
         public QueryStmt getQueryStmt() { return queryStmt; }
-        public Qualifier getQualifier() { return qualifier_; }
+        public Qualifier getQualifier() { return qualifier; }
         public Operation getOperation() {
             return operation;
         }
         // Used for propagating DISTINCT.
-        public void setQualifier(Qualifier qualifier) { qualifier_ = qualifier; }
+        public void setQualifier(Qualifier qualifier) { this.qualifier = qualifier; }
 
         public void setOperation(Operation operation) {
             this.operation =operation;
@@ -822,7 +860,7 @@ public void setQueryStmt(QueryStmt queryStmt) {
             this.queryStmt = queryStmt;
         }
         public Analyzer getAnalyzer() { return analyzer; }
-        public ExprSubstitutionMap getSmap() { return smap_; }
+        public ExprSubstitutionMap getSmap() { return smap; }
 
         public boolean hasAnalyticExprs() {
             if (queryStmt instanceof SelectStmt) {
@@ -839,15 +877,15 @@ public boolean hasAnalyticExprs() {
         private SetOperand(SetOperand other) {
             queryStmt = other.queryStmt.clone();
             this.operation = other.operation;
-            qualifier_ = other.qualifier_;
+            qualifier = other.qualifier;
             analyzer = other.analyzer;
-            smap_ = other.smap_.clone();
+            smap = other.smap.clone();
         }
 
         public void reset() {
             queryStmt.reset();
             analyzer = null;
-            smap_.clear();
+            smap.clear();
         }
 
         @Override
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 961b760807efcd..d9bc8ac25f0386 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
@@ -51,9 +51,9 @@ public enum StreamLoadState {
     }
 
     private String dbName;
-    private Expr whereClause;
-    private LimitElement limitElement;
-    private List<OrderByElement> orderByElements;
+    private final Expr whereClause;
+    private final LimitElement limitElement;
+    private final List<OrderByElement> orderByElements;
 
     private String labelValue;
     private String stateValue;
@@ -61,7 +61,7 @@ public enum StreamLoadState {
 
     private ArrayList<OrderByPair> orderByPairs;
 
-    private ImmutableList<String> TITLE_NAMES = new ImmutableList.Builder<String>()
+    private static final ImmutableList<String> TITLE_NAMES = new ImmutableList.Builder<String>()
             .add("Label").add("Db").add("Table").add("User")
             .add("ClientIp").add("Status").add("Message").add("Url").add("TotalRows")
             .add("LoadedRows").add("FilteredRows").add("UnselectedRows").add("LoadBytes")
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotDescriptor.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotDescriptor.java
index 373b88b26d6abd..e516894edaf6ba 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotDescriptor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotDescriptor.java
@@ -41,11 +41,11 @@ public class SlotDescriptor {
     private Column column;  // underlying column, if there is one
 
     // for SlotRef.toSql() in the absence of a path
-    private String label_;
+    private String label;
 
     // Expr(s) materialized into this slot; multiple exprs for unions. Should be empty if
     // path_ is set.
-    private List<Expr> sourceExprs_ = Lists.newArrayList();
+    private List<Expr> sourceExprs = Lists.newArrayList();
 
     // if false, this slot doesn't need to be materialized in parent tuple
     // (and physical layout parameters are invalid)
@@ -213,12 +213,12 @@ public int getSlotOffset() {
         return slotOffset;
     }
 
-    public String getLabel() { return label_; }
-    public void setLabel(String label) { label_ = label; }
-    public void setSourceExprs(List<Expr> exprs) { sourceExprs_ = exprs; }
-    public void setSourceExpr(Expr expr) { sourceExprs_ = Collections.singletonList(expr); }
-    public void addSourceExpr(Expr expr) { sourceExprs_.add(expr); }
-    public List<Expr> getSourceExprs() { return sourceExprs_; }
+    public String getLabel() { return label; }
+    public void setLabel(String label) { this.label = label; }
+    public void setSourceExprs(List<Expr> exprs) { sourceExprs = exprs; }
+    public void setSourceExpr(Expr expr) { sourceExprs = Collections.singletonList(expr); }
+    public void addSourceExpr(Expr expr) { sourceExprs.add(expr); }
+    public List<Expr> getSourceExprs() { return sourceExprs; }
 
 
     /**
@@ -227,7 +227,7 @@ public int getSlotOffset() {
     public void initFromExpr(Expr expr) {
         setIsNullable(expr.isNullable());
         setLabel(expr.toSql());
-        Preconditions.checkState(sourceExprs_.isEmpty());
+        Preconditions.checkState(sourceExprs.isEmpty());
         setSourceExpr(expr);
         setStats(ColumnStats.fromExpr(expr));
         Preconditions.checkState(expr.getType().isValid());
@@ -238,13 +238,25 @@ public void initFromExpr(Expr expr) {
      * Return true if the physical layout of this descriptor matches the physical layout
      * of the other descriptor, but not necessarily ids.
      */
-    public boolean LayoutEquals(SlotDescriptor other) {
-        if (!getType().equals(other.getType())) return false;
-        if (isNullable != other.isNullable) return false;
-        if (getByteSize() != other.getByteSize()) return false;
-        if (getByteOffset() != other.getByteOffset()) return false;
-        if (getNullIndicatorByte() != other.getNullIndicatorByte()) return false;
-        if (getNullIndicatorBit() != other.getNullIndicatorBit()) return false;
+    public boolean layoutEquals(SlotDescriptor other) {
+        if (!getType().equals(other.getType())) {
+            return false;
+        }
+        if (isNullable != other.isNullable) {
+            return false;
+        }
+        if (getByteSize() != other.getByteSize()) {
+            return false;
+        }
+        if (getByteOffset() != other.getByteOffset()) {
+            return false;
+        }
+        if (getNullIndicatorByte() != other.getNullIndicatorByte()) {
+            return false;
+        }
+        if (getNullIndicatorBit() != other.getNullIndicatorBit()) {
+            return false;
+        }
         return true;
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotId.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotId.java
index 370eb0ebd42806..6854fe2d71d3b2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotId.java
@@ -31,9 +31,9 @@ public SlotId(int id) {
     public static IdGenerator<SlotId> createGenerator() {
         return new IdGenerator<SlotId>() {
             @Override
-            public SlotId getNextId() { return new SlotId(nextId_++); }
+            public SlotId getNextId() { return new SlotId(nextId++); }
             @Override
-            public SlotId getMaxId() { return new SlotId(nextId_ - 1); }
+            public SlotId getMaxId() { return new SlotId(nextId - 1); }
         };
     }
 }
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 788b81f55c8df2..636fbc991eeeac 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
@@ -318,7 +318,9 @@ public boolean notCheckDescIdEquals(Object obj) {
     public boolean isBoundByTupleIds(List<TupleId> tids) {
         Preconditions.checkState(desc != null);
         for (TupleId tid: tids) {
-            if (tid.equals(desc.getParent().getId())) return true;
+            if (tid.equals(desc.getParent().getId())) {
+                return true;
+            }
         }
         return false;
     }
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 128a88459bb359..09a2b2b3b12aa2 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
@@ -49,41 +49,41 @@ public class SortInfo {
     // TODO: rethink this when we have a better cost model.
     private static final float SORT_MATERIALIZATION_COST_THRESHOLD = Expr.FUNCTION_CALL_COST;
 
-    private List<Expr> orderingExprs_;
-    private final List<Boolean> isAscOrder_;
+    private List<Expr> orderingExprs;
+    private final List<Boolean> isAscOrder;
     // True if "NULLS FIRST", false if "NULLS LAST", null if not specified.
-    private final List<Boolean> nullsFirstParams_;
+    private final List<Boolean> nullsFirstParams;
     // Subset of ordering exprs that are materialized. Populated in
     // createMaterializedOrderExprs(), used for EXPLAIN output.
-    private List<Expr> materializedOrderingExprs_;
+    private List<Expr> materializedOrderingExprs;
     // The single tuple that is materialized, sorted, and output by a sort operator
     // (i.e. SortNode or TopNNode)
-    private TupleDescriptor sortTupleDesc_;
+    private TupleDescriptor sortTupleDesc;
     // Input expressions materialized into sortTupleDesc_. One expr per slot in
     // sortTupleDesc_.
-    private List<Expr> sortTupleSlotExprs_;
+    private List<Expr> sortTupleSlotExprs;
 
     public SortInfo(List<Expr> orderingExprs, List<Boolean> isAscOrder,
                     List<Boolean> nullsFirstParams) {
         Preconditions.checkArgument(orderingExprs.size() == isAscOrder.size());
         Preconditions.checkArgument(orderingExprs.size() == nullsFirstParams.size());
-        orderingExprs_ = orderingExprs;
-        isAscOrder_ = isAscOrder;
-        nullsFirstParams_ = nullsFirstParams;
-        materializedOrderingExprs_ = Lists.newArrayList();
+        this.orderingExprs = orderingExprs;
+        this.isAscOrder = isAscOrder;
+        this.nullsFirstParams = nullsFirstParams;
+        materializedOrderingExprs = Lists.newArrayList();
     }
 
     /**
      * C'tor for cloning.
      */
     private SortInfo(SortInfo other) {
-        orderingExprs_ = Expr.cloneList(other.orderingExprs_);
-        isAscOrder_ = Lists.newArrayList(other.isAscOrder_);
-        nullsFirstParams_ = Lists.newArrayList(other.nullsFirstParams_);
-        materializedOrderingExprs_ = Expr.cloneList(other.materializedOrderingExprs_);
-        sortTupleDesc_ = other.sortTupleDesc_;
-        if (other.sortTupleSlotExprs_ != null) {
-            sortTupleSlotExprs_ = Expr.cloneList(other.sortTupleSlotExprs_);
+        orderingExprs = Expr.cloneList(other.orderingExprs);
+        isAscOrder = Lists.newArrayList(other.isAscOrder);
+        nullsFirstParams = Lists.newArrayList(other.nullsFirstParams);
+        materializedOrderingExprs = Expr.cloneList(other.materializedOrderingExprs);
+        sortTupleDesc = other.sortTupleDesc;
+        if (other.sortTupleSlotExprs != null) {
+            sortTupleSlotExprs = Expr.cloneList(other.sortTupleSlotExprs);
         }
     }
 
@@ -95,31 +95,31 @@ private SortInfo(SortInfo other) {
     public void setMaterializedTupleInfo(
             TupleDescriptor tupleDesc, List<Expr> tupleSlotExprs) {
         Preconditions.checkState(tupleDesc.getSlots().size() == tupleSlotExprs.size());
-        sortTupleDesc_ = tupleDesc;
-        sortTupleSlotExprs_ = tupleSlotExprs;
-        for (int i = 0; i < sortTupleDesc_.getSlots().size(); ++i) {
-            SlotDescriptor slotDesc = sortTupleDesc_.getSlots().get(i);
-            slotDesc.setSourceExpr(sortTupleSlotExprs_.get(i));
+        sortTupleDesc = tupleDesc;
+        sortTupleSlotExprs = tupleSlotExprs;
+        for (int i = 0; i < sortTupleDesc.getSlots().size(); ++i) {
+            SlotDescriptor slotDesc = sortTupleDesc.getSlots().get(i);
+            slotDesc.setSourceExpr(sortTupleSlotExprs.get(i));
         }
     }
 
-    public List<Expr> getOrderingExprs() { return orderingExprs_; }
-    public List<Boolean> getIsAscOrder() { return isAscOrder_; }
-    public List<Boolean> getNullsFirstParams() { return nullsFirstParams_; }
-    public List<Expr> getMaterializedOrderingExprs() { return materializedOrderingExprs_; }
-    public List<Expr> getSortTupleSlotExprs() { return sortTupleSlotExprs_; }
-    public TupleDescriptor getSortTupleDescriptor() { return sortTupleDesc_; }
+    public List<Expr> getOrderingExprs() { return orderingExprs; }
+    public List<Boolean> getIsAscOrder() { return isAscOrder; }
+    public List<Boolean> getNullsFirstParams() { return nullsFirstParams; }
+    public List<Expr> getMaterializedOrderingExprs() { return materializedOrderingExprs; }
+    public List<Expr> getSortTupleSlotExprs() { return sortTupleSlotExprs; }
+    public TupleDescriptor getSortTupleDescriptor() { return sortTupleDesc; }
 
     /**
      * Gets the list of booleans indicating whether nulls come first or last, independent
      * of asc/desc.
      */
     public List<Boolean> getNullsFirst() {
-        Preconditions.checkState(orderingExprs_.size() == nullsFirstParams_.size());
+        Preconditions.checkState(orderingExprs.size() == nullsFirstParams.size());
         List<Boolean> nullsFirst = Lists.newArrayList();
-        for (int i = 0; i < orderingExprs_.size(); ++i) {
-            nullsFirst.add(OrderByElement.nullsFirst(nullsFirstParams_.get(i),
-                    isAscOrder_.get(i)));
+        for (int i = 0; i < orderingExprs.size(); ++i) {
+            nullsFirst.add(OrderByElement.nullsFirst(nullsFirstParams.get(i),
+                    isAscOrder.get(i)));
         }
         return nullsFirst;
     }
@@ -130,15 +130,15 @@ public List<Boolean> getNullsFirst() {
      * applying the 'smap'.
      */
     public void materializeRequiredSlots(Analyzer analyzer, ExprSubstitutionMap smap) {
-        Preconditions.checkNotNull(sortTupleDesc_);
-        Preconditions.checkNotNull(sortTupleSlotExprs_);
-        Preconditions.checkState(sortTupleDesc_.isMaterialized());
-        analyzer.materializeSlots(orderingExprs_);
-        List<SlotDescriptor> sortTupleSlotDescs = sortTupleDesc_.getSlots();
+        Preconditions.checkNotNull(sortTupleDesc);
+        Preconditions.checkNotNull(sortTupleSlotExprs);
+        Preconditions.checkState(sortTupleDesc.isMaterialized());
+        analyzer.materializeSlots(orderingExprs);
+        List<SlotDescriptor> sortTupleSlotDescs = sortTupleDesc.getSlots();
         List<Expr> materializedExprs = Lists.newArrayList();
         for (int i = 0; i < sortTupleSlotDescs.size(); ++i) {
             if (sortTupleSlotDescs.get(i).isMaterialized()) {
-                materializedExprs.add(sortTupleSlotExprs_.get(i));
+                materializedExprs.add(sortTupleSlotExprs.get(i));
             }
         }
         List<Expr> substMaterializedExprs =
@@ -147,15 +147,15 @@ public void materializeRequiredSlots(Analyzer analyzer, ExprSubstitutionMap smap
     }
 
     public void substituteOrderingExprs(ExprSubstitutionMap smap, Analyzer analyzer) {
-        orderingExprs_ = Expr.substituteList(orderingExprs_, smap, analyzer, false);
+        orderingExprs = Expr.substituteList(orderingExprs, smap, analyzer, false);
     }
 
     /**
      * Asserts that all ordering exprs are bound by the sort tuple.
      */
     public void checkConsistency() {
-        for (Expr orderingExpr: orderingExprs_) {
-            Preconditions.checkState(orderingExpr.isBound(sortTupleDesc_.getId()));
+        for (Expr orderingExpr: orderingExprs) {
+            Preconditions.checkState(orderingExpr.isBound(sortTupleDesc.getId()));
         }
     }
 
@@ -193,7 +193,7 @@ public ExprSubstitutionMap createSortTupleInfo(
         Set<SlotRef> sourceSlots = Sets.newHashSet();
         TreeNode.collect(Expr.substituteList(resultExprs, substOrderBy, analyzer, false),
                 Predicates.instanceOf(SlotRef.class), sourceSlots);
-        TreeNode.collect(Expr.substituteList(orderingExprs_, substOrderBy, analyzer, false),
+        TreeNode.collect(Expr.substituteList(orderingExprs, substOrderBy, analyzer, false),
                 Predicates.instanceOf(SlotRef.class), sourceSlots);
         for (SlotRef origSlotRef: sourceSlots) {
             // Don't rematerialize slots that are already in the sort tuple.
@@ -231,7 +231,7 @@ public ExprSubstitutionMap createSortTupleInfo(
     public ExprSubstitutionMap createMaterializedOrderExprs(
             TupleDescriptor sortTupleDesc, Analyzer analyzer) {
         ExprSubstitutionMap substOrderBy = new ExprSubstitutionMap();
-        for (Expr origOrderingExpr : orderingExprs_) {
+        for (Expr origOrderingExpr : orderingExprs) {
             // TODO(zc): support materialized order exprs
             // if (!origOrderingExpr.hasCost()
             //         || origOrderingExpr.getCost() > SORT_MATERIALIZATION_COST_THRESHOLD
@@ -250,7 +250,7 @@ public ExprSubstitutionMap createMaterializedOrderExprs(
                 materializedDesc.setIsMaterialized(true);
                 SlotRef materializedRef = new SlotRef(materializedDesc);
                 substOrderBy.put(origOrderingExpr, materializedRef);
-                materializedOrderingExprs_.add(origOrderingExpr);
+                materializedOrderingExprs.add(origOrderingExpr);
             }
         }
         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 897c5a7b6d86ba..92ffaa6bbf9b0e 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
@@ -72,7 +72,9 @@ protected StatementBase(StatementBase other) {
      * tables/views get collected in the Analyzer before failing analyze().
      */
     public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
-        if (isAnalyzed()) return;
+        if (isAnalyzed()) {
+            return;
+        }
         this.analyzer = analyzer;
         if (Strings.isNullOrEmpty(analyzer.getClusterName())) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_CLUSTER_NO_SELECT_CLUSTER);
@@ -129,7 +131,9 @@ public String toSql() {
      */
     public void setColLabels(List<String> colLabels) {
         List<String> oldLabels = getColLabels();
-        if (oldLabels == colLabels) return;
+        if (oldLabels == colLabels) {
+            return;
+        }
         oldLabels.clear();
         oldLabels.addAll(colLabels);
     }
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 8ce0529714e9ad..64695fd6bb629a 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
@@ -92,7 +92,7 @@ private static SelectStmt rewriteSelectStatement(SelectStmt stmt, Analyzer analy
             throws AnalysisException {
         SelectStmt result = stmt;
         // Rewrite all the subqueries in the FROM clause.
-        for (TableRef tblRef : result.fromClause_) {
+        for (TableRef tblRef : result.fromClause) {
             if (!(tblRef instanceof InlineViewRef)) {
                 continue;
             }
@@ -118,7 +118,7 @@ private static SelectStmt rewriteSelectStatement(SelectStmt stmt, Analyzer analy
                 && result.getHavingClauseAfterAnaylzed().getSubquery() != null) {
             result = rewriteHavingClauseSubqueries(result, analyzer);
         }
-        result.sqlString_ = null;
+        result.sqlString = null;
         if (LOG.isDebugEnabled()) {
             LOG.debug("rewritten stmt: " + result.toSql());
         }
@@ -403,7 +403,7 @@ private static boolean hasSubqueryInDisjunction(Expr expr) {
     private static void rewriteWhereClauseSubqueries(
             SelectStmt stmt, Analyzer analyzer)
             throws AnalysisException {
-        int numTableRefs = stmt.fromClause_.size();
+        int numTableRefs = stmt.fromClause.size();
         ArrayList<Expr> exprsWithSubqueries = Lists.newArrayList();
         ExprSubstitutionMap smap = new ExprSubstitutionMap();
         // Check if all the conjuncts in the WHERE clause that contain subqueries
@@ -613,9 +613,9 @@ private static boolean mergeExpr(SelectStmt stmt, Expr expr,
         } catch (UserException e) {
             throw new AnalysisException(e.getMessage());
         }
-        inlineView.setLeftTblRef(stmt.fromClause_.get(stmt.fromClause_.size() - 1));
+        inlineView.setLeftTblRef(stmt.fromClause.get(stmt.fromClause.size() - 1));
 
-        stmt.fromClause_.add(inlineView);
+        stmt.fromClause.add(inlineView);
         JoinOperator joinOp = JoinOperator.LEFT_SEMI_JOIN;
 
         // Create a join conjunct from the expr that contains a subquery.
@@ -786,7 +786,7 @@ private static boolean mergeExpr(SelectStmt stmt, Expr expr,
      * replacing an unqualified star item.
      */
     private static void replaceUnqualifiedStarItems(SelectStmt stmt, int tableIdx) {
-        Preconditions.checkState(tableIdx < stmt.fromClause_.size());
+        Preconditions.checkState(tableIdx < stmt.fromClause.size());
         ArrayList<SelectListItem> newItems = Lists.newArrayList();
         for (int i = 0; i < stmt.selectList.getItems().size(); ++i) {
             SelectListItem item = stmt.selectList.getItems().get(i);
@@ -797,7 +797,7 @@ private static void replaceUnqualifiedStarItems(SelectStmt stmt, int tableIdx) {
             // '*' needs to be replaced by tbl1.*,...,tbln.*, where
             // tbl1,...,tbln are the visible tableRefs in stmt.
             for (int j = 0; j < tableIdx; ++j) {
-                TableRef tableRef = stmt.fromClause_.get(j);
+                TableRef tableRef = stmt.fromClause.get(j);
                 if (tableRef.getJoinOp() == JoinOperator.LEFT_SEMI_JOIN ||
                         tableRef.getJoinOp() == JoinOperator.LEFT_ANTI_JOIN) {
                     continue;
@@ -1171,8 +1171,8 @@ public static boolean rewriteByPolicy(StatementBase statementBase, Analyzer anal
         }
         SelectStmt selectStmt = (SelectStmt) statementBase;
         boolean reAnalyze = false;
-        for (int i = 0; i < selectStmt.fromClause_.size(); i++) {
-            TableRef tableRef = selectStmt.fromClause_.get(i);
+        for (int i = 0; i < selectStmt.fromClause.size(); i++) {
+            TableRef tableRef = selectStmt.fromClause.get(i);
             // Recursively rewrite subquery
             if (tableRef instanceof InlineViewRef) {
                 InlineViewRef viewRef = (InlineViewRef) tableRef;
@@ -1203,7 +1203,7 @@ public static boolean rewriteByPolicy(StatementBase statementBase, Analyzer anal
                     null,
                     null,
                     LimitElement.NO_LIMIT);
-            selectStmt.fromClause_.set(i, new InlineViewRef(tableRef.getAliasAsName().getTbl(), stmt));
+            selectStmt.fromClause.set(i, new InlineViewRef(tableRef.getAliasAsName().getTbl(), stmt));
             selectStmt.analyze(analyzer);
             reAnalyze = true;
         }
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 c29a2ada224245..8365bbbc16674e 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
@@ -109,7 +109,9 @@ public void analyzeImpl(Analyzer parentAnalyzer) throws AnalysisException {
         }
 
         // If the subquery returns many rows, set its type to MultiRowType.
-        if (!((SelectStmt)stmt).returnsSingleRow()) type = new MultiRowType(type);
+        if (!((SelectStmt)stmt).returnsSingleRow()) {
+            type = new MultiRowType(type);
+        }
 
         // Preconditions.checkNotNull(type);
         // type.analyze();
@@ -138,7 +140,9 @@ private StructType createStructTypeFromExprList() {
         // Check if we have unique labels
         List<String> labels = stmt.getColLabels();
         boolean hasUniqueLabels = true;
-        if (Sets.newHashSet(labels).size() != labels.size()) hasUniqueLabels = false;
+        if (Sets.newHashSet(labels).size() != labels.size()) {
+            hasUniqueLabels = false;
+        }
 
         // Construct a StructField from each expr in the select list
         for (int i = 0; i < stmtResultExprs.size(); ++i) {
@@ -182,7 +186,9 @@ public boolean isCorrelatedPredicate(List<TupleId> tupleIdList) {
      */
     @Override
     public boolean equals(Object o) {
-        if (!super.equals(o)) return false;
+        if (!super.equals(o)) {
+            return false;
+        }
         return stmt.toSql().equals(((Subquery)o).stmt.toSql());
     }
 
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 7bf37905840da7..f64af5449f85ad 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
@@ -86,10 +86,10 @@ public class TableRef implements ParseNode, Writable {
     // analysis. By convention, for table refs with multiple implicit aliases, aliases_[0]
     // contains the fully-qualified implicit alias to ensure that aliases_[0] always
     // uniquely identifies this table ref regardless of whether it has an explicit alias.
-    protected String[] aliases_;
+    protected String[] aliases;
 
     // Indicates whether this table ref is given an explicit alias,
-    protected boolean hasExplicitAlias_;
+    protected boolean hasExplicitAlias;
 
     protected JoinOperator joinOp;
     protected List<String> usingColNames;
@@ -115,14 +115,14 @@ public class TableRef implements ParseNode, Writable {
     // we may alter the chain of table refs during plan generation, but we still rely
     // on the original list of ids for correct predicate assignment.
     // Populated in analyzeJoin().
-    protected List<TupleId> allTableRefIds_ = Lists.newArrayList();
-    protected List<TupleId> allMaterializedTupleIds_ = Lists.newArrayList();
+    protected List<TupleId> allTableRefIds = Lists.newArrayList();
+    protected List<TupleId> allMaterializedTupleIds = Lists.newArrayList();
 
     // All physical tuple ids that this table ref is correlated with:
     // Tuple ids of root descriptors from outer query blocks that this table ref
     // (if a CollectionTableRef) or contained CollectionTableRefs (if an InlineViewRef)
     // are rooted at. Populated during analysis.
-    protected List<TupleId> correlatedTupleIds_ = Lists.newArrayList();
+    protected List<TupleId> correlatedTupleIds = Lists.newArrayList();
 
     // analysis output
     protected TupleDescriptor desc;
@@ -153,10 +153,10 @@ public TableRef(TableName name, String alias, PartitionNames partitionNames, Arr
             if (Catalog.isStoredTableNamesLowerCase()) {
                 alias = alias.toLowerCase();
             }
-            aliases_ = new String[]{alias};
-            hasExplicitAlias_ = true;
+            aliases = new String[]{alias};
+            hasExplicitAlias = true;
         } else {
-            hasExplicitAlias_ = false;
+            hasExplicitAlias = false;
         }
         this.partitionNames = partitionNames;
         this.commonHints = commonHints;
@@ -167,8 +167,8 @@ public TableRef(TableName name, String alias, PartitionNames partitionNames, Arr
     // this will reset all the 'analyzed' stuff
     protected TableRef(TableRef other) {
         name = other.name;
-        aliases_ = other.aliases_;
-        hasExplicitAlias_ = other.hasExplicitAlias_;
+        aliases = other.aliases;
+        hasExplicitAlias = other.hasExplicitAlias;
         joinOp = other.joinOp;
         // NOTE: joinHints and sortHints maybe changed after clone. so we new one List.
         joinHints =
@@ -185,9 +185,9 @@ protected TableRef(TableRef other) {
         // table refs is the responsibility of the statement.
         leftTblRef = null;
         isAnalyzed = other.isAnalyzed;
-        allTableRefIds_ = Lists.newArrayList(other.allTableRefIds_);
-        allMaterializedTupleIds_ = Lists.newArrayList(other.allMaterializedTupleIds_);
-        correlatedTupleIds_ = Lists.newArrayList(other.correlatedTupleIds_);
+        allTableRefIds = Lists.newArrayList(other.allTableRefIds);
+        allMaterializedTupleIds = Lists.newArrayList(other.allMaterializedTupleIds);
+        correlatedTupleIds = Lists.newArrayList(other.correlatedTupleIds);
         desc = other.desc;
         lateralViewRefs = null;
         if (other.lateralViewRefs != null) {
@@ -297,7 +297,7 @@ public boolean isRelative() {
      * an outer query block.
      */
     public boolean isCorrelated() {
-        return !correlatedTupleIds_.isEmpty();
+        return !correlatedTupleIds.isEmpty();
     }
 
     public Table getTable() {
@@ -440,14 +440,14 @@ public void analyzeJoin(Analyzer analyzer) throws AnalysisException {
         analyzeJoinHints();
 
         // Populate the lists of all table ref and materialized tuple ids.
-        allTableRefIds_.clear();
-        allMaterializedTupleIds_.clear();
+        allTableRefIds.clear();
+        allMaterializedTupleIds.clear();
         if (leftTblRef != null) {
-            allTableRefIds_.addAll(leftTblRef.getAllTableRefIds());
-            allMaterializedTupleIds_.addAll(leftTblRef.getAllMaterializedTupleIds());
+            allTableRefIds.addAll(leftTblRef.getAllTableRefIds());
+            allMaterializedTupleIds.addAll(leftTblRef.getAllMaterializedTupleIds());
         }
-        allTableRefIds_.add(getId());
-        allMaterializedTupleIds_.addAll(getMaterializedTupleIds());
+        allTableRefIds.add(getId());
+        allMaterializedTupleIds.addAll(getMaterializedTupleIds());
 
         if (usingColNames != null) {
             // Turn USING clause into equivalent ON clause.
@@ -620,7 +620,7 @@ private String joinOpToSql() {
      */
     public List<TupleId> getAllTableRefIds() {
         Preconditions.checkState(isAnalyzed);
-        return allTableRefIds_;
+        return allTableRefIds;
     }
 
     /**
@@ -713,7 +713,7 @@ public TableName getAliasAsName() {
      * Returns all legal aliases of this table ref.
      */
     public String[] getAliases() {
-        return aliases_;
+        return aliases;
     }
 
     /**
@@ -722,7 +722,7 @@ public String[] getAliases() {
      * be ambiguous).
      */
     public String getUniqueAlias() {
-        return aliases_[0];
+        return aliases[0];
     }
 
     /**
@@ -731,14 +731,16 @@ public String getUniqueAlias() {
      * nested collection refs have only a single implicit alias.
      */
     public boolean hasExplicitAlias() {
-        return hasExplicitAlias_;
+        return hasExplicitAlias;
     }
 
     /**
      * Returns the explicit alias if this table ref has one, null otherwise.
      */
     public String getExplicitAlias() {
-        if (hasExplicitAlias()) return getUniqueAlias();
+        if (hasExplicitAlias()) {
+            return getUniqueAlias();
+        }
         return null;
     }
 
@@ -787,9 +789,9 @@ public void reset() {
             onClause.reset();
         }
         leftTblRef = null;
-        allTableRefIds_.clear();
-        allMaterializedTupleIds_.clear();
-        correlatedTupleIds_.clear();
+        allTableRefIds.clear();
+        allMaterializedTupleIds.clear();
+        correlatedTupleIds.clear();
         desc = null;
         if (lateralViewRefs != null) {
             for (LateralViewRef lateralViewRef : lateralViewRefs) {
@@ -814,8 +816,8 @@ public String toString() {
         if (partitionNames != null) {
             sb.append(partitionNames.toSql());
         }
-        if (aliases_ != null && aliases_.length > 0) {
-            sb.append(" AS ").append(aliases_[0]);
+        if (aliases != null && aliases.length > 0) {
+            sb.append(" AS ").append(aliases[0]);
         }
         return sb.toString();
     }
@@ -847,7 +849,7 @@ public void readFields(DataInput in) throws IOException {
 
         if (in.readBoolean()) {
             String alias = Text.readString(in);
-            aliases_ = new String[]{alias};
+            aliases = new String[]{alias};
         }
     }
 }
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 45fab98fa8315c..d5fc90ff10fcc9 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
@@ -50,12 +50,12 @@ public class TupleDescriptor {
     private TableRef ref;
 
     // All legal aliases of this tuple.
-    private String[] aliases_;
+    private String[] aliases;
 
     // If true, requires that aliases_.length() == 1. However, aliases_.length() == 1
     // does not imply an explicit alias because nested collection refs have only a
     // single implicit alias.
-    private boolean hasExplicitAlias_;
+    private boolean hasExplicitAlias;
 
     // if false, this tuple doesn't need to be materialized
     private boolean isMaterialized = true;
@@ -97,8 +97,8 @@ public TableRef getRef() {
         return ref;
     }
 
-    public void setRef(TableRef new_ref) {
-        ref = new_ref;
+    public void setRef(TableRef tableRef) {
+        ref = tableRef;
     }
 
     public ArrayList<SlotDescriptor> getSlots() {
@@ -131,7 +131,9 @@ public long getCardinality() {
     public ArrayList<SlotDescriptor> getMaterializedSlots() {
         ArrayList<SlotDescriptor> result = Lists.newArrayList();
         for (SlotDescriptor slot : slots) {
-            if (slot.isMaterialized()) result.add(slot);
+            if (slot.isMaterialized()) {
+                result.add(slot);
+            }
         }
         return result;
     }
@@ -175,13 +177,13 @@ public float getAvgSerializedSize() {
     }
 
     public void setAliases(String[] aliases, boolean hasExplicitAlias) {
-        aliases_ = aliases;
-        hasExplicitAlias_ = hasExplicitAlias;
+        this.aliases = aliases;
+        this.hasExplicitAlias = hasExplicitAlias;
     }
-    public boolean hasExplicitAlias() { return hasExplicitAlias_; }
-    public String getAlias() { return (aliases_ != null) ? aliases_[0] : null; }
+    public boolean hasExplicitAlias() { return hasExplicitAlias; }
+    public String getAlias() { return (aliases != null) ? aliases[0] : null; }
     public TableName getAliasAsName() {
-        return (aliases_ != null) ? new TableName(null, aliases_[0]) : null;
+        return (aliases != null) ? new TableName(null, aliases[0]) : null;
     }
 
     public TTupleDescriptor toThrift() {
@@ -328,7 +330,9 @@ public boolean isCompatible(TupleDescriptor desc) {
      * Materialize all slots.
      */
     public void materializeSlots() {
-        for (SlotDescriptor slot: slots) slot.setIsMaterialized(true);
+        for (SlotDescriptor slot: slots) {
+            slot.setIsMaterialized(true);
+        }
     }
 
     public void getTableIdToColumnNames(Map<Long, Set<String>> tableIdToColumnNames) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleId.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleId.java
index 0104c090f88db6..a3424ea4674bc0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleId.java
@@ -34,9 +34,9 @@ public TupleId(int id) {
     public static IdGenerator<TupleId> createGenerator() {
         return new IdGenerator<TupleId>() {
             @Override
-            public TupleId getNextId() { return new TupleId(nextId_++); }
+            public TupleId getNextId() { return new TupleId(nextId++); }
             @Override
-            public TupleId getMaxId() { return new TupleId(nextId_ - 1); }
+            public TupleId getMaxId() { return new TupleId(nextId - 1); }
         };
     }
 }
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 f944c1f76369ca..9b67d4cd1ae343 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
@@ -31,6 +31,7 @@
 import com.google.common.collect.Lists;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Internal expr that returns true if all of the given tuples are NULL, otherwise false.
@@ -64,7 +65,9 @@ protected boolean isConstantImpl() {
     @Override
     public boolean isBoundByTupleIds(List<TupleId> tids) {
         for (TupleId tid : tids) {
-            if (tupleIds.contains(tid)) return true;
+            if (tupleIds.contains(tid)) {
+                return true;
+            }
         }
         return false;
     }
@@ -87,6 +90,10 @@ public List<TupleId> getTupleIds() {
         return tupleIds;
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode());
+    }
 
     @Override
     public boolean equals(Object o) {
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 a55e3c6786850a..b87878fa4ec7ca 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
@@ -45,16 +45,16 @@
 // cmy@192.168.%
 // cmy@[domain.name]
 public class UserIdentity implements Writable {
-    
+
     @SerializedName(value = "user")
     private String user;
-    
+
     @SerializedName(value = "host")
     private String host;
-    
+
     @SerializedName(value = "isDomain")
     private boolean isDomain;
-    
+
     private boolean isAnalyzed = false;
 
     public static final UserIdentity ROOT;
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 729bac76a010c7..eb631146dc2c9f 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
@@ -56,7 +56,7 @@ public class WithClause implements ParseNode {
     /////////////////////////////////////////
     // BEGIN: Members that need to be reset()
 
-    private final ArrayList<View> views_;
+    private final ArrayList<View> views;
 
     // END: Members that need to be reset()
     /////////////////////////////////////////
@@ -64,7 +64,7 @@ public class WithClause implements ParseNode {
     public WithClause(ArrayList<View> views) {
         Preconditions.checkNotNull(views);
         Preconditions.checkState(!views.isEmpty());
-        views_ = views;
+        this.views = views;
     }
 
     /**
@@ -80,8 +80,10 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
         // that local views registered in parent blocks are visible here.
         Analyzer withClauseAnalyzer = Analyzer.createWithNewGlobalState(analyzer);
         withClauseAnalyzer.setIsWithClause();
-        if (analyzer.isExplain()) withClauseAnalyzer.setIsExplain();
-        for (View view: views_) {
+        if (analyzer.isExplain()) {
+            withClauseAnalyzer.setIsExplain();
+        }
+        for (View view: views) {
             Analyzer viewAnalyzer = new Analyzer(withClauseAnalyzer);
             view.getQueryStmt().analyze(viewAnalyzer);
             // Register this view so that the next view can reference it.
@@ -98,19 +100,21 @@ public void analyze(Analyzer analyzer) throws AnalysisException, UserException {
      */
     private WithClause(WithClause other) {
         Preconditions.checkNotNull(other);
-        views_ = Lists.newArrayList();
-        for (View view: other.views_) {
-            views_.add(new View(view.getName(), view.getQueryStmt().clone(),
+        views = Lists.newArrayList();
+        for (View view: other.views) {
+            views.add(new View(view.getName(), view.getQueryStmt().clone(),
                     view.getOriginalColLabels()));
         }
     }
 
     public void reset() {
-        for (View view: views_) view.getQueryStmt().reset();
+        for (View view: views) {
+            view.getQueryStmt().reset();
+        }
     }
 
     public void getTables(Analyzer analyzer, Map<Long, Table> tableMap, Set<String> parentViewNameSet) throws AnalysisException {
-        for (View view : views_) {
+        for (View view : views) {
             QueryStmt stmt = view.getQueryStmt();
             parentViewNameSet.add(view.getName());
             stmt.getTables(analyzer, tableMap, parentViewNameSet);
@@ -118,7 +122,7 @@ public void getTables(Analyzer analyzer, Map<Long, Table> tableMap, Set<String>
     }
 
     public void getTableRefs(Analyzer analyzer, List<TableRef> tblRefs, Set<String> parentViewNameSet) {
-        for (View view : views_) {
+        for (View view : views) {
             QueryStmt stmt = view.getQueryStmt();
             parentViewNameSet.add(view.getName());
             stmt.getTableRefs(analyzer, tblRefs, parentViewNameSet);
@@ -131,7 +135,7 @@ public void getTableRefs(Analyzer analyzer, List<TableRef> tblRefs, Set<String>
     @Override
     public String toSql() {
         List<String> viewStrings = Lists.newArrayList();
-        for (View view: views_) {
+        for (View view: views) {
             // Enclose the view alias and explicit labels in quotes if Hive cannot parse it
             // without quotes. This is needed for view compatibility between Impala and Hive.
             String aliasSql = ToSqlUtils.getIdentSql(view.getName());
@@ -146,7 +150,7 @@ public String toSql() {
 
     public String toDigest() {
         List<String> viewStrings = Lists.newArrayList();
-        for (View view : views_) {
+        for (View view : views) {
             // Enclose the view alias and explicit labels in quotes if Hive cannot parse it
             // without quotes. This is needed for view compatibility between Impala and Hive.
             String aliasSql = ToSqlUtils.getIdentSql(view.getName());
@@ -159,5 +163,5 @@ public String toDigest() {
         return "WITH " + Joiner.on(",").join(viewStrings);
     }
 
-    public List<View> getViews() { return views_; }
+    public List<View> getViews() { return views; }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/HDFSStorage.java b/fe/fe-core/src/main/java/org/apache/doris/backup/HdfsStorage.java
similarity index 97%
rename from fe/fe-core/src/main/java/org/apache/doris/backup/HDFSStorage.java
rename to fe/fe-core/src/main/java/org/apache/doris/backup/HdfsStorage.java
index 8544cf3a47fd4a..5db9b0810cf241 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/backup/HDFSStorage.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/backup/HdfsStorage.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 // TODO: extend BlobStorage
-public class HDFSStorage {
+public class HdfsStorage {
     public static final String HDFS_DEFAULT_FS = "fs.defaultFS";
 
     public static void checkHDFS(Map<String, String> properties) throws UserException {
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 5445253cacc5ee..ec25ade6ee1274 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
@@ -87,13 +87,13 @@ public enum AggregateType {
 
         primitiveTypeList.clear();
         // all types except object stored column type, such as bitmap hll quantile_state.
-        EnumSet<PrimitiveType> exc_object_stored = EnumSet.allOf(PrimitiveType.class);
-        exc_object_stored.remove(PrimitiveType.BITMAP);
-        exc_object_stored.remove(PrimitiveType.HLL);
-        exc_object_stored.remove(PrimitiveType.QUANTILE_STATE);
-        compatibilityMap.put(REPLACE, EnumSet.copyOf(exc_object_stored));
+        EnumSet<PrimitiveType> excObjectStored = EnumSet.allOf(PrimitiveType.class);
+        excObjectStored.remove(PrimitiveType.BITMAP);
+        excObjectStored.remove(PrimitiveType.HLL);
+        excObjectStored.remove(PrimitiveType.QUANTILE_STATE);
+        compatibilityMap.put(REPLACE, EnumSet.copyOf(excObjectStored));
 
-        compatibilityMap.put(REPLACE_IF_NOT_NULL, EnumSet.copyOf(exc_object_stored));
+        compatibilityMap.put(REPLACE_IF_NOT_NULL, EnumSet.copyOf(excObjectStored));
 
         primitiveTypeList.clear();
         primitiveTypeList.add(PrimitiveType.HLL);
@@ -107,7 +107,7 @@ public enum AggregateType {
         primitiveTypeList.add(PrimitiveType.QUANTILE_STATE);
         compatibilityMap.put(QUANTILE_UNION, EnumSet.copyOf(primitiveTypeList));
 
-        compatibilityMap.put(NONE, EnumSet.copyOf(exc_object_stored));
+        compatibilityMap.put(NONE, EnumSet.copyOf(excObjectStored));
     }
     private final String sqlName;
 
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 0329352d6975eb..447cd705ba5230 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
@@ -185,6 +185,8 @@ public void analyze() throws AnalysisException {
                             typeDefParams.add(scalarType.getLenStr());
                         }
                         break;
+                    default:
+                        throw new AnalysisException("Alias type is invalid: " + primitiveType);
                 }
             }
         } else {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ArrayType.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ArrayType.java
index f3adcc67ee7c7b..bbc517a81af054 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ArrayType.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ArrayType.java
@@ -27,6 +27,8 @@
 import com.google.common.base.Strings;
 import com.google.gson.annotations.SerializedName;
 
+import java.util.Objects;
+
 /**
  * Describes an ARRAY type.
  */
@@ -90,6 +92,11 @@ public String toSql(int depth) {
         return String.format("ARRAY<%s>", itemType.toSql(depth + 1));
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(itemType);
+    }
+
     @Override
     public boolean equals(Object other) {
         if (!(other instanceof ArrayType)) {
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 69fe06925830d2..ffe9825740f6f5 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
@@ -155,7 +155,7 @@
 import org.apache.doris.external.hudi.HudiUtils;
 import org.apache.doris.external.iceberg.IcebergCatalogMgr;
 import org.apache.doris.external.iceberg.IcebergTableCreationRecordMgr;
-import org.apache.doris.ha.BDBHA;
+import org.apache.doris.ha.BdbHA;
 import org.apache.doris.ha.FrontendNodeType;
 import org.apache.doris.ha.HAProtocol;
 import org.apache.doris.ha.MasterInfo;
@@ -1440,7 +1440,7 @@ private void transferToNonMaster(FrontendNodeType newType) {
         if (Config.edit_log_type.equalsIgnoreCase("BDB")) {
             for (Frontend fe : frontends.values()) {
                 if (fe.getRole() == FrontendNodeType.FOLLOWER || fe.getRole() == FrontendNodeType.REPLICA) {
-                    ((BDBHA) getHaProtocol()).addHelperSocket(fe.getHost(), fe.getEditLogPort());
+                    ((BdbHA) getHaProtocol()).addHelperSocket(fe.getHost(), fe.getEditLogPort());
                 }
             }
         }
@@ -2440,6 +2440,7 @@ protected synchronized void runOneCycle() {
                             LOG.error(msg);
                             Util.stdoutWithTime(msg);
                             System.exit(-1);
+                            break;
                         }
                         default:
                             break;
@@ -2527,7 +2528,7 @@ public void addFrontend(FrontendNodeType role, String host, int editLogPort) thr
             fe = new Frontend(role, nodeName, host, editLogPort);
             frontends.put(nodeName, fe);
             if (role == FrontendNodeType.FOLLOWER || role == FrontendNodeType.REPLICA) {
-                ((BDBHA) getHaProtocol()).addHelperSocket(host, editLogPort);
+                ((BdbHA) getHaProtocol()).addHelperSocket(host, editLogPort);
                 helperNodes.add(Pair.create(host, editLogPort));
             }
             editLog.logAddFrontend(fe);
@@ -5262,7 +5263,7 @@ public String getMasterIp() {
     public EsRepository getEsRepository() {
         return this.esRepository;
     }
-    
+
     public PolicyMgr getPolicyMgr() {
         return this.policyMgr;
     }
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 2da813b79f0a66..9d6144fede1d17 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
@@ -43,6 +43,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * This class represents the column-related metadata.
@@ -526,6 +527,13 @@ public String toString() {
         return toSql();
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, getDataType(), aggregationType, isAggregationTypeImplicit,
+                isKey, isAllowNull, getDefaultValue(), getStrLen(), getPrecision(), getScale(),
+                comment, visible, children);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == this) {
@@ -644,10 +652,13 @@ public String getSignatureString(Map<PrimitiveType, String> typeStringMap) {
                 break;
             case ARRAY:
                 sb.append(type.toString());
+                break;
             case MAP:
                 sb.append(type.toString());
+                break;
             case STRUCT:
                 sb.append(type.toString());
+                break;
             default:
                 sb.append(typeStringMap.get(dataType));
                 break;
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 441c9af7260098..6a7a85294660c9 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
@@ -30,6 +30,7 @@
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.util.Objects;
 
 /**
  * Statistics for a single column.
@@ -138,6 +139,11 @@ public static ColumnStats read(DataInput in) throws IOException {
         return columnStats;
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(avgSerializedSize, maxSize, numDistinctValues, numNulls);
+    }
+
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -176,9 +182,13 @@ public static ColumnStats fromExpr(Expr expr) {
       ColumnStats stats = new ColumnStats(expr.getType().getPrimitiveType());
       stats.setNumDistinctValues(expr.getNumDistinctValues());
       SlotRef slotRef = expr.unwrapSlotRef();
-      if (slotRef == null) return stats;
+      if (slotRef == null) {
+          return stats;
+      }
       ColumnStats slotStats = slotRef.getDesc().getStats();
-      if (slotStats == null) return stats;
+      if (slotStats == null) {
+          return stats;
+      }
       stats.numNulls = slotStats.getNumNulls();
       stats.avgSerializedSize = slotStats.getAvgSerializedSize();
       stats.maxSize = slotStats.getMaxSize();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
index 250cbbb332df35..5340e7a89d4ae5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java
@@ -30,6 +30,7 @@
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.util.Objects;
 
 public class DataProperty implements Writable {
     public static final DataProperty DEFAULT_DATA_PROPERTY = new DataProperty(
@@ -109,6 +110,11 @@ public void readFields(DataInput in) throws IOException {
         remoteCooldownTimeMs = MAX_COOLDOWN_TIME_MS;
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(storageMedium, cooldownTimeMs, remoteStorageResourceName, remoteCooldownTimeMs);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
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 3c3534b5e07182..945315d391744f 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
@@ -49,6 +49,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
@@ -681,6 +682,11 @@ public void readFields(DataInput in) throws IOException {
         }
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, fullQualifiedName, dataQuotaBytes);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
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 c1caa4313cb1b7..49ba2b6f361e01 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
@@ -600,7 +600,7 @@ public int getCode() {
         }
 
         public static FunctionType fromCode(int code) {
-            switch (code) {
+            switch (code) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                 case 0:
                     return ORIGIN;
                 case 1:
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 2193317f9303e0..4b94052643b36e 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
@@ -41,7 +41,7 @@
 import java.util.Map;
 import java.util.Set;
 
-public class FunctionSet<min_initIN9doris_udf12DecimalV2ValEEEvPNS2_15FunctionContextEPT_> {
+public class FunctionSet<T> {
     private static final Logger LOG = LogManager.getLogger(FunctionSet.class);
 
     // All of the registered user functions. The key is the user facing name (e.g. "myUdf"),
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 ac92ca9cb5a44e..9c69ef787fb442 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
@@ -80,8 +80,9 @@ public static String databaseProperName(TOdbcTableType tableType, String name) {
         switch (tableType) {
             case MYSQL:
                 return mysqlProperName(name);
+            default:
+                return name;
         }
-        return name;
     }
 
     private String odbcCatalogResourceName;
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 abf23a32035bab..75e64b62923743 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
@@ -244,6 +244,7 @@ public List<MaterializedIndex> getMaterializedIndices(IndexExtState extState) {
                 break;
             case SHADOW:
                 indices.addAll(idToShadowIndex.values());
+                break;
             default:
                 break;
         }
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 72c79a95d41389..3b4436562684b6 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
@@ -189,16 +189,16 @@ public static int compareLiteralExpr(LiteralExpr key1, LiteralExpr key2) {
     // compare with other PartitionKey. used for partition prune
     @Override
     public int compareTo(PartitionKey other) {
-        int this_key_len = this.keys.size();
-        int other_key_len = other.keys.size();
-        int min_len = Math.min(this_key_len, other_key_len);
-        for (int i = 0; i < min_len; ++i) {
+        int thisKeyLen = this.keys.size();
+        int otherKeyLen = other.keys.size();
+        int minLen = Math.min(thisKeyLen, otherKeyLen);
+        for (int i = 0; i < minLen; ++i) {
             int ret = compareLiteralExpr(this.getKeys().get(i), other.getKeys().get(i));
             if (0 != ret) {
                 return ret;
             }
         }
-        return Integer.compare(this_key_len, other_key_len);
+        return Integer.compare(thisKeyLen, otherKeyLen);
     }
 
     // return: ("100", "200", "300")
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ReplicaAllocation.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ReplicaAllocation.java
index 6b02270fad3cb3..80ad94349a60e8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ReplicaAllocation.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ReplicaAllocation.java
@@ -99,8 +99,12 @@ public static ReplicaAllocation read(DataInput in) throws IOException {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         ReplicaAllocation that = (ReplicaAllocation) o;
         return that.allocMap.equals(this.allocMap);
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceType.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceType.java
index d687b457f883d8..d66054be43b3e4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceType.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceType.java
@@ -100,8 +100,9 @@ public static ResourceType fromThrift(TResourceType tType) {
                 return HDD_READ_MBPS;
             case TRESOURCE_HDD_WRITE_MBPS:
                 return HDD_WRITE_MBPS;
+            default:
+                return null;
         }
-        return null;
     }
 
     @Override
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 527e81357a893f..299160cc432a0a 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
@@ -175,7 +175,9 @@ public static ScalarFunction createBuiltinOperator(
             }
         }
         String beClass = usesDecimal ? "DecimalOperators" : "Operators";
-        if (usesDecimalV2) beClass = "DecimalV2Operators";
+        if (usesDecimalV2) {
+            beClass = "DecimalV2Operators";
+        }
         String symbol = "doris::" + beClass + "::" + beFn;
         return createBuiltinOperator(name, symbol, argTypes, retType, nullableMode);
     }
@@ -245,7 +247,9 @@ public static ScalarFunction createVecBuiltinOperator(
             }
         }
         String beClass = usesDecimal ? "DecimalOperators" : "Operators";
-        if (usesDecimalV2) beClass = "DecimalV2Operators";
+        if (usesDecimalV2) {
+            beClass = "DecimalV2Operators";
+        }
         String symbol = "doris::" + beClass + "::" + beFn;
         return createVecBuiltinOperator(name, symbol, argTypes, retType, nullableMode);
     }
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 e23302d96c7c2d..758e65e8d43c67 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
@@ -480,7 +480,9 @@ public boolean exceedsMaxNestingDepth() {
      * MAP<STRING,STRUCT<f1:INT>> --> 3
      */
     private boolean exceedsMaxNestingDepth(int d) {
-        if (d >= MAX_NESTING_DEPTH) return true;
+        if (d >= MAX_NESTING_DEPTH) {
+            return true;
+        }
         if (isStructType()) {
             StructType structType = (StructType) this;
             for (StructField f : structType.getFields()) {
@@ -579,7 +581,7 @@ protected static Pair<Type, Integer> fromThrift(TTypeDesc col, int nodeIdx) {
         TTypeNode node = col.getTypes().get(nodeIdx);
         Type type = null;
         int tmpNodeIdx = nodeIdx;
-        switch (node.getType()) {
+        switch (node.getType()) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case SCALAR: {
                 Preconditions.checkState(node.isSetScalarType());
                 TScalarType scalarType = node.getScalarType();
@@ -661,8 +663,12 @@ public TPrimitiveType getTPrimitiveType(TTypeDesc ttype) {
      * Null is returned for for data types where the column size is not applicable.
      */
     public Integer getColumnSize() {
-        if (!isScalarType()) return null;
-        if (isNumericType()) return getPrecision();
+        if (!isScalarType()) {
+            return null;
+        }
+        if (isNumericType()) {
+            return getPrecision();
+        }
         ScalarType t = (ScalarType) this;
         switch (t.getPrimitiveType()) {
             case CHAR:
@@ -711,7 +717,9 @@ public int getColumnStringRepSize() throws DdlException {
      * For non-numeric types, returns null.
      */
     public Integer getPrecision() {
-        if (!isScalarType()) return null;
+        if (!isScalarType()) {
+            return null;
+        }
         ScalarType t = (ScalarType) this;
         switch (t.getPrimitiveType()) {
             case TINYINT:
@@ -742,7 +750,9 @@ public Integer getPrecision() {
      * component.
      */
     public Integer getDecimalDigits() {
-        if (!isScalarType()) return null;
+        if (!isScalarType()) {
+            return null;
+        }
         ScalarType t = (ScalarType) this;
         switch (t.getPrimitiveType()) {
             case BOOLEAN:
@@ -775,7 +785,9 @@ public Integer getDecimalDigits() {
      * types where NUM_PREC_RADIX is not applicable.
      */
     public Integer getNumPrecRadix() {
-        if (!isScalarType()) return null;
+        if (!isScalarType()) {
+            return null;
+        }
         ScalarType t = (ScalarType) this;
         switch (t.getPrimitiveType()) {
             case TINYINT:
@@ -1046,15 +1058,27 @@ public Integer getNumPrecRadix() {
                 PrimitiveType t1 = PrimitiveType.values()[i];
                 PrimitiveType t2 = PrimitiveType.values()[j];
                 // DECIMAL, NULL, and INVALID_TYPE  are handled separately.
-                if (t1 == PrimitiveType.INVALID_TYPE ||
-                        t2 == PrimitiveType.INVALID_TYPE) continue;
-                if (t1 == PrimitiveType.NULL_TYPE || t2 == PrimitiveType.NULL_TYPE) continue;
-                if (t1 == PrimitiveType.ARRAY || t2 == PrimitiveType.ARRAY) continue;
-                if (t1 == PrimitiveType.DECIMALV2 || t2 == PrimitiveType.DECIMALV2) continue;
-                if (t1 == PrimitiveType.TIME || t2 == PrimitiveType.TIME) continue;
-                if (t1 == PrimitiveType.ARRAY || t2 == PrimitiveType.ARRAY) continue;
-                if (t1 == PrimitiveType.MAP || t2 == PrimitiveType.MAP) continue;
-                if (t1 == PrimitiveType.STRUCT || t2 == PrimitiveType.STRUCT) continue;
+                if (t1 == PrimitiveType.INVALID_TYPE || t2 == PrimitiveType.INVALID_TYPE) {
+                    continue;
+                }
+                if (t1 == PrimitiveType.NULL_TYPE || t2 == PrimitiveType.NULL_TYPE) {
+                    continue;
+                }
+                if (t1 == PrimitiveType.DECIMALV2 || t2 == PrimitiveType.DECIMALV2) {
+                    continue;
+                }
+                if (t1 == PrimitiveType.TIME || t2 == PrimitiveType.TIME) {
+                    continue;
+                }
+                if (t1 == PrimitiveType.ARRAY || t2 == PrimitiveType.ARRAY) {
+                    continue;
+                }
+                if (t1 == PrimitiveType.MAP || t2 == PrimitiveType.MAP) {
+                    continue;
+                }
+                if (t1 == PrimitiveType.STRUCT || t2 == PrimitiveType.STRUCT) {
+                    continue;
+                }
                 Preconditions.checkNotNull(compatibilityMatrix[i][j]);
             }
         }
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 08c7e359ffe3e1..c842776257c91b 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
@@ -85,7 +85,7 @@ public class View extends Table {
     private boolean isLocalView;
 
     // Set if this View is from a WITH clause with column labels.
-    private List<String> colLabels_;
+    private List<String> colLabels;
 
     // Used for read from image
     public View() {
@@ -106,7 +106,7 @@ public View(String alias, QueryStmt queryStmt, List<String> colLabels) {
         super(-1, alias, TableType.VIEW, null);
         this.isLocalView = true;
         this.queryStmt = queryStmt;
-        colLabels_ = colLabels;
+        this.colLabels = colLabels;
     }
 
     public boolean isLocalView() {
@@ -188,7 +188,7 @@ public synchronized QueryStmt init() throws UserException {
     /**
      * Returns the column labels the user specified in the WITH-clause.
      */
-    public List<String> getOriginalColLabels() { return colLabels_; }
+    public List<String> getOriginalColLabels() { return colLabels; }
 
     /**
      * Returns the explicit column labels for this view, or null if they need to be derived
@@ -197,17 +197,19 @@ public synchronized QueryStmt init() throws UserException {
      */
     public List<String> getColLabels() {
         QueryStmt stmt = getQueryStmt();
-        if (colLabels_ == null) return null;
-        if (colLabels_.size() >= stmt.getColLabels().size()) {
-            return colLabels_;
+        if (colLabels == null) {
+            return null;
+        }
+        if (colLabels.size() >= stmt.getColLabels().size()) {
+            return colLabels;
         }
-        List<String> explicitColLabels = Lists.newArrayList(colLabels_);
-        explicitColLabels.addAll(stmt.getColLabels().subList(colLabels_.size(), stmt.getColLabels().size()));
+        List<String> explicitColLabels = Lists.newArrayList(colLabels);
+        explicitColLabels.addAll(stmt.getColLabels().subList(colLabels.size(), stmt.getColLabels().size()));
         return explicitColLabels;
     }
 
     public boolean hasColLabels() {
-        return colLabels_ != null;
+        return colLabels != null;
     }
 
     // Get the md5 of signature string of this view.
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 761404e6ef8c43..4728803fc7c073 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
@@ -80,7 +80,7 @@ public class DynamicPartitionScheduler extends MasterDaemon {
     public static final String CREATE_PARTITION_MSG = "createPartitionMsg";
     public static final String DROP_PARTITION_MSG = "dropPartitionMsg";
 
-    private final String DEFAULT_RUNTIME_VALUE = FeConstants.null_string;
+    private static final String DEFAULT_RUNTIME_VALUE = FeConstants.null_string;
 
     private Map<Long, Map<String, String>> runtimeInfos = Maps.newConcurrentMap();
     private Set<Pair<Long, Long>> dynamicPartitionTableInfo = Sets.newConcurrentHashSet();
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 2ce36a371a136f..35902463554c80 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
@@ -67,8 +67,12 @@ public static class PartitionMove {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
             PartitionMove that = (PartitionMove) o;
             return Objects.equal(partitionId, that.partitionId) &&
                     Objects.equal(indexId, that.indexId) &&
@@ -292,9 +296,9 @@ public static boolean applyMove(PartitionMove move, TreeMultimap<Long, Long> beB
             moveOneReplica(move.fromBe, move.toBe, newInfo.beByReplicaCount);
 
             skewMap.remove(skew, partitionBalanceInfo);
-            long min_count = newInfo.beByReplicaCount.keySet().first();
-            long max_count = newInfo.beByReplicaCount.keySet().last();
-            skewMap.put(max_count - min_count, newInfo);
+            long minCount = newInfo.beByReplicaCount.keySet().first();
+            long maxCount = newInfo.beByReplicaCount.keySet().last();
+            skewMap.put(maxCount - minCount, newInfo);
         } catch (IllegalStateException e) {
             // If touch IllegalState, the skew map doesn't be modified, so we should rollback the move of beByTotalReplicaCount
             moveOneReplica(move.toBe, move.fromBe, beByTotalReplicaCount);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/IdGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/common/IdGenerator.java
index 1085c297bda3a5..6f025a396c98b0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/IdGenerator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/IdGenerator.java
@@ -25,7 +25,7 @@
  * Subclasses of Id should be able to create a generator for their Id type.
  */
 public abstract class IdGenerator<IdType extends Id<IdType>> {
-    protected int nextId_ = 0;
+    protected int nextId = 0;
     public abstract IdType getNextId();
     public abstract IdType getMaxId();
 }
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 4acf2fa2d6027e..253eaf5ee52708 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
@@ -57,7 +57,7 @@ public ServerContext createContext(TProtocol input, TProtocol output) {
         // param input is class org.apache.thrift.protocol.TBinaryProtocol
         TSocket tSocket = null;
         TTransport transport = input.getTransport();
-        switch (thriftServer.getType()) {
+        switch (thriftServer.getType()) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case THREADED_SELECTOR:
                 // class org.apache.thrift.transport.TFramedTransport
                 Preconditions.checkState(transport instanceof TFramedTransport);
@@ -71,6 +71,7 @@ public ServerContext createContext(TProtocol input, TProtocol output) {
                 Preconditions.checkState(transport instanceof TSocket);
                 tSocket = (TSocket) transport;
                 break;
+                // CHECKSTYLE IGNORE THIS LINE
         }
         if (tSocket == null) {
             LOG.warn("fail to get client socket. server type: {}", thriftServer.getType());
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 7529d04fad6373..22de70a1e385c1 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
@@ -62,7 +62,9 @@ public void removeNode(int i){
      */
     public int numNodes() {
         int numNodes = 1;
-        for (NodeType child: children) numNodes += child.numNodes();
+        for (NodeType child: children) {
+            numNodes += child.numNodes();
+        }
         return numNodes;
     }
 
@@ -82,7 +84,9 @@ public <C extends TreeNode<NodeType>, D extends C> void collect(
             matches.add((D) this);
             return;
         }
-        for (NodeType child: children) child.collect(predicate, matches);
+        for (NodeType child: children) {
+            child.collect(predicate, matches);
+        }
     }
 
     /**
@@ -96,7 +100,9 @@ public <C extends TreeNode<NodeType>, D extends C> void collect(
             matches.add((D) this);
             return;
         }
-        for (NodeType child: children) child.collect(cl, matches);
+        for (NodeType child: children) {
+            child.collect(cl, matches);
+        }
     }
 
     /**
@@ -106,8 +112,12 @@ public <C extends TreeNode<NodeType>, D extends C> void collect(
      */
     public <C extends TreeNode<NodeType>, D extends C> void collectAll(
             Predicate<? super C> predicate, List<D> matches) {
-        if (predicate.apply((C) this)) matches.add((D) this);
-        for (NodeType child: children) child.collectAll(predicate, matches);
+        if (predicate.apply((C) this)) {
+            matches.add((D) this);
+        }
+        for (NodeType child: children) {
+            child.collectAll(predicate, matches);
+        }
     }
 
     /**
@@ -116,7 +126,9 @@ public <C extends TreeNode<NodeType>, D extends C> void collectAll(
      */
     public static <C extends TreeNode<C>, D extends C> void collect(
             Collection<C> nodeList, Predicate<? super C> predicate, Collection<D> matches) {
-        for (C node: nodeList) node.collect(predicate, matches);
+        for (C node: nodeList) {
+            node.collect(predicate, matches);
+        }
     }
 
     /**
@@ -125,7 +137,9 @@ public static <C extends TreeNode<C>, D extends C> void collect(
      */
     public static <C extends TreeNode<C>, D extends C> void collect(
             Collection<C> nodeList, Class cl, Collection<D> matches) {
-        for (C node: nodeList) node.collect(cl, matches);
+        for (C node: nodeList) {
+            node.collect(cl, matches);
+        }
     }
 
     public boolean contains(Class cl) {
@@ -145,8 +159,14 @@ public boolean contains(Class cl) {
      */
     public <C extends TreeNode<NodeType>> boolean contains(
             Predicate<? super C> predicate) {
-        if (predicate.apply((C) this)) return true;
-        for (NodeType child: children) if (child.contains(predicate)) return true;
+        if (predicate.apply((C) this)) {
+            return true;
+        }
+        for (NodeType child: children) {
+            if (child.contains(predicate)) {
+                return true;
+            }
+        }
         return false;
     }
 
@@ -156,7 +176,11 @@ public <C extends TreeNode<NodeType>> boolean contains(
      */
     public static <C extends TreeNode<C>, D extends C> boolean contains(
             Collection<C> nodeList, Predicate<? super C> predicate) {
-        for (C node: nodeList) if (node.contains(predicate)) return true;
+        for (C node: nodeList) {
+            if (node.contains(predicate)) {
+                return true;
+            }
+        }
         return false;
     }
 
@@ -165,7 +189,11 @@ public static <C extends TreeNode<C>, D extends C> boolean contains(
      */
     public static <C extends TreeNode<C>> boolean contains(
             List<C> nodeList, Class cl) {
-        for (C node: nodeList) if (node.contains(cl)) return true;
+        for (C node: nodeList) {
+            if (node.contains(cl)) {
+                return true;
+            }
+        }
         return false;
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEDatabaseProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeDatabaseProcDir.java
similarity index 92%
rename from fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEDatabaseProcDir.java
rename to fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeDatabaseProcDir.java
index 36b568f8378964..a002fb46eba755 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEDatabaseProcDir.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeDatabaseProcDir.java
@@ -27,13 +27,13 @@
 import java.util.List;
 
 // SHOW PROC "/bdbje/dbname/"
-public class BDBJEDatabaseProcDir implements ProcDirInterface  {
+public class BdbjeDatabaseProcDir implements ProcDirInterface  {
     public static final ImmutableList<String> TITLE_NAMES = new ImmutableList.Builder<String>()
             .add("JournalId").build();
 
     private String dbName;
 
-    public BDBJEDatabaseProcDir(String dbName){
+    public BdbjeDatabaseProcDir(String dbName){
         this.dbName = dbName;
     }
 
@@ -44,7 +44,7 @@ public boolean register(String name, ProcNodeInterface node) {
 
     @Override
     public ProcNodeInterface lookup(String journalId) throws AnalysisException {
-        return new BDBJEJournalDataProcNode(dbName, Long.valueOf(journalId));
+        return new BdbjeJournalDataProcNode(dbName, Long.valueOf(journalId));
     }
 
     @Override
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEJournalDataProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeJournalDataProcNode.java
similarity index 94%
rename from fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEJournalDataProcNode.java
rename to fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeJournalDataProcNode.java
index ab36a0f4d7aaa9..c8c197b8cac976 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEJournalDataProcNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeJournalDataProcNode.java
@@ -26,7 +26,7 @@
 import com.google.common.collect.Lists;
 
 // SHOW PROC "/bdbje/dbname/journalID"
-public class BDBJEJournalDataProcNode implements ProcNodeInterface  {
+public class BdbjeJournalDataProcNode implements ProcNodeInterface  {
 
     public static final ImmutableList<String> TITLE_NAMES = new ImmutableList.Builder<String>()
             .add("JournalId").add("OpType").add("Data").build();
@@ -34,7 +34,7 @@ public class BDBJEJournalDataProcNode implements ProcNodeInterface  {
     private String dbName;
     private Long journalId;
 
-    public BDBJEJournalDataProcNode(String dbName, Long journalId) {
+    public BdbjeJournalDataProcNode(String dbName, Long journalId) {
         this.dbName = dbName;
         this.journalId = journalId;
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeProcDir.java
similarity index 95%
rename from fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEProcDir.java
rename to fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeProcDir.java
index 84bf4a7d21518d..66b56c21654690 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEProcDir.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeProcDir.java
@@ -29,7 +29,7 @@
 import java.util.TreeMap;
 
 // SHOW PROC "/bdbje"
-public class BDBJEProcDir implements ProcDirInterface  {
+public class BdbjeProcDir implements ProcDirInterface  {
     public static final ImmutableList<String> TITLE_NAMES = new ImmutableList.Builder<String>()
             .add("DbNames").add("JournalNumber").add("Comment").build();
 
@@ -40,7 +40,7 @@ public boolean register(String name, ProcNodeInterface node) {
 
     @Override
     public ProcNodeInterface lookup(String dbName) throws AnalysisException {
-        return new BDBJEDatabaseProcDir(dbName);
+        return new BdbjeDatabaseProcDir(dbName);
     }
 
     @Override
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 59a354265bc5b6..003f5c083c607e 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
@@ -56,7 +56,7 @@ private ProcService() {
         root.register("routine_loads", new RoutineLoadsProcDir());
         root.register("stream_loads", new StreamLoadProcNode());
         root.register("colocation_group", new ColocationGroupProcDir());
-        root.register("bdbje", new BDBJEProcDir());
+        root.register("bdbje", new BdbjeProcDir());
     }
 
     // 通过指定的路径获得对应的PROC Node
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 66108bac9235ec..bd8ecdb846ce4e 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
@@ -195,7 +195,7 @@ static class DBTabletStatistic {
                                             replicaAlloc, aliveBeIdsInCluster);
                                     res = pair.first;
                                 }
-                                switch (res) {
+                                switch (res) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                                     case HEALTHY:
                                         healthyNum++;
                                         break;
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 4bdd0d5be58a89..f51ae5f674bcca 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
@@ -79,14 +79,14 @@ private static String getTaskName(long id, String name) {
      * @param title a string title for the stack trace
      */
     public static void printThreadInfo(PrintWriter stream, String title) {
-        final int STACK_DEPTH = 20;
+        final int stackDepth = 20;
         boolean contention = threadBean.isThreadContentionMonitoringEnabled();
         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);
+            ThreadInfo info = threadBean.getThreadInfo(tid, stackDepth);
             if (info == null) {
                 stream.println("  Inactive");
                 continue;
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 abbecd36844f52..891852d8603490 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
@@ -388,7 +388,7 @@ public static void stdoutWithTime(String msg) {
     // not support encode negative value now
     public static void encodeVarint64(long source, DataOutput out) throws IOException {
         assert source >= 0;
-        short B = 128;
+        short B = 128; // CHECKSTYLE IGNORE THIS LINE
 
         while (source > B) {
             out.write((int)(source & (B - 1) | B));
@@ -401,7 +401,7 @@ public static void encodeVarint64(long source, DataOutput out) throws IOExceptio
     public static long decodeVarint64(DataInput in) throws IOException {
         long result = 0;
         int shift = 0;
-        short B = 128;
+        short B = 128; // CHECKSTYLE IGNORE THIS LINE
 
         while (true) {
             int oneByte = in.readUnsignedByte();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsNodeInfo.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsNodeInfo.java
index 384c291f43f7e4..b8c757e7b08cd6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsNodeInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsNodeInfo.java
@@ -164,8 +164,12 @@ public TNetworkAddress getThriftAddress() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         EsNodeInfo nodeInfo = (EsNodeInfo) o;
 
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
similarity index 98%
rename from fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java
rename to fe/fe-core/src/main/java/org/apache/doris/ha/BdbHA.java
index c08011a6035480..aee7006f3ccb74 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
@@ -40,14 +40,14 @@
 import java.util.List;
 import java.util.Set;
 
-public class BDBHA implements HAProtocol {
-    private static final Logger LOG = LogManager.getLogger(BDBHA.class);
+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) {
+    public BdbHA(BDBEnvironment env, String nodeName) {
         this.environment = env;
         this.nodeName = nodeName;
     }
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 986b141b04f2df..1fa5abf5c88baa 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
@@ -97,14 +97,14 @@ private void appendCategories(Map<String, Object> result) {
             List<String> topics = module.listTopicByCategory(categories.get(0));
 
             if (topics.size() > 0) {
-                List<Map<String, String>> topic_list = new ArrayList<>();
+                List<Map<String, String>> topicList = new ArrayList<>();
                 result.put("topicSize", topics.size());
                 for (String topic : topics) {
                     Map<String, String> top = new HashMap<>();
                     top.put("name", topic);
-                    topic_list.add(top);
+                    topicList.add(top);
                 }
-                result.put("topicdatas", topic_list);
+                result.put("topicdatas", topicList);
             }
 
             List<String> subCategories = module.listCategoryByCategory(categories.get(0));
@@ -119,15 +119,15 @@ private void appendCategories(Map<String, Object> result) {
                 result.put("subdatas", subCate);
             }
         } else {
-            List<Map<String, String>> category_list = new ArrayList<>();
+            List<Map<String, String>> categoryList = new ArrayList<>();
             if (categories.size() > 0) {
                 result.put("categoriesSize", categories.size());
                 for (String cate : categories) {
                     Map<String, String> subMap = new HashMap<>();
                     subMap.put("name", cate);
-                    category_list.add(subMap);
+                    categoryList.add(subMap);
                 }
-                result.put("categoryDatas", category_list);
+                result.put("categoryDatas", categoryList);
             }
         }
     }
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 6afa9dfd8293e7..302ef1b4e18b99 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
@@ -218,26 +218,26 @@ private void handleQuery(ConnectContext context, String requestDb, String reques
         UUID uuid = UUID.randomUUID();
         tQueryPlanInfo.query_id = new TUniqueId(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
 
-        Map<Long, TTabletVersionInfo> tablet_info = new HashMap<>();
+        Map<Long, TTabletVersionInfo> tabletInfo = new HashMap<>();
         // acquire resolved tablet distribution
         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));
+            tabletInfo.put(tablet, new TTabletVersionInfo(tablet, node.version, 0L /*version hash*/, node.schemaHash));
         });
-        tQueryPlanInfo.tablet_info = tablet_info;
+        tQueryPlanInfo.tablet_info = tabletInfo;
 
         // serialize TQueryPlanInfo and encode plan with Base64 to string in order to translate by json format
         TSerializer serializer = new TSerializer();
-        String opaqued_query_plan;
+        String opaquedQueryPlan;
         try {
-            byte[] query_plan_stream = serializer.serialize(tQueryPlanInfo);
-            opaqued_query_plan = Base64.getEncoder().encodeToString(query_plan_stream);
+            byte[] queryPlanStream = serializer.serialize(tQueryPlanInfo);
+            opaquedQueryPlan = Base64.getEncoder().encodeToString(queryPlanStream);
         } catch (TException e) {
             throw new DorisHttpException(HttpResponseStatus.INTERNAL_SERVER_ERROR, "TSerializer failed to serialize PlanFragment, reason [ " + e.getMessage() + " ]");
         }
         result.put("partitions", tabletRoutings);
-        result.put("opaqued_query_plan", opaqued_query_plan);
+        result.put("opaqued_query_plan", opaquedQueryPlan);
         result.put("status", 200);
     }
 
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 b5b4a0a69300e4..79a0b8276b020f 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
@@ -154,11 +154,11 @@ private Object fetchNodeInfo(HttpServletRequest request, HttpServletResponse res
     @Getter
     @Setter
     public static class NodeInfo {
-        public List<String> column_names;
+        public List<String> columnNames;
         public List<List<String>> rows;
 
-        public NodeInfo(List<String> column_names, List<List<String>> rows) {
-            this.column_names = column_names;
+        public NodeInfo(List<String> columnNames, List<List<String>> rows) {
+            this.columnNames = columnNames;
             this.rows = rows;
         }
     }
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 8def07653521a4..e066c32c23ac6d 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
@@ -49,8 +49,9 @@ public static String getBody(HttpServletRequest request) {
         BufferedReader reader = null;
         try {
             reader = request.getReader();
-            while (null != (line = reader.readLine()))
+            while (null != (line = reader.readLine())) {
                 data.append(new String(line.getBytes("utf-8")));
+            }
         } catch (IOException e) {
         } finally {
         }
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 6544c9a4344273..4c8c02ee67c1dc 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
@@ -151,22 +151,22 @@ private Backend selectOneBackend() throws LoadException {
     }
 
     public static class SubmitResult {
-        public String TxnId;
-        public String Label;
-        public String Status;
-        public String ExistingJobStatus;
-        public String Message;
-        public String NumberTotalRows;
-        public String NumberLoadedRows;
-        public String NumberFilteredRows;
-        public String NumberUnselectedRows;
-        public String LoadBytes;
-        public String LoadTimeMs;
-        public String BeginTxnTimeMs;
-        public String StreamLoadPutTimeMs;
-        public String ReadDataTimeMs;
-        public String WriteDataTimeMs;
-        public String CommitAndPublishTimeMs;
-        public String ErrorURL;
+        public String txnId;
+        public String label;
+        public String status;
+        public String existingJobStatus;
+        public String message;
+        public String numberTotalRows;
+        public String numberLoadedRows;
+        public String numberFilteredRows;
+        public String numberUnselectedRows;
+        public String loadBytes;
+        public String loadTimeMs;
+        public String beginTxnTimeMs;
+        public String streamLoadPutTimeMs;
+        public String readDataTimeMs;
+        public String writeDataTimeMs;
+        public String commitAndPublishTimeMs;
+        public String errorURL;
     }
 }
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 16a8b086ff8a7b..aeb2b91ba4568d 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
@@ -124,7 +124,9 @@ public ExecutionResultSet call() throws Exception {
                     LOG.warn("failed to close stmt", se2);
                 }
                 try {
-                    if (conn != null) conn.close();
+                    if (conn != null) {
+                        conn.close();
+                    }
                 } catch (SQLException se) {
                     LOG.warn("failed to close connection", se);
                 }
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 c4d7559c6a5874..711322bbe46f7a 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
@@ -19,8 +19,8 @@
 
 import org.apache.doris.catalog.Catalog;
 import org.apache.doris.common.Config;
-import org.apache.doris.ha.BDBHA;
 import org.apache.doris.ha.BDBStateChangeListener;
+import org.apache.doris.ha.BdbHA;
 import org.apache.doris.ha.HAProtocol;
 
 import com.sleepycat.je.Database;
@@ -167,7 +167,7 @@ public void setup(File envHome, String selfNodeName, String selfNodeHostPort,
                 replicationGroupAdmin = new ReplicationGroupAdmin(PALO_JOURNAL_GROUP, adminNodes);
 
                 // get a BDBHA object and pass the reference to Catalog
-                HAProtocol protocol = new BDBHA(this, selfNodeName);
+                HAProtocol protocol = new BdbHA(this, selfNodeName);
                 Catalog.getCurrentCatalog().setHaProtocol(protocol);
 
                 // start state change listener
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
similarity index 99%
rename from fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJEJournal.java
rename to fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BdbjeJournal.java
index 686867eec60eb5..a5d54c9bb0338f 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
@@ -55,8 +55,8 @@
  * Finally, close this journal.
  * This class encapsulates the read, write APIs of bdbje
  */
-public class BDBJEJournal implements Journal {
-    public static final Logger LOG = LogManager.getLogger(BDBJEJournal.class);
+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;
 
@@ -69,7 +69,7 @@ public class BDBJEJournal implements Journal {
     // the next journal's id. start from 1.
     private AtomicLong nextJournalId = new AtomicLong(1);
 
-    public BDBJEJournal(String nodeName) {
+    public BdbjeJournal(String nodeName) {
         initBDBEnv(nodeName);
     }
 
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 5b4fa42a35c902..62c4897adb9555 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
@@ -216,7 +216,9 @@ public static boolean hasLdapPrivs(UserIdentity userIdent) {
 
     public static Map<TablePattern, PrivBitSet> getLdapAllDbPrivs(UserIdentity userIdentity) {
         Map<TablePattern, PrivBitSet> ldapDbPrivs = Maps.newConcurrentMap();
-        if (!hasLdapPrivs(userIdentity)) return ldapDbPrivs;
+        if (!hasLdapPrivs(userIdentity)) {
+            return ldapDbPrivs;
+        }
         for (Map.Entry<TablePattern, PrivBitSet> entry : ConnectContext.get().getLdapGroupsPrivs()
                 .getTblPatternToPrivs().entrySet()) {
             if (entry.getKey().getPrivLevel().equals(PaloAuth.PrivLevel.DATABASE)) {
@@ -228,7 +230,9 @@ public static Map<TablePattern, PrivBitSet> getLdapAllDbPrivs(UserIdentity userI
 
     public static Map<TablePattern, PrivBitSet> getLdapAllTblPrivs(UserIdentity userIdentity) {
         Map<TablePattern, PrivBitSet> ldapTblPrivs = Maps.newConcurrentMap();
-        if (!hasLdapPrivs(userIdentity)) return ldapTblPrivs;
+        if (!hasLdapPrivs(userIdentity)) {
+            return ldapTblPrivs;
+        }
         for (Map.Entry<TablePattern, PrivBitSet> entry : ConnectContext.get().getLdapGroupsPrivs()
                 .getTblPatternToPrivs().entrySet()) {
             if (entry.getKey().getPrivLevel().equals(PaloAuth.PrivLevel.TABLE)) {
@@ -240,7 +244,9 @@ public static Map<TablePattern, PrivBitSet> getLdapAllTblPrivs(UserIdentity user
 
     public static Map<ResourcePattern, PrivBitSet> getLdapAllResourcePrivs(UserIdentity userIdentity) {
         Map<ResourcePattern, PrivBitSet> ldapResourcePrivs = Maps.newConcurrentMap();
-        if (!hasLdapPrivs(userIdentity)) return ldapResourcePrivs;
+        if (!hasLdapPrivs(userIdentity)) {
+            return ldapResourcePrivs;
+        }
         for (Map.Entry<ResourcePattern, PrivBitSet> entry : ConnectContext.get().getLdapGroupsPrivs()
                 .getResourcePatternToPrivs().entrySet()) {
             if (entry.getKey().getPrivLevel().equals(PaloAuth.PrivLevel.RESOURCE)) {
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 5d72e10b20d9b9..03f1c4a298e0c0 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
@@ -154,6 +154,7 @@ public Map<String, Object> toDppConfigInfo() {
                     break;
                 case BROKER_TYPE:
                     Preconditions.checkState(false, "hadoop load do not support broker error hub");
+                    break;
                 case NULL_TYPE:
                     break;
                 default:
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 a51b8cb077f3ac..138b5addeb58dc 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
@@ -118,15 +118,15 @@ public void addStreamLoadRecord(long dbId, String label, StreamLoadRecord stream
         while (isQueueFull()) {
             StreamLoadItem record = streamLoadRecordHeap.poll();
             if (record != null) {
-                String de_label = record.getLabel();
-                long de_dbId = record.getDbId();
-
-                Map<String, StreamLoadRecord> labelToStreamLoadRecord = dbIdToLabelToStreamLoadRecord.get(de_dbId);
-                Iterator<Map.Entry<String, StreamLoadRecord>> iter_record = labelToStreamLoadRecord.entrySet().iterator();
-                while (iter_record.hasNext()) {
-                    String labelInMap = iter_record.next().getKey();
-                    if (labelInMap.equals(de_label)) {
-                        iter_record.remove();
+                String deLabel = record.getLabel();
+                long deDbId = record.getDbId();
+
+                Map<String, StreamLoadRecord> labelToStreamLoadRecord = dbIdToLabelToStreamLoadRecord.get(deDbId);
+                Iterator<Map.Entry<String, StreamLoadRecord>> iterRecord = labelToStreamLoadRecord.entrySet().iterator();
+                while (iterRecord.hasNext()) {
+                    String labelInMap = iterRecord.next().getKey();
+                    if (labelInMap.equals(deLabel)) {
+                        iterRecord.remove();
                         break;
                     }
                 }
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 6d44e5a3a93ae1..7f5a57831985ff 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
@@ -225,15 +225,15 @@ private void getLibraries(String remoteArchivePath, List<SparkLibrary> libraries
             // fileName should like:
             //      __lib_md5sum_spark-dpp-1.0.0-jar-with-dependencies.jar
             //      __lib_md5sum_spark-2x.zip
-            String[] lib_arg = unwrap(PREFIX_LIB, fileName).split(FILE_NAME_SEPARATOR);
-            if (lib_arg.length != 2) {
+            String[] libArg = unwrap(PREFIX_LIB, fileName).split(FILE_NAME_SEPARATOR);
+            if (libArg.length != 2) {
                 continue;
             }
-            String md5sum = lib_arg[0];
+            String md5sum = libArg[0];
             if (Strings.isNullOrEmpty(md5sum)) {
                 continue;
             }
-            String type = lib_arg[1];
+            String type = libArg[1];
             SparkLibrary.LibType libType = null;
             if (type.equals(SPARK_DPP)) {
                 libType = SparkLibrary.LibType.DPP;
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 fa54894f0fc7b5..cb0703176561ce 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
@@ -554,10 +554,12 @@ private void sortRoutineLoadJob(List<RoutineLoadJob> routineLoadJobList) {
         int i = 0;
         int j = routineLoadJobList.size() - 1;
         while (i < j) {
-            while (!routineLoadJobList.get(i).isFinal() && (i < j))
+            while (!routineLoadJobList.get(i).isFinal() && (i < j)) {
                 i++;
-            while (routineLoadJobList.get(j).isFinal() && (i < j))
+            }
+            while (routineLoadJobList.get(j).isFinal() && (i < j)) {
                 j--;
+            }
             if (i < j) {
                 RoutineLoadJob routineLoadJob = routineLoadJobList.get(i);
                 routineLoadJobList.set(i, routineLoadJobList.get(j));
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 9fdb1048e9124a..ded37f2ddee6a3 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
@@ -25,7 +25,7 @@
 import org.apache.logging.log4j.Logger;
 
 public class SyncChannelHandle implements SyncChannelCallback {
-    private Logger LOG = LogManager.getLogger(SyncChannelHandle.class);
+    private final static Logger LOG = LogManager.getLogger(SyncChannelHandle.class);
 
     // channel id -> dummy value(-1)
     private MarkedCountDownLatch<Long, Long> latch;
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 a7401da9e2d4f1..399026a37c7a6a 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
@@ -188,7 +188,7 @@ public void unprotectedUpdateState(JobState newState, boolean isReplay) {
     }
 
     private void checkStateTransform(JobState newState) throws UserException {
-        switch (jobState) {
+        switch (jobState) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case PENDING:
                 break;
             case RUNNING:
diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalDestination.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalDestination.java
index 8aebd0f08525f0..f2ae06a8f0168f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalDestination.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalDestination.java
@@ -99,7 +99,9 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object other) {
-        if (other == this) return true;
+        if (other == this) {
+            return true;
+        }
         if (!(other instanceof CanalDestination)) {
             return false;
         }
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 ce4a8c901796d2..7749c9d6e745ce 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
@@ -273,6 +273,8 @@ public void replayUpdateSyncJobState(SyncJobUpdateStateInfo info) {
                 case CANCELLED:
                     updateState(JobState.CANCELLED, true);
                     break;
+                default:
+                    throw new UserException("job state is invalid: " + jobState);
             }
         } catch (UserException e) {
             LOG.error(new LogBuilder(LogKey.SYNC_JOB, id)
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 01b1823bfcca2f..c8660c316d699c 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
@@ -51,8 +51,8 @@
 
 public class UpdatePlanner extends Planner {
 
-    private final IdGenerator<PlanNodeId> nodeIdGenerator_ = PlanNodeId.createGenerator();
-    private final IdGenerator<PlanFragmentId> fragmentIdGenerator_ =
+    private final IdGenerator<PlanNodeId> nodeIdGenerator = PlanNodeId.createGenerator();
+    private final IdGenerator<PlanFragmentId> fragmentIdGenerator =
             PlanFragmentId.createGenerator();
 
     private long targetDBId;
@@ -79,7 +79,7 @@ public List<ScanNode> getScanNodes() {
 
     public void plan(long txnId) throws UserException {
         // 1. gen scan node
-        OlapScanNode olapScanNode = new OlapScanNode(nodeIdGenerator_.getNextId(), srcTupleDesc, "OlapScanNode");
+        OlapScanNode olapScanNode = new OlapScanNode(nodeIdGenerator.getNextId(), srcTupleDesc, "OlapScanNode");
         /* BEGIN: Temporary code, this part of the code needs to be refactored */
         olapScanNode.closePreAggregation("This an update operation");
         olapScanNode.useBaseIndexId();
@@ -97,7 +97,7 @@ public void plan(long txnId) throws UserException {
                 analyzer.getContext().getSessionVariable().sendBatchParallelism, false);
         olapTableSink.complete();
         // 3. gen plan fragment
-        PlanFragment planFragment = new PlanFragment(fragmentIdGenerator_.getNextId(), olapScanNode,
+        PlanFragment planFragment = new PlanFragment(fragmentIdGenerator.getNextId(), olapScanNode,
                 DataPartition.RANDOM);
         planFragment.setSink(olapTableSink);
         planFragment.setOutputExprs(computeOutputExprs());
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 0b6671aa7e18b4..40153bb9de997f 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
@@ -51,14 +51,14 @@ public class JvmPauseMonitor {
 
     // Check for Java deadlocks at this interval. Set by init(). 0 or negative means that
     // the deadlock checks are disabled.
-    private long deadlockCheckIntervalS_ = 0;
+    private long deadlockCheckIntervalS = 0;
 
     // log WARN if we detect a pause longer than this threshold.
-    private long warnThresholdMs_;
+    private long warnThresholdMs;
     private static final long WARN_THRESHOLD_MS = 10000;
 
     // log INFO if we detect a pause longer than this threshold.
-    private long infoThresholdMs_;
+    private long infoThresholdMs;
     private static final long INFO_THRESHOLD_MS = 1000;
 
     // Overall metrics
@@ -70,7 +70,7 @@ public class JvmPauseMonitor {
     private volatile long totalGcExtraSleepTime = 0;
 
     // Daemon thread running the pause monitor loop.
-    private Thread monitorThread_;
+    private Thread monitorThread;
     private volatile boolean shouldRun = true;
 
     // Singleton instance of this pause monitor.
@@ -78,7 +78,9 @@ public class JvmPauseMonitor {
 
     // Initializes the pause monitor. No-op if called multiple times.
     public static void initPauseMonitor(long deadlockCheckIntervalS) {
-        if (INSTANCE.isStarted()) return;
+        if (INSTANCE.isStarted()) {
+            return;
+        }
         INSTANCE.init(deadlockCheckIntervalS);
     }
 
@@ -87,19 +89,19 @@ private JvmPauseMonitor() {
     }
 
     private JvmPauseMonitor(long infoThresholdMs, long warnThresholdMs) {
-        this.infoThresholdMs_ = infoThresholdMs;
-        this.warnThresholdMs_ = warnThresholdMs;
+        this.infoThresholdMs = infoThresholdMs;
+        this.warnThresholdMs = warnThresholdMs;
     }
 
     protected void init(long deadlockCheckIntervalS) {
-        deadlockCheckIntervalS_ = deadlockCheckIntervalS;
-        monitorThread_ = new Thread(new Monitor(), "JVM pause monitor");
-        monitorThread_.setDaemon(true);
-        monitorThread_.start();
+        this.deadlockCheckIntervalS = deadlockCheckIntervalS;
+        monitorThread = new Thread(new Monitor(), "JVM pause monitor");
+        monitorThread.setDaemon(true);
+        monitorThread.start();
     }
 
     public boolean isStarted() {
-        return monitorThread_ != null;
+        return monitorThread != null;
     }
 
     public long getNumGcWarnThresholdExceeded() {
@@ -202,11 +204,11 @@ public void run() {
                 long extraSleepTime = sw.elapsed(TimeUnit.MILLISECONDS) - SLEEP_INTERVAL_MS;
                 Map<String, GcTimes> gcTimesAfterSleep = getGcTimes();
 
-                if (extraSleepTime > warnThresholdMs_) {
+                if (extraSleepTime > warnThresholdMs) {
                     ++numGcWarnThresholdExceeded;
                     LOG.warn(formatMessage(
                             extraSleepTime, gcTimesAfterSleep, gcTimesBeforeSleep));
-                } else if (extraSleepTime > infoThresholdMs_) {
+                } else if (extraSleepTime > infoThresholdMs) {
                     ++numGcInfoThresholdExceeded;
                     LOG.info(formatMessage(
                             extraSleepTime, gcTimesAfterSleep, gcTimesBeforeSleep));
@@ -214,8 +216,8 @@ public void run() {
                 totalGcExtraSleepTime += extraSleepTime;
                 gcTimesBeforeSleep = gcTimesAfterSleep;
 
-                if (deadlockCheckIntervalS_ > 0 &&
-                        timeSinceDeadlockCheck.elapsed(TimeUnit.SECONDS) >= deadlockCheckIntervalS_) {
+                if (deadlockCheckIntervalS > 0 &&
+                        timeSinceDeadlockCheck.elapsed(TimeUnit.SECONDS) >= deadlockCheckIntervalS) {
                     checkForDeadlocks();
                     timeSinceDeadlockCheck.reset().start();
                 }
@@ -242,7 +244,9 @@ private void checkForDeadlocks() {
                 for (ThreadInfo thread : deadlockedThreads) {
                     // Defensively check for null in case the thread somehow disappeared between
                     // findDeadlockedThreads() and getThreadInfo().
-                    if (thread != null) LOG.error(thread.toString());
+                    if (thread != null) {
+                        LOG.error(thread.toString());
+                    }
                 }
                 LOG.warn("All threads:");
                 for (ThreadInfo thread : threadMx.dumpAllThreads(true, true)) {
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 bb5c33dcb8eceb..97982c4c582f12 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
@@ -92,7 +92,9 @@ public static JvmStats jvmStats() {
         int threadsTerminated = 0;
         long threadIds[] = threadMXBean.getAllThreadIds();
         for (ThreadInfo threadInfo : threadMXBean.getThreadInfo(threadIds, 0)) {
-            if (threadInfo == null) continue; // race protection
+            if (threadInfo == null) {
+                continue; // race protection
+            }
             switch (threadInfo.getThreadState()) {
                 case NEW:           threadsNew++;           break;
                 case RUNNABLE:      threadsRunnable++;      break;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/monitor/unit/ByteSizeUnit.java b/fe/fe-core/src/main/java/org/apache/doris/monitor/unit/ByteSizeUnit.java
index 504e3bc9c94ea8..f4f487a37f5ece 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/monitor/unit/ByteSizeUnit.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/monitor/unit/ByteSizeUnit.java
@@ -60,7 +60,7 @@ public long toPB(long size) {
     KB {
         @Override
         public long toBytes(long size) {
-            return x(size, C1 / C0, MAX / (C1 / C0));
+            return multiply(size, C1 / C0, MAX / (C1 / C0));
         }
 
         @Override
@@ -91,12 +91,12 @@ public long toPB(long size) {
     MB {
         @Override
         public long toBytes(long size) {
-            return x(size, C2 / C0, MAX / (C2 / C0));
+            return multiply(size, C2 / C0, MAX / (C2 / C0));
         }
 
         @Override
         public long toKB(long size) {
-            return x(size, C2 / C1, MAX / (C2 / C1));
+            return multiply(size, C2 / C1, MAX / (C2 / C1));
         }
 
         @Override
@@ -122,17 +122,17 @@ public long toPB(long size) {
     GB {
         @Override
         public long toBytes(long size) {
-            return x(size, C3 / C0, MAX / (C3 / C0));
+            return multiply(size, C3 / C0, MAX / (C3 / C0));
         }
 
         @Override
         public long toKB(long size) {
-            return x(size, C3 / C1, MAX / (C3 / C1));
+            return multiply(size, C3 / C1, MAX / (C3 / C1));
         }
 
         @Override
         public long toMB(long size) {
-            return x(size, C3 / C2, MAX / (C3 / C2));
+            return multiply(size, C3 / C2, MAX / (C3 / C2));
         }
 
         @Override
@@ -153,22 +153,22 @@ public long toPB(long size) {
     TB {
         @Override
         public long toBytes(long size) {
-            return x(size, C4 / C0, MAX / (C4 / C0));
+            return multiply(size, C4 / C0, MAX / (C4 / C0));
         }
 
         @Override
         public long toKB(long size) {
-            return x(size, C4 / C1, MAX / (C4 / C1));
+            return multiply(size, C4 / C1, MAX / (C4 / C1));
         }
 
         @Override
         public long toMB(long size) {
-            return x(size, C4 / C2, MAX / (C4 / C2));
+            return multiply(size, C4 / C2, MAX / (C4 / C2));
         }
 
         @Override
         public long toGB(long size) {
-            return x(size, C4 / C3, MAX / (C4 / C3));
+            return multiply(size, C4 / C3, MAX / (C4 / C3));
         }
 
         @Override
@@ -184,27 +184,27 @@ public long toPB(long size) {
     PB {
         @Override
         public long toBytes(long size) {
-            return x(size, C5 / C0, MAX / (C5 / C0));
+            return multiply(size, C5 / C0, MAX / (C5 / C0));
         }
 
         @Override
         public long toKB(long size) {
-            return x(size, C5 / C1, MAX / (C5 / C1));
+            return multiply(size, C5 / C1, MAX / (C5 / C1));
         }
 
         @Override
         public long toMB(long size) {
-            return x(size, C5 / C2, MAX / (C5 / C2));
+            return multiply(size, C5 / C2, MAX / (C5 / C2));
         }
 
         @Override
         public long toGB(long size) {
-            return x(size, C5 / C3, MAX / (C5 / C3));
+            return multiply(size, C5 / C3, MAX / (C5 / C3));
         }
 
         @Override
         public long toTB(long size) {
-            return x(size, C5 / C4, MAX / (C5 / C4));
+            return multiply(size, C5 / C4, MAX / (C5 / C4));
         }
 
         @Override
@@ -233,9 +233,13 @@ public static ByteSizeUnit fromId(int id) {
      * Scale d by m, checking for overflow.
      * This has a short name to make above code more readable.
      */
-    static long x(long d, long m, long over) {
-        if (d > over) return Long.MAX_VALUE;
-        if (d < -over) return Long.MIN_VALUE;
+    static long multiply(long d, long m, long over) {
+        if (d > over) {
+            return Long.MAX_VALUE;
+        }
+        if (d < -over) {
+            return Long.MIN_VALUE;
+        }
         return d * m;
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/monitor/unit/TimeValue.java b/fe/fe-core/src/main/java/org/apache/doris/monitor/unit/TimeValue.java
index 8f15c01968a02c..8f135bff100730 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/monitor/unit/TimeValue.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/monitor/unit/TimeValue.java
@@ -341,8 +341,12 @@ private static long parse(final String initialInput, final String normalized, fi
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         return this.compareTo(((TimeValue) o)) == 0;
     }
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 847cf5eba9a1a7..10a4d36f195302 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
@@ -36,8 +36,8 @@
  * listener for accept mysql connections.
  */
 public class AcceptListener implements ChannelListener<AcceptingChannel<StreamConnection>> {
-    private final Logger LOG = LogManager.getLogger(this.getClass());
-    private ConnectScheduler connectScheduler;
+    private final static Logger LOG = LogManager.getLogger(AcceptListener.class);
+    private final ConnectScheduler connectScheduler;
 
     public AcceptListener(ConnectScheduler connectScheduler) {
         this.connectScheduler = connectScheduler;
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 44c9c5113153d2..2cfc5a9e511612 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
@@ -33,7 +33,7 @@
  * mysql Channel based on nio.
  */
 public class NMysqlChannel extends MysqlChannel {
-    protected final Logger LOG = LogManager.getLogger(this.getClass());
+    protected final static Logger LOG = LogManager.getLogger(NMysqlChannel.class);
     private StreamConnection conn;
 
     public NMysqlChannel(StreamConnection connection) {
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 a33223edc127bb..51e6d975f7a75a 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
@@ -39,7 +39,7 @@
  * mysql protocol implementation based on nio.
  */
 public class NMysqlServer extends MysqlServer {
-    private final Logger LOG = LogManager.getLogger(this.getClass());
+    private final static Logger LOG = LogManager.getLogger(NMysqlServer.class);
 
     private XnioWorker xnioWorker;
 
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 f9123cf5df6a76..82df15160d6391 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
@@ -30,7 +30,7 @@
  * listener for handle mysql cmd.
  */
 public class ReadListener implements ChannelListener<ConduitStreamSourceChannel> {
-    private final Logger LOG = LogManager.getLogger(this.getClass());
+    private static final Logger LOG = LogManager.getLogger(ReadListener.class);
     private NConnectContext ctx;
     private ConnectProcessor connectProcessor;
 
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 852ba178bfc662..3657e03c9f8035 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
@@ -985,7 +985,7 @@ public void revokePrivs(UserIdentity userIdent, ResourcePattern resourcePattern,
                             boolean errOnNonExist) throws DdlException {
         writeLock();
         try {
-            switch (resourcePattern.getPrivLevel()) {
+            switch (resourcePattern.getPrivLevel()) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
                 case GLOBAL:
                     revokeGlobalPrivs(userIdent, privs, errOnNonExist);
                     break;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
index 8dfc6bec9152d6..779ca0ef939a7a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
@@ -67,7 +67,6 @@
 import org.apache.doris.nereids.trees.plans.logical.LogicalProject;
 
 import com.google.common.collect.Lists;
-
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.RuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/BinaryExpression.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/BinaryExpression.java
index 988985c196136b..9cd3d9abc49e18 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/BinaryExpression.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/BinaryExpression.java
@@ -18,7 +18,6 @@
 package org.apache.doris.nereids.trees.expressions;
 
 import org.apache.doris.nereids.trees.BinaryNode;
-import org.apache.doris.nereids.trees.NodeType;
 
 /**
  * Interface for all expression that have two children.
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 2037f50c48cd78..3f14c65addb0bb 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
@@ -83,7 +83,9 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object other) {
-        if (other == this) return true;
+        if (other == this) {
+            return true;
+        }
         if (!(other instanceof AlterViewInfo)) {
             return false;
         }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/ColocatePersistInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/ColocatePersistInfo.java
index eb49e63e2ca23b..8016a38cc3ebc0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/ColocatePersistInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/ColocatePersistInfo.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * PersistInfo for ColocateTableIndex
@@ -117,6 +118,11 @@ private void readFields(DataInput in) throws IOException {
         }
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(groupId, tableId, backendsPerBucketSeq);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == this) {
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 843dfc4b975c01..a59a68e5f50083 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
@@ -27,6 +27,7 @@
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.util.Objects;
 
 public class CreateTableInfo implements Writable {
     public static final Logger LOG = LoggerFactory.getLogger(CreateTableInfo.class);
@@ -66,6 +67,11 @@ public static CreateTableInfo read(DataInput in) throws IOException {
         return createTableInfo;
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(dbName, table);
+    }
+
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
index ca958128ab1c0a..44d36a51631fd5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
@@ -45,7 +45,7 @@
 import org.apache.doris.journal.Journal;
 import org.apache.doris.journal.JournalCursor;
 import org.apache.doris.journal.JournalEntity;
-import org.apache.doris.journal.bdbje.BDBJEJournal;
+import org.apache.doris.journal.bdbje.BdbjeJournal;
 import org.apache.doris.journal.bdbje.Timestamp;
 import org.apache.doris.load.DeleteHandler;
 import org.apache.doris.load.DeleteInfo;
@@ -93,7 +93,7 @@ public class EditLog {
     private Journal journal;
 
     public EditLog(String nodeName) {
-        journal = new BDBJEJournal(nodeName);
+        journal = new BdbjeJournal(nodeName);
     }
 
     public long getMaxJournalId() {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/OperationType.java b/fe/fe-core/src/main/java/org/apache/doris/persist/OperationType.java
index 31c06fc5eaf886..fbdf117921d282 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/OperationType.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/OperationType.java
@@ -218,7 +218,7 @@ public class OperationType {
     public static final short OP_CREATE_SQL_BLOCK_RULE = 300;
     public static final short OP_ALTER_SQL_BLOCK_RULE = 301;
     public static final short OP_DROP_SQL_BLOCK_RULE = 302;
-    
+
     // policy 310-320
     public static final short OP_CREATE_POLICY = 310;
     public static final short OP_DROP_POLICY = 311;
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 9a24d72303c3dd..d49332d5f98d11 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
@@ -96,9 +96,9 @@ public void unsetNeedsFinalize() {
      * Sets this node as a preaggregation. Only valid to call this if it is not marked
      * as a preaggregation
      */
-    public void setIsPreagg(PlannerContext ctx_) {
-        useStreamingPreagg =  ctx_.getQueryOptions().isSetDisableStreamPreaggregations()
-                && !ctx_.getQueryOptions().disable_stream_preaggregations
+    public void setIsPreagg(PlannerContext ctx) {
+        useStreamingPreagg =  ctx.getQueryOptions().isSetDisableStreamPreaggregations()
+                && !ctx.getQueryOptions().disable_stream_preaggregations
                 && aggInfo.getGroupingExprs().size() > 0;
     }
 
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 57925d25c4838a..f276c50e737b1b 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
@@ -76,12 +76,12 @@ public class AnalyticPlanner {
     private final AnalyticInfo analyticInfo;
     private final Analyzer analyzer;
 
-    private final PlannerContext ctx_;
+    private final PlannerContext ctx;
 
     public AnalyticPlanner(AnalyticInfo analyticInfo, Analyzer analyzer, PlannerContext ctx) {
         this.analyticInfo = analyticInfo;
         this.analyzer = analyzer;
-        this.ctx_ = ctx;
+        this.ctx = ctx;
     }
 
     /**
@@ -342,7 +342,9 @@ private SortInfo createSortInfo(
             for (int i = 0; i < inputSmap.size(); ++i) {
                 Expr rhsExpr = inputSmap.getRhs().get(i);
                 // Ignore substitutions that are irrelevant at this plan node and its ancestors.
-                if (!rhsExpr.isBoundByTupleIds(input.getTupleIds())) continue;
+                if (!rhsExpr.isBoundByTupleIds(input.getTupleIds())) {
+                    continue;
+                }
                 rhsExpr.collect(TupleIsNullPredicate.class, tupleIsNullPredsToMaterialize);
             }
             Expr.removeDuplicates(tupleIsNullPredsToMaterialize);
@@ -414,7 +416,7 @@ private PlanNode createSortGroupPlan(PlanNode root, SortGroup sortGroup,
             }
 
             SortInfo sortInfo = createSortInfo(newRoot, sortExprs, isAsc, nullsFirst);
-            SortNode sortNode = new SortNode(ctx_.getNextNodeId(), newRoot, sortInfo, false, false, 0);
+            SortNode sortNode = new SortNode(ctx.getNextNodeId(), newRoot, sortInfo, false, false, 0);
 
             // if this sort group does not have partitioning exprs, we want the sort
             // to be executed like a regular distributed sort
@@ -482,7 +484,7 @@ private PlanNode createSortGroupPlan(PlanNode root, SortGroup sortGroup,
                 LOG.trace("orderByEq: " + orderByEq.debugString());
             }
 
-            AnalyticEvalNode node = new AnalyticEvalNode(ctx_.getNextNodeId(), newRoot,
+            AnalyticEvalNode node = new AnalyticEvalNode(ctx.getNextNodeId(), newRoot,
                     windowGroup.analyticFnCalls, windowGroup.partitionByExprs,
                     windowGroup.orderByElements,
                     windowGroup.window,
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 59fada152ea9e1..f6f137f77f6b2b 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
@@ -49,6 +49,7 @@
 import org.apache.doris.thrift.TBrokerScanRangeParams;
 import org.apache.doris.thrift.TExplainLevel;
 import org.apache.doris.thrift.TFileFormatType;
+import org.apache.doris.thrift.TFileType;
 import org.apache.doris.thrift.THdfsParams;
 import org.apache.doris.thrift.TNetworkAddress;
 import org.apache.doris.thrift.TScanRange;
@@ -452,11 +453,11 @@ public String getHostUri() throws UserException {
         return "";
     }
 
-    private String getHeaderType(String format_type) {
-        if (format_type != null) {
-            if (format_type.toLowerCase().equals(FeConstants.csv_with_names)
-                    || format_type.toLowerCase().equals(FeConstants.csv_with_names_and_types)) {
-                return format_type;
+    private String getHeaderType(String formatType) {
+        if (formatType != null) {
+            if (formatType.toLowerCase().equals(FeConstants.csv_with_names)
+                    || formatType.toLowerCase().equals(FeConstants.csv_with_names_and_types)) {
+                return formatType;
             }
         }
         return "";
@@ -483,7 +484,7 @@ private void processFileGroup(
             long leftBytes = fileStatus.size - curFileOffset;
             long tmpBytes = curInstanceBytes + leftBytes;
             //header_type
-            String header_type = getHeaderType(context.fileGroup.getFileFormat());
+            String headerType = getHeaderType(context.fileGroup.getFileFormat());
             TFileFormatType formatType = formatType(context.fileGroup.getFileFormat(), fileStatus.path);
             List<String> columnsFromPath = BrokerUtil.parseColumnsFromPath(fileStatus.path,
                     context.fileGroup.getColumnsFromPath());
@@ -494,7 +495,7 @@ private void processFileGroup(
                         || formatType == TFileFormatType.FORMAT_JSON) {
                     long rangeBytes = bytesPerInstance - curInstanceBytes;
                     TBrokerRangeDesc rangeDesc = createBrokerRangeDesc(curFileOffset, fileStatus, formatType,
-                            rangeBytes, columnsFromPath, numberOfColumnsFromFile, brokerDesc, header_type);
+                            rangeBytes, columnsFromPath, numberOfColumnsFromFile, brokerDesc, headerType);
                     if (formatType == TFileFormatType.FORMAT_JSON) {
                         rangeDesc.setStripOuterArray(context.fileGroup.isStripOuterArray());
                         rangeDesc.setJsonpaths(context.fileGroup.getJsonPaths());
@@ -508,7 +509,7 @@ private void processFileGroup(
 
                 } else {
                     TBrokerRangeDesc rangeDesc = createBrokerRangeDesc(curFileOffset, fileStatus, formatType,
-                            leftBytes, columnsFromPath, numberOfColumnsFromFile, brokerDesc, header_type);
+                            leftBytes, columnsFromPath, numberOfColumnsFromFile, brokerDesc, headerType);
                     if (rangeDesc.hdfs_params != null && rangeDesc.hdfs_params.getFsName() == null) {
                         rangeDesc.hdfs_params.setFsName(fsName);
                     } else if (rangeDesc.hdfs_params == null) {
@@ -528,7 +529,7 @@ private void processFileGroup(
 
             } else {
                 TBrokerRangeDesc rangeDesc = createBrokerRangeDesc(curFileOffset, fileStatus, formatType,
-                        leftBytes, columnsFromPath, numberOfColumnsFromFile, brokerDesc, header_type);
+                        leftBytes, columnsFromPath, numberOfColumnsFromFile, brokerDesc, headerType);
                 if (formatType == TFileFormatType.FORMAT_JSON) {
                     rangeDesc.setStripOuterArray(context.fileGroup.isStripOuterArray());
                     rangeDesc.setJsonpaths(context.fileGroup.getJsonPaths());
@@ -573,10 +574,8 @@ private TBrokerRangeDesc createBrokerRangeDesc(long curFileOffset, TBrokerFileSt
         rangeDesc.setColumnsFromPath(columnsFromPath);
         rangeDesc.setHeaderType(headerType);
         // set hdfs params for hdfs file type.
-        switch (brokerDesc.getFileType()) {
-            case FILE_HDFS:
-                BrokerUtil.generateHdfsParam(brokerDesc.getProperties(), rangeDesc);
-                break;
+        if (brokerDesc.getFileType() == TFileType.FILE_HDFS) {
+            BrokerUtil.generateHdfsParam(brokerDesc.getProperties(), rangeDesc);
         }
         return rangeDesc;
     }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ColumnBound.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ColumnBound.java
index 805d4ddaa33188..05cc040f738960 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/ColumnBound.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ColumnBound.java
@@ -53,8 +53,12 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         ColumnBound that = (ColumnBound) o;
         return Objects.equal(value, that.value);
     }
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 7cb411da8d34d8..0df0fa2803bc6b 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
@@ -38,11 +38,11 @@ public class CrossJoinNode extends PlanNode {
     // Default per-host memory requirement used if no valid stats are available.
     // TODO: Come up with a more useful heuristic (e.g., based on scanned partitions).
     private final static long DEFAULT_PER_HOST_MEM = 2L * 1024L * 1024L * 1024L;
-    private final TableRef innerRef_;
+    private final TableRef innerRef;
 
     public CrossJoinNode(PlanNodeId id, PlanNode outer, PlanNode inner, TableRef innerRef) {
         super(id, "CROSS JOIN");
-        innerRef_ = innerRef;
+        this.innerRef = innerRef;
         tupleIds.addAll(outer.getTupleIds());
         tupleIds.addAll(inner.getTupleIds());
         tblRefIds.addAll(outer.getTblRefIds());
@@ -57,7 +57,7 @@ public CrossJoinNode(PlanNodeId id, PlanNode outer, PlanNode inner, TableRef inn
     }
 
     public TableRef getInnerRef() {
-        return innerRef_;
+        return innerRef;
     }
 
     @Override
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/DataSink.java b/fe/fe-core/src/main/java/org/apache/doris/planner/DataSink.java
index 2de32c35fad3ca..03f24a532481be 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/DataSink.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/DataSink.java
@@ -35,7 +35,7 @@
  */
 public abstract class DataSink {
     // Fragment that this DataSink belongs to. Set by the PlanFragment enclosing this sink.
-    protected PlanFragment fragment_;
+    protected PlanFragment fragment;
 
     /**
      * Return an explain string for the DataSink. Each line of the explain will be prefixed
@@ -48,8 +48,8 @@ public abstract class DataSink {
 
     protected abstract TDataSink toThrift();
 
-    public void setFragment(PlanFragment fragment) { fragment_ = fragment; }
-    public PlanFragment getFragment() { return fragment_; }
+    public void setFragment(PlanFragment fragment) { this.fragment = fragment; }
+    public PlanFragment getFragment() { return fragment; }
 
     public abstract PlanNodeId getExchNodeId();
 
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 293d00436ff1b1..2b4485f1a147c0 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
@@ -61,10 +61,10 @@
 public class DistributedPlanner {
     private final static Logger LOG = LogManager.getLogger(DistributedPlanner.class);
 
-    private final PlannerContext ctx_;
+    private final PlannerContext ctx;
 
     public DistributedPlanner(PlannerContext ctx) {
-        ctx_ = ctx;
+        this.ctx = ctx;
     }
 
     /**
@@ -80,9 +80,9 @@ public DistributedPlanner(PlannerContext ctx) {
      */
     public ArrayList<PlanFragment> createPlanFragments(
             PlanNode singleNodePlan) throws UserException, AnalysisException {
-        Preconditions.checkState(!ctx_.isSingleNodeExec());
+        Preconditions.checkState(!ctx.isSingleNodeExec());
         // AnalysisContext.AnalysisResult analysisResult = ctx_.getAnalysisResult();
-        QueryStmt queryStmt = ctx_.getQueryStmt();
+        QueryStmt queryStmt = ctx.getQueryStmt();
         ArrayList<PlanFragment> fragments = Lists.newArrayList();
         // For inserts or CTAS, unless there is a limit, leave the root fragment
         // partitioned, otherwise merge everything into a single coordinator fragment,
@@ -94,7 +94,7 @@ public ArrayList<PlanFragment> createPlanFragments(
         //     Preconditions.checkState(!queryStmt.hasOffset());
         //     isPartitioned = true;
         // }
-        if (ctx_.isInsert() && !singleNodePlan.hasLimit()) {
+        if (ctx.isInsert() && !singleNodePlan.hasLimit()) {
             Preconditions.checkState(!queryStmt.hasOffset());
             isPartitioned = true;
         }
@@ -158,13 +158,13 @@ PlanFragment createInsertFragment(
         // Following is repartition logic
         Preconditions.checkState(needRepartition);
 
-        ExchangeNode exchNode = new ExchangeNode(ctx_.getNextNodeId(), inputFragment.getPlanRoot(), false);
+        ExchangeNode exchNode = new ExchangeNode(ctx.getNextNodeId(), inputFragment.getPlanRoot(), false);
         exchNode.setNumInstances(inputFragment.getPlanRoot().getNumInstances());
         // exchNode.computeStats(analyzer);
         // exchNode.createDefaultSmap(analyzer);
-        exchNode.init(ctx_.getRootAnalyzer());
+        exchNode.init(ctx.getRootAnalyzer());
         DataPartition dataPartition = stmt.getDataPartition();
-        PlanFragment fragment = new PlanFragment(ctx_.getNextFragmentId(), exchNode, dataPartition);
+        PlanFragment fragment = new PlanFragment(ctx.getNextFragmentId(), exchNode, dataPartition);
         inputFragment.setDestination(exchNode);
         inputFragment.setOutputPartition(dataPartition);
         fragments.add(fragment);
@@ -224,7 +224,7 @@ private PlanFragment createPlanFragments(
         } else if (root instanceof AnalyticEvalNode) {
             result = createAnalyticFragment(root, childFragments.get(0), fragments);
         } else if (root instanceof EmptySetNode) {
-            result = new PlanFragment(ctx_.getNextFragmentId(), root, DataPartition.UNPARTITIONED);
+            result = new PlanFragment(ctx.getNextFragmentId(), root, DataPartition.UNPARTITIONED);
         } else if (root instanceof RepeatNode) {
             result = createRepeatNodeFragment((RepeatNode) root, childFragments.get(0), fragments);
         } else if (root instanceof AssertNumRowsNode) {
@@ -256,11 +256,11 @@ private PlanFragment createMergeFragment(PlanFragment inputFragment)
 
         // exchange node clones the behavior of its input, aside from the conjuncts
         ExchangeNode mergePlan =
-                new ExchangeNode(ctx_.getNextNodeId(), inputFragment.getPlanRoot(), false);
+                new ExchangeNode(ctx.getNextNodeId(), inputFragment.getPlanRoot(), false);
         mergePlan.setNumInstances(inputFragment.getPlanRoot().getNumInstances());
-        mergePlan.init(ctx_.getRootAnalyzer());
+        mergePlan.init(ctx.getRootAnalyzer());
         Preconditions.checkState(mergePlan.hasValidStats());
-        PlanFragment fragment = new PlanFragment(ctx_.getNextFragmentId(), mergePlan, DataPartition.UNPARTITIONED);
+        PlanFragment fragment = new PlanFragment(ctx.getNextFragmentId(), mergePlan, DataPartition.UNPARTITIONED);
         inputFragment.setDestination(mergePlan);
         return fragment;
     }
@@ -273,17 +273,17 @@ private PlanFragment createMergeFragment(PlanFragment inputFragment)
      */
     private PlanFragment createScanFragment(PlanNode node) throws UserException {
         if (node instanceof MysqlScanNode || node instanceof OdbcScanNode) {
-            return new PlanFragment(ctx_.getNextFragmentId(), node, DataPartition.UNPARTITIONED);
+            return new PlanFragment(ctx.getNextFragmentId(), node, DataPartition.UNPARTITIONED);
         } else if (node instanceof SchemaScanNode) {
-            return new PlanFragment(ctx_.getNextFragmentId(), node, DataPartition.UNPARTITIONED);
+            return new PlanFragment(ctx.getNextFragmentId(), node, DataPartition.UNPARTITIONED);
         } else if (node instanceof OlapScanNode) {
             // olap scan node
             OlapScanNode olapScanNode = (OlapScanNode) node;
-            return new PlanFragment(ctx_.getNextFragmentId(), node,
+            return new PlanFragment(ctx.getNextFragmentId(), node,
                     olapScanNode.constructInputPartitionByDistributionInfo(), DataPartition.RANDOM);
         } else {
             // other scan nodes are random partitioned: es, broker
-            return new PlanFragment(ctx_.getNextFragmentId(), node, DataPartition.RANDOM);
+            return new PlanFragment(ctx.getNextFragmentId(), node, DataPartition.RANDOM);
         }
     }
 
@@ -328,9 +328,9 @@ private PlanFragment createHashJoinFragment(
             DataPartition rhsJoinPartition =
                     new DataPartition(TPartitionType.BUCKET_SHFFULE_HASH_PARTITIONED, rhsPartitionxprs);
             ExchangeNode rhsExchange =
-                    new ExchangeNode(ctx_.getNextNodeId(), rightChildFragment.getPlanRoot(), false);
+                    new ExchangeNode(ctx.getNextNodeId(), rightChildFragment.getPlanRoot(), false);
             rhsExchange.setNumInstances(rightChildFragment.getPlanRoot().getNumInstances());
-            rhsExchange.init(ctx_.getRootAnalyzer());
+            rhsExchange.init(ctx.getRootAnalyzer());
 
             node.setChild(0, leftChildFragment.getPlanRoot());
             node.setChild(1, rhsExchange);
@@ -358,7 +358,7 @@ private PlanFragment createHashJoinFragment(
                 doBroadcast = true;
             } else if (!node.getInnerRef().isPartitionJoin() && joinCostEvaluation.isBroadcastCostSmaller()
                     && joinCostEvaluation.constructHashTableSpace()
-                    <= ctx_.getRootAnalyzer().getAutoBroadcastJoinThreshold()) {
+                    <= ctx.getRootAnalyzer().getAutoBroadcastJoinThreshold()) {
                 doBroadcast = true;
             } else {
                 doBroadcast = false;
@@ -398,20 +398,20 @@ private PlanFragment createHashJoinFragment(
             DataPartition lhsJoinPartition = new DataPartition(TPartitionType.HASH_PARTITIONED,
                     Expr.cloneList(lhsJoinExprs, null));
             ExchangeNode lhsExchange =
-                    new ExchangeNode(ctx_.getNextNodeId(), leftChildFragment.getPlanRoot(), false);
+                    new ExchangeNode(ctx.getNextNodeId(), leftChildFragment.getPlanRoot(), false);
             lhsExchange.setNumInstances(leftChildFragment.getPlanRoot().getNumInstances());
-            lhsExchange.init(ctx_.getRootAnalyzer());
+            lhsExchange.init(ctx.getRootAnalyzer());
 
             DataPartition rhsJoinPartition =
                     new DataPartition(TPartitionType.HASH_PARTITIONED, rhsJoinExprs);
             ExchangeNode rhsExchange =
-                    new ExchangeNode(ctx_.getNextNodeId(), rightChildFragment.getPlanRoot(), false);
+                    new ExchangeNode(ctx.getNextNodeId(), rightChildFragment.getPlanRoot(), false);
             rhsExchange.setNumInstances(rightChildFragment.getPlanRoot().getNumInstances());
-            rhsExchange.init(ctx_.getRootAnalyzer());
+            rhsExchange.init(ctx.getRootAnalyzer());
 
             node.setChild(0, lhsExchange);
             node.setChild(1, rhsExchange);
-            PlanFragment joinFragment = new PlanFragment(ctx_.getNextFragmentId(), node, lhsJoinPartition);
+            PlanFragment joinFragment = new PlanFragment(ctx.getNextFragmentId(), node, lhsJoinPartition);
             // connect the child fragments
             leftChildFragment.setDestination(lhsExchange);
             leftChildFragment.setOutputPartition(lhsJoinPartition);
@@ -616,8 +616,9 @@ private boolean canBucketShuffleJoin(HashJoinNode node, PlanNode leftRoot,
         if (leftScanNode.getSelectedPartitionIds().size() != 1) {
             ColocateTableIndex colocateIndex = Catalog.getCurrentColocateIndex();
             if (!leftTable.isColocateTable() ||
-                    colocateIndex.isGroupUnstable(colocateIndex.getGroup(leftTable.getId())))
+                    colocateIndex.isGroupUnstable(colocateIndex.getGroup(leftTable.getId()))) {
                 return false;
+            }
         }
 
         DistributionInfo leftDistribution = leftScanNode.getOlapTable().getDefaultDistributionInfo();
@@ -664,7 +665,9 @@ private boolean canBucketShuffleJoin(HashJoinNode node, PlanNode leftRoot,
                     }
                 }
 
-                if (!findRhsExprs) return false;
+                if (!findRhsExprs) {
+                    return false;
+                }
             }
         } else {
             return false;
@@ -710,13 +713,15 @@ private PlanFragment createSetOperationNodeFragment(
         // were dropped because of constant predicates that evaluated to false.
         if (setOperationNode.getChildren().isEmpty()) {
             return new PlanFragment(
-                    ctx_.getNextFragmentId(), setOperationNode, DataPartition.UNPARTITIONED);
+                    ctx.getNextFragmentId(), setOperationNode, DataPartition.UNPARTITIONED);
         }
 
         Preconditions.checkState(!childFragments.isEmpty());
         int numUnpartitionedChildFragments = 0;
         for (int i = 0; i < childFragments.size(); ++i) {
-            if (!childFragments.get(i).isPartitioned()) ++numUnpartitionedChildFragments;
+            if (!childFragments.get(i).isPartitioned()) {
+                ++numUnpartitionedChildFragments;
+            }
         }
 
         // remove all children to avoid them being tagged with the wrong
@@ -727,7 +732,7 @@ private PlanFragment createSetOperationNodeFragment(
         // with a UnionNode that merges all child fragments.
         if (numUnpartitionedChildFragments == childFragments.size()) {
             PlanFragment setOperationFragment = new PlanFragment(
-                    ctx_.getNextFragmentId(), setOperationNode, DataPartition.UNPARTITIONED);
+                    ctx.getNextFragmentId(), setOperationNode, DataPartition.UNPARTITIONED);
             // Absorb the plan trees of all childFragments into unionNode
             // and fix up the fragment tree in the process.
             for (int i = 0; i < childFragments.size(); ++i) {
@@ -735,7 +740,7 @@ private PlanFragment createSetOperationNodeFragment(
                 setOperationFragment.setFragmentInPlanTree(setOperationNode.getChild(i));
                 setOperationFragment.addChildren(childFragments.get(i).getChildren());
             }
-            setOperationNode.init(ctx_.getRootAnalyzer());
+            setOperationNode.init(ctx.getRootAnalyzer());
             // All child fragments have been absorbed into unionFragment.
             fragments.removeAll(childFragments);
             return setOperationFragment;
@@ -743,9 +748,9 @@ private PlanFragment createSetOperationNodeFragment(
 
         // There is at least one partitioned child fragment.
         // TODO(ML): here
-        PlanFragment setOperationFragment = new PlanFragment(ctx_.getNextFragmentId(), setOperationNode,
+        PlanFragment setOperationFragment = new PlanFragment(ctx.getNextFragmentId(), setOperationNode,
                 new DataPartition(TPartitionType.HASH_PARTITIONED,
-                        setOperationNode.getMaterializedResultExprLists_().get(0)));
+                        setOperationNode.getMaterializedResultExprLists().get(0)));
         for (int i = 0; i < childFragments.size(); ++i) {
             PlanFragment childFragment = childFragments.get(i);
             /* if (childFragment.isPartitioned() && childFragment.getPlanRoot().getNumInstances() > 1) {
@@ -771,7 +776,7 @@ private PlanFragment createSetOperationNodeFragment(
             // Connect the unpartitioned child fragments to SetOperationNode via a random exchange.
             connectChildFragment(setOperationNode, i, setOperationFragment, childFragment);
             childFragment.setOutputPartition(
-                    DataPartition.hashPartitioned(setOperationNode.getMaterializedResultExprLists_().get(i)));
+                    DataPartition.hashPartitioned(setOperationNode.getMaterializedResultExprLists().get(i)));
         }
         return setOperationFragment;
     }
@@ -796,9 +801,9 @@ private void connectChildFragment(
             PlanNode node, int childIdx,
             PlanFragment parentFragment, PlanFragment childFragment)
             throws UserException {
-        ExchangeNode exchangeNode = new ExchangeNode(ctx_.getNextNodeId(), childFragment.getPlanRoot(), false);
+        ExchangeNode exchangeNode = new ExchangeNode(ctx.getNextNodeId(), childFragment.getPlanRoot(), false);
         exchangeNode.setNumInstances(childFragment.getPlanRoot().getNumInstances());
-        exchangeNode.init(ctx_.getRootAnalyzer());
+        exchangeNode.init(ctx.getRootAnalyzer());
         exchangeNode.setFragment(parentFragment);
         node.setChild(childIdx, exchangeNode);
         childFragment.setDestination(exchangeNode);
@@ -816,10 +821,10 @@ private void connectChildFragment(
      */
     private PlanFragment createParentFragment(PlanFragment childFragment, DataPartition parentPartition)
             throws UserException {
-        ExchangeNode exchangeNode = new ExchangeNode(ctx_.getNextNodeId(), childFragment.getPlanRoot(), false);
+        ExchangeNode exchangeNode = new ExchangeNode(ctx.getNextNodeId(), childFragment.getPlanRoot(), false);
         exchangeNode.setNumInstances(childFragment.getPlanRoot().getNumInstances());
-        exchangeNode.init(ctx_.getRootAnalyzer());
-        PlanFragment parentFragment = new PlanFragment(ctx_.getNextFragmentId(), exchangeNode, parentPartition);
+        exchangeNode.init(ctx.getRootAnalyzer());
+        PlanFragment parentFragment = new PlanFragment(ctx.getNextFragmentId(), exchangeNode, parentPartition);
         childFragment.setDestination(exchangeNode);
         childFragment.setOutputPartition(parentPartition);
         return parentFragment;
@@ -982,7 +987,9 @@ private PlanFragment createMergeAggregationFragment(AggregationNode node, PlanFr
         DataPartition parentPartition = null;
         if (hasGrouping) {
             List<Expr> partitionExprs = node.getAggInfo().getPartitionExprs();
-            if (partitionExprs == null) partitionExprs = groupingExprs;
+            if (partitionExprs == null) {
+                partitionExprs = groupingExprs;
+            }
             // boolean childHasCompatPartition = ctx_.getRootAnalyzer().equivSets(partitionExprs,
             //         childFragment.getDataPartition().getPartitionExprs());
             // if (childHasCompatPartition && !childFragment.refsNullableTupleId(partitionExprs)) {
@@ -997,7 +1004,7 @@ private PlanFragment createMergeAggregationFragment(AggregationNode node, PlanFr
             // the parent fragment is partitioned on the grouping exprs;
             // substitute grouping exprs to reference the *output* of the agg, not the input
             partitionExprs = Expr.substituteList(partitionExprs,
-                    node.getAggInfo().getIntermediateSmap(), ctx_.getRootAnalyzer(), false);
+                    node.getAggInfo().getIntermediateSmap(), ctx.getRootAnalyzer(), false);
             parentPartition = DataPartition.hashPartitioned(partitionExprs);
         } else {
             // the parent fragment is unpartitioned
@@ -1010,7 +1017,7 @@ private PlanFragment createMergeAggregationFragment(AggregationNode node, PlanFr
         childFragment.addPlanRoot(node);
         node.setIntermediateTuple();
 
-        node.setIsPreagg(ctx_);
+        node.setIsPreagg(ctx);
 
         // if there is a limit, we need to transfer it from the pre-aggregation
         // node in the child fragment to the merge aggregation node in the parent
@@ -1020,9 +1027,9 @@ private PlanFragment createMergeAggregationFragment(AggregationNode node, PlanFr
 
         // place a merge aggregation step in a new fragment
         PlanFragment mergeFragment = createParentFragment(childFragment, parentPartition);
-        AggregationNode mergeAggNode = new AggregationNode(ctx_.getNextNodeId(),
+        AggregationNode mergeAggNode = new AggregationNode(ctx.getNextNodeId(),
                 mergeFragment.getPlanRoot(), node.getAggInfo().getMergeAggInfo());
-        mergeAggNode.init(ctx_.getRootAnalyzer());
+        mergeAggNode.init(ctx.getRootAnalyzer());
         mergeAggNode.setLimit(limit);
         // Merge of non-grouping agg only processes one tuple per Impala daemon - codegen
         // will cost more than benefit.
@@ -1035,9 +1042,9 @@ private PlanFragment createMergeAggregationFragment(AggregationNode node, PlanFr
         // HAVING predicates can only be evaluated after the merge agg step
         node.transferConjuncts(mergeAggNode);
         // Recompute stats after transferring the conjuncts_ (order is important).
-        node.computeStats(ctx_.getRootAnalyzer());
-        mergeFragment.getPlanRoot().computeStats(ctx_.getRootAnalyzer());
-        mergeAggNode.computeStats(ctx_.getRootAnalyzer());
+        node.computeStats(ctx.getRootAnalyzer());
+        mergeFragment.getPlanRoot().computeStats(ctx.getRootAnalyzer());
+        mergeAggNode.computeStats(ctx.getRootAnalyzer());
         // Set new plan root after updating stats.
         mergeFragment.addPlanRoot(mergeAggNode);
 
@@ -1073,7 +1080,7 @@ private PlanFragment createPhase2DistinctAggregationFragment(
             // partitioning happens on the intermediate tuple of the 1st phase.
             partitionExprs = Expr.substituteList(
                     groupingExprs, firstPhaseAggInfo.getOutputToIntermediateSmap(),
-                    ctx_.getRootAnalyzer(), false);
+                    ctx.getRootAnalyzer(), false);
         } else {
             // We need to do
             // - child fragment:
@@ -1085,7 +1092,7 @@ private PlanFragment createPhase2DistinctAggregationFragment(
             //   * merge agg of phase 2
             if (!isMultiDistinct) {
                 partitionExprs = Expr.substituteList(firstPhaseAggInfo.getGroupingExprs(),
-                        firstPhaseAggInfo.getIntermediateSmap(), ctx_.getRootAnalyzer(), false);
+                        firstPhaseAggInfo.getIntermediateSmap(), ctx.getRootAnalyzer(), false);
             }
         }
 
@@ -1103,14 +1110,14 @@ private PlanFragment createPhase2DistinctAggregationFragment(
             // Convert the existing node to a preaggregation.
             AggregationNode preaggNode = (AggregationNode)node.getChild(0);
 
-            preaggNode.setIsPreagg(ctx_);
+            preaggNode.setIsPreagg(ctx);
 
             // place a merge aggregation step for the 1st phase in a new fragment
             mergeFragment = createParentFragment(childFragment, mergePartition);
             AggregateInfo phase1MergeAggInfo = firstPhaseAggInfo.getMergeAggInfo();
             AggregationNode phase1MergeAggNode =
-                    new AggregationNode(ctx_.getNextNodeId(), preaggNode, phase1MergeAggInfo);
-            phase1MergeAggNode.init(ctx_.getRootAnalyzer());
+                    new AggregationNode(ctx.getNextNodeId(), preaggNode, phase1MergeAggInfo);
+            phase1MergeAggNode.init(ctx.getRootAnalyzer());
             phase1MergeAggNode.unsetNeedsFinalize();
             phase1MergeAggNode.setIntermediateTuple();
             mergeFragment.addPlanRoot(phase1MergeAggNode);
@@ -1124,7 +1131,9 @@ private PlanFragment createPhase2DistinctAggregationFragment(
         if (!hasGrouping && !isMultiDistinct) {
             // place the merge aggregation of the 2nd phase in an unpartitioned fragment;
             // add preceding merge fragment at end
-            if (mergeFragment != childFragment) fragments.add(mergeFragment);
+            if (mergeFragment != childFragment) {
+                fragments.add(mergeFragment);
+            }
 
             node.unsetNeedsFinalize();
             node.setIntermediateTuple();
@@ -1133,9 +1142,9 @@ private PlanFragment createPhase2DistinctAggregationFragment(
             node.unsetLimit();
             mergeFragment = createParentFragment(mergeFragment, DataPartition.UNPARTITIONED);
             AggregateInfo phase2MergeAggInfo = node.getAggInfo().getMergeAggInfo();
-            AggregationNode phase2MergeAggNode = new AggregationNode(ctx_.getNextNodeId(), node,
+            AggregationNode phase2MergeAggNode = new AggregationNode(ctx.getNextNodeId(), node,
                     phase2MergeAggInfo);
-            phase2MergeAggNode.init(ctx_.getRootAnalyzer());
+            phase2MergeAggNode.init(ctx.getRootAnalyzer());
             // Transfer having predicates. If hasGrouping == true, the predicates should
             // instead be evaluated by the 2nd phase agg (the predicates are already there).
             node.transferConjuncts(phase2MergeAggNode);
@@ -1183,7 +1192,7 @@ private PlanFragment createAnalyticFragment(
         PlanFragment analyticFragment = childFragment;
         if (sortNode.getInputPartition() != null) {
             sortNode.getInputPartition().substitute(
-                    childFragment.getPlanRoot().getOutputSmap(), ctx_.getRootAnalyzer());
+                    childFragment.getPlanRoot().getOutputSmap(), ctx.getRootAnalyzer());
 
             // Make sure the childFragment's output is partitioned as required by the sortNode.
             // Even if the fragment and the sort partition exprs are equal, an exchange is
@@ -1242,8 +1251,8 @@ private PlanFragment createOrderByFragment(
             childSortNode.setLimit(limit + offset);
         }
         childSortNode.setOffset(0);
-        childSortNode.computeStats(ctx_.getRootAnalyzer());
-        exchNode.computeStats(ctx_.getRootAnalyzer());
+        childSortNode.computeStats(ctx.getRootAnalyzer());
+        exchNode.computeStats(ctx.getRootAnalyzer());
 
         return mergeFragment;
     }
@@ -1262,8 +1271,8 @@ private PlanFragment createAssertFragment(PlanNode assertRowCountNode, PlanFragm
         mergeFragment.addPlanRoot(assertRowCountNode);
 
         // reset the stat of assert row count node
-        exchNode.computeStats(ctx_.getRootAnalyzer());
-        assertRowCountNode.computeStats(ctx_.getRootAnalyzer());
+        exchNode.computeStats(ctx.getRootAnalyzer());
+        assertRowCountNode.computeStats(ctx.getRootAnalyzer());
 
         return mergeFragment;
     }
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 d00dc12724a3ed..bda1f85aa54c79 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
@@ -59,7 +59,9 @@ public void init(Analyzer analyzer) {
         // the logical output tuple is returned by getMaterializedTupleIds(). It needs
         // to be set as materialized (even though it isn't) to avoid failing precondition
         // checks generating the thrift for slot refs that may reference this tuple.
-        for (TupleId id: tupleIds) analyzer.getTupleDesc(id).setIsMaterialized(true);
+        for (TupleId id: tupleIds) {
+            analyzer.getTupleDesc(id).setIsMaterialized(true);
+        }
         computeTupleStatAndMemLayout(analyzer);
         computeStats(analyzer);
     }
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 e9d1e3434a6427..c1c24960eca685 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
@@ -77,7 +77,9 @@ public ExchangeNode(PlanNodeId id, PlanNode inputNode, boolean copyConjuncts) {
             this.conjuncts = Lists.newArrayList();
         }
         // Only apply the limit at the receiver if there are multiple senders.
-        if (inputNode.getFragment().isPartitioned()) limit = inputNode.limit;
+        if (inputNode.getFragment().isPartitioned()) {
+            limit = inputNode.limit;
+        }
         computeTupleIds();
     }
 
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 812b7d459d3b5e..ab04131c162f50 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
@@ -328,17 +328,27 @@ public TupleId rhsTid() {
          * table/column of at least one side is missing stats.
          */
         public static EqJoinConjunctScanSlots create(Expr eqJoinConjunct) {
-            if (!Expr.IS_EQ_BINARY_PREDICATE.apply(eqJoinConjunct)) return null;
+            if (!Expr.IS_EQ_BINARY_PREDICATE.apply(eqJoinConjunct)) {
+                return null;
+            }
             SlotDescriptor lhsScanSlot = eqJoinConjunct.getChild(0).findSrcScanSlot();
-            if (lhsScanSlot == null || !hasNumRowsAndNdvStats(lhsScanSlot)) return null;
+            if (lhsScanSlot == null || !hasNumRowsAndNdvStats(lhsScanSlot)) {
+                return null;
+            }
             SlotDescriptor rhsScanSlot = eqJoinConjunct.getChild(1).findSrcScanSlot();
-            if (rhsScanSlot == null || !hasNumRowsAndNdvStats(rhsScanSlot)) return null;
+            if (rhsScanSlot == null || !hasNumRowsAndNdvStats(rhsScanSlot)) {
+                return null;
+            }
             return new EqJoinConjunctScanSlots(eqJoinConjunct, lhsScanSlot, rhsScanSlot);
         }
 
         private static boolean hasNumRowsAndNdvStats(SlotDescriptor slotDesc) {
-            if (slotDesc.getColumn() == null) return false;
-            if (!slotDesc.getStats().hasNumDistinctValues()) return false;
+            if (slotDesc.getColumn() == null) {
+                return false;
+            }
+            if (!slotDesc.getStats().hasNumDistinctValues()) {
+                return false;
+            }
             return true;
         }
 
@@ -381,7 +391,9 @@ private long getJoinCardinality() {
         List<EqJoinConjunctScanSlots> eqJoinConjunctSlots = new ArrayList<>();
         for (Expr eqJoinConjunct : eqJoinConjuncts) {
             EqJoinConjunctScanSlots slots = EqJoinConjunctScanSlots.create(eqJoinConjunct);
-            if (slots != null) eqJoinConjunctSlots.add(slots);
+            if (slots != null) {
+                eqJoinConjunctSlots.add(slots);
+            }
         }
 
         if (eqJoinConjunctSlots.isEmpty()) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ListPartitionPrunerV2.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ListPartitionPrunerV2.java
index 154f9cfbc259c5..fffff0fb6626e7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/ListPartitionPrunerV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ListPartitionPrunerV2.java
@@ -181,8 +181,12 @@ public String toString() {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
             ListPartitionUniqueId that = (ListPartitionUniqueId) o;
             return partitionId == that.partitionId && partitionKeyIndex == that.partitionKeyIndex;
         }
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 bc8963681bd986..ac910d8bbd60ac 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
@@ -81,7 +81,7 @@ public class MaterializedViewSelector {
     //    private Map<String, Set<AggregatedColumn>> aggregateColumnsInQuery = Maps.newHashMap();
     private Map<Long, Set<String>> columnNamesInQueryOutput = Maps.newHashMap();
 
-    private boolean disableSPJGView;
+    private boolean disableSpjgView;
 
     // The Following 2 variables should be reset each time before calling selectBestMV();
     // Unlike the "isPreAggregation" in OlapScanNode which defaults to false,
@@ -330,7 +330,7 @@ aggregate mv index (k1, k2)
                 continue;
             }
             // When the query is SPJ type but the candidate index is SPJG type, it will not pass directly.
-            if (isSPJQuery || disableSPJGView) {
+            if (isSPJQuery || disableSpjgView) {
                 iterator.remove();
                 continue;
             }
@@ -360,7 +360,7 @@ private void checkAggregationFunction(Set<FunctionCallExpr> aggregatedColumnsInQ
                 continue;
             }
             // When the query is SPJ type but the candidate index is SPJG type, it will not pass directly.
-            if (isSPJQuery || disableSPJGView) {
+            if (isSPJQuery || disableSpjgView) {
                 iterator.remove();
                 continue;
             }
@@ -447,7 +447,7 @@ private void init() {
                 // TODO(ml): support count(*)
                 if (tableIdToAggColumnNames.size() != 1) {
                     reasonOfDisable = "aggExpr[" + aggExpr.debugString() + "] should involved only one column";
-                    disableSPJGView = true;
+                    disableSpjgView = true;
                     break;
                 }
                 addAggColumnInQuery(tableIdToAggColumnNames.keySet().stream().findFirst().get(), aggExpr);
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 4703f0827c428e..d49165e1eadf40 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
@@ -164,10 +164,16 @@ public PlanFragment(PlanFragmentId id, PlanNode root, DataPartition partition, D
      * different fragment.
      */
     public void setFragmentInPlanTree(PlanNode node) {
-        if (node == null) return;
+        if (node == null) {
+            return;
+        }
         node.setFragment(this);
-        if (node instanceof ExchangeNode) return;
-        for (PlanNode child : node.getChildren()) setFragmentInPlanTree(child);
+        if (node instanceof ExchangeNode) {
+            return;
+        }
+        for (PlanNode child : node.getChildren()) {
+            setFragmentInPlanTree(child);
+        }
     }
 
     /**
@@ -320,7 +326,9 @@ public void updateDataPartition(DataPartition dataPartition) {
     public PlanFragmentId getId() { return fragmentId; }
 
     public PlanFragment getDestFragment() {
-        if (destNode == null) return null;
+        if (destNode == null) {
+            return null;
+        }
         return destNode.getFragment();
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragmentId.java b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragmentId.java
index 7c0ff3ab35dfec..72872b99bb788d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragmentId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragmentId.java
@@ -31,9 +31,9 @@ public PlanFragmentId(int id) {
     public static IdGenerator<PlanFragmentId> createGenerator() {
         return new IdGenerator<PlanFragmentId>() {
             @Override
-            public PlanFragmentId getNextId() { return new PlanFragmentId(nextId_++); }
+            public PlanFragmentId getNextId() { return new PlanFragmentId(nextId++); }
             @Override
-            public PlanFragmentId getMaxId() { return new PlanFragmentId(nextId_ - 1); }
+            public PlanFragmentId getMaxId() { return new PlanFragmentId(nextId - 1); }
         };
     }
 
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 d254e096c6a576..d43747ed11479e 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
@@ -111,7 +111,7 @@ abstract public class PlanNode extends TreeNode<PlanNode> {
 
     // Fragment that this PlanNode is executed in. Valid only after this PlanNode has been
     // assigned to a fragment. Set and maintained by enclosing PlanFragment.
-    protected PlanFragment fragment_;
+    protected PlanFragment fragment;
 
     // estimate of the output cardinality of this node; set in computeStats();
     // invalid: -1
@@ -242,7 +242,7 @@ public void setId(PlanNodeId id) {
     }
 
     public PlanFragmentId getFragmentId() {
-        return fragment_.getFragmentId();
+        return fragment.getFragmentId();
     }
 
     public void setFragmentId(PlanFragmentId id) {
@@ -250,11 +250,11 @@ public void setFragmentId(PlanFragmentId id) {
     }
 
     public void setFragment(PlanFragment fragment) {
-        fragment_ = fragment;
+        this.fragment = fragment;
     }
 
     public PlanFragment getFragment() {
-        return fragment_;
+        return fragment;
     }
 
     public long getLimit() {
@@ -781,7 +781,9 @@ static protected double computeCombinedSelectivity(List<Expr> conjuncts) {
         // Collect all estimated selectivities.
         List<Double> selectivities = new ArrayList<>();
         for (Expr e : conjuncts) {
-            if (e.hasSelectivity()) selectivities.add(e.getSelectivity());
+            if (e.hasSelectivity()) {
+                selectivities.add(e.getSelectivity());
+            }
         }
         if (selectivities.size() != conjuncts.size()) {
             // Some conjuncts have no estimated selectivity. Use a single default
@@ -874,7 +876,9 @@ public ScanNode getScanNodeInOneFragmentByTupleId(TupleId tupleId) {
     public void clearRuntimeFilters() { runtimeFilters.clear(); }
 
     protected String getRuntimeFilterExplainString(boolean isBuildNode) {
-        if (runtimeFilters.isEmpty()) return "";
+        if (runtimeFilters.isEmpty()) {
+            return "";
+        }
         List<String> filtersStr = new ArrayList<>();
         for (RuntimeFilter filter: runtimeFilters) {
             StringBuilder filterStr = new StringBuilder();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNodeId.java b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNodeId.java
index 5b78dae8581758..26e5a0799fe17d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNodeId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNodeId.java
@@ -31,9 +31,9 @@ public PlanNodeId(int id) {
     public static IdGenerator<PlanNodeId> createGenerator() {
         return new IdGenerator<PlanNodeId>() {
             @Override
-            public PlanNodeId getNextId() { return new PlanNodeId(nextId_++); }
+            public PlanNodeId getNextId() { return new PlanNodeId(nextId++); }
             @Override
-            public PlanNodeId getMaxId() { return new PlanNodeId(nextId_ - 1); }
+            public PlanNodeId getMaxId() { return new PlanNodeId(nextId - 1); }
         };
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/PlannerContext.java b/fe/fe-core/src/main/java/org/apache/doris/planner/PlannerContext.java
index f1cf9d3405a04b..3d9be70c42b57b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/PlannerContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/PlannerContext.java
@@ -41,30 +41,30 @@ public class PlannerContext {
     // used for determining whether a broadcast join is feasible.
     public final static double HASH_TBL_SPACE_OVERHEAD = 1.1;
 
-    private final IdGenerator<PlanNodeId> nodeIdGenerator_ = PlanNodeId.createGenerator();
-    private final IdGenerator<PlanFragmentId> fragmentIdGenerator_ =
+    private final IdGenerator<PlanNodeId> nodeIdGenerator = PlanNodeId.createGenerator();
+    private final IdGenerator<PlanFragmentId> fragmentIdGenerator =
             PlanFragmentId.createGenerator();
 
     // TODO(zc) private final TQueryCtx queryCtx_;
     // TODO(zc) private final AnalysisContext.AnalysisResult analysisResult_;
-    private final Analyzer analyzer_;
-    private final TQueryOptions queryOptions_;
-    private final QueryStmt queryStmt_;
-    private final StatementBase statement_;
+    private final Analyzer analyzer;
+    private final TQueryOptions queryOptions;
+    private final QueryStmt queryStmt;
+    private final StatementBase statement;
 
     public PlannerContext(Analyzer analyzer, QueryStmt queryStmt, TQueryOptions queryOptions, StatementBase statement) {
-        this.analyzer_ = analyzer;
-        this.queryStmt_ = queryStmt;
-        this.queryOptions_ = queryOptions;
-        this.statement_ = statement;
+        this.analyzer = analyzer;
+        this.queryStmt = queryStmt;
+        this.queryOptions = queryOptions;
+        this.statement = statement;
     }
 
-    public QueryStmt getQueryStmt() { return queryStmt_; }
-    public TQueryOptions getQueryOptions() { return queryOptions_; } // getRootAnalyzer().getQueryOptions(); }
-    public Analyzer getRootAnalyzer() { return analyzer_; } // analysisResult_.getAnalyzer(); }
+    public QueryStmt getQueryStmt() { return queryStmt; }
+    public TQueryOptions getQueryOptions() { return queryOptions; } // getRootAnalyzer().getQueryOptions(); }
+    public Analyzer getRootAnalyzer() { return analyzer; } // analysisResult_.getAnalyzer(); }
     public boolean isSingleNodeExec() { return getQueryOptions().num_nodes == 1; }
-    public PlanNodeId getNextNodeId() { return nodeIdGenerator_.getNextId(); }
-    public PlanFragmentId getNextFragmentId() { return fragmentIdGenerator_.getNextId(); }
+    public PlanNodeId getNextNodeId() { return nodeIdGenerator.getNextId(); }
+    public PlanFragmentId getNextFragmentId() { return fragmentIdGenerator.getNextId(); }
 
-    public boolean isInsert() { return statement_ instanceof InsertStmt; }
+    public boolean isInsert() { return statement instanceof InsertStmt; }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/RangePartitionPrunerV2.java b/fe/fe-core/src/main/java/org/apache/doris/planner/RangePartitionPrunerV2.java
index e1228771282883..d2642473313f0d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/RangePartitionPrunerV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/RangePartitionPrunerV2.java
@@ -256,8 +256,12 @@ public String toString() {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
             RangePartitionUniqueId that = (RangePartitionUniqueId) o;
             return partitionId == that.partitionId;
         }
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 bfca278792a70a..0ba37afbc6d912 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
@@ -41,7 +41,7 @@ public class ResultFileSink extends DataSink {
     private DataPartition outputPartition;
     private TupleId outputTupleId;
     private String header = "";
-    private String header_type = "";
+    private String headerType = "";
 
     public ResultFileSink(PlanNodeId exchNodeId, OutFileClause outFileClause) {
         this.exchNodeId = exchNodeId;
@@ -69,7 +69,7 @@ public ResultFileSink(PlanNodeId exchNodeId, OutFileClause outFileClause, ArrayL
                 outFileClause.getHeaderType().equals(FeConstants.csv_with_names_and_types)) {
             header = genNames(labels, outFileClause.getColumnSeparator(), outFileClause.getLineDelimiter());
         }
-        header_type = outFileClause.getHeaderType();
+        headerType = outFileClause.getHeaderType();
     }
 
     public String getBrokerName() {
@@ -118,7 +118,7 @@ protected TDataSink toThrift() {
         tResultFileSink.setFileOptions(fileSinkOptions);
         tResultFileSink.setStorageBackendType(storageType.toThrift());
         tResultFileSink.setDestNodeId(exchNodeId.asInt());
-        tResultFileSink.setHeaderType(header_type);
+        tResultFileSink.setHeaderType(headerType);
         tResultFileSink.setHeader(header);
         if (outputTupleId != null) {
             tResultFileSink.setOutputTupleId(outputTupleId.asInt());
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 45c90d30252b2b..a23570b81534d8 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
@@ -142,7 +142,9 @@ private RuntimeFilter(RuntimeFilterId filterId, HashJoinNode filterSrcNode, Expr
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof RuntimeFilter)) return false;
+        if (!(obj instanceof RuntimeFilter)) {
+            return false;
+        }
         return ((RuntimeFilter) obj).id.equals(id);
     }
 
@@ -198,13 +200,17 @@ public static RuntimeFilter create(IdGenerator<RuntimeFilterId> idGen, Analyzer
         // will filter the null value in child[0] while it is needed in the Null-safe equal join.
         // For example: select * from a join b where a.id<=>b.id
         // the null value in table a should be return by scan node instead of filtering it by runtimeFilter.
-        if (!Predicate.isUnNullSafeEquivalencePredicate(joinPredicate)) return null;
+        if (!Predicate.isUnNullSafeEquivalencePredicate(joinPredicate)) {
+            return null;
+        }
 
         BinaryPredicate normalizedJoinConjunct =
                 SingleNodePlanner.getNormalizedEqPred(joinPredicate,
                         filterSrcNode.getChild(0).getTupleIds(),
                         filterSrcNode.getChild(1).getTupleIds(), analyzer);
-        if (normalizedJoinConjunct == null) return null;
+        if (normalizedJoinConjunct == null) {
+            return null;
+        }
 
         // Ensure that the target expr does not contain TupleIsNull predicates as these
         // can't be evaluated at a scan node.
@@ -213,11 +219,15 @@ public static RuntimeFilter create(IdGenerator<RuntimeFilterId> idGen, Analyzer
         Expr srcExpr = normalizedJoinConjunct.getChild(1);
 
         if (srcExpr.getType().equals(ScalarType.createHllType())
-                || srcExpr.getType().equals(ScalarType.createType(PrimitiveType.BITMAP))) return null;
+                || srcExpr.getType().equals(ScalarType.createType(PrimitiveType.BITMAP))) {
+            return null;
+        }
 
         Map<TupleId, List<SlotId>> targetSlots = getTargetSlots(analyzer, targetExpr);
         Preconditions.checkNotNull(targetSlots);
-        if (targetSlots.isEmpty()) return null;
+        if (targetSlots.isEmpty()) {
+            return null;
+        }
 
         if (LOG.isTraceEnabled()) {
             LOG.trace("Generating runtime filter from predicate " + joinPredicate);
@@ -295,8 +305,9 @@ so after the COALESCE() the join condition becomes 100 = 100.
             // TODO(zxy) Returns true if 'p' evaluates to true when all its referenced slots are NULL, returns false
             //  otherwise. Throws if backend expression evaluation fails.
             if (expr.isContainsFunction("COALESCE") || expr.isContainsFunction("IFNULL")
-                    || expr.isContainsClass("org.apache.doris.analysis.CaseExpr"))
+                    || expr.isContainsClass("org.apache.doris.analysis.CaseExpr")) {
                 return Collections.emptyMap();
+            }
         }
 
         Map<TupleId, List<SlotId>> slotsByTid = new HashMap<>();
@@ -304,7 +315,9 @@ so after the COALESCE() the join condition becomes 100 = 100.
         // equivalent slots that are bound by the same base table tuple(s).
         for (SlotId slotId: sids) {
             Map<TupleId, List<SlotId>> currSlotsByTid = getBaseTblEquivSlots(analyzer, slotId);
-            if (currSlotsByTid.isEmpty()) return Collections.emptyMap();
+            if (currSlotsByTid.isEmpty()) {
+                return Collections.emptyMap();
+            }
             if (slotsByTid.isEmpty()) {
                 slotsByTid.putAll(currSlotsByTid);
                 continue;
@@ -329,7 +342,9 @@ so after the COALESCE() the join condition becomes 100 = 100.
                     entry.getValue().addAll(slotIds);
                 }
             }
-            if (slotsByTid.isEmpty()) return Collections.emptyMap();
+            if (slotsByTid.isEmpty()) {
+                return Collections.emptyMap();
+            }
         }
         return slotsByTid;
     }
@@ -344,7 +359,9 @@ private static Map<TupleId, List<SlotId>> getBaseTblEquivSlots(Analyzer analyzer
         Map<TupleId, List<SlotId>> slotsByTid = new HashMap<>();
         for (SlotId targetSid: analyzer.getValueTransferTargets(srcSid)) {
             TupleDescriptor tupleDesc = analyzer.getSlotDesc(targetSid).getParent();
-            if (tupleDesc.getTable() == null) continue;
+            if (tupleDesc.getTable() == null) {
+                continue;
+            }
             List<SlotId> sids = slotsByTid.computeIfAbsent(tupleDesc.getId(), k -> new ArrayList<>());
             sids.add(targetSid);
         }
@@ -353,7 +370,9 @@ private static Map<TupleId, List<SlotId>> getBaseTblEquivSlots(Analyzer analyzer
 
     public Expr getTargetExpr(PlanNodeId targetPlanNodeId) {
         for (RuntimeFilterTarget target: targets) {
-            if (target.node.getId() != targetPlanNodeId) continue;
+            if (target.node.getId() != targetPlanNodeId) {
+                continue;
+            }
             return target.expr;
         }
         return null;
@@ -403,7 +422,7 @@ private void calculateFilterSize(RuntimeFilterGenerator.FilterSizeLimits filterS
             return;
         }
         double fpp = FeConstants.default_bloom_filter_fpp;
-        int logFilterSize = GetMinLogSpaceForBloomFilter(ndvEstimate, fpp);
+        int logFilterSize = getMinLogSpaceForBloomFilter(ndvEstimate, fpp);
         filterSizeBytes = 1L << logFilterSize;
         filterSizeBytes = Math.max(filterSizeBytes, filterSizeLimits.minVal);
         filterSizeBytes = Math.min(filterSizeBytes, filterSizeLimits.maxVal);
@@ -414,8 +433,10 @@ private void calculateFilterSize(RuntimeFilterGenerator.FilterSizeLimits filterS
      * filter with 'ndv' unique elements and a false positive probability of less
      * than 'fpp'.
      */
-    public static int GetMinLogSpaceForBloomFilter(long ndv, double fpp) {
-        if (0 == ndv) return 0;
+    public static int getMinLogSpaceForBloomFilter(long ndv, double fpp) {
+        if (0 == ndv) {
+            return 0;
+        }
         double k = 8; // BUCKET_WORDS
         // m is the number of bits we would need to get the fpp specified
         double m = -k * ndv / Math.log(1 - Math.pow(fpp, 1.0 / k));
@@ -430,17 +451,19 @@ public static int GetMinLogSpaceForBloomFilter(long ndv, double fpp) {
     public void assignToPlanNodes() {
         Preconditions.checkState(hasTargets());
         builderNode.addRuntimeFilter(this);
-        builderNode.fragment_.setBuilderRuntimeFilterIds(getFilterId());
+        builderNode.fragment.setBuilderRuntimeFilterIds(getFilterId());
         for (RuntimeFilterTarget target: targets) {
             target.node.addRuntimeFilter(this);
             // fragment is expected to use this filter id
-            target.node.fragment_.setTargetRuntimeFilterIds(this.id);
+            target.node.fragment.setTargetRuntimeFilterIds(this.id);
         }
     }
 
     public void registerToPlan(Analyzer analyzer) {
         setIsBroadcast(getBuilderNode().getDistributionMode() == HashJoinNode.DistributionMode.BROADCAST);
-        if (LOG.isTraceEnabled()) LOG.trace("Runtime filter: " + debugString());
+        if (LOG.isTraceEnabled()) {
+            LOG.trace("Runtime filter: " + debugString());
+        }
         assignToPlanNodes();
         analyzer.putAssignedRuntimeFilter(this);
     }
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 b6872c9ecf3092..b68df92ba4a062 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
@@ -153,7 +153,9 @@ public static void generateRuntimeFilters(Analyzer analyzer, PlanNode plan) {
         for (RuntimeFilter filter: filters) {
             filter.extractTargetsPosition();
             if (filter.getType() == TRuntimeFilterType.BLOOM) {
-                if (numBloomFilters >= maxNumBloomFilters) continue;
+                if (numBloomFilters >= maxNumBloomFilters) {
+                    continue;
+                }
                 ++numBloomFilters;
             }
             filter.registerToPlan(analyzer);
@@ -209,12 +211,16 @@ private void generateFilters(PlanNode root) {
             // Actually all types of Runtime Filter objects generated by the same joinConjunct have the same
             // properties except ID. Maybe consider avoiding repeated generation
             for (TRuntimeFilterType type : TRuntimeFilterType.values()) {
-                if ((sessionVariable.getRuntimeFilterType() & type.getValue()) == 0) continue;
+                if ((sessionVariable.getRuntimeFilterType() & type.getValue()) == 0) {
+                    continue;
+                }
                 for (int i = 0; i < joinConjuncts.size(); i++) {
                     Expr conjunct = joinConjuncts.get(i);
                     RuntimeFilter filter = RuntimeFilter.create(filterIdGenerator,
                             analyzer, conjunct, i, joinNode, type, bloomFilterSizeLimits);
-                    if (filter == null) continue;
+                    if (filter == null) {
+                        continue;
+                    }
                     registerRuntimeFilter(filter);
                     filters.add(filter);
                 }
@@ -223,7 +229,9 @@ private void generateFilters(PlanNode root) {
             // Finalize every runtime filter of that join. This is to ensure that we don't
             // assign a filter to a scan node from the right subtree of joinNode or ancestor
             // join nodes in case we don't find a destination node in the left subtree.
-            for (RuntimeFilter runtimeFilter: filters) finalizeRuntimeFilter(runtimeFilter);
+            for (RuntimeFilter runtimeFilter: filters) {
+                finalizeRuntimeFilter(runtimeFilter);
+            }
             generateFilters(root.getChild(1));
         } else if (root instanceof ScanNode) {
             assignRuntimeFilters((ScanNode) root);
@@ -284,20 +292,32 @@ private void finalizeRuntimeFilter(RuntimeFilter runtimeFilter) {
      * 2. Only olap scan nodes are supported:
      */
     private void assignRuntimeFilters(ScanNode scanNode) {
-        if (!(scanNode instanceof OlapScanNode)) return;
+        if (!(scanNode instanceof OlapScanNode)) {
+            return;
+        }
         TupleId tid = scanNode.getTupleIds().get(0);
-        if (!runtimeFiltersByTid.containsKey(tid)) return;
+        if (!runtimeFiltersByTid.containsKey(tid)) {
+            return;
+        }
         String runtimeFilterMode = sessionVariable.getRuntimeFilterMode();
         Preconditions.checkState(Arrays.stream(TRuntimeFilterMode.values()).map(Enum::name).anyMatch(
                 p -> p.equals(runtimeFilterMode.toUpperCase())), "runtimeFilterMode not expected");
         for (RuntimeFilter filter: runtimeFiltersByTid.get(tid)) {
-            if (filter.isFinalized()) continue;
+            if (filter.isFinalized()) {
+                continue;
+            }
             Expr targetExpr = computeTargetExpr(filter, tid);
-            if (targetExpr == null) continue;
+            if (targetExpr == null) {
+                continue;
+            }
             boolean isBoundByKeyColumns = isBoundByKeyColumns(analyzer, targetExpr, scanNode);
             boolean isLocalTarget = isLocalTarget(filter, scanNode);
-            if (runtimeFilterMode.equals(TRuntimeFilterMode.LOCAL.name()) && !isLocalTarget) continue;
-            if (runtimeFilterMode.equals(TRuntimeFilterMode.REMOTE.name()) && isLocalTarget) continue;
+            if (runtimeFilterMode.equals(TRuntimeFilterMode.LOCAL.name()) && !isLocalTarget) {
+                continue;
+            }
+            if (runtimeFilterMode.equals(TRuntimeFilterMode.REMOTE.name()) && isLocalTarget) {
+                continue;
+            }
 
             RuntimeFilter.RuntimeFilterTarget target = new RuntimeFilter.RuntimeFilterTarget(
                     scanNode, targetExpr, isBoundByKeyColumns, isLocalTarget);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterId.java b/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterId.java
index c4339b4ecbc71c..f4c8e4ff1aaa26 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterId.java
@@ -30,12 +30,12 @@ public static IdGenerator<RuntimeFilterId> createGenerator() {
         return new IdGenerator<RuntimeFilterId>() {
             @Override
             public RuntimeFilterId getNextId() {
-                return new RuntimeFilterId(nextId_++);
+                return new RuntimeFilterId(nextId++);
             }
 
             @Override
             public RuntimeFilterId getMaxId() {
-                return new RuntimeFilterId(nextId_ - 1);
+                return new RuntimeFilterId(nextId - 1);
             }
         };
     }
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 41f3ad0b77fd02..c308896c3a03da 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
@@ -191,6 +191,7 @@ private ColumnRange createColumnRange(SlotDescriptor desc,
                         break;
                     case CONVERT_SUCCESS:
                         result.intersect(ranges.ranges);
+                        break;
                     case CONVERT_FAILURE:
                     default:
                         break;
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 a378635b2c50b3..b500fed25f5026 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
@@ -58,54 +58,54 @@ public abstract class SetOperationNode extends PlanNode {
 
     // List of set operation result exprs of the originating SetOperationStmt. Used for
     // determining passthrough-compatibility of children.
-    protected List<Expr> setOpResultExprs_;
+    protected List<Expr> setOpResultExprs;
 
     // Expr lists corresponding to the input query stmts.
     // The ith resultExprList belongs to the ith child.
     // All exprs are resolved to base tables.
-    protected List<List<Expr>> resultExprLists_ = Lists.newArrayList();
+    protected List<List<Expr>> resultExprLists = Lists.newArrayList();
 
     // Expr lists that originate from constant select stmts.
     // We keep them separate from the regular expr lists to avoid null children.
-    protected List<List<Expr>> constExprLists_ = Lists.newArrayList();
+    protected List<List<Expr>> constExprLists = Lists.newArrayList();
 
     // Materialized result/const exprs corresponding to materialized slots.
     // Set in finalize() and substituted against the corresponding child's output smap.
-    protected List<List<Expr>> materializedResultExprLists_ = Lists.newArrayList();
-    protected List<List<Expr>> materializedConstExprLists_ = Lists.newArrayList();
+    protected List<List<Expr>> materializedResultExprLists = Lists.newArrayList();
+    protected List<List<Expr>> materializedConstExprLists = Lists.newArrayList();
 
     // Indicates if this UnionNode is inside a subplan.
-    protected boolean isInSubplan_;
+    protected boolean isInSubplan;
 
     // Index of the first non-passthrough child.
-    protected int firstMaterializedChildIdx_;
+    protected int firstMaterializedChildIdx;
 
-    protected final TupleId tupleId_;
+    protected final TupleId tupleId;
 
     protected SetOperationNode(PlanNodeId id, TupleId tupleId, String planNodeName) {
         super(id, tupleId.asList(), planNodeName);
-        setOpResultExprs_ = Lists.newArrayList();
-        tupleId_ = tupleId;
-        isInSubplan_ = false;
+        setOpResultExprs = Lists.newArrayList();
+        this.tupleId = tupleId;
+        isInSubplan = false;
     }
 
     protected SetOperationNode(PlanNodeId id, TupleId tupleId, String planNodeName,
                                List<Expr> setOpResultExprs, boolean isInSubplan) {
         super(id, tupleId.asList(), planNodeName);
-        setOpResultExprs_ = setOpResultExprs;
-        tupleId_ = tupleId;
-        isInSubplan_ = isInSubplan;
+        this.setOpResultExprs = setOpResultExprs;
+        this.tupleId = tupleId;
+        this.isInSubplan = isInSubplan;
     }
 
     public void addConstExprList(List<Expr> exprs) {
-        constExprLists_.add(exprs);
+        constExprLists.add(exprs);
     }
 
     /**
      * Returns true if this UnionNode has only constant exprs.
      */
     public boolean isConstantUnion() {
-        return resultExprLists_.isEmpty();
+        return resultExprLists.isEmpty();
     }
 
     /**
@@ -113,15 +113,15 @@ public boolean isConstantUnion() {
      */
     public void addChild(PlanNode node, List<Expr> resultExprs) {
         super.addChild(node);
-        resultExprLists_.add(resultExprs);
+        resultExprLists.add(resultExprs);
     }
 
-    public List<List<Expr>> getMaterializedResultExprLists_() {
-        return materializedResultExprLists_;
+    public List<List<Expr>> getMaterializedResultExprLists() {
+        return materializedResultExprLists;
     }
 
-    public List<List<Expr>> getMaterializedConstExprLists_() {
-        return materializedConstExprLists_;
+    public List<List<Expr>> getMaterializedConstExprLists() {
+        return materializedConstExprLists;
     }
 
     @Override
@@ -149,11 +149,11 @@ public void finalize(Analyzer analyzer) throws UserException {
         }
         // drop resultExprs/constExprs that aren't getting materialized (= where the
         // corresponding output slot isn't being materialized)
-        materializedResultExprLists_.clear();
-        Preconditions.checkState(resultExprLists_.size() == children.size());
-        List<SlotDescriptor> slots = analyzer.getDescTbl().getTupleDesc(tupleId_).getSlots();
-        for (int i = 0; i < resultExprLists_.size(); ++i) {
-            List<Expr> exprList = resultExprLists_.get(i);
+        materializedResultExprLists.clear();
+        Preconditions.checkState(resultExprLists.size() == children.size());
+        List<SlotDescriptor> slots = analyzer.getDescTbl().getTupleDesc(tupleId).getSlots();
+        for (int i = 0; i < resultExprLists.size(); ++i) {
+            List<Expr> exprList = resultExprLists.get(i);
             List<Expr> newExprList = Lists.newArrayList();
             Preconditions.checkState(exprList.size() == slots.size());
             for (int j = 0; j < exprList.size(); ++j) {
@@ -161,14 +161,14 @@ public void finalize(Analyzer analyzer) throws UserException {
                     newExprList.add(exprList.get(j));
                 }
             }
-            materializedResultExprLists_.add(
+            materializedResultExprLists.add(
                     Expr.substituteList(newExprList, getChild(i).getOutputSmap(), analyzer, true));
         }
         Preconditions.checkState(
-                materializedResultExprLists_.size() == getChildren().size());
+                materializedResultExprLists.size() == getChildren().size());
 
-        materializedConstExprLists_.clear();
-        for (List<Expr> exprList : constExprLists_) {
+        materializedConstExprLists.clear();
+        for (List<Expr> exprList : constExprLists) {
             Preconditions.checkState(exprList.size() == slots.size());
             List<Expr> newExprList = Lists.newArrayList();
             for (int i = 0; i < exprList.size(); ++i) {
@@ -176,7 +176,7 @@ public void finalize(Analyzer analyzer) throws UserException {
                     newExprList.add(exprList.get(i));
                 }
             }
-            materializedConstExprLists_.add(newExprList);
+            materializedConstExprLists.add(newExprList);
         }
     }
 
@@ -195,7 +195,7 @@ protected void computeOldCardinality() {
     }
 
     private void computeCardinality() {
-        cardinality = constExprLists_.size();
+        cardinality = constExprLists.size();
         for (PlanNode child : children) {
             // ignore missing child cardinality info in the hope it won't matter enough
             // to change the planning outcome
@@ -229,7 +229,7 @@ private boolean isChildPassthrough(
         // If the Union node is inside a subplan, passthrough should be disabled to avoid
         // performance issues by forcing tiny batches.
         // TODO: Remove this as part of IMPALA-4179.
-        if (isInSubplan_) {
+        if (isInSubplan) {
             return false;
         }
         // Pass through is only done for the simple case where the row has a single tuple. One
@@ -238,35 +238,36 @@ private boolean isChildPassthrough(
         if (childTupleIds.size() != 1) {
             return false;
         }
-        Preconditions.checkState(!setOpResultExprs_.isEmpty());
+        Preconditions.checkState(!setOpResultExprs.isEmpty());
 
-        TupleDescriptor setOpTupleDescriptor = analyzer.getDescTbl().getTupleDesc(tupleId_);
+        TupleDescriptor setOpTupleDescriptor = analyzer.getDescTbl().getTupleDesc(tupleId);
         TupleDescriptor childTupleDescriptor =
                 analyzer.getDescTbl().getTupleDesc(childTupleIds.get(0));
 
         // Verify that the set operation tuple descriptor has one slot for every expression.
-        Preconditions.checkState(setOpTupleDescriptor.getSlots().size() == setOpResultExprs_.size());
+        Preconditions.checkState(setOpTupleDescriptor.getSlots().size() == setOpResultExprs.size());
         // Verify that the set operation node has one slot for every child expression.
         Preconditions.checkState(
                 setOpTupleDescriptor.getSlots().size() == childExprList.size());
 
-        if (setOpResultExprs_.size() != childTupleDescriptor.getSlots().size()) {
+        if (setOpResultExprs.size() != childTupleDescriptor.getSlots().size()) {
             return false;
         }
         if (setOpTupleDescriptor.getByteSize() != childTupleDescriptor.getByteSize()) {
             return false;
         }
 
-        for (int i = 0; i < setOpResultExprs_.size(); ++i) {
-            if (!setOpTupleDescriptor.getSlots().get(i).isMaterialized())
+        for (int i = 0; i < setOpResultExprs.size(); ++i) {
+            if (!setOpTupleDescriptor.getSlots().get(i).isMaterialized()) {
                 continue;
-            SlotRef setOpSlotRef = setOpResultExprs_.get(i).unwrapSlotRef(false);
+            }
+            SlotRef setOpSlotRef = setOpResultExprs.get(i).unwrapSlotRef(false);
             SlotRef childSlotRef = childExprList.get(i).unwrapSlotRef(false);
             Preconditions.checkNotNull(setOpSlotRef);
             if (childSlotRef == null) {
                 return false;
             }
-            if (!childSlotRef.getDesc().LayoutEquals(setOpSlotRef.getDesc())) {
+            if (!childSlotRef.getDesc().layoutEquals(setOpSlotRef.getDesc())) {
                 return false;
             }
         }
@@ -283,22 +284,22 @@ void computePassthrough(Analyzer analyzer) {
         List<List<Expr>> newResultExprLists = Lists.newArrayList();
         ArrayList<PlanNode> newChildren = Lists.newArrayList();
         for (int i = 0; i < children.size(); i++) {
-            if (isChildPassthrough(analyzer, children.get(i), resultExprLists_.get(i))) {
-                newResultExprLists.add(resultExprLists_.get(i));
+            if (isChildPassthrough(analyzer, children.get(i), resultExprLists.get(i))) {
+                newResultExprLists.add(resultExprLists.get(i));
                 newChildren.add(children.get(i));
             }
         }
-        firstMaterializedChildIdx_ = newChildren.size();
+        firstMaterializedChildIdx = newChildren.size();
 
         for (int i = 0; i < children.size(); i++) {
-            if (!isChildPassthrough(analyzer, children.get(i), resultExprLists_.get(i))) {
-                newResultExprLists.add(resultExprLists_.get(i));
+            if (!isChildPassthrough(analyzer, children.get(i), resultExprLists.get(i))) {
+                newResultExprLists.add(resultExprLists.get(i));
                 newChildren.add(children.get(i));
             }
         }
 
-        Preconditions.checkState(resultExprLists_.size() == newResultExprLists.size());
-        resultExprLists_ = newResultExprLists;
+        Preconditions.checkState(resultExprLists.size() == newResultExprLists.size());
+        resultExprLists = newResultExprLists;
         Preconditions.checkState(children.size() == newChildren.size());
         children = newChildren;
     }
@@ -320,30 +321,30 @@ public void init(Analyzer analyzer) {
     }
 
     protected void toThrift(TPlanNode msg, TPlanNodeType nodeType) {
-        Preconditions.checkState( materializedResultExprLists_.size() == children.size());
+        Preconditions.checkState( materializedResultExprLists.size() == children.size());
         List<List<TExpr>> texprLists = Lists.newArrayList();
-        for (List<Expr> exprList : materializedResultExprLists_) {
+        for (List<Expr> exprList : materializedResultExprLists) {
             texprLists.add(Expr.treesToThrift(exprList));
         }
         List<List<TExpr>> constTexprLists = Lists.newArrayList();
-        for (List<Expr> constTexprList : materializedConstExprLists_) {
+        for (List<Expr> constTexprList : materializedConstExprLists) {
             constTexprLists.add(Expr.treesToThrift(constTexprList));
         }
-        Preconditions.checkState(firstMaterializedChildIdx_ <= children.size());
+        Preconditions.checkState(firstMaterializedChildIdx <= children.size());
         switch (nodeType) {
             case UNION_NODE:
                 msg.union_node = new TUnionNode(
-                        tupleId_.asInt(), texprLists, constTexprLists, firstMaterializedChildIdx_);
+                        tupleId.asInt(), texprLists, constTexprLists, firstMaterializedChildIdx);
                 msg.node_type = TPlanNodeType.UNION_NODE;
                 break;
             case INTERSECT_NODE:
                 msg.intersect_node = new TIntersectNode(
-                        tupleId_.asInt(), texprLists, constTexprLists, firstMaterializedChildIdx_);
+                        tupleId.asInt(), texprLists, constTexprLists, firstMaterializedChildIdx);
                 msg.node_type = TPlanNodeType.INTERSECT_NODE;
                 break;
             case EXCEPT_NODE:
                 msg.except_node = new TExceptNode(
-                        tupleId_.asInt(), texprLists, constTexprLists, firstMaterializedChildIdx_);
+                        tupleId.asInt(), texprLists, constTexprLists, firstMaterializedChildIdx);
                 msg.node_type = TPlanNodeType.EXCEPT_NODE;
                 break;
             default:
@@ -364,23 +365,23 @@ public String getNodeExplainString(String prefix, TExplainLevel detailLevel) {
         if (CollectionUtils.isNotEmpty(conjuncts)) {
             output.append(prefix).append("predicates: ").append(getExplainString(conjuncts)).append("\n");
         }
-        if (CollectionUtils.isNotEmpty(constExprLists_)) {
+        if (CollectionUtils.isNotEmpty(constExprLists)) {
             output.append(prefix).append("constant exprs: ").append("\n");
-            for (List<Expr> exprs : constExprLists_) {
+            for (List<Expr> exprs : constExprLists) {
                 output.append(prefix).append("    ").append(exprs.stream().map(Expr::toSql)
                         .collect(Collectors.joining(" | "))).append("\n");
             }
         }
         if (detailLevel == TExplainLevel.VERBOSE) {
-            if (CollectionUtils.isNotEmpty(materializedResultExprLists_)) {
+            if (CollectionUtils.isNotEmpty(materializedResultExprLists)) {
                 output.append(prefix).append("child exprs: ").append("\n");
-                for(List<Expr> exprs : materializedResultExprLists_) {
+                for(List<Expr> exprs : materializedResultExprLists) {
                     output.append(prefix).append("    ").append(exprs.stream().map(Expr::toSql)
                             .collect(Collectors.joining(" | "))).append("\n");
                 }
             }
             List<String> passThroughNodeIds = Lists.newArrayList();
-            for (int i = 0; i < firstMaterializedChildIdx_; ++i) {
+            for (int i = 0; i < firstMaterializedChildIdx; ++i) {
                 passThroughNodeIds.add(children.get(i).getId().toString());
             }
             if (!passThroughNodeIds.isEmpty()) {
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 0b07b5e2e0b8c4..59d8bd3c49e9bb 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
@@ -43,19 +43,19 @@
 public class AuditLogBuilder extends Plugin implements AuditPlugin {
     private static final Logger LOG = LogManager.getLogger(AuditLogBuilder.class);
 
-    private PluginInfo pluginInfo;
+    private final PluginInfo pluginInfo;
 
-    private final String[] LOAD_ANNONATION_NAMES = {"JobId", "Label", "LoadType", "Db", "TableList",
+    private final static String[] LOAD_ANNONATION_NAMES = {"JobId", "Label", "LoadType", "Db", "TableList",
         "FilePathList", "BrokerUser", "Timestamp", "LoadStartTime", "LoadFinishTime", "ScanRows",
         "ScanBytes", "FileNumber"};
 
-    private Set<String> loadAnnotationSet;
+    private final Set<String> loadAnnotationSet;
 
-    private final String[] STREAM_LOAD_ANNONATION_NAMES = {"Label", "Db", "Table", "User", "ClientIp",
+    private final static String[] STREAM_LOAD_ANNONATION_NAMES = {"Label", "Db", "Table", "User", "ClientIp",
             "Status", "Message", "Url", "TotalRows", "LoadedRows", "FilteredRows", "UnselectedRows",
             "LoadBytes", "StartTime", "FinishTime"};
 
-    private Set<String> streamLoadAnnotationSet;
+    private final Set<String> streamLoadAnnotationSet;
 
     public AuditLogBuilder() {
         pluginInfo = new PluginInfo(PluginMgr.BUILTIN_PLUGIN_PREFIX + "AuditLogBuilder", PluginType.AUDIT,
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 2c8ccc3ee19898..c4bff97a6cdfcf 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
@@ -103,19 +103,20 @@ public void registerInstances(TUniqueId queryId, Integer instancesNum) throws Us
                 maxQueryInstances = Config.default_max_query_instances;
             }
             if (maxQueryInstances > 0) {
-                AtomicInteger currentCount = userToInstancesCount.computeIfAbsent(user, __ -> new AtomicInteger(0));
+                AtomicInteger currentCount = userToInstancesCount
+                        .computeIfAbsent(user, ignored -> new AtomicInteger(0));
                 // Many query can reach here.
                 if (instancesNum + currentCount.get() > maxQueryInstances) {
                     throw new UserException("reach max_query_instances " + maxQueryInstances);
                 }
             }
             queryToInstancesNum.put(queryId, instancesNum);
-            userToInstancesCount.computeIfAbsent(user, __ -> new AtomicInteger(0)).addAndGet(instancesNum);
+            userToInstancesCount.computeIfAbsent(user, ignored -> new AtomicInteger(0)).addAndGet(instancesNum);
         }
     }
 
     public Map<String, Integer> getInstancesNumPerUser() {
-        return Maps.transformEntries(userToInstancesCount, (__, value) -> value != null ? value.get() : 0);
+        return Maps.transformEntries(userToInstancesCount, (ignored, value) -> value != null ? value.get() : 0);
     }
 
     @Override
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 e4efa4513a26e2..ae46d9bc4da8c8 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
@@ -31,7 +31,7 @@ public QueryStateException(MysqlStateType stateType, String msg) {
 
     public void createQueryState(MysqlStateType stateType, String msg) {
         this.queryState = new QueryState();
-        switch (stateType) {
+        switch (stateType) { // CHECKSTYLE IGNORE THIS LINE: missing switch default
             case OK:
                 queryState.setOk(0L, 0, msg);
                 break;
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 56f8659c5b7e34..b4022f6838b4e7 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
@@ -718,7 +718,9 @@ private void analyzeAndGenerateQueryPlan(TQueryOptions tQueryOptions) throws Use
                 if (LOG.isTraceEnabled()) {
                     LOG.trace("rewrittenStmt: " + parsedStmt.toSql());
                 }
-                if (explainOptions != null) parsedStmt.setIsExplain(explainOptions);
+                if (explainOptions != null) {
+                    parsedStmt.setIsExplain(explainOptions);
+                }
             }
         }
         plannerProfile.setQueryAnalysisFinishTime();
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 99bb658c670478..27d30f4a560552 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
@@ -152,7 +152,7 @@ public int compareTo(CacheTable table) {
             return Long.compare(table.latestTime, this.latestTime);
         }
 
-        public void Debug() {
+        public void debug() {
             LOG.debug("table {}, partition id {}, ver {}, time {}", olapTable.getName(), latestPartitionId, latestVersion, latestTime);
         }
     }
@@ -213,7 +213,7 @@ private CacheMode innerCheckCacheMode(long now) {
         MetricRepo.COUNTER_QUERY_OLAP_TABLE.increase(1L);
         Collections.sort(tblTimeList);
         latestTable = tblTimeList.get(0);
-        latestTable.Debug();
+        latestTable.debug();
 
         addAllViewStmt(selectStmt);
         String allViewExpandStmtListStr = StringUtils.join(allViewStmtSet, "|");
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 4c73d083c4ca31..91f3f936602711 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
@@ -43,7 +43,7 @@ public class CacheCoordinator {
     private static final Logger LOG = LogManager.getLogger(CacheCoordinator.class);
     private static final int VIRTUAL_NODES = 10;
     private static final int REFRESH_NODE_TIME = 300000;
-    public boolean DebugModel = false;
+    public boolean debugModel = false;
     private Hashtable<Long, Backend> realNodes = new Hashtable<>();
     private SortedMap<Long, Backend> virtualNodes = new TreeMap<>();
     private static Lock belock = new ReentrantLock();
@@ -109,7 +109,7 @@ public void resetBackend() {
             belock.lock();
             ImmutableMap<Long, Backend> idToBackend = Catalog.getCurrentSystemInfo().getIdToBackend();
             if (idToBackend != null) {
-                if (!DebugModel) {
+                if (!debugModel) {
                     clearBackend(idToBackend);
                 }
                 for (Backend backend : idToBackend.values().asList()) {
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 63f1ba91c4b920..20d6f5d0d02401 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
@@ -47,12 +47,8 @@ protected CacheProxy() {
     }
 
     public static CacheProxy getCacheProxy(CacheProxyType type) {
-        switch (type) {
-            case BE:
-                return new CacheBeProxy();
-            case FE:
-            case OUTER:
-                return null;
+        if (CacheProxyType.BE == type) {
+            return new CacheBeProxy();
         }
         return null;
     }
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 5a4ab074854bb6..d4194f380f5723 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
@@ -117,7 +117,7 @@ public PartitionSingle() {
             this.tooNew = false;
         }
 
-        public void Debug() {
+        public void debug() {
             if (partition != null) {
                 LOG.info("partition id {}, cacheKey {}, version {}, time {}, fromCache {}, tooNew {} ",
                         partitionId, cacheKey.realValue(),
@@ -196,6 +196,8 @@ public boolean init(Type type, LiteralExpr expr) {
                     value = expr.getLongValue();
                     keyType = KeyType.LONG;
                     break;
+                default:
+                    return true;
             }
             return true;
         }
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 5dc82d0e6a3c2b..37b91b6f89a15a 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
@@ -166,10 +166,6 @@ public InternalService.PUpdateCacheRequest buildPartitionUpdateRequest(String sq
             Long key = entry.getKey();
             PartitionRange.PartitionSingle partition = cachePartMap.get(key);
             partitionRowList = entry.getValue();
-            int data_size = 0;
-            for (byte[] buf : partitionRowList) {
-                data_size += buf.length;
-            }
             updateRequest = updateRequest.toBuilder()
                     .addValues(InternalService.PCacheValue.newBuilder()
                             .setParam(InternalService.PCacheParam.newBuilder()
@@ -177,7 +173,7 @@ public InternalService.PUpdateCacheRequest buildPartitionUpdateRequest(String sq
                                     .setLastVersion(partition.getPartition().getVisibleVersion())
                                     .setLastVersionTime(partition.getPartition().getVisibleVersionTime())
                                     .build()).setDataSize(dataSize).addAllRows(
-                                    partitionRowList.stream().map(row -> ByteString.copyFrom(row))
+                                    partitionRowList.stream().map(ByteString::copyFrom)
                                             .collect(Collectors.toList()))).build();
         }
         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 88e939183a7225..cdbb485ff1656c 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
@@ -107,7 +107,9 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object other) {
-        if (other == this) return true;
+        if (other == this) {
+            return true;
+        }
         if (!(other instanceof Tag)) {
             return false;
         }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/BetweenToCompoundRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/BetweenToCompoundRule.java
index 5373a1000d594c..c73908a10d7501 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/BetweenToCompoundRule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/BetweenToCompoundRule.java
@@ -42,7 +42,9 @@ public final class BetweenToCompoundRule implements ExprRewriteRule {
 
     @Override
     public Expr apply(Expr expr, Analyzer analyzer, ExprRewriter.ClauseType clauseType) throws AnalysisException {
-        if (!(expr instanceof BetweenPredicate)) return expr;
+        if (!(expr instanceof BetweenPredicate)) {
+            return expr;
+        }
         BetweenPredicate bp = (BetweenPredicate) expr;
         Expr result = null;
         if (bp.isNotBetween()) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/CompoundPredicateWriteRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/CompoundPredicateWriteRule.java
index b035e1fd83d4ef..1e78dd47107c1d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/CompoundPredicateWriteRule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/CompoundPredicateWriteRule.java
@@ -46,7 +46,9 @@ public class CompoundPredicateWriteRule implements ExprRewriteRule {
     @Override
     public Expr apply(Expr expr, Analyzer analyzer, ExprRewriter.ClauseType clauseType) throws AnalysisException {
 
-        if (!(expr instanceof CompoundPredicate)) return expr;
+        if (!(expr instanceof CompoundPredicate)) {
+            return expr;
+        }
         CompoundPredicate cp = (CompoundPredicate) expr;
 
         List<Expr> children = cp.getChildren();
@@ -66,22 +68,38 @@ public Expr apply(Expr expr, Analyzer analyzer, ExprRewriter.ClauseType clauseTy
         boolean rightChildFalse = (rightChild instanceof BoolLiteral) && (!((BoolLiteral) rightChild).getValue());
 
         // case true and expr ==> expr
-        if (leftChildTrue && and) return rightChild;
+        if (leftChildTrue && and) {
+            return rightChild;
+        }
         // case expr and true ==> expr
-        if (and && rightChildTrue) return leftChild;
+        if (and && rightChildTrue) {
+            return leftChild;
+        }
         // case false or expr ==> expr
-        if (leftChildFalse && or) return rightChild;
+        if (leftChildFalse && or) {
+            return rightChild;
+        }
         // case expr or false ==> expr
-        if (or && rightChildFalse) return leftChild;
+        if (or && rightChildFalse) {
+            return leftChild;
+        }
 
         // case false and expr ==> false
-        if (leftChildFalse && and) return new BoolLiteral(false);
+        if (leftChildFalse && and) {
+            return new BoolLiteral(false);
+        }
         // case expr and false ==> false
-        if (and && rightChildFalse) return new BoolLiteral(false);
+        if (and && rightChildFalse) {
+            return new BoolLiteral(false);
+        }
         // case true or expr ==> true
-        if (leftChildTrue && or) return new BoolLiteral(true);
+        if (leftChildTrue && or) {
+            return new BoolLiteral(true);
+        }
         // case expr or true ==> true
-        if (or && rightChildTrue) return new BoolLiteral(true);
+        if (or && rightChildTrue) {
+            return new BoolLiteral(true);
+        }
 
         // other case ,return origin expr
         return expr;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/ExprRewriter.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/ExprRewriter.java
index 29fd5d4e714cfb..9b8ee0d8e0681a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/ExprRewriter.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/ExprRewriter.java
@@ -47,8 +47,8 @@
  * Doris match different Rewriter framework execution.
  */
 public class ExprRewriter {
-    private int numChanges_ = 0;
-    private final List<ExprRewriteRule> rules_;
+    private int numChanges = 0;
+    private final List<ExprRewriteRule> rules;
 
     // The type of clause that executes the rule.
     // This type is only used in InferFiltersRule, RewriteDateLiteralRule, other rules are not used
@@ -59,19 +59,19 @@ public enum ClauseType {
     }
 
     // Once-only Rules
-    private List<ExprRewriteRule> onceRules_ = Lists.newArrayList();
+    private List<ExprRewriteRule> onceRules = Lists.newArrayList();
 
     public ExprRewriter(List<ExprRewriteRule> rules) {
-        rules_ = rules;
+        this.rules = rules;
     }
 
     public ExprRewriter(List<ExprRewriteRule> rules, List<ExprRewriteRule> onceRules) {
-        rules_ = rules;
-        onceRules_ = onceRules;
+        this.rules = rules;
+        this.onceRules = onceRules;
     }
 
     public ExprRewriter(ExprRewriteRule rule) {
-        rules_ = Lists.newArrayList(rule);
+        rules = Lists.newArrayList(rule);
     }
 
     public Expr rewrite(Expr expr, Analyzer analyzer) throws AnalysisException {
@@ -84,17 +84,17 @@ public Expr rewrite(Expr expr, Analyzer analyzer, ClauseType clauseType) throws
         int oldNumChanges;
         Expr rewrittenExpr = expr;
         do {
-            oldNumChanges = numChanges_;
-            for (ExprRewriteRule rule: rules_) {
+            oldNumChanges = numChanges;
+            for (ExprRewriteRule rule: rules) {
                 // when foldConstantByBe is on, fold all constant expr by BE instead of applying FoldConstantsRule in FE.
                 if (rule instanceof FoldConstantsRule && analyzer.safeIsEnableFoldConstantByBe()) {
                     continue;
                 }
                 rewrittenExpr = applyRuleRepeatedly(rewrittenExpr, rule, analyzer, clauseType);
             }
-        } while (oldNumChanges != numChanges_);
+        } while (oldNumChanges != numChanges);
 
-        for (ExprRewriteRule rule: onceRules_) {
+        for (ExprRewriteRule rule: onceRules) {
             rewrittenExpr = applyRuleOnce(rewrittenExpr, rule, analyzer, clauseType);
         }
         return rewrittenExpr;
@@ -103,7 +103,7 @@ public Expr rewrite(Expr expr, Analyzer analyzer, ClauseType clauseType) throws
     private Expr applyRuleOnce(Expr expr, ExprRewriteRule rule, Analyzer analyzer, ClauseType clauseType) throws AnalysisException {
         Expr rewrittenExpr = rule.apply(expr, analyzer, clauseType);
         if (rewrittenExpr != expr) {
-            numChanges_++;
+            numChanges++;
         }
         return rewrittenExpr;
     }
@@ -117,13 +117,13 @@ public void rewriteConstant(Map<String, Expr> exprMap, Analyzer analyzer) throws
         }
         boolean changed = false;
         // rewrite constant expr
-        for (ExprRewriteRule rule : rules_) {
+        for (ExprRewriteRule rule : rules) {
             if (rule instanceof FoldConstantsRule) {
                 changed = ((FoldConstantsRule) rule).apply(exprMap, analyzer, changed);
             }
         }
         if (changed) {
-            ++numChanges_;
+            ++numChanges;
         }
     }
 
@@ -136,9 +136,9 @@ private Expr applyRuleRepeatedly(Expr expr, ExprRewriteRule rule, Analyzer analy
         int oldNumChanges;
         Expr rewrittenExpr = expr;
         do {
-            oldNumChanges = numChanges_;
+            oldNumChanges = numChanges;
             rewrittenExpr = applyRuleBottomUp(rewrittenExpr, rule, analyzer, clauseType);
-        } while (oldNumChanges != numChanges_);
+        } while (oldNumChanges != numChanges);
         return rewrittenExpr;
     }
 
@@ -152,15 +152,19 @@ private Expr applyRuleBottomUp(Expr expr, ExprRewriteRule rule, Analyzer analyze
             expr.setChild(i, applyRuleBottomUp(expr.getChild(i), rule, analyzer, clauseType));
         }
         Expr rewrittenExpr = rule.apply(expr, analyzer, clauseType);
-        if (rewrittenExpr != expr) ++numChanges_;
+        if (rewrittenExpr != expr) {
+            ++numChanges;
+        }
         return rewrittenExpr;
     }
 
     public void rewriteList(List<Expr> exprs, Analyzer analyzer) throws AnalysisException {
-        for (int i = 0; i < exprs.size(); ++i) exprs.set(i, rewrite(exprs.get(i), analyzer));
+        for (int i = 0; i < exprs.size(); ++i) {
+            exprs.set(i, rewrite(exprs.get(i), analyzer));
+        }
     }
 
-    public void reset() { numChanges_ = 0; }
-    public boolean changed() { return numChanges_ > 0; }
-    public int getNumChanges() { return numChanges_; }
+    public void reset() { numChanges = 0; }
+    public boolean changed() { return numChanges > 0; }
+    public int getNumChanges() { return numChanges; }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/NormalizeBinaryPredicatesRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/NormalizeBinaryPredicatesRule.java
index 5940961e03792b..7743928fa64c26 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/NormalizeBinaryPredicatesRule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/NormalizeBinaryPredicatesRule.java
@@ -38,9 +38,15 @@ public class NormalizeBinaryPredicatesRule implements ExprRewriteRule {
 
     @Override
     public Expr apply(Expr expr, Analyzer analyzer, ExprRewriter.ClauseType clauseType) throws AnalysisException {
-        if (!(expr instanceof BinaryPredicate)) return expr;
-        if (expr.getChild(0).unwrapSlotRef(false) != null) return expr;
-        if (expr.getChild(1).unwrapSlotRef(false) == null) return expr;
+        if (!(expr instanceof BinaryPredicate)) {
+            return expr;
+        }
+        if (expr.getChild(0).unwrapSlotRef(false) != null) {
+            return expr;
+        }
+        if (expr.getChild(1).unwrapSlotRef(false) == null) {
+            return expr;
+        }
 
         BinaryPredicate.Operator op = ((BinaryPredicate) expr).getOp();
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteBinaryPredicatesRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteBinaryPredicatesRule.java
index 95f3ea73bcdcc5..de3bae9057e9ab 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteBinaryPredicatesRule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteBinaryPredicatesRule.java
@@ -86,7 +86,9 @@ private Expr rewriteBigintSlotRefCompareDecimalLiteral(Expr expr0, Expr expr1, B
 
     @Override
     public Expr apply(Expr expr, Analyzer analyzer, ExprRewriter.ClauseType clauseType) throws AnalysisException {
-        if (!(expr instanceof BinaryPredicate)) return expr;
+        if (!(expr instanceof BinaryPredicate)) {
+            return expr;
+        }
         BinaryPredicate.Operator op = ((BinaryPredicate) expr).getOp();
         Expr expr0 = expr.getChild(0);
         Expr expr1 = expr.getChild(1);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteDateLiteralRule.java b/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteDateLiteralRule.java
index 2448903fc6d4ae..c3eee2f3f6b981 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteDateLiteralRule.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteDateLiteralRule.java
@@ -40,7 +40,9 @@ public class RewriteDateLiteralRule implements ExprRewriteRule {
 
     @Override
     public Expr apply(Expr expr, Analyzer analyzer, ExprRewriter.ClauseType clauseType) throws AnalysisException {
-        if (!(expr instanceof BinaryPredicate)) return expr;
+        if (!(expr instanceof BinaryPredicate)) {
+            return expr;
+        }
         Expr lchild = expr.getChild(0);
         if (!lchild.getType().isDateType()) {
             return expr;
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 857073bb6bad52..4f864bfc2d10f1 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
@@ -100,13 +100,13 @@ public static String getHostname() {
     }
 
     private static void analyzePriorityCidrs() {
-        String prior_cidrs = Config.priority_networks;
-        if (Strings.isNullOrEmpty(prior_cidrs)) {
+        String priorCidrs = Config.priority_networks;
+        if (Strings.isNullOrEmpty(priorCidrs)) {
             return;
         }
-        LOG.info("configured prior_cidrs value: {}", prior_cidrs);
+        LOG.info("configured prior_cidrs value: {}", priorCidrs);
 
-        String[] cidrList = prior_cidrs.split(PRIORITY_CIDR_SEPARATOR);
+        String[] cidrList = priorCidrs.split(PRIORITY_CIDR_SEPARATOR);
         List<String> priorNetworks = Lists.newArrayList(cidrList);
         for (String cidrStr : priorNetworks) {
             priorityCidrs.add(new CIDR(cidrStr));
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 0e1301903d6f7e..4a8e4958950541 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
@@ -105,7 +105,9 @@ protected double computeCombinedSelectivity(List<Expr> conjuncts) {
         // Collect all estimated selectivities.
         List<Double> selectivities = new ArrayList<>();
         for (Expr e : conjuncts) {
-            if (e.hasSelectivity()) selectivities.add(e.getSelectivity());
+            if (e.hasSelectivity()) {
+                selectivities.add(e.getSelectivity());
+            }
         }
         if (selectivities.size() != conjuncts.size()) {
             // Some conjuncts have no estimated selectivity. Use a single default
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/DeriveFactory.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/DeriveFactory.java
index d663bf5e08c677..9ff438e7f5375d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/DeriveFactory.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/DeriveFactory.java
@@ -23,14 +23,14 @@ public class DeriveFactory {
 
     public BaseStatsDerive getStatsDerive(PlanNode.NodeType nodeType) {
         switch (nodeType) {
+            case OLAP_SCAN_NODE:
+                return new OlapScanStatsDerive();
             case AGG_NODE:
             case HASH_JOIN_NODE:
             case MERGE_NODE:
-                break;
-            case OLAP_SCAN_NODE:
-                return new OlapScanStatsDerive();
             case DEFAULT:
+            default:
+                return new BaseStatsDerive();
         }
-        return new BaseStatsDerive();
     }
 }
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 374a6ccee2174e..1388a6acc8b3e9 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
@@ -43,6 +43,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -569,6 +570,11 @@ private void readFields(DataInput in) throws IOException {
         brpcPort = in.readInt();
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, host, heartbeatPort, bePort, isAlive);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
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 97770d0556db97..d2bfa158cf2b82 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
@@ -146,6 +146,8 @@ public TUpdateTabletMetaInfoReq toThrift() {
                 }
                 break;
             }
+            default:
+                break;
         }
         updateTabletMetaInfoReq.setTabletMetaInfos(metaInfos);
         return updateTabletMetaInfoReq;
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 0d3a0bb233bc53..869231216ee029 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
@@ -935,35 +935,35 @@ public void testExternalTableAlterOperations() throws Exception {
         stmt = "alter table test.odbc_table add column k6 INT KEY after k1, add column k7 TINYINT KEY after k6";
         alterTable(stmt, false);
         Database db = Catalog.getCurrentCatalog().getDbOrMetaException("default_cluster:test");
-        Table odbc_table = db.getTableOrMetaException("odbc_table");
-        Assert.assertEquals(odbc_table.getBaseSchema().size(), 7);
-        Assert.assertEquals(odbc_table.getBaseSchema().get(1).getDataType(), PrimitiveType.INT);
-        Assert.assertEquals(odbc_table.getBaseSchema().get(2).getDataType(), PrimitiveType.TINYINT);
+        Table odbcTable = db.getTableOrMetaException("odbc_table");
+        Assert.assertEquals(odbcTable.getBaseSchema().size(), 7);
+        Assert.assertEquals(odbcTable.getBaseSchema().get(1).getDataType(), PrimitiveType.INT);
+        Assert.assertEquals(odbcTable.getBaseSchema().get(2).getDataType(), PrimitiveType.TINYINT);
 
         // external table support drop column
         stmt = "alter table test.odbc_table drop column k7";
         alterTable(stmt, false);
         db = Catalog.getCurrentCatalog().getDbOrMetaException("default_cluster:test");
-        odbc_table = db.getTableOrMetaException("odbc_table");
-        Assert.assertEquals(odbc_table.getBaseSchema().size(), 6);
+        odbcTable = db.getTableOrMetaException("odbc_table");
+        Assert.assertEquals(odbcTable.getBaseSchema().size(), 6);
 
         // external table support modify column
         stmt = "alter table test.odbc_table modify column k6 bigint after k5";
         alterTable(stmt, false);
         db = Catalog.getCurrentCatalog().getDbOrMetaException("default_cluster:test");
-        odbc_table = db.getTableOrMetaException("odbc_table");
-        Assert.assertEquals(odbc_table.getBaseSchema().size(), 6);
-        Assert.assertEquals(odbc_table.getBaseSchema().get(5).getDataType(), PrimitiveType.BIGINT);
+        odbcTable = db.getTableOrMetaException("odbc_table");
+        Assert.assertEquals(odbcTable.getBaseSchema().size(), 6);
+        Assert.assertEquals(odbcTable.getBaseSchema().get(5).getDataType(), PrimitiveType.BIGINT);
 
         // external table support reorder column
         db = Catalog.getCurrentCatalog().getDbOrMetaException("default_cluster:test");
-        odbc_table = db.getTableOrMetaException("odbc_table");
-        Assert.assertTrue(odbc_table.getBaseSchema().stream().
+        odbcTable = db.getTableOrMetaException("odbc_table");
+        Assert.assertTrue(odbcTable.getBaseSchema().stream().
                 map(column -> column.getName()).
                 reduce("", (totalName, columnName) -> totalName + columnName).equals("k1k2k3k4k5k6"));
         stmt = "alter table test.odbc_table order by (k6, k5, k4, k3, k2, k1)";
         alterTable(stmt, false);
-        Assert.assertTrue(odbc_table.getBaseSchema().stream().
+        Assert.assertTrue(odbcTable.getBaseSchema().stream().
                 map(column -> column.getName()).
                 reduce("", (totalName, columnName) -> totalName + columnName).equals("k6k5k4k3k2k1"));
 
@@ -979,19 +979,19 @@ public void testExternalTableAlterOperations() throws Exception {
         stmt = "alter table test.odbc_table drop column k2";
         alterTable(stmt, false);
         // do not allow drop last column
-        Assert.assertEquals(odbc_table.getBaseSchema().size(), 1);
+        Assert.assertEquals(odbcTable.getBaseSchema().size(), 1);
         stmt = "alter table test.odbc_table drop column k1";
         alterTable(stmt, true);
-        Assert.assertEquals(odbc_table.getBaseSchema().size(), 1);
+        Assert.assertEquals(odbcTable.getBaseSchema().size(), 1);
 
         // external table support rename operation
         stmt = "alter table test.odbc_table rename oracle_table";
         alterTable(stmt, false);
         db = Catalog.getCurrentCatalog().getDbOrMetaException("default_cluster:test");
-        odbc_table = db.getTableNullable("oracle_table");
-        Assert.assertNotNull(odbc_table);
-        odbc_table = db.getTableNullable("odbc_table");
-        Assert.assertNull(odbc_table);
+        odbcTable = db.getTableNullable("oracle_table");
+        Assert.assertNotNull(odbcTable);
+        odbcTable = db.getTableNullable("odbc_table");
+        Assert.assertNull(odbcTable);
     }
 
     @Test
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 3faf12f344fd1b..257ea1b6951c0f 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
@@ -61,7 +61,10 @@
 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;
@@ -77,10 +80,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";
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminShowReplicaTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminShowReplicaTest.java
index cd02ad3d8ad084..48b49276f4239e 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminShowReplicaTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AdminShowReplicaTest.java
@@ -71,8 +71,8 @@ public void testShowReplicaDistribution() throws Exception {
         Database db = Catalog.getCurrentCatalog().getDbOrAnalysisException("default_cluster:test");
         OlapTable olapTable = db.getOlapTableOrAnalysisException("tbl1");
         for (Partition partition : olapTable.getPartitions()) {
-            for (MaterializedIndex mIndex : partition.getMaterializedIndices(MaterializedIndex.IndexExtState.VISIBLE)) {
-                for (Tablet tablet : mIndex.getTablets()) {
+            for (MaterializedIndex index : partition.getMaterializedIndices(MaterializedIndex.IndexExtState.VISIBLE)) {
+                for (Tablet tablet : index.getTablets()) {
                     for (Replica replica : tablet.getReplicas()) {
                         replica.updateStat(1024, 2);
                     }
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 044aeb4cd1c409..0f697a6cce0edf 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
@@ -29,7 +29,9 @@
 
 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;
@@ -38,9 +40,6 @@
 
 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/CreateMaterializedViewStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateMaterializedViewStmtTest.java
index a3dba780ba28f9..31abb892a45c0f 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,16 +32,15 @@
 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;
 
 import java.util.ArrayList;
 import java.util.List;
-import mockit.Expectations;
-import mockit.Injectable;
-import mockit.Mocked;
 
 public class CreateMaterializedViewStmtTest {
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DateLiteralTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DateLiteralTest.java
index 0a380f885f0d03..0a91c7f64c5292 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DateLiteralTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DateLiteralTest.java
@@ -28,7 +28,7 @@
 public class DateLiteralTest {
 
     @Test
-    public void TwoDigitYear() {
+    public void twoDigitYear() {
         boolean hasException = false;
         try {
             DateLiteral literal = new DateLiteral("1997-10-07", Type.DATE);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/TableNameComparedLowercaseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/TableNameComparedLowercaseTest.java
index b8408eea61dc1c..7445467f9c7a60 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/TableNameComparedLowercaseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/TableNameComparedLowercaseTest.java
@@ -105,10 +105,10 @@ public void testQueryTableNameCaseInsensitive() throws Exception {
 
     @Test
     public void testCreateSameTableFailed() {
-        String TABle2 = "create table db1.TABle2(k1 int, k2 varchar(32), k3 varchar(32)) "
+        String table2 = "create table db1.TABle2(k1 int, k2 varchar(32), k3 varchar(32)) "
                 + "AGGREGATE KEY(k1, k2, k3) distributed by hash(k1) buckets 3 properties('replication_num' = '1');";
         try {
-            dorisAssert.withTable(TABle2);
+            dorisAssert.withTable(table2);
             Assert.fail("The table name is case insensitive, " +
                     "but the tables 'TABLE2' and 'table2' were successfully created");
         } catch (Exception e) {
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/TableNameStoredLowercaseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/TableNameStoredLowercaseTest.java
index 0ae7a29c765ffc..8e5843712b46eb 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/TableNameStoredLowercaseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/TableNameStoredLowercaseTest.java
@@ -110,10 +110,10 @@ public void testQueryTableAliasCaseInsensitive() throws Exception {
 
     @Test
     public void testCreateSameTableFailed() {
-        String TABle2 = "create table db1.TABle2(k1 int, k2 varchar(32), k3 varchar(32)) "
+        String table2 = "create table db1.TABle2(k1 int, k2 varchar(32), k3 varchar(32)) "
                 + "AGGREGATE KEY(k1, k2, k3) distributed by hash(k1) buckets 3 properties('replication_num' = '1');";
         try {
-            dorisAssert.withTable(TABle2);
+            dorisAssert.withTable(table2);
             Assert.fail("The table name is case insensitive, " +
                     "but the tables 'TABLE2' and 'table2' were successfully created");
         } catch (Exception e) {
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 1056117a3bdd76..cb3edb8966ef58 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
@@ -234,10 +234,10 @@ public void testRunNormal() {
         snapshotFiles.add("1.dat");
         snapshotFiles.add("1.idx");
         snapshotFiles.add("1.hdr");
-        TStatus task_status = new TStatus(TStatusCode.OK);
+        TStatus taskStatus = new TStatus(TStatusCode.OK);
         TBackend tBackend = new TBackend("", 0, 1);
         TFinishTaskRequest request = new TFinishTaskRequest(tBackend, TTaskType.MAKE_SNAPSHOT,
-                snapshotTask.getSignature(), task_status);
+                snapshotTask.getSignature(), taskStatus);
         request.setSnapshotFiles(snapshotFiles);
         request.setSnapshotPath(snapshotPath);
         Assert.assertTrue(job.finishTabletSnapshotTask(snapshotTask, request));
@@ -268,7 +268,7 @@ public void testRunNormal() {
         Assert.assertEquals(BackupJobState.UPLOADING, job.getState());
         Map<Long, List<String>> tabletFileMap = Maps.newHashMap();
         request = new TFinishTaskRequest(tBackend, TTaskType.UPLOAD,
-                upTask.getSignature(), task_status);
+                upTask.getSignature(), taskStatus);
         request.setTabletFiles(tabletFileMap);
 
         Assert.assertFalse(job.finishSnapshotUploadTask(upTask, request));
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 e12e147de3d7df..8eb1359fefff46 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
@@ -72,7 +72,8 @@ private static void createTable(String sql) throws Exception {
     }
 
     private static void createTableLike(String sql) throws Exception {
-        CreateTableLikeStmt createTableLikeStmt = (CreateTableLikeStmt) UtFrameUtils.parseAndAnalyzeStmt(sql, connectContext);
+        CreateTableLikeStmt createTableLikeStmt =
+                (CreateTableLikeStmt) UtFrameUtils.parseAndAnalyzeStmt(sql, connectContext);
         Catalog.getCurrentCatalog().createTableLike(createTableLikeStmt);
     }
 
@@ -83,11 +84,14 @@ private static void checkTableEqual(Table newTable, Table existedTable, int roll
         List<String> existedTableStmt = Lists.newArrayList();
         List<String> existedAddRollupStmt = Lists.newArrayList();
         Catalog.getDdlStmt(existedTable, existedTableStmt, null, existedAddRollupStmt, false, true /* hide password */);
-        Assert.assertEquals(newCreateTableStmt.get(0).replace(newTable.getName(), existedTable.getName()), existedTableStmt.get(0));
-        checkTableRollup(existedAddRollupStmt, newAddRollupStmt, newTable.getName(), existedTable.getName(), rollupSize);
+        Assert.assertEquals(newCreateTableStmt.get(0).replace(newTable.getName(), existedTable.getName()),
+                existedTableStmt.get(0));
+        checkTableRollup(existedAddRollupStmt, newAddRollupStmt, newTable.getName(), existedTable.getName(),
+                rollupSize);
     }
 
-    private static void checkTableRollup(List<String> existedAddRollupStmt, List<String> newAddRollupStmt, String newTableName, String existedTableName, int rollupSize){
+    private static void checkTableRollup(List<String> existedAddRollupStmt, List<String> newAddRollupStmt,
+            String newTableName, String existedTableName, int rollupSize) {
         if (rollupSize != 0) {
             List<String> addRollupStmt = Lists.newArrayList();
             for (String aaRollupStmt : newAddRollupStmt) {
@@ -98,15 +102,14 @@ private static void checkTableRollup(List<String> existedAddRollupStmt, List<Str
         }
     }
 
-    private static void checkCreateOlapTableLike(String createTableSql, String createTableLikeSql,
-                                                 String newDbName, String existedDbName,
-                                                 String newTblName, String existedTblName) throws Exception {
-        checkCreateOlapTableLike(createTableSql, createTableLikeSql, newDbName, existedDbName, newTblName, existedTblName,0);
+    private static void checkCreateOlapTableLike(String createTableSql, String createTableLikeSql, String newDbName,
+            String existedDbName, String newTblName, String existedTblName) throws Exception {
+        checkCreateOlapTableLike(createTableSql, createTableLikeSql, newDbName, existedDbName, newTblName,
+                existedTblName, 0);
     }
 
-    private static void checkCreateOlapTableLike(String createTableSql, String createTableLikeSql,
-                                                 String newDbName, String existedDbName,
-                                                 String newTblName, String existedTblName, int rollupSize) throws Exception {
+    private static void checkCreateOlapTableLike(String createTableSql, String createTableLikeSql, String newDbName,
+            String existedDbName, String newTblName, String existedTblName, int rollupSize) throws Exception {
         createTable(createTableSql);
         createTableLike(createTableLikeSql);
         Database newDb = Catalog.getCurrentCatalog().getDbOrDdlException("default_cluster:" + newDbName);
@@ -116,9 +119,8 @@ private static void checkCreateOlapTableLike(String createTableSql, String creat
         checkTableEqual(newTbl, existedTbl, rollupSize);
     }
 
-    private static void checkCreateMysqlTableLike(String createTableSql, String createTableLikeSql,
-                                                  String newDbName, String existedDbName,
-                                                  String newTblName, String existedTblName) throws Exception {
+    private static void checkCreateMysqlTableLike(String createTableSql, String createTableLikeSql, String newDbName,
+            String existedDbName, String newTblName, String existedTblName) throws Exception {
 
         createTable(createTableSql);
         createTableLike(createTableLikeSql);
@@ -131,28 +133,20 @@ private static void checkCreateMysqlTableLike(String createTableSql, String crea
 
     @Test
     public void testDeepCopyOfDistributionInfo() throws Exception {
-        String createTableSql = "CREATE TABLE IF NOT EXISTS test.bucket_distribution_test (\n" +
-                "  `dt` bigint(20) NULL COMMENT \"\",\n" +
-                "  `id1` bigint(20) NULL COMMENT \"\",\n" +
-                "  `last_time` varchar(20) MAX NULL COMMENT \"\"\n" +
-                ") ENGINE=OLAP\n" +
-                "AGGREGATE KEY(`dt`, `id1`) \n" +
-                "PARTITION BY RANGE(`dt`) \n" +
-                "(\n" +
-                "    PARTITION p1 VALUES  [(\"20220101\"),(\"20220201\")),\n" +
-                "    partition p2 VALUES  [(\"20211201\"),(\"20220101\"))\n" +
-                ")\n" +
-                "DISTRIBUTED BY HASH(`id1`) BUCKETS 1\n" +
-                "PROPERTIES (\n" +
-                "\"replication_num\" = \"1\"\n" +
-                ");";
+        String createTableSql = "CREATE TABLE IF NOT EXISTS test.bucket_distribution_test (\n"
+                + "  `dt` bigint(20) NULL COMMENT \"\",\n" + "  `id1` bigint(20) NULL COMMENT \"\",\n"
+                + "  `last_time` varchar(20) MAX NULL COMMENT \"\"\n" + ") ENGINE=OLAP\n"
+                + "AGGREGATE KEY(`dt`, `id1`) \n" + "PARTITION BY RANGE(`dt`) \n" + "(\n"
+                + "    PARTITION p1 VALUES  [(\"20220101\"),(\"20220201\")),\n"
+                + "    partition p2 VALUES  [(\"20211201\"),(\"20220101\"))\n" + ")\n"
+                + "DISTRIBUTED BY HASH(`id1`) BUCKETS 1\n" + "PROPERTIES (\n" + "\"replication_num\" = \"1\"\n" + ");";
         createTable(createTableSql);
         Database db = Catalog.getCurrentCatalog().getDbOrMetaException("default_cluster:test");
         OlapTable table = (OlapTable) db.getTableOrDdlException("bucket_distribution_test");
-        DistributionInfo default_info = table.getDefaultDistributionInfo();
+        DistributionInfo defaultInfo = table.getDefaultDistributionInfo();
         DistributionInfo previous = null;
         for (Partition p : table.getPartitions()) {
-            Assert.assertFalse(p.getDistributionInfo() == default_info);
+            Assert.assertFalse(p.getDistributionInfo() == defaultInfo);
             Assert.assertFalse(p.getDistributionInfo() == previous);
             previous = p.getDistributionInfo();
         }
@@ -169,107 +163,95 @@ public void testNormal() throws Exception {
         String existedTblName = "testTbl1";
         checkCreateOlapTableLike(createTableSql, createTableLikeSql, newDbName, newDbName, newTblName, existedTblName);
         // 2. create table with hash partition
-        String createTableWithHashPartitionSql = "create table test.testTbl2\n" + "(k1 int, k2 int)\n"
-                + "duplicate key(k1)\n" + "partition by range(k2)\n" + "(partition p1 values less than(\"10\"))\n"
-                + "distributed by hash(k2) buckets 1\n" + "properties('replication_num' = '1'); ";
+        String createTableWithHashPartitionSql =
+                "create table test.testTbl2\n" + "(k1 int, k2 int)\n" + "duplicate key(k1)\n"
+                        + "partition by range(k2)\n" + "(partition p1 values less than(\"10\"))\n"
+                        + "distributed by hash(k2) buckets 1\n" + "properties('replication_num' = '1'); ";
         String createTableLikeSql2 = "create table test.testTbl2_like like test.testTbl2";
         String newDbName2 = "test";
         String newTblName2 = "testTbl2_like";
         String existedTblName2 = "testTbl2";
-        checkCreateOlapTableLike(createTableWithHashPartitionSql, createTableLikeSql2, newDbName2, newDbName2, newTblName2, existedTblName2);
+        checkCreateOlapTableLike(createTableWithHashPartitionSql, createTableLikeSql2, newDbName2, newDbName2,
+                newTblName2, existedTblName2);
         // 3. create aggregate table
-        String createAggTableSql3 = "create table test.testTbl3\n" + "(k1 varchar(40), k2 int, v1 int sum)\n"
-                + "partition by range(k2)\n" + "(partition p1 values less than(\"10\"))\n"
-                + "distributed by hash(k1) buckets 1\n" + "properties('replication_num' = '1');";
+        String createAggTableSql3 =
+                "create table test.testTbl3\n" + "(k1 varchar(40), k2 int, v1 int sum)\n" + "partition by range(k2)\n"
+                        + "(partition p1 values less than(\"10\"))\n" + "distributed by hash(k1) buckets 1\n"
+                        + "properties('replication_num' = '1');";
         String createTableLikeSql3 = "create table test.testTbl3_like like test.testTbl3";
         String newDbName3 = "test";
         String newTblName3 = "testTbl3_like";
         String existedTblName3 = "testTbl3";
-        checkCreateOlapTableLike(createAggTableSql3, createTableLikeSql3, newDbName3, newDbName3, newTblName3, existedTblName3);
+        checkCreateOlapTableLike(createAggTableSql3, createTableLikeSql3, newDbName3, newDbName3, newTblName3,
+                existedTblName3);
         // 4. create aggregate table without partition
-        String createAggTableWithoutPartitionSql4 = "create table test.testTbl4\n" + "(k1 varchar(40), k2 int, k3 int)\n" + "duplicate key(k1, k2, k3)\n"
-                + "partition by range(k2)\n" + "()\n"
-                + "distributed by hash(k1) buckets 1\n" + "properties('replication_num' = '1');";
+        String createAggTableWithoutPartitionSql4 =
+                "create table test.testTbl4\n" + "(k1 varchar(40), k2 int, k3 int)\n" + "duplicate key(k1, k2, k3)\n"
+                        + "partition by range(k2)\n" + "()\n" + "distributed by hash(k1) buckets 1\n"
+                        + "properties('replication_num' = '1');";
         String createTableLikeSql4 = "create table test.testTbl4_like like test.testTbl4";
         String newDbName4 = "test";
         String newTblName4 = "testTbl4_like";
         String existedTblName4 = "testTbl4";
-        checkCreateOlapTableLike(createAggTableWithoutPartitionSql4, createTableLikeSql4, newDbName4, newDbName4, newTblName4, existedTblName4);
+        checkCreateOlapTableLike(createAggTableWithoutPartitionSql4, createTableLikeSql4, newDbName4, newDbName4,
+                newTblName4, existedTblName4);
         // 5. create table from different db
-        String createTableFromDiffDb5 = "create table test.testTbl5\n" + "(k1 varchar(40), k2 int, k3 int)\n" + "duplicate key(k1, k2, k3)\n"
-                + "partition by range(k2)\n" + "()\n"
-                + "distributed by hash(k1) buckets 1\n" + "properties('replication_num' = '1');";
+        String createTableFromDiffDb5 =
+                "create table test.testTbl5\n" + "(k1 varchar(40), k2 int, k3 int)\n" + "duplicate key(k1, k2, k3)\n"
+                        + "partition by range(k2)\n" + "()\n" + "distributed by hash(k1) buckets 1\n"
+                        + "properties('replication_num' = '1');";
         String createTableLikeSql5 = "create table test2.testTbl5_like like test.testTbl5";
         String newDbName5 = "test2";
         String existedDbName5 = "test";
         String newTblName5 = "testTbl5_like";
         String existedTblName5 = "testTbl5";
-        checkCreateOlapTableLike(createTableFromDiffDb5, createTableLikeSql5, newDbName5, existedDbName5, newTblName5, existedTblName5);
+        checkCreateOlapTableLike(createTableFromDiffDb5, createTableLikeSql5, newDbName5, existedDbName5, newTblName5,
+                existedTblName5);
         // 6. create table from dynamic partition table
-        String createDynamicTblSql = "CREATE TABLE test.`dynamic_partition_normal` (\n" +
-                "  `k1` date NULL COMMENT \"\",\n" +
-                "  `k2` int NULL COMMENT \"\",\n" +
-                "  `k3` smallint NULL COMMENT \"\",\n" +
-                "  `v1` varchar(2048) NULL COMMENT \"\",\n" +
-                "  `v2` datetime NULL COMMENT \"\"\n" +
-                ") ENGINE=OLAP\n" +
-                "DUPLICATE KEY(`k1`, `k2`, `k3`)\n" +
-                "COMMENT \"OLAP\"\n" +
-                "PARTITION BY RANGE (k1)\n" +
-                "(\n" +
-                "PARTITION p1 VALUES LESS THAN (\"2014-01-01\"),\n" +
-                "PARTITION p2 VALUES LESS THAN (\"2014-06-01\"),\n" +
-                "PARTITION p3 VALUES LESS THAN (\"2014-12-01\")\n" +
-                ")\n" +
-                "DISTRIBUTED BY HASH(`k1`) BUCKETS 32\n" +
-                "PROPERTIES (\n" +
-                "\"replication_num\" = \"1\",\n" +
-                "\"dynamic_partition.enable\" = \"true\",\n" +
-                "\"dynamic_partition.start\" = \"-3\",\n" +
-                "\"dynamic_partition.end\" = \"3\",\n" +
-                "\"dynamic_partition.time_unit\" = \"day\",\n" +
-                "\"dynamic_partition.prefix\" = \"p\",\n" +
-                "\"dynamic_partition.buckets\" = \"1\"\n" +
-                ");";
-        String createTableLikeSql6 = "create table test.dynamic_partition_normal_like like test.dynamic_partition_normal";
+        String createDynamicTblSql =
+                "CREATE TABLE test.`dynamic_partition_normal` (\n" + "  `k1` date NULL COMMENT \"\",\n"
+                        + "  `k2` int NULL COMMENT \"\",\n" + "  `k3` smallint NULL COMMENT \"\",\n"
+                        + "  `v1` varchar(2048) NULL COMMENT \"\",\n" + "  `v2` datetime NULL COMMENT \"\"\n"
+                        + ") ENGINE=OLAP\n" + "DUPLICATE KEY(`k1`, `k2`, `k3`)\n" + "COMMENT \"OLAP\"\n"
+                        + "PARTITION BY RANGE (k1)\n" + "(\n" + "PARTITION p1 VALUES LESS THAN (\"2014-01-01\"),\n"
+                        + "PARTITION p2 VALUES LESS THAN (\"2014-06-01\"),\n"
+                        + "PARTITION p3 VALUES LESS THAN (\"2014-12-01\")\n" + ")\n"
+                        + "DISTRIBUTED BY HASH(`k1`) BUCKETS 32\n" + "PROPERTIES (\n" + "\"replication_num\" = \"1\",\n"
+                        + "\"dynamic_partition.enable\" = \"true\",\n" + "\"dynamic_partition.start\" = \"-3\",\n"
+                        + "\"dynamic_partition.end\" = \"3\",\n" + "\"dynamic_partition.time_unit\" = \"day\",\n"
+                        + "\"dynamic_partition.prefix\" = \"p\",\n" + "\"dynamic_partition.buckets\" = \"1\"\n" + ");";
+        String createTableLikeSql6 =
+                "create table test.dynamic_partition_normal_like" + " like test.dynamic_partition_normal";
         String newDbName6 = "test";
         String newTblName6 = "dynamic_partition_normal_like";
         String existedTblName6 = "dynamic_partition_normal";
-        checkCreateOlapTableLike(createDynamicTblSql, createTableLikeSql6, newDbName6, newDbName6, newTblName6, existedTblName6);
+        checkCreateOlapTableLike(createDynamicTblSql, createTableLikeSql6, newDbName6, newDbName6, newTblName6,
+                existedTblName6);
         // 7. create table from colocate table
-        String createColocateTblSql = "create table test.colocateTbl (\n" +
-                " `k1` int NULL COMMENT \"\",\n" +
-                " `k2` varchar(10) NULL COMMENT \"\"\n" +
-                ") ENGINE=OLAP\n" +
-                "DUPLICATE KEY(`k1`, `k2`)\n" +
-                "COMMENT \"OLAP\"\n" +
-                "DISTRIBUTED BY HASH(`k1`, `k2`) BUCKETS 1\n" +
-                "PROPERTIES (\n" +
-                " \"replication_num\" = \"1\",\n" +
-                " \"colocate_with\" = \"test_group\"\n" +
-                ");";
+        String createColocateTblSql = "create table test.colocateTbl (\n" + " `k1` int NULL COMMENT \"\",\n"
+                + " `k2` varchar(10) NULL COMMENT \"\"\n" + ") ENGINE=OLAP\n" + "DUPLICATE KEY(`k1`, `k2`)\n"
+                + "COMMENT \"OLAP\"\n" + "DISTRIBUTED BY HASH(`k1`, `k2`) BUCKETS 1\n" + "PROPERTIES (\n"
+                + " \"replication_num\" = \"1\",\n" + " \"colocate_with\" = \"test_group\"\n" + ");";
         String createTableLikeSql7 = "create table test.colocateTbl_like like test.colocateTbl";
         String newDbName7 = "test";
         String newTblName7 = "colocateTbl_like";
         String existedTblName7 = "colocateTbl";
-        checkCreateOlapTableLike(createColocateTblSql, createTableLikeSql7, newDbName7, newDbName7, newTblName7, existedTblName7);
+        checkCreateOlapTableLike(createColocateTblSql, createTableLikeSql7, newDbName7, newDbName7, newTblName7,
+                existedTblName7);
 
         // 8. creat non-OLAP table
-        String createNonOlapTableSql = "create table test.testMysqlTbl\n" +
-                "(k1 DATE, k2 INT, k3 SMALLINT, k4 VARCHAR(2048), k5 DATETIME)\n" +
-                "ENGINE=mysql\nPROPERTIES(\n"+
-                "\"host\" = \"127.0.0.1\",\n" +
-                "\"port\" = \"8239\",\n" +
-                "\"user\" = \"mysql_passwd\",\n" +
-                "\"password\" = \"mysql_passwd\",\n" +
-                "\"database\" = \"mysql_db_test\",\n" +
-                "\"table\" = \"mysql_table_test\");";
+        String createNonOlapTableSql =
+                "create table test.testMysqlTbl\n" + "(k1 DATE, k2 INT, k3 SMALLINT, k4 VARCHAR(2048), k5 DATETIME)\n"
+                        + "ENGINE=mysql\nPROPERTIES(\n" + "\"host\" = \"127.0.0.1\",\n" + "\"port\" = \"8239\",\n"
+                        + "\"user\" = \"mysql_passwd\",\n" + "\"password\" = \"mysql_passwd\",\n"
+                        + "\"database\" = \"mysql_db_test\",\n" + "\"table\" = \"mysql_table_test\");";
         String createTableLikeSql8 = "create table test.testMysqlTbl_like like test.testMysqlTbl";
         String newDbName8 = "test";
         String existedDbName8 = "test";
         String newTblName8 = "testMysqlTbl_like";
         String existedTblName8 = "testMysqlTbl";
-        checkCreateMysqlTableLike(createNonOlapTableSql, createTableLikeSql8, newDbName8, existedDbName8, newTblName8, existedTblName8);
+        checkCreateMysqlTableLike(createNonOlapTableSql, createTableLikeSql8, newDbName8, existedDbName8, newTblName8,
+                existedTblName8);
 
         // 9. test if not exist
         String createTableLikeSql9 = "create table test.testMysqlTbl_like like test.testMysqlTbl";
@@ -287,52 +269,47 @@ public void testNormal() throws Exception {
         }
 
         // 10. test create table like with rollup
-        String createTableWithRollup = "CREATE TABLE IF NOT EXISTS test.table_with_rollup\n" +
-                "(\n" +
-                "    event_day DATE,\n" +
-                "    siteid INT DEFAULT '10',\n" +
-                "    citycode SMALLINT,\n" +
-                "    username VARCHAR(32) DEFAULT '',\n" +
-                "    pv BIGINT SUM DEFAULT '0'\n" +
-                ")\n" +
-                "AGGREGATE KEY(event_day, siteid, citycode, username)\n" +
-                "PARTITION BY RANGE(event_day)\n" +
-                "(\n" +
-                "    PARTITION p201706 VALUES LESS THAN ('2021-07-01'),\n" +
-                "    PARTITION p201707 VALUES LESS THAN ('2021-08-01'),\n" +
-                "    PARTITION p201708 VALUES LESS THAN ('2021-09-01')\n" +
-                ")\n" +
-                "DISTRIBUTED BY HASH(siteid) BUCKETS 10\n" +
-                "ROLLUP\n" +
-                "(\n" +
-                "r(event_day,pv),\n" +
-                "r1(event_day,siteid,pv),\n" +
-                "r2(siteid,pv),\n" +
-                "r3(siteid,citycode,username,pv)\n" +
-                ")\n" +
-                "PROPERTIES(\"replication_num\" = \"1\");";
-
-        String createTableLikeWithRollupSql1_1 = "create table test.table_like_rollup like test.table_with_rollup with rollup (r1,r2)";
-        String createTableLikeWithRollupSql1_2 = "create table test.table_like_rollup1 like test.table_with_rollup with rollup";
+        String createTableWithRollup =
+                "CREATE TABLE IF NOT EXISTS test.table_with_rollup\n" + "(\n" + "    event_day DATE,\n"
+                        + "    siteid INT DEFAULT '10',\n" + "    citycode SMALLINT,\n"
+                        + "    username VARCHAR(32) DEFAULT '',\n" + "    pv BIGINT SUM DEFAULT '0'\n" + ")\n"
+                        + "AGGREGATE KEY(event_day, siteid, citycode, username)\n" + "PARTITION BY RANGE(event_day)\n"
+                        + "(\n" + "    PARTITION p201706 VALUES LESS THAN ('2021-07-01'),\n"
+                        + "    PARTITION p201707 VALUES LESS THAN ('2021-08-01'),\n"
+                        + "    PARTITION p201708 VALUES LESS THAN ('2021-09-01')\n" + ")\n"
+                        + "DISTRIBUTED BY HASH(siteid) BUCKETS 10\n" + "ROLLUP\n" + "(\n" + "r(event_day,pv),\n"
+                        + "r1(event_day,siteid,pv),\n" + "r2(siteid,pv),\n" + "r3(siteid,citycode,username,pv)\n"
+                        + ")\n" + "PROPERTIES(\"replication_num\" = \"1\");";
+
+        String createTableLikeWithRollupSql1Dot1 =
+                "create table test.table_like_rollup" + " like test.table_with_rollup with rollup (r1,r2)";
+        String createTableLikeWithRollupSql1Dot2 =
+                "create table test.table_like_rollup1" + " like test.table_with_rollup with rollup";
 
         String newDbName10 = "test";
         String existedDbName10 = "test";
-        String newTblName10_1 = "table_like_rollup";
-        String newTblName10_2 = "table_like_rollup1";
+        String newTblName10Dot1 = "table_like_rollup";
+        String newTblName10Dot2 = "table_like_rollup1";
         String existedTblName10 = "table_with_rollup";
-        checkCreateOlapTableLike(createTableWithRollup, createTableLikeWithRollupSql1_1, newDbName10, existedDbName10, newTblName10_1, existedTblName10, 2);
-        checkCreateOlapTableLike(createTableWithRollup, createTableLikeWithRollupSql1_2, newDbName10, existedDbName10, newTblName10_2, existedTblName10, 4);
+        checkCreateOlapTableLike(createTableWithRollup, createTableLikeWithRollupSql1Dot1, newDbName10, existedDbName10,
+                newTblName10Dot1, existedTblName10, 2);
+        checkCreateOlapTableLike(createTableWithRollup, createTableLikeWithRollupSql1Dot2, newDbName10, existedDbName10,
+                newTblName10Dot2, existedTblName10, 4);
 
-        String createTableLikeWithRollupSql2_1 = "create table test2.table_like_rollup like test.table_with_rollup with rollup (r1,r2)";
-        String createTableLikeWithRollupSql2_2 = "create table test2.table_like_rollup1 like test.table_with_rollup with rollup";
+        String createTableLikeWithRollupSql2Dot1 =
+                "create table test2.table_like_rollup" + " like test.table_with_rollup with rollup (r1,r2)";
+        String createTableLikeWithRollupSql2Dot2 =
+                "create table test2.table_like_rollup1" + " like test.table_with_rollup with rollup";
 
         String newDbName11 = "test2";
         String existedDbName11 = "test";
-        String newTblName11_1 = "table_like_rollup";
-        String newTblName11_2 = "table_like_rollup1";
+        String newTblName11Dot1 = "table_like_rollup";
+        String newTblName11Dot2 = "table_like_rollup1";
         String existedTblName11 = "table_with_rollup";
-        checkCreateOlapTableLike(createTableWithRollup, createTableLikeWithRollupSql2_1, newDbName11, existedDbName11, newTblName11_1, existedTblName11, 2);
-        checkCreateOlapTableLike(createTableWithRollup, createTableLikeWithRollupSql2_2, newDbName11, existedDbName11, newTblName11_2, existedTblName11, 4);
+        checkCreateOlapTableLike(createTableWithRollup, createTableLikeWithRollupSql2Dot1, newDbName11, existedDbName11,
+                newTblName11Dot1, existedTblName11, 2);
+        checkCreateOlapTableLike(createTableWithRollup, createTableLikeWithRollupSql2Dot2, newDbName11, existedDbName11,
+                newTblName11Dot2, existedTblName11, 4);
 
     }
 
@@ -345,7 +322,8 @@ public void testAbnormal() {
         String newDbName = "test";
         String newTblName = "testAbTbl1";
         ExceptionChecker.expectThrowsWithMsg(DdlException.class, "Table 'testAbTbl1' already exists",
-                () -> checkCreateOlapTableLike(createTableSql, createTableLikeSql, newDbName, newDbName, newTblName, newTblName));
+                () -> checkCreateOlapTableLike(createTableSql, createTableLikeSql, newDbName, newDbName, newTblName,
+                        newTblName));
         // 2. create table with not existed DB
         String createTableSql2 = "create table test.testAbTbl2\n" + "(k1 int, k2 int)\n" + "duplicate key(k1)\n"
                 + "distributed by hash(k2) buckets 1\n" + "properties('replication_num' = '1'); ";
@@ -355,42 +333,32 @@ public void testAbnormal() {
         String newTblName2 = "testAbTbl2_like";
         String existedTblName2 = "testAbTbl1";
         ExceptionChecker.expectThrowsWithMsg(DdlException.class, "Unknown database 'default_cluster:fake_test'",
-                () -> checkCreateOlapTableLike(createTableSql2, createTableLikeSql2, newDbName2, existedDbName2, newTblName2, existedTblName2));
+                () -> checkCreateOlapTableLike(createTableSql2, createTableLikeSql2, newDbName2, existedDbName2,
+                        newTblName2, existedTblName2));
 
         //3. add not existed rollup
-        String createTableWithRollup = "CREATE TABLE IF NOT EXISTS test.table_with_rollup\n" +
-                "(\n" +
-                "    event_day DATE,\n" +
-                "    siteid INT DEFAULT '10',\n" +
-                "    citycode SMALLINT,\n" +
-                "    username VARCHAR(32) DEFAULT '',\n" +
-                "    pv BIGINT SUM DEFAULT '0'\n" +
-                ")\n" +
-                "AGGREGATE KEY(event_day, siteid, citycode, username)\n" +
-                "PARTITION BY RANGE(event_day)\n" +
-                "(\n" +
-                "    PARTITION p201706 VALUES LESS THAN ('2021-07-01'),\n" +
-                "    PARTITION p201707 VALUES LESS THAN ('2021-08-01'),\n" +
-                "    PARTITION p201708 VALUES LESS THAN ('2021-09-01')\n" +
-                ")\n" +
-                "DISTRIBUTED BY HASH(siteid) BUCKETS 10\n" +
-                "ROLLUP\n" +
-                "(\n" +
-                "r(event_day,pv),\n" +
-                "r1(event_day,siteid,pv),\n" +
-                "r2(siteid,pv),\n" +
-                "r3(siteid,citycode,username,pv)\n" +
-                ")\n" +
-                "PROPERTIES(\"replication_num\" = \"1\");";
-
-        String createTableLikeWithRollupSq3 = "create table test.table_like_rollup like test.table_with_rollup with rollup (r11)";
+        String createTableWithRollup =
+                "CREATE TABLE IF NOT EXISTS test.table_with_rollup\n" + "(\n" + "    event_day DATE,\n"
+                        + "    siteid INT DEFAULT '10',\n" + "    citycode SMALLINT,\n"
+                        + "    username VARCHAR(32) DEFAULT '',\n" + "    pv BIGINT SUM DEFAULT '0'\n" + ")\n"
+                        + "AGGREGATE KEY(event_day, siteid, citycode, username)\n" + "PARTITION BY RANGE(event_day)\n"
+                        + "(\n" + "    PARTITION p201706 VALUES LESS THAN ('2021-07-01'),\n"
+                        + "    PARTITION p201707 VALUES LESS THAN ('2021-08-01'),\n"
+                        + "    PARTITION p201708 VALUES LESS THAN ('2021-09-01')\n" + ")\n"
+                        + "DISTRIBUTED BY HASH(siteid) BUCKETS 10\n" + "ROLLUP\n" + "(\n" + "r(event_day,pv),\n"
+                        + "r1(event_day,siteid,pv),\n" + "r2(siteid,pv),\n" + "r3(siteid,citycode,username,pv)\n"
+                        + ")\n" + "PROPERTIES(\"replication_num\" = \"1\");";
+
+        String createTableLikeWithRollupSq3 =
+                "create table test.table_like_rollup" + " like test.table_with_rollup with rollup (r11)";
 
         String newDbName3 = "test";
         String existedDbName3 = "test";
         String newTblName3 = "table_like_rollup";
         String existedTblName3 = "table_with_rollup";
-        ExceptionChecker.expectThrowsWithMsg(DdlException.class, "Rollup index[r11] not exists in Table[table_with_rollup]",
-                () -> checkCreateOlapTableLike(createTableWithRollup, createTableLikeWithRollupSq3, newDbName3, existedDbName3, newTblName3, existedTblName3, 1));
-
+        ExceptionChecker.expectThrowsWithMsg(DdlException.class,
+                "Rollup index[r11] not exists in Table[table_with_rollup]",
+                () -> checkCreateOlapTableLike(createTableWithRollup, createTableLikeWithRollupSq3, newDbName3,
+                        existedDbName3, newTblName3, existedTblName3, 1));
     }
 }
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 e4fca21787c634..9e96b8a509390d 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
@@ -55,7 +55,7 @@ public class DatabaseTest {
     private EditLog editLog;
 
     @Before
-    public void Setup() {
+    public void setup() {
         db = new Database(dbId, "dbTest");
         new Expectations() {
             {
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 9626a2d2a730cd..be2e5a014fd455 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
@@ -74,7 +74,7 @@ public static void beforeClass() throws Exception {
     }
 
     @AfterClass
-    public static void TearDown() {
+    public static void tearDown() {
         UtFrameUtils.cleanDorisFeDir(runningDir);
     }
 
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 0a5257bff0ad05..6fb0abbf4fe30d 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
@@ -39,7 +39,7 @@ public class FakeEditLog extends MockUp<EditLog> {
     private Map<Long, TransactionState> allTransactionState = new HashMap<>();
 
     @Mock
-    public void $init(String nodeName) {
+    public void $init(String nodeName) { // CHECKSTYLE IGNORE THIS LINE
         // do nothing
         System.out.println("abc");
     }
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 588c72c8407123..517caca9d575c4 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
@@ -104,7 +104,7 @@ public void setUp() throws Exception {
                 catalog.getNextId();
                 minTimes = 0;
                 result = new Delegate() {
-                    long a() {
+                    long ignored() {
                         return id++;
                     }
                 };
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 115284f4015422..e1bf4a6e7c254c 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
@@ -110,7 +110,7 @@ public void setUp() throws Exception {
                 catalog.getNextId();
                 minTimes = 0;
                 result = new Delegate() {
-                    long a() {
+                    long ignored() {
                         return id++;
                     }
                 };
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 b53ba05c91093a..a32d21ee6aa0bb 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
@@ -151,7 +151,7 @@ public static void beforeClass() throws Exception {
     }
 
     @AfterClass
-    public static void TearDown() {
+    public static void tearDown() {
         UtFrameUtils.cleanDorisFeDir(runningDirBase);
     }
 
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 10c1ce7002b17d..61eebfc3de71ae 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
@@ -119,7 +119,7 @@ public static void beforeClass() throws Exception {
     }
 
     @AfterClass
-    public static void TearDown() {
+    public static void tearDown() {
         UtFrameUtils.cleanDorisFeDir(runningDirBase);
     }
 
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 103e87b3b4edab..6acb26a5b430c7 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
@@ -83,7 +83,7 @@ static class PartitionPerBeReplicas {
 
     // Transform the definition of the test cluster into the ClusterInfo
     // that is consumed by the rebalancing algorithm.
-    private ClusterBalanceInfo ClusterConfigToClusterBalanceInfo(TestClusterConfig tcc) {
+    private ClusterBalanceInfo clusterConfigToClusterBalanceInfo(TestClusterConfig tcc) {
         // First verify that the configuration of the test cluster is valid.
         Set<Pair<Long, Long>> partitionIds = Sets.newHashSet();
         for (TestClusterConfig.PartitionPerBeReplicas p : tcc.partitionReplicas) {
@@ -114,17 +114,17 @@ private ClusterBalanceInfo ClusterConfigToClusterBalanceInfo(TestClusterConfig t
             List<Long> replicaCount = distribution.numReplicasByServer;
             IntStream.range(0, replicaCount.size()).forEach(i -> info.beByReplicaCount.put(replicaCount.get(i), tcc.beIds.get(i)));
 
-            Long max_count = info.beByReplicaCount.keySet().last();
-            Long min_count = info.beByReplicaCount.keySet().first();
-            Assert.assertTrue(max_count >= min_count);
-            balance.partitionInfoBySkew.put(max_count - min_count, info);
+            Long maxCount = info.beByReplicaCount.keySet().last();
+            Long minCount = info.beByReplicaCount.keySet().first();
+            Assert.assertTrue(maxCount >= minCount);
+            balance.partitionInfoBySkew.put(maxCount - minCount, info);
         }
         return balance;
     }
 
     private void verifyMoves(List<TestClusterConfig> configs) {
         for (TestClusterConfig config : configs) {
-            List<PartitionMove> moves = algo.getNextMoves(ClusterConfigToClusterBalanceInfo(config), 0);
+            List<PartitionMove> moves = algo.getNextMoves(clusterConfigToClusterBalanceInfo(config), 0);
             Assert.assertEquals(moves, config.expectedMoves);
         }
     }
diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/CIDRTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/CidrTest.java
similarity index 99%
rename from fe/fe-core/src/test/java/org/apache/doris/common/CIDRTest.java
rename to fe/fe-core/src/test/java/org/apache/doris/common/CidrTest.java
index 141aa223981155..a63b33df7bee6e 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/common/CIDRTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/common/CidrTest.java
@@ -20,7 +20,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class CIDRTest {
+public class CidrTest {
     @Test
     public void testWrongFormat() {
         // no mask
diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/GenericPoolTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/GenericPoolTest.java
index 55eb21d02c5f4d..11fa99415c6796 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/common/GenericPoolTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/common/GenericPoolTest.java
@@ -147,7 +147,7 @@ public TAgentResult submitTasks(List<TAgentTaskRequest> tasks) throws TException
         }
 
         @Override
-        public TAgentResult releaseSnapshot(String snapshot_path) throws TException {
+        public TAgentResult releaseSnapshot(String snapshotPath) throws TException {
             return null;
         }
 
@@ -172,7 +172,7 @@ public TAgentResult deleteEtlFiles(TDeleteEtlFilesRequest request) throws TExcep
         }
 
         @Override
-        public TAgentResult makeSnapshot(TSnapshotRequest snapshot_request) throws TException {
+        public TAgentResult makeSnapshot(TSnapshotRequest snapshotRequest) throws TException {
             // TODO Auto-generated method stub
             return null;
         }
@@ -184,13 +184,13 @@ public TStatus submitExportTask(TExportTaskRequest request) throws TException {
         }
 
         @Override
-        public TExportStatusResult getExportStatus(TUniqueId task_id) throws TException {
+        public TExportStatusResult getExportStatus(TUniqueId taskId) throws TException {
             // TODO Auto-generated method stub
             return null;
         }
 
         @Override
-        public TStatus eraseExportTask(TUniqueId task_id) throws TException {
+        public TStatus eraseExportTask(TUniqueId taskId) throws TException {
             // TODO Auto-generated method stub
             return null;
         }
@@ -235,7 +235,7 @@ public TScanCloseResult closeScanner(TScanCloseParams params) throws TException
         }
 
         @Override
-        public TStreamLoadRecordResult getStreamLoadRecord(long last_stream_record_time) throws TException {
+        public TStreamLoadRecordResult getStreamLoadRecord(long lastStreamRecordTime) throws TException {
             // TODO Auto-generated method stub
             return null;
         }
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 6343e92823beb6..f4787a8e1c67df 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
@@ -40,12 +40,12 @@
 public class SparkRepositoryTest {
     private SparkRepository repository;
 
-    private final String DPP_LOCAL_MD5SUM = "b3cd0ae3a4121e2426532484442e90ec";
-    private final String SPARK_LOCAL_MD5SUM = "6d2b052ffbdf7082c019bd202432739c";
-    private final String DPP_VERSION = Config.spark_dpp_version;
-    private final String SPARK_LOAD_WORK_DIR = "hdfs://127.0.0.1/99999/user/doris/etl";
-    private final String DPP_NAME = SparkRepository.SPARK_DPP + ".jar";
-    private final String SPARK_NAME = SparkRepository.SPARK_2X + ".zip";
+    private final static String DPP_LOCAL_MD5SUM = "b3cd0ae3a4121e2426532484442e90ec";
+    private final static String SPARK_LOCAL_MD5SUM = "6d2b052ffbdf7082c019bd202432739c";
+    private final static String DPP_VERSION = Config.spark_dpp_version;
+    private final static String SPARK_LOAD_WORK_DIR = "hdfs://127.0.0.1/99999/user/doris/etl";
+    private final static String DPP_NAME = SparkRepository.SPARK_DPP + ".jar";
+    private final static String SPARK_NAME = SparkRepository.SPARK_2X + ".zip";
 
     private String remoteRepoPath;
     private String remoteArchivePath;
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 5f5a7e2b39efc3..72f1fa26a5d915 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
@@ -49,11 +49,11 @@ public class UpdateStmtExecutorTest {
     public void testCommitAndPublishTxn(@Injectable Analyzer analyzer,
                                         @Injectable Coordinator coordinator,
                                         @Mocked GlobalTransactionMgr globalTransactionMgr) {
-        Cluster test_cluster = new Cluster("test_cluster", 0);
-        Database test_db = new Database(1, "test_db");
-        test_db.setClusterName("test_cluster");
-        Catalog.getCurrentCatalog().addCluster(test_cluster);
-        Catalog.getCurrentCatalog().unprotectCreateDb(test_db);
+        Cluster testCluster = new Cluster("test_cluster", 0);
+        Database testDb = new Database(1, "test_db");
+        testDb.setClusterName("test_cluster");
+        Catalog.getCurrentCatalog().addCluster(testCluster);
+        Catalog.getCurrentCatalog().unprotectCreateDb(testDb);
         UpdateStmtExecutor updateStmtExecutor = new UpdateStmtExecutor();
         Deencapsulation.setField(updateStmtExecutor, "dbId", 1);
         Deencapsulation.setField(updateStmtExecutor, "effectRows", 0);
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 03ac1073e7042e..c485ffe896549a 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
@@ -85,6 +85,8 @@ public boolean resolveWithBNS(String domainName, Set<String> resolvedIPs) {
                     resolvedIPs.add("20.1.1.2");
                     resolvedIPs.add("20.1.1.3");
                     break;
+                default:
+                    break;
             }
             return true;
         }
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 7b5b31818b54be..9941079ada7718 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
@@ -35,35 +35,35 @@
 import java.util.List;
 
 public class BatchModifyPartitionsInfoTest {
-    private static String fileName = "./BatchModifyPartitionsInfoTest";
+    private final static String FILE_NAME = "./BatchModifyPartitionsInfoTest";
 
-    private final long DB_ID = 10000L;
-    private final long TB_ID = 30000L;
-    private final long PARTITION_ID_1 = 40000L;
-    private final long PARTITION_ID_2 = 40001L;
-    private final long PARTITION_ID_3 = 40002L;
+    private final static long DB_ID = 10000L;
+    private final static long TB_ID = 30000L;
+    private final static long PARTITION_ID_1 = 40000L;
+    private final static long PARTITION_ID_2 = 40001L;
+    private final static long PARTITION_ID_3 = 40002L;
 
     @After
     public void tearDown() {
-        File file = new File(fileName);
+        File file = new File(FILE_NAME);
         file.delete();
     }
 
     @Test
     public void testSerializeBatchModifyPartitionsInfo() throws IOException, AnalysisException {
-        List<ModifyPartitionInfo> ModifyInfos = Lists.newArrayList();
+        List<ModifyPartitionInfo> modifyInfos = Lists.newArrayList();
         // 1. Write objects to file
-        File file = new File(fileName);
+        File file = new File(FILE_NAME);
         file.createNewFile();
         DataOutputStream out = new DataOutputStream(new FileOutputStream(file));
 
         List<Long> partitionIds = Lists.newArrayList(PARTITION_ID_1, PARTITION_ID_2, PARTITION_ID_3);
         for (long partitionId : partitionIds) {
-            ModifyInfos.add(new ModifyPartitionInfo(DB_ID, TB_ID, partitionId,
+            modifyInfos.add(new ModifyPartitionInfo(DB_ID, TB_ID, partitionId,
                     DataProperty.DEFAULT_DATA_PROPERTY, ReplicaAllocation.DEFAULT_ALLOCATION, true));
         }
 
-        BatchModifyPartitionsInfo batchModifyPartitionsInfo = new BatchModifyPartitionsInfo(ModifyInfos);
+        BatchModifyPartitionsInfo batchModifyPartitionsInfo = new BatchModifyPartitionsInfo(modifyInfos);
         batchModifyPartitionsInfo.write(out);
         out.flush();
         out.close();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewFunctionTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewFunctionTest.java
index a980ff9a67231f..9b73aa03e7f810 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewFunctionTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewFunctionTest.java
@@ -94,19 +94,19 @@ public static void afterClass() throws Exception {
 
     @Test
     public void testProjectionMV1() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid from "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid from "
                 + EMPS_TABLE_NAME + " order by deptno;";
         String query = "select empid, deptno from " + EMPS_TABLE_NAME + ";";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testProjectionMV2() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid from "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid from "
                 + EMPS_TABLE_NAME + " order by deptno;";
         String query1 = "select empid + 1 from " + EMPS_TABLE_NAME + " where deptno = 10;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query1).explainContains(QUERY_USE_EMPS_MV);
         String query2 = "select name from " + EMPS_TABLE_NAME + " where deptno -10 = 0;";
         dorisAssert.query(query2).explainWithout(QUERY_USE_EMPS_MV);
@@ -115,10 +115,10 @@ public void testProjectionMV2() throws Exception {
 
     @Test
     public void testProjectionMV3() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, name from "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, name from "
                 + EMPS_TABLE_NAME + " order by deptno;";
         String query1 = "select empid +1, name from " + EMPS_TABLE_NAME + " where deptno = 10;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query1).explainContains(QUERY_USE_EMPS_MV);
         String query2 = "select name from " + EMPS_TABLE_NAME + " where deptno - 10 = 0;";
         dorisAssert.query(query2).explainContains(QUERY_USE_EMPS_MV);
@@ -126,10 +126,10 @@ public void testProjectionMV3() throws Exception {
 
     @Test
     public void testProjectionMV4() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select name, deptno, salary from "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select name, deptno, salary from "
                 + EMPS_TABLE_NAME + ";";
         String query1 = "select name from " + EMPS_TABLE_NAME + " where deptno > 30 and salary > 3000;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query1).explainContains(QUERY_USE_EMPS_MV);
         String query2 = "select empid from " + EMPS_TABLE_NAME + " where deptno > 30 and empid > 10;";
         dorisAssert.query(query2).explainWithout(QUERY_USE_EMPS_MV);
@@ -137,28 +137,28 @@ public void testProjectionMV4() throws Exception {
 
     @Test
     public void testUnionQueryOnProjectionMV() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid from " +
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid from " +
                 EMPS_TABLE_NAME + " order by deptno;";
         String union = "select empid from " + EMPS_TABLE_NAME + " where deptno > 300" + " union all select empid from"
                 + " " + EMPS_TABLE_NAME + " where deptno < 200";
-        dorisAssert.withMaterializedView(createMVSQL).query(union).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createMVSql).query(union).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggQueryOnAggMV1() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, sum(salary), "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, sum(salary), "
                 + "max(commission) from " + EMPS_TABLE_NAME + " group by deptno;";
         String query = "select sum(salary), deptno from " + EMPS_TABLE_NAME + " group by deptno;";
-        dorisAssert.withMaterializedView(createMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createMVSql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggQueryOnAggMV2() throws Exception {
         String agg = "select deptno, sum(salary) from " + EMPS_TABLE_NAME + " group by deptno";
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as " + agg + ";";
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as " + agg + ";";
         String query = "select * from (select deptno, sum(salary) as sum_salary from " + EMPS_TABLE_NAME + " group "
                 + "by" + " deptno) a where (sum_salary * 2) > 3;";
-        dorisAssert.withMaterializedView(createMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createMVSql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     /*
@@ -168,9 +168,9 @@ public void testAggQueryOnAggMV2() throws Exception {
     public void testAggQueryOnDeduplicatedMV() throws Exception {
         String deduplicateSQL = "select deptno, empid, name, salary, commission from " + EMPS_TABLE_NAME + " group "
                 + "by" + " deptno, empid, name, salary, commission";
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as " + deduplicateSQL + ";";
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as " + deduplicateSQL + ";";
         String query1 = "select deptno, sum(salary) from (" + deduplicateSQL + ") A group by deptno;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query1).explainContains(QUERY_USE_EMPS_MV);
         String query2 = "select deptno, empid from " + EMPS_TABLE_NAME + ";";
         dorisAssert.query(query2).explainWithout(QUERY_USE_EMPS_MV);
@@ -179,11 +179,11 @@ public void testAggQueryOnDeduplicatedMV() throws Exception {
 
     @Test
     public void testAggQueryOnAggMV3() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary)"
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary)"
                 + " from " + EMPS_TABLE_NAME + " group by deptno, commission;";
         String query = "select commission, sum(salary) from " + EMPS_TABLE_NAME + " where commission * (deptno + "
                 + "commission) = 100 group by commission;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
@@ -193,10 +193,10 @@ public void testAggQueryOnAggMV3() throws Exception {
      */
     @Test
     public void testAggQueryOnAggMV4() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary)"
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary)"
                 + " from " + EMPS_TABLE_NAME + " group by deptno, commission;";
         String query = "select deptno, sum(salary) from " + EMPS_TABLE_NAME + " where salary>1000 group by deptno;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainWithout(QUERY_USE_EMPS_MV);
     }
 
@@ -205,11 +205,11 @@ public void testAggQueryOnAggMV4() throws Exception {
      */
     @Test
     public void testAggQuqeryOnAggMV5() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary)"
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary)"
                 + " from " + EMPS_TABLE_NAME + " group by deptno, commission;";
         String query = "select * from (select deptno, sum(salary) as sum_salary from " + EMPS_TABLE_NAME
                 + " group by deptno) a where sum_salary>10;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
@@ -220,11 +220,11 @@ public void testAggQuqeryOnAggMV5() throws Exception {
      */
     @Test
     public void testAggQuqeryOnAggMV6() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary)"
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary)"
                 + " from " + EMPS_TABLE_NAME + " group by deptno, commission;";
         String query = "select * from (select deptno, sum(salary) as sum_salary from " + EMPS_TABLE_NAME
                 + " where deptno>=20 group by deptno) a where sum_salary>10;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
@@ -234,10 +234,10 @@ public void testAggQuqeryOnAggMV6() throws Exception {
      */
     @Test
     public void testGroupingSetQueryOnAggMV() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) " +
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) " +
                 "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select sum(salary), empid, deptno from " + EMPS_TABLE_NAME + " group by rollup(empid,deptno);";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
@@ -246,19 +246,19 @@ public void testGroupingSetQueryOnAggMV() throws Exception {
      */
     @Test
     public void testAggQuqeryOnAggMV7() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary) "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " " + "group by deptno, commission;";
         String query = "select deptno, sum(salary) from " + EMPS_TABLE_NAME + " where deptno>=20 group by deptno;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggQueryOnAggMV8() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, sum(salary) "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by deptno;";
         String query = "select deptno, sum(salary) + 1 from " + EMPS_TABLE_NAME + " group by deptno;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
@@ -267,11 +267,11 @@ public void testAggQueryOnAggMV8() throws Exception {
      */
     @Test
     public void testAggQueryOnAggMV9() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary) "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by deptno, commission;";
         String query = "select deptno, commission, sum(salary) + 1 from " + EMPS_TABLE_NAME
                 + " group by cube(deptno,commission);";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
@@ -280,11 +280,11 @@ public void testAggQueryOnAggMV9() throws Exception {
      */
     @Test
     public void testAggQueryOnAggMV10() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary) "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, commission, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by deptno, commission;";
         String query = "select deptno, commission, sum(salary) + 1 from " + EMPS_TABLE_NAME
                 + " group by rollup (deptno, commission);";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
@@ -293,11 +293,11 @@ public void testAggQueryOnAggMV10() throws Exception {
      */
     @Test
     public void testAggQueryOnAggMV11() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, count(salary) "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, count(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by deptno;";
         String query = "select deptno, count(salary) + count(1) from " + EMPS_TABLE_NAME
                 + " group by deptno;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS);
     }
 
@@ -306,232 +306,232 @@ public void testAggQueryOnAggMV11() throws Exception {
      */
     @Test
     public void testAggQueryWithSetOperandOnAggMV() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, count(salary) "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select deptno, count(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by deptno;";
         String query = "select deptno, count(salary) + count(1) from " + EMPS_TABLE_NAME
                 + " group by deptno union " +
                 "select deptno, count(salary) + count(1) from " + EMPS_TABLE_NAME
                 + " group by deptno;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         dorisAssert.query(query).explainContains(QUERY_USE_EMPS);
     }
 
     @Test
     public void testJoinOnLeftProjectToJoin() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME
                 + " as select deptno, sum(salary), sum(commission) from " + EMPS_TABLE_NAME + " group by deptno;";
         String createDeptsMVSQL = "create materialized view " + DEPTS_MV_NAME + " as select deptno, max(cost) from "
                 + DEPTS_TABLE_NAME + " group by deptno;";
         String query = "select * from (select deptno , sum(salary) from " + EMPS_TABLE_NAME + " group by deptno) A "
                 + "join (select deptno, max(cost) from " + DEPTS_TABLE_NAME + " group by deptno ) B on A.deptno = B"
                 + ".deptno;";
-        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVSQL).query(query)
+        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVsql).query(query)
                 .explainContains(QUERY_USE_EMPS_MV, QUERY_USE_DEPTS_MV);
     }
 
     @Test
     public void testJoinOnRightProjectToJoin() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, sum(salary), sum" +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, sum(salary), sum" +
                 "(commission) from " + EMPS_TABLE_NAME + " group by deptno;";
         String createDeptsMVSQL = "create materialized view " + DEPTS_MV_NAME + " as select deptno, max(cost) from "
                 + DEPTS_TABLE_NAME + " group by deptno;";
         String query = "select * from (select deptno , sum(salary), sum(commission) from " + EMPS_TABLE_NAME
                 + " group by deptno) A join (select deptno from " + DEPTS_TABLE_NAME + " group by deptno ) B on A"
                 + ".deptno = B.deptno;";
-        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVSQL).query(query)
+        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVsql).query(query)
                 .explainContains(QUERY_USE_EMPS_MV, QUERY_USE_DEPTS_MV);
     }
 
     @Test
     public void testJoinOnProjectsToJoin() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, sum(salary), sum" +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, sum(salary), sum" +
                 "(commission) from " + EMPS_TABLE_NAME + " group by deptno;";
         String createDeptsMVSQL = "create materialized view " + DEPTS_MV_NAME + " as select deptno, max(cost) from "
                 + DEPTS_TABLE_NAME + " group by deptno;";
         String query = "select * from (select deptno , sum(salary) from " + EMPS_TABLE_NAME + " group by deptno) A "
                 + "join (select deptno from " + DEPTS_TABLE_NAME + " group by deptno ) B on A.deptno = B.deptno;";
-        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVSQL).query(query)
+        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVsql).query(query)
                 .explainContains(QUERY_USE_EMPS_MV, QUERY_USE_DEPTS_MV);
     }
 
     @Test
     public void testJoinOnCalcToJoin0() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
                 EMPS_TABLE_NAME + ";";
         String createDeptsMVSQL = "create materialized view " + DEPTS_MV_NAME + " as select deptno from " +
                 DEPTS_TABLE_NAME + ";";
         String query = "select * from (select empid, deptno from " + EMPS_TABLE_NAME + " where deptno > 10 ) A " +
                 "join (select deptno from " + DEPTS_TABLE_NAME + " ) B on A.deptno = B.deptno;";
-        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVSQL).query(query)
+        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVsql).query(query)
                 .explainContains(QUERY_USE_EMPS_MV, QUERY_USE_DEPTS_MV);
     }
 
     @Test
     public void testJoinOnCalcToJoin1() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
                 EMPS_TABLE_NAME + ";";
         String createDeptsMVSQL = "create materialized view " + DEPTS_MV_NAME + " as select deptno from " +
                 DEPTS_TABLE_NAME + ";";
         String query = "select * from (select empid, deptno from " + EMPS_TABLE_NAME + " ) A join (select " +
                 "deptno from " + DEPTS_TABLE_NAME + " where deptno > 10 ) B on A.deptno = B.deptno;";
-        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVSQL).query(query)
+        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVsql).query(query)
                 .explainContains(QUERY_USE_EMPS_MV, QUERY_USE_DEPTS_MV);
     }
 
     @Test
     public void testJoinOnCalcToJoin2() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
                 EMPS_TABLE_NAME + ";";
         String createDeptsMVSQL = "create materialized view " + DEPTS_MV_NAME + " as select deptno from " +
                 DEPTS_TABLE_NAME + ";";
         String query = "select * from (select empid, deptno from " + EMPS_TABLE_NAME + " where empid >10 ) A " +
                 "join (select deptno from " + DEPTS_TABLE_NAME + " where deptno > 10 ) B on A.deptno = B.deptno;";
-        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVSQL).query(query)
+        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVsql).query(query)
                 .explainContains(QUERY_USE_EMPS_MV, QUERY_USE_DEPTS_MV);
     }
 
     @Test
     public void testJoinOnCalcToJoin3() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
                 EMPS_TABLE_NAME + ";";
         String createDeptsMVSQL = "create materialized view " + DEPTS_MV_NAME + " as select deptno from " +
                 DEPTS_TABLE_NAME + ";";
         String query = "select * from (select empid, deptno + 1 deptno from " + EMPS_TABLE_NAME + " where empid >10 )"
                 + " A join (select deptno from " + DEPTS_TABLE_NAME
                 + " where deptno > 10 ) B on A.deptno = B.deptno;";
-        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVSQL).query(query)
+        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVsql).query(query)
                 .explainContains(QUERY_USE_EMPS_MV, QUERY_USE_DEPTS_MV);
     }
 
     @Test
     public void testJoinOnCalcToJoin4() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
                 EMPS_TABLE_NAME + ";";
         String createDeptsMVSQL = "create materialized view " + DEPTS_MV_NAME + " as select deptno from " +
                 DEPTS_TABLE_NAME + ";";
         String query = "select * from (select empid, deptno + 1 deptno from " + EMPS_TABLE_NAME
                 + " where empid is not null ) A full join (select deptno from " + DEPTS_TABLE_NAME
                 + " where deptno is not null ) B on A.deptno = B.deptno;";
-        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVSQL).query(query)
+        dorisAssert.withMaterializedView(createDeptsMVSQL).withMaterializedView(createEmpsMVsql).query(query)
                 .explainContains(QUERY_USE_EMPS_MV, QUERY_USE_DEPTS_MV);
     }
 
     @Test
     public void testOrderByQueryOnProjectView() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid from " +
                 EMPS_TABLE_NAME + ";";
         String query = "select empid from " + EMPS_TABLE_NAME + " order by deptno";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testOrderByQueryOnOrderByView() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid from " +
                 EMPS_TABLE_NAME + " order by deptno;";
         String query = "select empid from " + EMPS_TABLE_NAME + " order by deptno";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testQueryOnStar() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select time, deptno, empid, name, " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select time, deptno, empid, name, " +
                 "salary, commission from " + EMPS_TABLE_NAME + " order by time, deptno, empid;";
         String query = "select * from " + EMPS_TABLE_NAME + " where deptno = 1";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggregateMVAggregateFuncs1() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select deptno from " + EMPS_TABLE_NAME + " group by deptno";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggregateMVAggregateFuncs2() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select deptno, sum(salary) from " + EMPS_TABLE_NAME + " group by deptno";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggregateMVAggregateFuncs3() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select deptno, empid, sum(salary) from " + EMPS_TABLE_NAME + " group by deptno, empid";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggregateMVAggregateFuncs4() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select deptno, sum(salary) from " + EMPS_TABLE_NAME + " where deptno > 10 group by deptno";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggregateMVAggregateFuncs5() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, sum(salary) "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select deptno, sum(salary) + 1 from " + EMPS_TABLE_NAME + " where deptno > 10 group by deptno";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggregateMVCalcGroupByQuery1() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, sum(salary) "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select deptno+1, sum(salary) + 1 from " + EMPS_TABLE_NAME + " where deptno > 10 "
                 + "group by deptno+1;";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggregateMVCalcGroupByQuery2() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, sum(salary) "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select deptno * empid, sum(salary) + 1 from " + EMPS_TABLE_NAME + " where deptno > 10 " +
                 "group by deptno * empid;";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggregateMVCalcGroupByQuery3() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, sum(salary) "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select empid, deptno * empid, sum(salary) + 1 from " + EMPS_TABLE_NAME + " where deptno > 10 "
                 + "group by empid, deptno * empid;";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testAggregateMVCalcAggFunctionQuery() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, sum(salary) "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select deptno, sum(salary + 1) from " + EMPS_TABLE_NAME + " where deptno > 10 "
                 + "group by deptno;";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainWithout(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainWithout(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testSubQuery() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid "
                 + "from " + EMPS_TABLE_NAME + ";";
         String query = "select empid, deptno, salary from " + EMPS_TABLE_NAME + " e1 where empid = (select max(empid)"
                 + " from " + EMPS_TABLE_NAME + " where deptno = e1.deptno);";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV,
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV,
                 QUERY_USE_EMPS);
     }
 
     @Test
     public void testDistinctQuery() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, sum(salary) " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, sum(salary) " +
                 "from " + EMPS_TABLE_NAME + " group by deptno;";
         String query1 = "select distinct deptno from " + EMPS_TABLE_NAME + ";";
-        dorisAssert.withMaterializedView(createEmpsMVSQL);
+        dorisAssert.withMaterializedView(createEmpsMVsql);
         dorisAssert.query(query1).explainContains(QUERY_USE_EMPS_MV);
         String query2 = "select deptno, sum(distinct salary) from " + EMPS_TABLE_NAME + " group by deptno;";
         dorisAssert.query(query2).explainWithout(QUERY_USE_EMPS_MV);
@@ -539,69 +539,69 @@ public void testDistinctQuery() throws Exception {
 
     @Test
     public void testSingleMVMultiUsage() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, salary " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select deptno, empid, salary " +
                 "from " + EMPS_TABLE_NAME + " order by deptno;";
         String query = "select * from (select deptno, empid from " + EMPS_TABLE_NAME + " where deptno>100) A join " +
                 "(select deptno, empid from " + EMPS_TABLE_NAME + " where deptno >200) B using (deptno);";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV, 2);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV, 2);
     }
 
     @Test
     public void testMultiMVMultiUsage() throws Exception {
-        String createEmpsMVSQL01 = "create materialized view emp_mv_01 as select deptno, empid, salary "
+        String createEmpsMVSql01 = "create materialized view emp_mv_01 as select deptno, empid, salary "
                 + "from " + EMPS_TABLE_NAME + " order by deptno;";
-        String createEmpsMVSQL02 = "create materialized view emp_mv_02 as select deptno, sum(salary) "
+        String createEmpsMVSql02 = "create materialized view emp_mv_02 as select deptno, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by deptno;";
         String query = "select * from (select deptno, empid from " + EMPS_TABLE_NAME + " where deptno>100) A join " +
                 "(select deptno, sum(salary) from " + EMPS_TABLE_NAME + " where deptno >200 group by deptno) B "
                 + "using (deptno);";
-        dorisAssert.withMaterializedView(createEmpsMVSQL01).withMaterializedView(createEmpsMVSQL02).query(query)
+        dorisAssert.withMaterializedView(createEmpsMVSql01).withMaterializedView(createEmpsMVSql02).query(query)
                 .explainContains("rollup: emp_mv_01", "rollup: emp_mv_02");
     }
 
     @Test
     public void testMVOnJoinQuery() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select salary, empid, deptno from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select salary, empid, deptno from " +
                 EMPS_TABLE_NAME + " order by salary;";
         String query = "select empid, salary from " + EMPS_TABLE_NAME + " join " + DEPTS_TABLE_NAME
                 + " using (deptno) where salary > 300;";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV,
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV,
                 QUERY_USE_DEPTS);
     }
 
     // TODO: should be support
     @Test
     public void testAggregateMVOnCountDistinctQuery1() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) "
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno, sum(salary) "
                 + "from " + EMPS_TABLE_NAME + " group by empid, deptno;";
         String query = "select deptno, count(distinct empid) from " + EMPS_TABLE_NAME + " group by deptno;";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testQueryAfterTrimingOfUnusedFields() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
                 EMPS_TABLE_NAME + " order by empid, deptno;";
         String query = "select empid, deptno from (select empid, deptno, salary from " + EMPS_TABLE_NAME + ") A;";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV);
     }
 
     @Test
     public void testUnionAll() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
                 EMPS_TABLE_NAME + " order by empid, deptno;";
         String query = "select empid, deptno from " + EMPS_TABLE_NAME + " where empid >1 union all select empid,"
                 + " deptno from " + EMPS_TABLE_NAME + " where empid <0;";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV, 2);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV, 2);
     }
 
     @Test
     public void testUnionDistinct() throws Exception {
-        String createEmpsMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
+        String createEmpsMVsql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from " +
                 EMPS_TABLE_NAME + " order by empid, deptno;";
         String query = "select empid, deptno from " + EMPS_TABLE_NAME + " where empid >1 union select empid," +
                 " deptno from " + EMPS_TABLE_NAME + " where empid <0;";
-        dorisAssert.withMaterializedView(createEmpsMVSQL).query(query).explainContains(QUERY_USE_EMPS_MV, 2);
+        dorisAssert.withMaterializedView(createEmpsMVsql).query(query).explainContains(QUERY_USE_EMPS_MV, 2);
     }
 
     @Test
@@ -695,9 +695,9 @@ public void testIncorrectMVRewriteInQuery() throws Exception {
         String createUserTagMVSql = "create materialized view " + USER_TAG_MV_NAME + " as select user_id, "
                 + "bitmap_union(to_bitmap(tag_id)) from " + USER_TAG_TABLE_NAME + " group by user_id;";
         dorisAssert.withMaterializedView(createUserTagMVSql);
-        String createEMPMVSQL = "create materialized view " + EMPS_MV_NAME + " as select name, deptno from " +
+        String createEmpMVSql = "create materialized view " + EMPS_MV_NAME + " as select name, deptno from " +
                 EMPS_TABLE_NAME + ";";
-        dorisAssert.withMaterializedView(createEMPMVSQL);
+        dorisAssert.withMaterializedView(createEmpMVSql);
         String query = "select user_name, bitmap_union_count(to_bitmap(tag_id)) a from " + USER_TAG_TABLE_NAME + ", "
                 + "(select name, deptno from " + EMPS_TABLE_NAME + ") a" + " where user_name=a.name group by "
                 + "user_name having a>1 order by a;";
@@ -802,9 +802,9 @@ public void testHLLUnionFamilyRewrite() throws Exception {
      */
     @Test
     public void testAggInHaving() throws Exception {
-        String createMVSQL = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from "
+        String createMVSql = "create materialized view " + EMPS_MV_NAME + " as select empid, deptno from "
                 + EMPS_TABLE_NAME + " group by empid, deptno;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         String query = "select empid from " + EMPS_TABLE_NAME + " group by empid having max(salary) > 1;";
         dorisAssert.query(query).explainWithout(QUERY_USE_EMPS_MV);
     }
@@ -823,10 +823,10 @@ public void testCountFieldInQuery() throws Exception {
 
     @Test
     public void testInvalidColumnInCreateMVStmt() throws Exception {
-        String createMVSQL = "create materialized view " + USER_TAG_MV_NAME + " as select invalid_column, user_id from "
+        String createMVSql = "create materialized view " + USER_TAG_MV_NAME + " as select invalid_column, user_id from "
                 + USER_TAG_TABLE_NAME + ";";
         try {
-            dorisAssert.withMaterializedView(createMVSQL);
+            dorisAssert.withMaterializedView(createMVSql);
             Assert.fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -842,10 +842,10 @@ public void testCreateMVBaseBitmapAggTable() throws Exception {
                 + "(partition p1 values less than MAXVALUE) "
                 + "distributed by hash(empid) buckets 3 properties('replication_num' = '1');";
         dorisAssert.withTable(createTableSQL);
-        String createMVSQL = "create materialized view mv as select empid, " + FunctionSet.BITMAP_UNION
+        String createMVSql = "create materialized view mv as select empid, " + FunctionSet.BITMAP_UNION
                 + "(salary) from agg_table "
                 + "group by empid;";
-        dorisAssert.withMaterializedView(createMVSQL);
+        dorisAssert.withMaterializedView(createMVSql);
         String query = "select count(distinct salary) from agg_table;";
         dorisAssert.query(query).explainContains("mv");
         dorisAssert.dropTable("agg_table", true);
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 7cc148064ef338..39aee63d0b7c1f 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
@@ -269,7 +269,7 @@ public void testSetOperation() throws Exception {
         stmtExecutor11.execute();
         Planner planner11 = stmtExecutor11.planner();
         SetOperationNode setNode11 = (SetOperationNode)(planner11.getFragments().get(1).getPlanRoot());
-        Assert.assertEquals(2, setNode11.getMaterializedConstExprLists_().size());
+        Assert.assertEquals(2, setNode11.getMaterializedConstExprLists().size());
 
         String sql12 = "SELECT a.x \n" +
                 "FROM (SELECT '01' x) a \n" +
@@ -281,7 +281,7 @@ public void testSetOperation() throws Exception {
         stmtExecutor12.execute();
         Planner planner12 = stmtExecutor12.planner();
         SetOperationNode setNode12 = (SetOperationNode)(planner12.getFragments().get(1).getPlanRoot());
-        Assert.assertEquals(2, setNode12.getMaterializedResultExprLists_().size());
+        Assert.assertEquals(2, setNode12.getMaterializedResultExprLists().size());
     }
 
     @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 a896dfc89989bc..767c7605683fef 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
@@ -136,7 +136,7 @@ public static void beforeClass() throws Exception {
     }
 
     @AfterClass
-    public static void TearDown() {
+    public static void tearDown() {
         UtFrameUtils.cleanDorisFeDir(runningDirBase);
     }
 
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 57d29b83c0f3f7..284ef2cc16c393 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
@@ -622,14 +622,14 @@ public void testGenerateRuntimeFiltersSize() {
 
         // Use ndv and fpp to calculate the minimum space required for bloom filter
         Assert.assertEquals(1L <<
-                RuntimeFilter.GetMinLogSpaceForBloomFilter(1000000, 0.05), 1048576);
+                RuntimeFilter.getMinLogSpaceForBloomFilter(1000000, 0.05), 1048576);
         Assert.assertEquals(1L <<
-                RuntimeFilter.GetMinLogSpaceForBloomFilter(1000000, 0.1), 1048576);
+                RuntimeFilter.getMinLogSpaceForBloomFilter(1000000, 0.1), 1048576);
         Assert.assertEquals(1L <<
-                RuntimeFilter.GetMinLogSpaceForBloomFilter(1000000, 0.3), 524288);
+                RuntimeFilter.getMinLogSpaceForBloomFilter(1000000, 0.3), 524288);
         Assert.assertEquals(1L <<
-                RuntimeFilter.GetMinLogSpaceForBloomFilter(10000000, 0.1), 8388608);
+                RuntimeFilter.getMinLogSpaceForBloomFilter(10000000, 0.1), 8388608);
         Assert.assertEquals(1L <<
-                RuntimeFilter.GetMinLogSpaceForBloomFilter(1000, 0.1), 1024);
+                RuntimeFilter.getMinLogSpaceForBloomFilter(1000, 0.1), 1024);
     }
 }
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 ac36efdba5f1ab..8af6745f907da8 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
@@ -45,8 +45,8 @@
 
 public class UpdatePlannerTest {
 
-    private final IdGenerator<TupleId> tupleIdGenerator_ = TupleId.createGenerator();
-    private final IdGenerator<SlotId> slotIdGenerator_ = SlotId.createGenerator();
+    private final IdGenerator<TupleId> tupleIdGenerator = TupleId.createGenerator();
+    private final IdGenerator<SlotId> slotIdGenerator = SlotId.createGenerator();
 
     /**
      * Full columns: k1, k2 v1, shadow_column
@@ -59,7 +59,7 @@ public void testComputeOutputExprsWithShadowColumnAndSetExpr(@Injectable OlapTab
                                                                  @Injectable Column k1,
                                                                  @Injectable Column k2,
                                                                  @Injectable Column v1,
-                                                                 @Injectable Column shadow_v1,
+                                                                 @Injectable Column shadowV1,
                                                                  @Injectable Analyzer analyzer) {
         List<Expr> setExprs = Lists.newArrayList();
         TableName tableName = new TableName(null, "test");
@@ -68,21 +68,21 @@ public void testComputeOutputExprsWithShadowColumnAndSetExpr(@Injectable OlapTab
         BinaryPredicate binaryPredicate = new BinaryPredicate(BinaryPredicate.Operator.EQ,
                 slotRef, intLiteral);
         setExprs.add(binaryPredicate);
-        TupleDescriptor srcTupleDesc = new TupleDescriptor(tupleIdGenerator_.getNextId());
-        SlotDescriptor k1SlotDesc = new SlotDescriptor(slotIdGenerator_.getNextId(), srcTupleDesc);
+        TupleDescriptor srcTupleDesc = new TupleDescriptor(tupleIdGenerator.getNextId());
+        SlotDescriptor k1SlotDesc = new SlotDescriptor(slotIdGenerator.getNextId(), srcTupleDesc);
         k1SlotDesc.setColumn(k1);
         srcTupleDesc.addSlot(k1SlotDesc);
-        SlotDescriptor k2SlotDesc = new SlotDescriptor(slotIdGenerator_.getNextId(), srcTupleDesc);
+        SlotDescriptor k2SlotDesc = new SlotDescriptor(slotIdGenerator.getNextId(), srcTupleDesc);
         k2SlotDesc.setColumn(k2);
         srcTupleDesc.addSlot(k2SlotDesc);
-        SlotDescriptor v1SlotDesc = new SlotDescriptor(slotIdGenerator_.getNextId(), srcTupleDesc);
+        SlotDescriptor v1SlotDesc = new SlotDescriptor(slotIdGenerator.getNextId(), srcTupleDesc);
         v1SlotDesc.setColumn(v1);
         srcTupleDesc.addSlot(v1SlotDesc);
         List<Column> fullSchema = Lists.newArrayList();
         fullSchema.add(k1);
         fullSchema.add(k2);
         fullSchema.add(v1);
-        fullSchema.add(shadow_v1);
+        fullSchema.add(shadowV1);
 
         new Expectations(){
             {
@@ -94,7 +94,7 @@ public void testComputeOutputExprsWithShadowColumnAndSetExpr(@Injectable OlapTab
                 result = "k2";
                 v1.getName();
                 result = "v1";
-                shadow_v1.getName();
+                shadowV1.getName();
                 result = SchemaChangeHandler.SHADOW_NAME_PRFIX + "v1";
             }
         };
@@ -121,7 +121,7 @@ public void testNewColumnBySchemaChange(@Injectable OlapTable targetTable,
                                             @Injectable Column k1,
                                             @Injectable Column k2,
                                             @Injectable Column v1,
-                                            @Injectable Column new_v2,
+                                            @Injectable Column newV2,
                                             @Injectable Analyzer analyzer) throws AnalysisException {
         List<Expr> setExprs = Lists.newArrayList();
         TableName tableName = new TableName(null, "test");
@@ -130,21 +130,21 @@ public void testNewColumnBySchemaChange(@Injectable OlapTable targetTable,
         BinaryPredicate binaryPredicate = new BinaryPredicate(BinaryPredicate.Operator.EQ,
                 slotRef, intLiteral);
         setExprs.add(binaryPredicate);
-        TupleDescriptor srcTupleDesc = new TupleDescriptor(tupleIdGenerator_.getNextId());
-        SlotDescriptor k1SlotDesc = new SlotDescriptor(slotIdGenerator_.getNextId(), srcTupleDesc);
+        TupleDescriptor srcTupleDesc = new TupleDescriptor(tupleIdGenerator.getNextId());
+        SlotDescriptor k1SlotDesc = new SlotDescriptor(slotIdGenerator.getNextId(), srcTupleDesc);
         k1SlotDesc.setColumn(k1);
         srcTupleDesc.addSlot(k1SlotDesc);
-        SlotDescriptor k2SlotDesc = new SlotDescriptor(slotIdGenerator_.getNextId(), srcTupleDesc);
+        SlotDescriptor k2SlotDesc = new SlotDescriptor(slotIdGenerator.getNextId(), srcTupleDesc);
         k2SlotDesc.setColumn(k2);
         srcTupleDesc.addSlot(k2SlotDesc);
-        SlotDescriptor v1SlotDesc = new SlotDescriptor(slotIdGenerator_.getNextId(), srcTupleDesc);
+        SlotDescriptor v1SlotDesc = new SlotDescriptor(slotIdGenerator.getNextId(), srcTupleDesc);
         v1SlotDesc.setColumn(v1);
         srcTupleDesc.addSlot(v1SlotDesc);
         List<Column> fullSchema = Lists.newArrayList();
         fullSchema.add(k1);
         fullSchema.add(k2);
         fullSchema.add(v1);
-        fullSchema.add(new_v2);
+        fullSchema.add(newV2);
 
         new Expectations(){
             {
@@ -156,11 +156,11 @@ public void testNewColumnBySchemaChange(@Injectable OlapTable targetTable,
                 result = "k2";
                 v1.getName();
                 result = "v1";
-                new_v2.getName();
+                newV2.getName();
                 result = "v2";
-                new_v2.getDefaultValue();
+                newV2.getDefaultValue();
                 result = "1";
-                new_v2.getDefaultValueExpr();
+                newV2.getDefaultValueExpr();
                 result = new IntLiteral(1);
             }
         };
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 8154bedea6fe82..37dd235740317b 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
@@ -107,13 +107,13 @@ public void testComputeColocateJoinInstanceParam()  {
         // 2. set bucketSeqToScanRange in coordinator
         Map<PlanFragmentId, BucketSeqToScanRange> fragmentIdBucketSeqToScanRangeMap = new HashMap<>();
         BucketSeqToScanRange bucketSeqToScanRange = new BucketSeqToScanRange();
-        Map<Integer, List<TScanRangeParams>> ScanRangeMap = new HashMap<>();
+        Map<Integer, List<TScanRangeParams>> scanRangeMap = new HashMap<>();
         List<TScanRangeParams> scanRangeParamsList = new ArrayList<>();
         scanRangeParamsList.add(new TScanRangeParams());
 
-        ScanRangeMap.put(scanNodeId, scanRangeParamsList);
+        scanRangeMap.put(scanNodeId, scanRangeParamsList);
         for (int i = 0; i < 3; i++) {
-            bucketSeqToScanRange.put(i, ScanRangeMap);
+            bucketSeqToScanRange.put(i, scanRangeMap);
         }
         fragmentIdBucketSeqToScanRangeMap.put(planFragmentId, bucketSeqToScanRange);
         Deencapsulation.setField(coordinator, "fragmentIdTobucketSeqToScanRangeMap", fragmentIdBucketSeqToScanRangeMap);
@@ -299,10 +299,10 @@ public void testColocateJoinAssignment()  {
         // 2. set bucketSeqToScanRange in coordinator
         Map<PlanFragmentId, BucketSeqToScanRange> fragmentIdBucketSeqToScanRangeMap = new HashMap<>();
         BucketSeqToScanRange bucketSeqToScanRange = new BucketSeqToScanRange();
-        Map<Integer, List<TScanRangeParams>> ScanRangeMap = new HashMap<>();
-        ScanRangeMap.put(scanNodeId, new ArrayList<>());
+        Map<Integer, List<TScanRangeParams>> scanRangeMap = new HashMap<>();
+        scanRangeMap.put(scanNodeId, new ArrayList<>());
         for (int i = 0; i < 3; i++) {
-            bucketSeqToScanRange.put(i, ScanRangeMap);
+            bucketSeqToScanRange.put(i, scanRangeMap);
         }
         fragmentIdBucketSeqToScanRangeMap.put(planFragmentId, bucketSeqToScanRange);
         Deencapsulation.setField(coordinator, "fragmentIdTobucketSeqToScanRangeMap", fragmentIdBucketSeqToScanRangeMap);
@@ -425,10 +425,10 @@ public void testComputeBucketShuffleJoinInstanceParam()  {
         // 2. set bucketSeqToScanRange in bucketShuffleJoinController
         Map<PlanFragmentId, BucketSeqToScanRange> fragmentIdBucketSeqToScanRangeMap = new HashMap<>();
         BucketSeqToScanRange bucketSeqToScanRange = new BucketSeqToScanRange();
-        Map<Integer, List<TScanRangeParams>> ScanRangeMap = new HashMap<>();
-        ScanRangeMap.put(scanNodeId, new ArrayList<>());
+        Map<Integer, List<TScanRangeParams>> scanRangeMap = new HashMap<>();
+        scanRangeMap.put(scanNodeId, new ArrayList<>());
         for (int i = 0; i < 3; i++) {
-            bucketSeqToScanRange.put(i, ScanRangeMap);
+            bucketSeqToScanRange.put(i, scanRangeMap);
         }
         fragmentIdBucketSeqToScanRangeMap.put(planFragmentId, bucketSeqToScanRange);
         Deencapsulation.setField(bucketShuffleJoinController, "fragmentIdBucketSeqToScanRangeMap", fragmentIdBucketSeqToScanRangeMap);
@@ -481,10 +481,10 @@ public void testBucketShuffleAssignment()  {
         // 2. set bucketSeqToScanRange in bucketShuffleJoinController
         Map<PlanFragmentId, BucketSeqToScanRange> fragmentIdBucketSeqToScanRangeMap = new HashMap<>();
         BucketSeqToScanRange bucketSeqToScanRange = new BucketSeqToScanRange();
-        Map<Integer, List<TScanRangeParams>> ScanRangeMap = new HashMap<>();
-        ScanRangeMap.put(scanNodeId, new ArrayList<>());
+        Map<Integer, List<TScanRangeParams>> scanRangeMap = new HashMap<>();
+        scanRangeMap.put(scanNodeId, new ArrayList<>());
         for (int i = 0; i < 3; i++) {
-            bucketSeqToScanRange.put(i, ScanRangeMap);
+            bucketSeqToScanRange.put(i, scanRangeMap);
         }
         fragmentIdBucketSeqToScanRangeMap.put(planFragmentId, bucketSeqToScanRange);
         Deencapsulation.setField(bucketShuffleJoinController, "fragmentIdBucketSeqToScanRangeMap", fragmentIdBucketSeqToScanRangeMap);
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 39edf3f7342421..a26ceb9643ba36 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
@@ -302,9 +302,9 @@ private OlapTable createOrderTable() {
         short shortKeyColumnCount = 1;
         table.setIndexMeta(10001, "group1", columns, 1, 1, shortKeyColumnCount, TStorageType.COLUMN, KeysType.DUP_KEYS);
 
-        List<Column> idx_columns = Lists.newArrayList();
-        idx_columns.add(column1);
-        table.setIndexMeta(new Long(1), "test", idx_columns, 1, 1, shortKeyColumnCount, TStorageType.COLUMN,
+        List<Column> idxColumns = Lists.newArrayList();
+        idxColumns.add(column1);
+        table.setIndexMeta(1L, "test", idxColumns, 1, 1, shortKeyColumnCount, TStorageType.COLUMN,
                 KeysType.DUP_KEYS);
         Deencapsulation.setField(table, "baseIndexId", 1000);
 
@@ -367,9 +367,9 @@ private OlapTable createProfileTable() {
         short shortKeyColumnCount = 1;
         table.setIndexMeta(20001, "group1", columns, 1, 1, shortKeyColumnCount, TStorageType.COLUMN, KeysType.AGG_KEYS);
 
-        List<Column> idx_columns = Lists.newArrayList();
-        idx_columns.add(column2);
-        table.setIndexMeta(new Long(2), "test", idx_columns, 1, 1, shortKeyColumnCount, TStorageType.COLUMN,
+        List<Column> idxColumns = Lists.newArrayList();
+        idxColumns.add(column2);
+        table.setIndexMeta(2L, "test", idxColumns, 1, 1, shortKeyColumnCount, TStorageType.COLUMN,
                 KeysType.AGG_KEYS);
 
         Deencapsulation.setField(table, "baseIndexId", 1000);
@@ -501,7 +501,7 @@ private StatementBase parseSql(String sql) {
     public void testCacheNode() throws Exception {
         Catalog.getCurrentSystemInfo();
         CacheCoordinator cp = CacheCoordinator.getInstance();
-        cp.DebugModel = true;
+        cp.debugModel = true;
         Backend bd1 = new Backend(1, "", 1000);
         bd1.updateOnce(0, 0, 0);
         Backend bd2 = new Backend(2, "", 2000);
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 d5ad913df6639b..32748f8fca6caa 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
@@ -39,13 +39,13 @@ public void testQueryDetailQueue() {
         Assert.assertTrue(queryDetails.size() == 1);
 
         Gson gson = new Gson();
-        String json_string = gson.toJson(queryDetails);
-        String query_detail_string = "[{\"eventTime\":1592208814796,"
+        String jsonString = gson.toJson(queryDetails);
+        String queryDetailString = "[{\"eventTime\":1592208814796,"
                                      + "\"queryId\":\"219a2d5443c542d4-8fc938db37c892e3\","
                                      + "\"startTime\":1592208814796,\"endTime\":-1,\"latency\":-1,"
                                      + "\"state\":\"RUNNING\",\"database\":\"testDb\","
                                      + "\"sql\":\"select * from table1 limit 1\"}]";
-        Assert.assertEquals(json_string, query_detail_string);
+        Assert.assertEquals(jsonString, queryDetailString);
 
         queryDetail.setEventTime(eventTime + 1);
         queryDetail.setEndTime(eventTime + 1);
@@ -56,12 +56,12 @@ public void testQueryDetailQueue() {
         queryDetails = QueryDetailQueue.getQueryDetails(eventTime);
         Assert.assertTrue(queryDetails.size() == 1);
 
-        json_string = gson.toJson(queryDetails);
-        query_detail_string = "[{\"eventTime\":1592208814797,"
+        jsonString = gson.toJson(queryDetails);
+        queryDetailString = "[{\"eventTime\":1592208814797,"
                               + "\"queryId\":\"219a2d5443c542d4-8fc938db37c892e3\","
                               + "\"startTime\":1592208814796,\"endTime\":1592208814797,"
                               + "\"latency\":1,\"state\":\"FINISHED\",\"database\":\"testDb\","
                               + "\"sql\":\"select * from table1 limit 1\"}]";
-        Assert.assertEquals(json_string, query_detail_string);
+        Assert.assertEquals(jsonString, queryDetailString);
     }
 }
diff --git a/fe/fe-core/src/test/java/org/apache/doris/service/ExecuteEnvTest.java b/fe/fe-core/src/test/java/org/apache/doris/service/ExecuteEnvTest.java
index fe1851b1c237d0..768a3c556a94ff 100755
--- a/fe/fe-core/src/test/java/org/apache/doris/service/ExecuteEnvTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/service/ExecuteEnvTest.java
@@ -24,13 +24,13 @@
 import java.util.Set;
 
 public class ExecuteEnvTest {
-    int THREAD_MAX_NUM = 10;
-    int[] oids = new int[THREAD_MAX_NUM];
+    int threadMaxNum = 10;
+    int[] oids = new int[threadMaxNum];
 
     @Test
     public void testGetInstance() {
         Set<Thread> tds = new HashSet<Thread>();
-        for (int i = 0 ;i < THREAD_MAX_NUM; i++) {
+        for (int i = 0 ;i < threadMaxNum; i++) {
             Thread td = new Thread(new MyTest(i, oids));
             tds.add(td);
             td.start();
@@ -43,7 +43,7 @@ public void testGetInstance() {
                 e.printStackTrace();
             }
         }
-        for (int i = 1; i < THREAD_MAX_NUM; i++) {
+        for (int i = 1; i < threadMaxNum; i++) {
             Assert.assertEquals(oids[i-1], oids[i]);
         }
     }
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 7d8abf1a811296..4935d69864972a 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
@@ -80,7 +80,7 @@ public void setUp() throws InstantiationException, IllegalAccessException, Illeg
     }
 
     public Map<String, Long> addTransactionToTransactionMgr() throws UserException {
-        Map<String, Long> LabelToTxnId = Maps.newHashMap();
+        Map<String, Long> labelToTxnId = Maps.newHashMap();
         FakeCatalog.setCatalog(masterCatalog);
         long transactionId1 = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1, Lists.newArrayList(CatalogTestUtil.testTableId1),
                 CatalogTestUtil.testTxnLabel1,
@@ -100,7 +100,7 @@ public Map<String, Long> addTransactionToTransactionMgr() throws UserException {
         Table testTable1 = masterCatalog.getDbOrMetaException(CatalogTestUtil.testDbId1).getTableOrMetaException(CatalogTestUtil.testTableId1);
         masterTransMgr.commitTransaction(CatalogTestUtil.testDbId1, Lists.newArrayList(testTable1), transactionId1, transTablets);
         masterTransMgr.finishTransaction(CatalogTestUtil.testDbId1, transactionId1, null);
-        LabelToTxnId.put(CatalogTestUtil.testTxnLabel1, transactionId1);
+        labelToTxnId.put(CatalogTestUtil.testTxnLabel1, transactionId1);
 
         TransactionState.TxnCoordinator beTransactionSource = new TransactionState.TxnCoordinator(TransactionState.TxnSourceType.BE, "be1");
         long transactionId2 = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1, Lists.newArrayList(CatalogTestUtil.testTableId1),
@@ -115,15 +115,15 @@ public Map<String, Long> addTransactionToTransactionMgr() throws UserException {
                 CatalogTestUtil.testTxnLabel4,
                 beTransactionSource,
                 TransactionState.LoadJobSourceType.BACKEND_STREAMING, Config.stream_load_default_timeout_second);
-        LabelToTxnId.put(CatalogTestUtil.testTxnLabel2, transactionId2);
-        LabelToTxnId.put(CatalogTestUtil.testTxnLabel3, transactionId3);
-        LabelToTxnId.put(CatalogTestUtil.testTxnLabel4, transactionId4);
+        labelToTxnId.put(CatalogTestUtil.testTxnLabel2, transactionId2);
+        labelToTxnId.put(CatalogTestUtil.testTxnLabel3, transactionId3);
+        labelToTxnId.put(CatalogTestUtil.testTxnLabel4, transactionId4);
 
         TransactionState transactionState1 = fakeEditLog.getTransaction(transactionId1);
 
         FakeCatalog.setCatalog(slaveCatalog);
         slaveTransMgr.replayUpsertTransactionState(transactionState1);
-        return LabelToTxnId;
+        return labelToTxnId;
     }
 
     @Test
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 643c270975a494..321883893bd6d6 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
@@ -31,7 +31,7 @@ public final class FakeTransactionIDGenerator extends MockUp<TransactionIdGenera
     private long currentId = 1000L;
 
     @Mock
-    public void $init() {
+    public void $init() { // CHECKSTYLE IGNORE THIS LINE
         // do nothing
     }
 
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 41ea13e9057c57..788dd109d605f7 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
@@ -72,7 +72,7 @@ public static void beforeClass() throws EnvVarNotSetException, IOException,
     }
 
     @AfterClass
-    public static void TearDown() {
+    public static void tearDown() {
         UtFrameUtils.cleanDorisFeDir(runningDir);
     }
 
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 feec2e020adcbe..0460d19e7b100a 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
@@ -117,7 +117,7 @@ public static void beforeClass() throws EnvVarNotSetException, IOException,
     }
 
     @AfterClass
-    public static void TearDown() {
+    public static void tearDown() {
         UtFrameUtils.cleanDorisFeDir(runningDirBase);
     }
 
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 928c79a19350e3..13dcc36f65d2d9 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
@@ -116,7 +116,7 @@ public DefaultHeartbeatServiceImpl(int beThriftPort, int beHttpPort, int beBrpcP
         }
 
         @Override
-        public THeartbeatResult heartbeat(TMasterInfo master_info) throws TException {
+        public THeartbeatResult heartbeat(TMasterInfo masterInfo) throws TException {
             TBackendInfo backendInfo = new TBackendInfo(beThriftPort, beHttpPort);
             backendInfo.setBrpcPort(beBrpcPort);
             THeartbeatResult result = new THeartbeatResult(new TStatus(TStatusCode.OK), backendInfo);
@@ -230,12 +230,12 @@ public TAgentResult submitTasks(List<TAgentTaskRequest> tasks) throws TException
         }
 
         @Override
-        public TAgentResult makeSnapshot(TSnapshotRequest snapshot_request) throws TException {
+        public TAgentResult makeSnapshot(TSnapshotRequest snapshotRequest) throws TException {
             return new TAgentResult(new TStatus(TStatusCode.OK));
         }
 
         @Override
-        public TAgentResult releaseSnapshot(String snapshot_path) throws TException {
+        public TAgentResult releaseSnapshot(String snapshotPath) throws TException {
             return new TAgentResult(new TStatus(TStatusCode.OK));
         }
 
@@ -265,12 +265,12 @@ public TStatus submitExportTask(TExportTaskRequest request) throws TException {
         }
 
         @Override
-        public TExportStatusResult getExportStatus(TUniqueId task_id) throws TException {
+        public TExportStatusResult getExportStatus(TUniqueId taskId) throws TException {
             return new TExportStatusResult(new TStatus(TStatusCode.OK), TExportState.FINISHED);
         }
 
         @Override
-        public TStatus eraseExportTask(TUniqueId task_id) throws TException {
+        public TStatus eraseExportTask(TUniqueId taskId) throws TException {
             return new TStatus(TStatusCode.OK);
         }
 
@@ -310,7 +310,7 @@ public TScanCloseResult closeScanner(TScanCloseParams params) throws TException
         }
 
         @Override
-        public TStreamLoadRecordResult getStreamLoadRecord(long last_stream_record_time) throws TException {
+        public TStreamLoadRecordResult getStreamLoadRecord(long lastStreamRecordTime) throws TException {
             return new TStreamLoadRecordResult(Maps.newHashMap());
         }
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
index 62c9ed44b01496..65357d41fb6457 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
@@ -198,23 +198,23 @@ protected int startFEServer(String runningDir) throws EnvVarNotSetException, IOE
             file.mkdir();
         }
 
-        int fe_http_port = findValidPort();
-        int fe_rpc_port = findValidPort();
-        int fe_query_port = findValidPort();
-        int fe_edit_log_port = findValidPort();
+        int feHttpPort = findValidPort();
+        int feRpcPort = findValidPort();
+        int feQueryPort = findValidPort();
+        int feEditLogPort = findValidPort();
 
         // start fe in "DORIS_HOME/fe/mocked/"
         MockedFrontend frontend = MockedFrontend.getInstance();
         Map<String, String> feConfMap = Maps.newHashMap();
         // set additional fe config
-        feConfMap.put("http_port", String.valueOf(fe_http_port));
-        feConfMap.put("rpc_port", String.valueOf(fe_rpc_port));
-        feConfMap.put("query_port", String.valueOf(fe_query_port));
-        feConfMap.put("edit_log_port", String.valueOf(fe_edit_log_port));
+        feConfMap.put("http_port", String.valueOf(feHttpPort));
+        feConfMap.put("rpc_port", String.valueOf(feRpcPort));
+        feConfMap.put("query_port", String.valueOf(feQueryPort));
+        feConfMap.put("edit_log_port", String.valueOf(feEditLogPort));
         feConfMap.put("tablet_create_timeout_second", "10");
         frontend.init(dorisHome + "/" + runningDir, feConfMap);
         frontend.start(new String[0]);
-        return fe_rpc_port;
+        return feRpcPort;
     }
 
     protected void createDorisCluster()
@@ -226,9 +226,9 @@ protected void createDorisCluster()
     protected void createDorisCluster(String runningDir, int backendNum)
             throws EnvVarNotSetException, IOException, FeStartException,
             NotInitException, DdlException, InterruptedException {
-        int fe_rpc_port = startFEServer(runningDir);
+        int feRpcPort = startFEServer(runningDir);
         for (int i = 0; i < backendNum; i++) {
-            createBackend("127.0.0.1", fe_rpc_port);
+            createBackend("127.0.0.1", feRpcPort);
             // sleep to wait first heartbeat
             Thread.sleep(6000);
         }
@@ -242,28 +242,28 @@ protected void createDorisClusterWithMultiTag(String runningDir,
             DdlException, InterruptedException {
         // set runningUnitTest to true, so that for ut, the agent task will be send to "127.0.0.1" to make cluster running well.
         FeConstants.runningUnitTest = true;
-        int fe_rpc_port = startFEServer(runningDir);
+        int feRpcPort = startFEServer(runningDir);
         for (int i = 0; i < backendNum; i++) {
             String host = "127.0.0." + (i + 1);
-            createBackend(host, fe_rpc_port);
+            createBackend(host, feRpcPort);
         }
         // sleep to wait first heartbeat
         Thread.sleep(6000);
     }
 
-    protected void createBackend(String beHost, int fe_rpc_port)
+    protected void createBackend(String beHost, int feRpcPort)
             throws IOException, InterruptedException {
-        int be_heartbeat_port = findValidPort();
-        int be_thrift_port = findValidPort();
-        int be_brpc_port = findValidPort();
-        int be_http_port = findValidPort();
+        int beHeartbeatPort = findValidPort();
+        int beThriftPort = findValidPort();
+        int beBrpcPort = findValidPort();
+        int beHttpPort = findValidPort();
 
         // start be
         MockedBackend backend = MockedBackendFactory.createBackend(beHost,
-                be_heartbeat_port, be_thrift_port, be_brpc_port, be_http_port,
-                new DefaultHeartbeatServiceImpl(be_thrift_port, be_http_port, be_brpc_port),
+                beHeartbeatPort, beThriftPort, beBrpcPort, beHttpPort,
+                new DefaultHeartbeatServiceImpl(beThriftPort, beHttpPort, beBrpcPort),
                 new DefaultBeThriftServiceImpl(), new DefaultPBackendServiceImpl());
-        backend.setFeAddress(new TNetworkAddress("127.0.0.1", fe_rpc_port));
+        backend.setFeAddress(new TNetworkAddress("127.0.0.1", feRpcPort));
         backend.start();
 
         // add be
@@ -278,9 +278,9 @@ protected void createBackend(String beHost, int fe_rpc_port)
         be.setDisks(ImmutableMap.copyOf(disks));
         be.setAlive(true);
         be.setOwnerClusterName(SystemInfoService.DEFAULT_CLUSTER);
-        be.setBePort(be_thrift_port);
-        be.setHttpPort(be_http_port);
-        be.setBrpcPort(be_brpc_port);
+        be.setBePort(beThriftPort);
+        be.setHttpPort(beHttpPort);
+        be.setBrpcPort(beBrpcPort);
         Catalog.getCurrentSystemInfo().addBackend(be);
     }
 
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 739947bd704e63..b13b19a60b5370 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
@@ -157,23 +157,23 @@ public static int startFEServer(String runningDir) throws EnvVarNotSetException,
             file.mkdir();
         }
 
-        int fe_http_port = findValidPort();
-        int fe_rpc_port = findValidPort();
-        int fe_query_port = findValidPort();
-        int fe_edit_log_port = findValidPort();
+        int feHttpPort = findValidPort();
+        int feRpcPort = findValidPort();
+        int feQueryPort = findValidPort();
+        int feEditLogPort = findValidPort();
 
         // start fe in "DORIS_HOME/fe/mocked/"
         MockedFrontend frontend = MockedFrontend.getInstance();
         Map<String, String> feConfMap = Maps.newHashMap();
         // set additional fe config
-        feConfMap.put("http_port", String.valueOf(fe_http_port));
-        feConfMap.put("rpc_port", String.valueOf(fe_rpc_port));
-        feConfMap.put("query_port", String.valueOf(fe_query_port));
-        feConfMap.put("edit_log_port", String.valueOf(fe_edit_log_port));
+        feConfMap.put("http_port", String.valueOf(feHttpPort));
+        feConfMap.put("rpc_port", String.valueOf(feRpcPort));
+        feConfMap.put("query_port", String.valueOf(feQueryPort));
+        feConfMap.put("edit_log_port", String.valueOf(feEditLogPort));
         feConfMap.put("tablet_create_timeout_second", "10");
         frontend.init(dorisHome + "/" + runningDir, feConfMap);
         frontend.start(new String[0]);
-        return fe_rpc_port;
+        return feRpcPort;
     }
 
     public static void createDorisCluster(String runningDir) throws InterruptedException, NotInitException,
@@ -183,9 +183,9 @@ public static void createDorisCluster(String runningDir) throws InterruptedExcep
 
     public static void createDorisCluster(String runningDir, int backendNum) throws EnvVarNotSetException, IOException,
             FeStartException, NotInitException, DdlException, InterruptedException {
-        int fe_rpc_port = startFEServer(runningDir);
+        int feRpcPort = startFEServer(runningDir);
         for (int i = 0; i < backendNum; i++) {
-            createBackend("127.0.0.1", fe_rpc_port);
+            createBackend("127.0.0.1", feRpcPort);
             // sleep to wait first heartbeat
             Thread.sleep(6000);
         }
@@ -197,27 +197,27 @@ public static void createDorisClusterWithMultiTag(String runningDir, int backend
             FeStartException, NotInitException, DdlException, InterruptedException {
         // set runningUnitTest to true, so that for ut, the agent task will be send to "127.0.0.1" to make cluster running well.
         FeConstants.runningUnitTest = true;
-        int fe_rpc_port = startFEServer(runningDir);
+        int feRpcPort = startFEServer(runningDir);
         for (int i = 0; i < backendNum; i++) {
             String host = "127.0.0." + (i + 1);
-            createBackend(host, fe_rpc_port);
+            createBackend(host, feRpcPort);
         }
         // sleep to wait first heartbeat
         Thread.sleep(6000);
     }
 
-    public static void createBackend(String beHost, int fe_rpc_port) throws IOException, InterruptedException {
-        int be_heartbeat_port = findValidPort();
-        int be_thrift_port = findValidPort();
-        int be_brpc_port = findValidPort();
-        int be_http_port = findValidPort();
+    public static void createBackend(String beHost, int feRpcPort) throws IOException, InterruptedException {
+        int beHeartbeatPort = findValidPort();
+        int beThriftPort = findValidPort();
+        int beBrpcPort = findValidPort();
+        int beHttpPort = findValidPort();
 
         // start be
         MockedBackend backend = MockedBackendFactory.createBackend(beHost,
-                be_heartbeat_port, be_thrift_port, be_brpc_port, be_http_port,
-                new DefaultHeartbeatServiceImpl(be_thrift_port, be_http_port, be_brpc_port),
+                beHeartbeatPort, beThriftPort, beBrpcPort, beHttpPort,
+                new DefaultHeartbeatServiceImpl(beThriftPort, beHttpPort, beBrpcPort),
                 new DefaultBeThriftServiceImpl(), new DefaultPBackendServiceImpl());
-        backend.setFeAddress(new TNetworkAddress("127.0.0.1", fe_rpc_port));
+        backend.setFeAddress(new TNetworkAddress("127.0.0.1", feRpcPort));
         backend.start();
 
         // add be
@@ -231,9 +231,9 @@ public static void createBackend(String beHost, int fe_rpc_port) throws IOExcept
         be.setDisks(ImmutableMap.copyOf(disks));
         be.setAlive(true);
         be.setOwnerClusterName(SystemInfoService.DEFAULT_CLUSTER);
-        be.setBePort(be_thrift_port);
-        be.setHttpPort(be_http_port);
-        be.setBrpcPort(be_brpc_port);
+        be.setBePort(beThriftPort);
+        be.setHttpPort(beHttpPort);
+        be.setBrpcPort(beBrpcPort);
         Catalog.getCurrentSystemInfo().addBackend(be);
     }
 
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 201ae33285c16b..932695057cd789 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
@@ -49,39 +49,39 @@ public class UdfExecutor {
     private final static TBinaryProtocol.Factory PROTOCOL_FACTORY =
             new TBinaryProtocol.Factory();
 
-    private Object udf_;
+    private Object udf;
     // setup by init() and cleared by close()
-    private Method method_;
+    private Method method;
     // setup by init() and cleared by close()
-    private URLClassLoader classLoader_;
+    private URLClassLoader classLoader;
 
     // Return and argument types of the function inferred from the udf method signature.
     // The JavaUdfDataType enum maps it to corresponding primitive type.
-    private JavaUdfDataType[] argTypes_;
-    private JavaUdfDataType retType_;
+    private JavaUdfDataType[] argTypes;
+    private JavaUdfDataType retType;
 
     // Input buffer from the backend. This is valid for the duration of an evaluate() call.
     // These buffers are allocated in the BE.
-    private final long inputBufferPtrs_;
-    private final long inputNullsPtrs_;
-    private final long inputOffsetsPtrs_;
+    private final long inputBufferPtrs;
+    private final long inputNullsPtrs;
+    private final long inputOffsetsPtrs;
 
     // Output buffer to return non-string values. These buffers are allocated in the BE.
-    private final long outputBufferPtr_;
-    private final long outputNullPtr_;
-    private final long outputOffsetsPtr_;
-    private final long outputIntermediateStatePtr_;
+    private final long outputBufferPtr;
+    private final long outputNullPtr;
+    private final long outputOffsetsPtr;
+    private final long outputIntermediateStatePtr;
 
     // Pre-constructed input objects for the UDF. This minimizes object creation overhead
     // as these objects are reused across calls to evaluate().
-    private Object[] inputObjects_;
+    private Object[] inputObjects;
     // inputArgs_[i] is either inputObjects_[i] or null
-    private Object[] inputArgs_;
+    private Object[] inputArgs;
 
-    private long outputOffset_;
-    private long row_idx_;
+    private long outputOffset;
+    private long rowIdx;
 
-    private final long batch_size_ptr_;
+    private final long batchSizePtr;
 
     // Data types that are supported as return or argument types in Java UDFs.
     public enum JavaUdfDataType {
@@ -97,27 +97,27 @@ public enum JavaUdfDataType {
         VARCHAR("VARCHAR", TPrimitiveType.VARCHAR, 0),
         STRING("STRING", TPrimitiveType.STRING, 0);
 
-        private final String description_;
-        private final TPrimitiveType thriftType_;
-        private final int len_;
+        private final String description;
+        private final TPrimitiveType thriftType;
+        private final int len;
 
         JavaUdfDataType(String description, TPrimitiveType thriftType, int len) {
-            description_ = description;
-            thriftType_ = thriftType;
-            len_ = len;
+            this.description = description;
+            this.thriftType = thriftType;
+            this.len = len;
         }
 
         @Override
         public String toString() {
-            return description_;
+            return description;
         }
 
         public TPrimitiveType getPrimitiveType() {
-            return thriftType_;
+            return thriftType;
         }
 
         public int getLen() {
-            return len_;
+            return len;
         }
 
         public static JavaUdfDataType getType(Class<?> c) {
@@ -145,7 +145,9 @@ public static JavaUdfDataType getType(Class<?> c) {
 
         public static boolean isSupported(Type t) {
             for (JavaUdfDataType javaType : JavaUdfDataType.values()) {
-                if (javaType == JavaUdfDataType.INVALID_TYPE) continue;
+                if (javaType == JavaUdfDataType.INVALID_TYPE) {
+                    continue;
+                }
                 if (javaType.getPrimitiveType() == t.getPrimitiveType().toThrift()) {
                     return true;
                 }
@@ -175,35 +177,37 @@ public UdfExecutor(byte[] thriftParams) throws Exception {
         for (int i = 0; i < request.fn.arg_types.size(); ++i) {
             parameterTypes[i] = Type.fromThrift(request.fn.arg_types.get(i));
         }
-        batch_size_ptr_ = request.batch_size_ptr;
-        inputBufferPtrs_ = request.input_buffer_ptrs;
-        inputNullsPtrs_ = request.input_nulls_ptrs;
-        inputOffsetsPtrs_ = request.input_offsets_ptrs;
+        batchSizePtr = request.batch_size_ptr;
+        inputBufferPtrs = request.input_buffer_ptrs;
+        inputNullsPtrs = request.input_nulls_ptrs;
+        inputOffsetsPtrs = request.input_offsets_ptrs;
 
-        outputBufferPtr_ = request.output_buffer_ptr;
-        outputNullPtr_ = request.output_null_ptr;
-        outputOffsetsPtr_ = request.output_offsets_ptr;
-        outputIntermediateStatePtr_ = request.output_intermediate_state_ptr;
+        outputBufferPtr = request.output_buffer_ptr;
+        outputNullPtr = request.output_null_ptr;
+        outputOffsetsPtr = request.output_offsets_ptr;
+        outputIntermediateStatePtr = request.output_intermediate_state_ptr;
 
-        outputOffset_ = 0L;
-        row_idx_ = 0L;
+        outputOffset = 0L;
+        rowIdx = 0L;
 
         init(jarFile, className, retType, parameterTypes);
     }
 
+    // CHECKSTYLE OFF
     @Override
     protected void finalize() throws Throwable {
         close();
         super.finalize();
     }
+    // CHECKSTYLE ON
 
     /**
      * Close the class loader we may have created.
      */
     public void close() {
-        if (classLoader_ != null) {
+        if (classLoader != null) {
             try {
-                classLoader_.close();
+                classLoader.close();
             } catch (IOException e) {
                 // Log and ignore.
                 LOG.debug("Error closing the URLClassloader.", e);
@@ -211,8 +215,8 @@ public void close() {
         }
         // We are now un-usable (because the class loader has been
         // closed), so null out method_ and classLoader_.
-        method_ = null;
-        classLoader_ = null;
+        method = null;
+        classLoader = null;
     }
 
     /**
@@ -220,51 +224,51 @@ public void close() {
      * been serialized to 'input'
      */
     public void evaluate() throws UdfRuntimeException {
-        int batch_size = UdfUtils.UNSAFE.getInt(null, batch_size_ptr_);
+        int batchSize = UdfUtils.UNSAFE.getInt(null, batchSizePtr);
         try {
-            if (retType_.equals(JavaUdfDataType.STRING) || retType_.equals(JavaUdfDataType.VARCHAR)
-                    || retType_.equals(JavaUdfDataType.CHAR)) {
+            if (retType.equals(JavaUdfDataType.STRING) || retType.equals(JavaUdfDataType.VARCHAR)
+                    || retType.equals(JavaUdfDataType.CHAR)) {
                 // If this udf return variable-size type (e.g.) String, we have to allocate output
                 // buffer multiple times until buffer size is enough to store output column. So we
                 // always begin with the last evaluated row instead of beginning of this batch.
-                row_idx_ = UdfUtils.UNSAFE.getLong(null, outputIntermediateStatePtr_ + 8);
-                if (row_idx_ == 0) {
-                    outputOffset_ = 0L;
+                rowIdx = UdfUtils.UNSAFE.getLong(null, outputIntermediateStatePtr + 8);
+                if (rowIdx == 0) {
+                    outputOffset = 0L;
                 }
             } else {
-                row_idx_ = 0;
+                rowIdx = 0;
             }
-            for (; row_idx_ < batch_size; row_idx_++) {
-                allocateInputObjects(row_idx_);
-                for (int i = 0; i < argTypes_.length; ++i) {
+            for (; rowIdx < batchSize; rowIdx++) {
+                allocateInputObjects(rowIdx);
+                for (int i = 0; i < argTypes.length; ++i) {
                     // Currently, -1 indicates this column is not nullable. So input argument is
                     // null iff inputNullsPtrs_ != -1 and nullCol[row_idx] != 0.
                     if (UdfUtils.UNSAFE.getLong(null,
-                            UdfUtils.getAddressAtOffset(inputNullsPtrs_, i)) == -1 ||
+                            UdfUtils.getAddressAtOffset(inputNullsPtrs, i)) == -1 ||
                             UdfUtils.UNSAFE.getByte(null, UdfUtils.UNSAFE.getLong(null,
-                                    UdfUtils.getAddressAtOffset(inputNullsPtrs_, i)) + row_idx_) == 0) {
-                        inputArgs_[i] = inputObjects_[i];
+                                    UdfUtils.getAddressAtOffset(inputNullsPtrs, i)) + rowIdx) == 0) {
+                        inputArgs[i] = inputObjects[i];
                     } else {
-                        inputArgs_[i] = null;
+                        inputArgs[i] = null;
                     }
                 }
                 // `storeUdfResult` is called to store udf result to output column. If true
                 // is returned, current value is stored successfully. Otherwise, current result is
                 // not processed successfully (e.g. current output buffer is not large enough) so
                 // we break this loop directly.
-                if (!storeUdfResult(evaluate(inputArgs_), row_idx_)) {
-                    UdfUtils.UNSAFE.putLong(null, outputIntermediateStatePtr_ + 8, row_idx_);
+                if (!storeUdfResult(evaluate(inputArgs), rowIdx)) {
+                    UdfUtils.UNSAFE.putLong(null, outputIntermediateStatePtr + 8, rowIdx);
                     return;
                 }
             }
         } catch (Exception e) {
-            if (retType_.equals(JavaUdfDataType.STRING)) {
-                UdfUtils.UNSAFE.putLong(null, outputIntermediateStatePtr_ + 8, batch_size);
+            if (retType.equals(JavaUdfDataType.STRING)) {
+                UdfUtils.UNSAFE.putLong(null, outputIntermediateStatePtr + 8, batchSize);
             }
             throw new UdfRuntimeException("UDF::evaluate() ran into a problem.", e);
         }
-        if (retType_.equals(JavaUdfDataType.STRING)) {
-            UdfUtils.UNSAFE.putLong(null, outputIntermediateStatePtr_ + 8, row_idx_);
+        if (retType.equals(JavaUdfDataType.STRING)) {
+            UdfUtils.UNSAFE.putLong(null, outputIntermediateStatePtr + 8, rowIdx);
         }
     }
 
@@ -273,135 +277,139 @@ public void evaluate() throws UdfRuntimeException {
      */
     private Object evaluate(Object... args) throws UdfRuntimeException {
         try {
-            return method_.invoke(udf_, args);
+            return method.invoke(udf, args);
         } catch (Exception e) {
             throw new UdfRuntimeException("UDF failed to evaluate", e);
         }
     }
 
     public Method getMethod() {
-        return method_;
+        return method;
     }
 
     // Sets the result object 'obj' into the outputBufferPtr_ and outputNullPtr_
     private boolean storeUdfResult(Object obj, long row) throws UdfRuntimeException {
         if (obj == null) {
-            assert (UdfUtils.UNSAFE.getLong(null, outputNullPtr_) != -1);
-            UdfUtils.UNSAFE.putByte(null, UdfUtils.UNSAFE.getLong(null, outputNullPtr_) + row, (byte) 1);
-            if (retType_.equals(JavaUdfDataType.STRING)) {
-                long bufferSize = UdfUtils.UNSAFE.getLong(null, outputIntermediateStatePtr_);
-                if (outputOffset_ + 1 > bufferSize) {
+            assert (UdfUtils.UNSAFE.getLong(null, outputNullPtr) != -1);
+            UdfUtils.UNSAFE.putByte(null, UdfUtils.UNSAFE.getLong(null, outputNullPtr) + row, (byte) 1);
+            if (retType.equals(JavaUdfDataType.STRING)) {
+                long bufferSize = UdfUtils.UNSAFE.getLong(null, outputIntermediateStatePtr);
+                if (outputOffset + 1 > bufferSize) {
                     return false;
                 }
-                outputOffset_ += 1;
-                UdfUtils.UNSAFE.putChar(null, UdfUtils.UNSAFE.getLong(null, outputBufferPtr_) +
-                        outputOffset_ - 1, UdfUtils.END_OF_STRING);
-                UdfUtils.UNSAFE.putInt(null, UdfUtils.UNSAFE.getLong(null, outputOffsetsPtr_) +
-                        4L * row, Integer.parseUnsignedInt(String.valueOf(outputOffset_)));
+                outputOffset += 1;
+                UdfUtils.UNSAFE.putChar(null, UdfUtils.UNSAFE.getLong(null, outputBufferPtr) + outputOffset - 1, UdfUtils.END_OF_STRING);
+                UdfUtils.UNSAFE.putInt(null, UdfUtils.UNSAFE.getLong(null, outputOffsetsPtr) +
+                        4L * row, Integer.parseUnsignedInt(String.valueOf(outputOffset)));
             }
             return true;
         }
-        if (UdfUtils.UNSAFE.getLong(null, outputNullPtr_) != -1) {
-            UdfUtils.UNSAFE.putByte(UdfUtils.UNSAFE.getLong(null, outputNullPtr_) + row, (byte) 0);
+        if (UdfUtils.UNSAFE.getLong(null, outputNullPtr) != -1) {
+            UdfUtils.UNSAFE.putByte(UdfUtils.UNSAFE.getLong(null, outputNullPtr) + row, (byte) 0);
         }
-        switch (retType_) {
+        switch (retType) {
             case BOOLEAN: {
                 boolean val = (boolean) obj;
-                UdfUtils.UNSAFE.putByte(UdfUtils.UNSAFE.getLong(null, outputBufferPtr_) + row * retType_.getLen(), val ? (byte) 1 : 0);
+                UdfUtils.UNSAFE.putByte(UdfUtils.UNSAFE.getLong(null, outputBufferPtr) + row * retType.getLen(), val ? (byte) 1 : 0);
                 return true;
             }
             case TINYINT: {
-                UdfUtils.UNSAFE.putByte(UdfUtils.UNSAFE.getLong(null, outputBufferPtr_) + row * retType_.getLen(), (byte) obj);
+                UdfUtils.UNSAFE.putByte(UdfUtils.UNSAFE.getLong(null, outputBufferPtr) + row * retType.getLen(), (byte) obj);
                 return true;
             }
             case SMALLINT: {
-                UdfUtils.UNSAFE.putShort(UdfUtils.UNSAFE.getLong(null, outputBufferPtr_) + row * retType_.getLen(), (short) obj);
+                UdfUtils.UNSAFE.putShort(UdfUtils.UNSAFE.getLong(null, outputBufferPtr) + row * retType.getLen(), (short) obj);
                 return true;
             }
             case INT: {
-                UdfUtils.UNSAFE.putInt(UdfUtils.UNSAFE.getLong(null, outputBufferPtr_) + row * retType_.getLen(), (int) obj);
+                UdfUtils.UNSAFE.putInt(UdfUtils.UNSAFE.getLong(null, outputBufferPtr) + row * retType.getLen(), (int) obj);
                 return true;
             }
             case BIGINT: {
-                UdfUtils.UNSAFE.putLong(UdfUtils.UNSAFE.getLong(null, outputBufferPtr_) + row * retType_.getLen(), (long) obj);
+                UdfUtils.UNSAFE.putLong(UdfUtils.UNSAFE.getLong(null, outputBufferPtr) + row * retType.getLen(), (long) obj);
                 return true;
             }
             case FLOAT: {
-                UdfUtils.UNSAFE.putFloat(UdfUtils.UNSAFE.getLong(null, outputBufferPtr_) + row * retType_.getLen(), (float) obj);
+                UdfUtils.UNSAFE.putFloat(UdfUtils.UNSAFE.getLong(null, outputBufferPtr) + row * retType.getLen(), (float) obj);
                 return true;
             }
             case DOUBLE: {
-                UdfUtils.UNSAFE.putDouble(UdfUtils.UNSAFE.getLong(null, outputBufferPtr_) + row * retType_.getLen(), (double) obj);
+                UdfUtils.UNSAFE.putDouble(UdfUtils.UNSAFE.getLong(null, outputBufferPtr) + row * retType.getLen(), (double) obj);
                 return true;
             }
             case CHAR:
             case VARCHAR:
             case STRING:
-                long bufferSize = UdfUtils.UNSAFE.getLong(null, outputIntermediateStatePtr_);
+                long bufferSize = UdfUtils.UNSAFE.getLong(null, outputIntermediateStatePtr);
                 byte[] bytes = ((String) obj).getBytes(StandardCharsets.UTF_8);
-                if (outputOffset_ + bytes.length + 1 > bufferSize) {
+                if (outputOffset + bytes.length + 1 > bufferSize) {
                     return false;
                 }
-                outputOffset_ += (bytes.length + 1);
-                UdfUtils.UNSAFE.putChar(UdfUtils.UNSAFE.getLong(null, outputBufferPtr_) +
-                        outputOffset_ - 1, UdfUtils.END_OF_STRING);
-                UdfUtils.UNSAFE.putInt(null, UdfUtils.UNSAFE.getLong(null, outputOffsetsPtr_) + 4L * row,
-                        Integer.parseUnsignedInt(String.valueOf(outputOffset_)));
+                outputOffset += (bytes.length + 1);
+                UdfUtils.UNSAFE.putChar(UdfUtils.UNSAFE.getLong(null, outputBufferPtr) + outputOffset - 1, UdfUtils.END_OF_STRING);
+                UdfUtils.UNSAFE.putInt(null, UdfUtils.UNSAFE.getLong(null, outputOffsetsPtr) + 4L * row,
+                        Integer.parseUnsignedInt(String.valueOf(outputOffset)));
                 UdfUtils.copyMemory(bytes, UdfUtils.BYTE_ARRAY_OFFSET, null,
-                        UdfUtils.UNSAFE.getLong(null, outputBufferPtr_) +
-                                outputOffset_ - bytes.length - 1, bytes.length);
+                        UdfUtils.UNSAFE.getLong(null, outputBufferPtr) + outputOffset - bytes.length - 1, bytes.length);
                 return true;
             default:
-                throw new UdfRuntimeException("Unsupported return type: " + retType_);
+                throw new UdfRuntimeException("Unsupported return type: " + retType);
         }
     }
 
     // Preallocate the input objects that will be passed to the underlying UDF.
     // These objects are allocated once and reused across calls to evaluate()
     private void allocateInputObjects(long row) throws UdfRuntimeException {
-        inputObjects_ = new Object[argTypes_.length];
-        inputArgs_ = new Object[argTypes_.length];
+        inputObjects = new Object[argTypes.length];
+        inputArgs = new Object[argTypes.length];
 
-        for (int i = 0; i < argTypes_.length; ++i) {
-            switch (argTypes_[i]) {
+        for (int i = 0; i < argTypes.length; ++i) {
+            switch (argTypes[i]) {
                 case BOOLEAN:
-                    inputObjects_[i] = UdfUtils.UNSAFE.getBoolean(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs_, i)) + row);
+                    inputObjects[i] = UdfUtils.UNSAFE.getBoolean(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(
+                            inputBufferPtrs, i)) + row);
                     break;
                 case TINYINT:
-                    inputObjects_[i] = UdfUtils.UNSAFE.getByte(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs_, i)) + row);
+                    inputObjects[i] = UdfUtils.UNSAFE.getByte(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(
+                            inputBufferPtrs, i)) + row);
                     break;
                 case SMALLINT:
-                    inputObjects_[i] = UdfUtils.UNSAFE.getShort(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs_, i)) + 2L * row);
+                    inputObjects[i] = UdfUtils.UNSAFE.getShort(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(
+                            inputBufferPtrs, i)) + 2L * row);
                     break;
                 case INT:
-                    inputObjects_[i] = UdfUtils.UNSAFE.getInt(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs_, i)) + 4L * row);
+                    inputObjects[i] = UdfUtils.UNSAFE.getInt(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(
+                            inputBufferPtrs, i)) + 4L * row);
                     break;
                 case BIGINT:
-                    inputObjects_[i] = UdfUtils.UNSAFE.getLong(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs_, i)) + 8L * row);
+                    inputObjects[i] = UdfUtils.UNSAFE.getLong(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(
+                            inputBufferPtrs, i)) + 8L * row);
                     break;
                 case FLOAT:
-                    inputObjects_[i] = UdfUtils.UNSAFE.getFloat(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs_, i)) + 4L * row);
+                    inputObjects[i] = UdfUtils.UNSAFE.getFloat(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(
+                            inputBufferPtrs, i)) + 4L * row);
                     break;
                 case DOUBLE:
-                    inputObjects_[i] = UdfUtils.UNSAFE.getDouble(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs_, i)) + 8L * row);
+                    inputObjects[i] = UdfUtils.UNSAFE.getDouble(null, UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(
+                            inputBufferPtrs, i)) + 8L * row);
                     break;
                 case CHAR:
                 case VARCHAR:
                 case STRING:
                     long offset = Integer.toUnsignedLong(UdfUtils.UNSAFE.getInt(null,
                             UdfUtils.UNSAFE.getLong(null,
-                                    UdfUtils.getAddressAtOffset(inputOffsetsPtrs_, i)) + 4L * row));
+                                    UdfUtils.getAddressAtOffset(inputOffsetsPtrs, i)) + 4L * row));
                     long numBytes = row == 0 ? offset - 1 : offset - Integer.toUnsignedLong(UdfUtils.UNSAFE.getInt(null,
                             UdfUtils.UNSAFE.getLong(null,
-                                    UdfUtils.getAddressAtOffset(inputOffsetsPtrs_, i)) + 4L * (row - 1))) - 1;
-                    long base = row == 0 ? UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs_, i)) :
-                            UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs_, i)) + offset - numBytes - 1;
+                                    UdfUtils.getAddressAtOffset(inputOffsetsPtrs, i)) + 4L * (row - 1))) - 1;
+                    long base = row == 0 ? UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs, i)) :
+                            UdfUtils.UNSAFE.getLong(null, UdfUtils.getAddressAtOffset(inputBufferPtrs, i)) + offset - numBytes - 1;
                     byte[] bytes = new byte[(int) numBytes];
                     UdfUtils.copyMemory(null, base, bytes, UdfUtils.BYTE_ARRAY_OFFSET, numBytes);
-                    inputObjects_[i] = new String(bytes, StandardCharsets.UTF_8);
+                    inputObjects[i] = new String(bytes, StandardCharsets.UTF_8);
                     break;
                 default:
-                    throw new UdfRuntimeException("Unsupported argument type: " + argTypes_[i]);
+                    throw new UdfRuntimeException("Unsupported argument type: " + argTypes[i]);
             }
         }
     }
@@ -428,7 +436,7 @@ private boolean setReturnType(Type retType, Class<?> udfReturnType)
         if (retType.getPrimitiveType().toThrift() != javaType.getPrimitiveType()) {
             return false;
         }
-        retType_ = javaType;
+        this.retType = javaType;
         return true;
     }
 
@@ -438,10 +446,10 @@ private boolean setReturnType(Type retType, Class<?> udfReturnType)
      * from the associated JAR file.
      */
     private boolean setArgTypes(Type[] parameterTypes, Class<?>[] udfArgTypes) {
-        Preconditions.checkNotNull(argTypes_);
+        Preconditions.checkNotNull(argTypes);
         for (int i = 0; i < udfArgTypes.length; ++i) {
-            argTypes_[i] = JavaUdfDataType.getType(udfArgTypes[i]);
-            if (argTypes_[i].getPrimitiveType()
+            argTypes[i] = JavaUdfDataType.getType(udfArgTypes[i]);
+            if (argTypes[i].getPrimitiveType()
                     != parameterTypes[i].getPrimitiveType().toThrift()) {
                 return false;
             }
@@ -457,33 +465,43 @@ private void init(String jarPath, String udfPath,
             ClassLoader loader;
             if (jarPath != null) {
                 // Save for cleanup.
-                classLoader_ = getClassLoader(jarPath);
-                loader = classLoader_;
+                classLoader = getClassLoader(jarPath);
+                loader = classLoader;
             } else {
                 loader = ClassLoader.getSystemClassLoader();
             }
             Class<?> c = Class.forName(udfPath, true, loader);
             Constructor<?> ctor = c.getConstructor();
-            udf_ = ctor.newInstance();
-            argTypes_ = new JavaUdfDataType[parameterTypes.length];
+            udf = ctor.newInstance();
+            argTypes = new JavaUdfDataType[parameterTypes.length];
             Method[] methods = c.getMethods();
             for (Method m : methods) {
                 // By convention, the udf must contain the function "evaluate"
-                if (!m.getName().equals(UDF_FUNCTION_NAME)) continue;
+                if (!m.getName().equals(UDF_FUNCTION_NAME)) {
+                    continue;
+                }
                 signatures.add(m.toGenericString());
                 Class<?>[] methodTypes = m.getParameterTypes();
 
                 // Try to match the arguments
-                if (methodTypes.length != parameterTypes.length) continue;
-                method_ = m;
+                if (methodTypes.length != parameterTypes.length) {
+                    continue;
+                }
+                method = m;
                 if (methodTypes.length == 0 && parameterTypes.length == 0) {
                     // Special case where the UDF doesn't take any input args
-                    if (!setReturnType(retType, m.getReturnType())) continue;
+                    if (!setReturnType(retType, m.getReturnType())) {
+                        continue;
+                    }
                     LOG.debug("Loaded UDF '" + udfPath + "' from " + jarPath);
                     return;
                 }
-                if (!setReturnType(retType, m.getReturnType())) continue;
-                if (!setArgTypes(parameterTypes, methodTypes)) continue;
+                if (!setReturnType(retType, m.getReturnType())) {
+                    continue;
+                }
+                if (!setArgTypes(parameterTypes, methodTypes)) {
+                    continue;
+                }
                 LOG.debug("Loaded UDF '" + udfPath + "' from " + jarPath);
                 return;
             }
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 ece24cd9915390..2905cb6d83cc9e 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
@@ -85,8 +85,12 @@ public int compareTo(DppColumns other) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         DppColumns dppColumns = (DppColumns) o;
         return Objects.equals(columns, dppColumns.columns);
     }
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 60697bf79eb2cb..ae5efc93af2e2b 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
@@ -402,6 +402,8 @@ public boolean validateData(Object srcValue, EtlJobConfig.EtlColumn etlColumn, C
                     return false;
                 }
                 break;
+            default:
+                return true;
         }
         return true;
     }

From 45ed3bd0c6e65eba2222c56140e12e0d280dc880 Mon Sep 17 00:00:00 2001
From: morrySnow <morrysnow@126.com>
Date: Thu, 19 May 2022 11:10:02 +0800
Subject: [PATCH 2/2] revert some change according to comments

---
 .../org/apache/doris/catalog/Catalog.java     |  6 ++--
 .../{BdbjeProcDir.java => BDBJEProcDir.java}  |  6 ++--
 .../apache/doris/common/proc/ProcService.java |  2 +-
 .../doris/ha/{BdbHA.java => BDBHA.java}       |  6 ++--
 .../doris/httpv2/util/LoadSubmitter.java      | 36 ++++++++++---------
 .../doris/journal/bdbje/BDBEnvironment.java   |  4 +--
 .../{BdbjeJournal.java => BDBJEJournal.java}  |  6 ++--
 .../org/apache/doris/persist/EditLog.java     |  4 +--
 .../planner/MaterializedViewSelector.java     |  8 ++---
 .../doris/catalog/CreateEncryptKeyTest.java   |  2 +-
 .../doris/catalog/CreateFunctionTest.java     | 10 +++---
 11 files changed, 47 insertions(+), 43 deletions(-)
 rename fe/fe-core/src/main/java/org/apache/doris/common/proc/{BdbjeProcDir.java => BDBJEProcDir.java} (94%)
 rename fe/fe-core/src/main/java/org/apache/doris/ha/{BdbHA.java => BDBHA.java} (98%)
 rename fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/{BdbjeJournal.java => BDBJEJournal.java} (98%)

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 ffe9825740f6f5..1458f63c38ea96 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
@@ -155,7 +155,7 @@
 import org.apache.doris.external.hudi.HudiUtils;
 import org.apache.doris.external.iceberg.IcebergCatalogMgr;
 import org.apache.doris.external.iceberg.IcebergTableCreationRecordMgr;
-import org.apache.doris.ha.BdbHA;
+import org.apache.doris.ha.BDBHA;
 import org.apache.doris.ha.FrontendNodeType;
 import org.apache.doris.ha.HAProtocol;
 import org.apache.doris.ha.MasterInfo;
@@ -1440,7 +1440,7 @@ private void transferToNonMaster(FrontendNodeType newType) {
         if (Config.edit_log_type.equalsIgnoreCase("BDB")) {
             for (Frontend fe : frontends.values()) {
                 if (fe.getRole() == FrontendNodeType.FOLLOWER || fe.getRole() == FrontendNodeType.REPLICA) {
-                    ((BdbHA) getHaProtocol()).addHelperSocket(fe.getHost(), fe.getEditLogPort());
+                    ((BDBHA) getHaProtocol()).addHelperSocket(fe.getHost(), fe.getEditLogPort());
                 }
             }
         }
@@ -2528,7 +2528,7 @@ public void addFrontend(FrontendNodeType role, String host, int editLogPort) thr
             fe = new Frontend(role, nodeName, host, editLogPort);
             frontends.put(nodeName, fe);
             if (role == FrontendNodeType.FOLLOWER || role == FrontendNodeType.REPLICA) {
-                ((BdbHA) getHaProtocol()).addHelperSocket(host, editLogPort);
+                ((BDBHA) getHaProtocol()).addHelperSocket(host, editLogPort);
                 helperNodes.add(Pair.create(host, editLogPort));
             }
             editLog.logAddFrontend(fe);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEProcDir.java
similarity index 94%
rename from fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeProcDir.java
rename to fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEProcDir.java
index 66b56c21654690..ef9b8ca5a5c908 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/BdbjeProcDir.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/BDBJEProcDir.java
@@ -28,8 +28,10 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-// SHOW PROC "/bdbje"
-public class BdbjeProcDir implements ProcDirInterface  {
+/**
+ * SHOW PROC "/bdbje".
+ */
+public class BDBJEProcDir implements ProcDirInterface  { // CHECKSTYLE IGNORE THIS LINE: BDBJE should use uppercase
     public static final ImmutableList<String> TITLE_NAMES = new ImmutableList.Builder<String>()
             .add("DbNames").add("JournalNumber").add("Comment").build();
 
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 003f5c083c607e..59a354265bc5b6 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
@@ -56,7 +56,7 @@ private ProcService() {
         root.register("routine_loads", new RoutineLoadsProcDir());
         root.register("stream_loads", new StreamLoadProcNode());
         root.register("colocation_group", new ColocationGroupProcDir());
-        root.register("bdbje", new BdbjeProcDir());
+        root.register("bdbje", new BDBJEProcDir());
     }
 
     // 通过指定的路径获得对应的PROC Node
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
similarity index 98%
rename from fe/fe-core/src/main/java/org/apache/doris/ha/BdbHA.java
rename to fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java
index aee7006f3ccb74..c08011a6035480 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
@@ -40,14 +40,14 @@
 import java.util.List;
 import java.util.Set;
 
-public class BdbHA implements HAProtocol {
-    private static final Logger LOG = LogManager.getLogger(BdbHA.class);
+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) {
+    public BDBHA(BDBEnvironment env, String nodeName) {
         this.environment = env;
         this.nodeName = nodeName;
     }
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 4c8c02ee67c1dc..ab6666066374dd 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
@@ -150,23 +150,25 @@ private Backend selectOneBackend() throws LoadException {
         }
     }
 
+    // CHECKSTYLE OFF: These name must match the name in json, case-sensitive.
     public static class SubmitResult {
-        public String txnId;
-        public String label;
-        public String status;
-        public String existingJobStatus;
-        public String message;
-        public String numberTotalRows;
-        public String numberLoadedRows;
-        public String numberFilteredRows;
-        public String numberUnselectedRows;
-        public String loadBytes;
-        public String loadTimeMs;
-        public String beginTxnTimeMs;
-        public String streamLoadPutTimeMs;
-        public String readDataTimeMs;
-        public String writeDataTimeMs;
-        public String commitAndPublishTimeMs;
-        public String errorURL;
+        public String TxnId;
+        public String Label;
+        public String Status;
+        public String ExistingJobStatus;
+        public String Message;
+        public String NumberTotalRows;
+        public String NumberLoadedRows;
+        public String NumberFilteredRows;
+        public String NumberUnselectedRows;
+        public String LoadBytes;
+        public String LoadTimeMs;
+        public String BeginTxnTimeMs;
+        public String StreamLoadPutTimeMs;
+        public String ReadDataTimeMs;
+        public String WriteDataTimeMs;
+        public String CommitAndPublishTimeMs;
+        public String ErrorURL;
     }
+    // CHECKSTYLE ON
 }
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 711322bbe46f7a..773e20c5ffb15e 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
@@ -20,7 +20,7 @@
 import org.apache.doris.catalog.Catalog;
 import org.apache.doris.common.Config;
 import org.apache.doris.ha.BDBStateChangeListener;
-import org.apache.doris.ha.BdbHA;
+import org.apache.doris.ha.BDBHA;
 import org.apache.doris.ha.HAProtocol;
 
 import com.sleepycat.je.Database;
@@ -167,7 +167,7 @@ public void setup(File envHome, String selfNodeName, String selfNodeHostPort,
                 replicationGroupAdmin = new ReplicationGroupAdmin(PALO_JOURNAL_GROUP, adminNodes);
 
                 // get a BDBHA object and pass the reference to Catalog
-                HAProtocol protocol = new BdbHA(this, selfNodeName);
+                HAProtocol protocol = new BDBHA(this, selfNodeName);
                 Catalog.getCurrentCatalog().setHaProtocol(protocol);
 
                 // start state change listener
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
similarity index 98%
rename from fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BdbjeJournal.java
rename to fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJEJournal.java
index a5d54c9bb0338f..4799fc22d6a476 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
@@ -55,8 +55,8 @@
  * Finally, close this journal.
  * This class encapsulates the read, write APIs of bdbje
  */
-public class BdbjeJournal implements Journal {
-    public static final Logger LOG = LogManager.getLogger(BdbjeJournal.class);
+public class BDBJEJournal implements Journal { // CHECKSTYLE IGNORE THIS LINE: BDBJE should use uppercase
+    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;
 
@@ -69,7 +69,7 @@ public class BdbjeJournal implements Journal {
     // the next journal's id. start from 1.
     private AtomicLong nextJournalId = new AtomicLong(1);
 
-    public BdbjeJournal(String nodeName) {
+    public BDBJEJournal(String nodeName) {
         initBDBEnv(nodeName);
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
index 44d36a51631fd5..ca958128ab1c0a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
@@ -45,7 +45,7 @@
 import org.apache.doris.journal.Journal;
 import org.apache.doris.journal.JournalCursor;
 import org.apache.doris.journal.JournalEntity;
-import org.apache.doris.journal.bdbje.BdbjeJournal;
+import org.apache.doris.journal.bdbje.BDBJEJournal;
 import org.apache.doris.journal.bdbje.Timestamp;
 import org.apache.doris.load.DeleteHandler;
 import org.apache.doris.load.DeleteInfo;
@@ -93,7 +93,7 @@ public class EditLog {
     private Journal journal;
 
     public EditLog(String nodeName) {
-        journal = new BdbjeJournal(nodeName);
+        journal = new BDBJEJournal(nodeName);
     }
 
     public long getMaxJournalId() {
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 ac910d8bbd60ac..bc8963681bd986 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
@@ -81,7 +81,7 @@ public class MaterializedViewSelector {
     //    private Map<String, Set<AggregatedColumn>> aggregateColumnsInQuery = Maps.newHashMap();
     private Map<Long, Set<String>> columnNamesInQueryOutput = Maps.newHashMap();
 
-    private boolean disableSpjgView;
+    private boolean disableSPJGView;
 
     // The Following 2 variables should be reset each time before calling selectBestMV();
     // Unlike the "isPreAggregation" in OlapScanNode which defaults to false,
@@ -330,7 +330,7 @@ aggregate mv index (k1, k2)
                 continue;
             }
             // When the query is SPJ type but the candidate index is SPJG type, it will not pass directly.
-            if (isSPJQuery || disableSpjgView) {
+            if (isSPJQuery || disableSPJGView) {
                 iterator.remove();
                 continue;
             }
@@ -360,7 +360,7 @@ private void checkAggregationFunction(Set<FunctionCallExpr> aggregatedColumnsInQ
                 continue;
             }
             // When the query is SPJ type but the candidate index is SPJG type, it will not pass directly.
-            if (isSPJQuery || disableSpjgView) {
+            if (isSPJQuery || disableSPJGView) {
                 iterator.remove();
                 continue;
             }
@@ -447,7 +447,7 @@ private void init() {
                 // TODO(ml): support count(*)
                 if (tableIdToAggColumnNames.size() != 1) {
                     reasonOfDisable = "aggExpr[" + aggExpr.debugString() + "] should involved only one column";
-                    disableSpjgView = true;
+                    disableSPJGView = true;
                     break;
                 }
                 addAggColumnInQuery(tableIdToAggColumnNames.keySet().stream().findFirst().get(), aggExpr);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateEncryptKeyTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateEncryptKeyTest.java
index 88fe7f4fab4d62..db88440d50251f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateEncryptKeyTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateEncryptKeyTest.java
@@ -87,7 +87,7 @@ public void test() throws Exception {
         PlanFragment fragment = planner.getFragments().get(0);
         Assert.assertTrue(fragment.getPlanRoot() instanceof UnionNode);
         UnionNode unionNode =  (UnionNode)fragment.getPlanRoot();
-        List<List<Expr>> constExprLists = Deencapsulation.getField(unionNode, "constExprLists_");
+        List<List<Expr>> constExprLists = Deencapsulation.getField(unionNode, "constExprLists");
         Assert.assertEquals(1, constExprLists.size());
         Assert.assertEquals(1, constExprLists.get(0).size());
         Assert.assertTrue(constExprLists.get(0).get(0) instanceof FunctionCallExpr);
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 41156c5f81976f..55adf8afd342a6 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
@@ -114,7 +114,7 @@ public void test() throws Exception {
         PlanFragment fragment = planner.getFragments().get(0);
         Assert.assertTrue(fragment.getPlanRoot() instanceof UnionNode);
         UnionNode unionNode =  (UnionNode)fragment.getPlanRoot();
-        List<List<Expr>> constExprLists = Deencapsulation.getField(unionNode, "constExprLists_");
+        List<List<Expr>> constExprLists = Deencapsulation.getField(unionNode, "constExprLists");
         Assert.assertEquals(1, constExprLists.size());
         Assert.assertEquals(1, constExprLists.get(0).size());
         Assert.assertTrue(constExprLists.get(0).get(0) instanceof FunctionCallExpr);
@@ -137,7 +137,7 @@ public void test() throws Exception {
         fragment = planner.getFragments().get(0);
         Assert.assertTrue(fragment.getPlanRoot() instanceof UnionNode);
         unionNode =  (UnionNode)fragment.getPlanRoot();
-        constExprLists = Deencapsulation.getField(unionNode, "constExprLists_");
+        constExprLists = Deencapsulation.getField(unionNode, "constExprLists");
         Assert.assertEquals(1, constExprLists.size());
         Assert.assertEquals(1, constExprLists.get(0).size());
         Assert.assertTrue(constExprLists.get(0).get(0) instanceof FunctionCallExpr);
@@ -165,7 +165,7 @@ public void test() throws Exception {
         fragment = planner.getFragments().get(0);
         Assert.assertTrue(fragment.getPlanRoot() instanceof UnionNode);
         unionNode =  (UnionNode)fragment.getPlanRoot();
-        constExprLists = Deencapsulation.getField(unionNode, "constExprLists_");
+        constExprLists = Deencapsulation.getField(unionNode, "constExprLists");
         System.out.println(constExprLists.get(0).get(0));
         Assert.assertTrue(constExprLists.get(0).get(0) instanceof StringLiteral);
 
@@ -191,7 +191,7 @@ public void test() throws Exception {
         fragment = planner.getFragments().get(0);
         Assert.assertTrue(fragment.getPlanRoot() instanceof UnionNode);
         unionNode =  (UnionNode)fragment.getPlanRoot();
-        constExprLists = Deencapsulation.getField(unionNode, "constExprLists_");
+        constExprLists = Deencapsulation.getField(unionNode, "constExprLists");
         Assert.assertEquals(1, constExprLists.size());
         Assert.assertEquals(1, constExprLists.get(0).size());
         Assert.assertTrue(constExprLists.get(0).get(0) instanceof StringLiteral);
@@ -218,7 +218,7 @@ public void test() throws Exception {
         fragment = planner.getFragments().get(0);
         Assert.assertTrue(fragment.getPlanRoot() instanceof UnionNode);
         unionNode =  (UnionNode)fragment.getPlanRoot();
-        constExprLists = Deencapsulation.getField(unionNode, "constExprLists_");
+        constExprLists = Deencapsulation.getField(unionNode, "constExprLists");
         Assert.assertEquals(1, constExprLists.size());
         Assert.assertEquals(1, constExprLists.get(0).size());
         Assert.assertTrue(constExprLists.get(0).get(0) instanceof StringLiteral);