This is an automated email from the ASF dual-hosted git repository.
englefly pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 8f48acaab1 [refactor](nereids) convert session var name "beNumForTest"
#23255
8f48acaab1 is described below
commit 8f48acaab1a6dbc11f25928a8be2bf83ecf994f5
Author: minghong <[email protected]>
AuthorDate: Tue Aug 22 10:12:07 2023 +0800
[refactor](nereids) convert session var name "beNumForTest" #23255
this var is used for test only. So keep "for_test" as suffix.
---
.../java/org/apache/doris/nereids/cost/CostModelV1.java | 4 ++--
.../org/apache/doris/nereids/minidump/MinidumpUtils.java | 2 +-
.../src/main/java/org/apache/doris/qe/SessionVariable.java | 14 +++++++-------
.../java/org/apache/doris/system/SystemInfoService.java | 2 +-
.../test/java/org/apache/doris/qe/PartitionCacheTest.java | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/cost/CostModelV1.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/cost/CostModelV1.java
index d579d03764..07a8e591ab 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/cost/CostModelV1.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/cost/CostModelV1.java
@@ -73,8 +73,8 @@ class CostModelV1 extends PlanVisitor<Cost, PlanContext> {
if (ConnectContext.get().getSessionVariable().isPlayNereidsDump()) {
// TODO: @bingfeng refine minidump setting, and pass testMinidumpUt
beNumber = 1;
- } else if (ConnectContext.get().getSessionVariable().getBeNumber() !=
-1) {
- beNumber = ConnectContext.get().getSessionVariable().getBeNumber();
+ } else if
(ConnectContext.get().getSessionVariable().getBeNumberForTest() != -1) {
+ beNumber =
ConnectContext.get().getSessionVariable().getBeNumberForTest();
} else {
beNumber = Math.max(1,
ConnectContext.get().getEnv().getClusterInfo().getBackendsNumber(true));
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/minidump/MinidumpUtils.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/minidump/MinidumpUtils.java
index 97366c9d9e..41de1f81e5 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/minidump/MinidumpUtils.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/minidump/MinidumpUtils.java
@@ -436,7 +436,7 @@ public class MinidumpUtils {
jsonObj.put("Sql",
ConnectContext.get().getStatementContext().getOriginStatement().originStmt);
// add session variable
int beNumber =
ConnectContext.get().getEnv().getClusterInfo().getBackendsNumber(true);
- ConnectContext.get().getSessionVariable().setBeNumber(beNumber);
+ ConnectContext.get().getSessionVariable().setBeNumberForTest(beNumber);
jsonObj.put("SessionVariable",
serializeChangedSessionVariable(ConnectContext.get().getSessionVariable()));
// add tables
jsonObj.put("DbName", ConnectContext.get().getDatabase());
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index e9e89854d8..930163fc29 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -161,7 +161,7 @@ public class SessionVariable implements Serializable,
Writable {
// if the right table is greater than this value in the hash join, we
will ignore IN filter
public static final String RUNTIME_FILTER_MAX_IN_NUM =
"runtime_filter_max_in_num";
- public static final String BE_NUMBER = "be_number_for_test";
+ public static final String BE_NUMBER_FOR_TEST = "be_number_for_test";
// max ms to wait transaction publish finish when exec insert stmt.
public static final String INSERT_VISIBLE_TIMEOUT_MS =
"insert_visible_timeout_ms";
@@ -712,16 +712,16 @@ public class SessionVariable implements Serializable,
Writable {
@VariableMgr.VarAttr(name = USE_RF_DEFAULT)
public boolean useRuntimeFilterDefaultSize = false;
- public int getBeNumber() {
- return beNumber;
+ public int getBeNumberForTest() {
+ return beNumberForTest;
}
- public void setBeNumber(int beNumber) {
- this.beNumber = beNumber;
+ public void setBeNumberForTest(int beNumberForTest) {
+ this.beNumberForTest = beNumberForTest;
}
- @VariableMgr.VarAttr(name = BE_NUMBER)
- private int beNumber = -1;
+ @VariableMgr.VarAttr(name = BE_NUMBER_FOR_TEST)
+ private int beNumberForTest = -1;
public double getCboCpuWeight() {
return cboCpuWeight;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
b/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
index f94534ad8b..8826fbbf64 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
@@ -355,7 +355,7 @@ public class SystemInfoService {
}
public int getBackendsNumber(boolean needAlive) {
- int beNumber = ConnectContext.get().getSessionVariable().getBeNumber();
+ int beNumber =
ConnectContext.get().getSessionVariable().getBeNumberForTest();
if (beNumber < 0) {
beNumber = getAllBackendIds(needAlive).size();
}
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 5923b57ea2..94216f74b4 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
@@ -242,7 +242,7 @@ public class PartitionCacheTest {
channel.reset();
SessionVariable sessionVariable = new SessionVariable();
- Deencapsulation.setField(sessionVariable, "beNumber", 1);
+ Deencapsulation.setField(sessionVariable, "beNumberForTest", 1);
new Expectations(channel) {
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
