From 1c6b6435a5e439c1458f5bfc1c0e2c516edec6b5 Mon Sep 17 00:00:00 2001 From: morningman Date: Sat, 9 Sep 2023 16:10:15 +0800 Subject: [PATCH 1/2] 1 --- fe/check/checkstyle/import-control.xml | 1 + .../java/org/apache/doris/analysis/S3TvfLoadStmtTest.java | 2 +- .../apache/doris/external/hms/MetastoreEventFactoryTest.java | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fe/check/checkstyle/import-control.xml b/fe/check/checkstyle/import-control.xml index 9ff32f7d512eb0..16371ce8919206 100644 --- a/fe/check/checkstyle/import-control.xml +++ b/fe/check/checkstyle/import-control.xml @@ -25,6 +25,7 @@ under the License. + diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/S3TvfLoadStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/S3TvfLoadStmtTest.java index cc41e31e3c338c..6c847f28206a6f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/S3TvfLoadStmtTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/S3TvfLoadStmtTest.java @@ -33,11 +33,11 @@ import org.apache.doris.load.loadv2.LoadTask.MergeType; import org.apache.doris.tablefunction.S3TableValuedFunction; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import mockit.Expectations; import mockit.Injectable; -import org.apache.hadoop.util.Lists; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/external/hms/MetastoreEventFactoryTest.java b/fe/fe-core/src/test/java/org/apache/doris/external/hms/MetastoreEventFactoryTest.java index ba18c84bd7e0e1..7b20d4af1db7f2 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/external/hms/MetastoreEventFactoryTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/external/hms/MetastoreEventFactoryTest.java @@ -28,7 +28,7 @@ import org.apache.doris.datasource.hive.event.MetastoreEvent; import org.apache.doris.datasource.hive.event.MetastoreEventFactory; -import org.apache.hadoop.util.Lists; +import com.google.common.collect.Lists; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -57,7 +57,7 @@ public void testCreateBatchEvents() { AlterDatabaseEvent e14 = new AlterDatabaseEvent(14L, "test_ctl", "test_db", false); List mergedEvents; - List testEvents = Lists.newLinkedList(); + List testEvents = Lists.newArrayList(); testEvents.add(e1); testEvents.add(e2); From 555323e1573267b71d18ee0f0e3b9d4984ea9f8a Mon Sep 17 00:00:00 2001 From: morningman Date: Sat, 9 Sep 2023 16:25:18 +0800 Subject: [PATCH 2/2] 2 --- fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java | 3 ++- .../src/main/java/org/apache/doris/qe/ConnectProcessor.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java index 7f223775b60323..8ba9335e28590c 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java @@ -1184,7 +1184,8 @@ private void getClusterIdAndRole() throws IOException { } if (Config.cluster_id != -1 && clusterId != Config.cluster_id) { - throw new IOException("cluster id is not equal with config item cluster_id. will exit."); + throw new IOException("cluster id is not equal with config item cluster_id. will exit. " + + "If you are in recovery mode, please also modify the cluster_id in 'doris-meta/image/VERSION'"); } if (role.equals(FrontendNodeType.FOLLOWER)) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java index 73c6debb698ed3..4c2549d22a5730 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java @@ -362,7 +362,9 @@ private void auditAfterExec(String origStmt, StatementBase parsedStmt, // Process COM_QUERY statement, // only throw an exception when there is a problem interacting with the requesting client private void handleQuery(MysqlCommand mysqlCommand) { - MetricRepo.COUNTER_REQUEST_ALL.increase(1L); + if (MetricRepo.isInit) { + MetricRepo.COUNTER_REQUEST_ALL.increase(1L); + } // convert statement to Java string byte[] bytes = packetBuf.array(); int ending = packetBuf.limit() - 1;