Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fe/check/checkstyle/import-control.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ under the License.
<import-control pkg="org.apache.doris" strategyOnMismatch="allowed">
<disallow pkg="com.clearspring.analytics.util" />
<disallow pkg="com.alibaba.google" />
<disallow pkg="org.apache.hadoop.util.Lists" />
<disallow pkg="org.spark_project.guava" />
<disallow pkg="org.glassfish.jersey.internal.guava" />
<disallow pkg="io.fabric8.zjsonpatch.internal.guava" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down