database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[minor](fe) optimize some log info and imports issue (#24138)

Browse Source
This commit is contained in:
Mingyu Chen
2023-09-11 16:16:58 +08:00
committed by GitHub
parent 8ae7e67623
commit 6384198136
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
View File

@ -1184,7 +1184,8 @@ public class Env {
}
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)) {

4
fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
View File

@ -280,7 +280,9 @@ public class ConnectProcessor {
// 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;

2
fe/fe-core/src/test/java/org/apache/doris/analysis/S3TvfLoadStmtTest.java
View File

@ -33,11 +33,11 @@ import org.apache.doris.datasource.property.constants.S3Properties.Env;
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;