This is an automated email from the ASF dual-hosted git repository.
lihaopeng 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 552cb345be8 [Refactor](scan) remove unless code in BE and FE (#40927)
552cb345be8 is described below
commit 552cb345be8fa5d359db88d2db910449d6889e60
Author: HappenLee <happen...@hotmail.com>
AuthorDate: Thu Sep 19 11:15:19 2024 +0800
[Refactor](scan) remove unless code in BE and FE (#40927)
1. change error comment of FE
2. delete the unless code of BE/FE
---
be/src/pipeline/exec/scan_operator.cpp | 12 +++---------
.../src/main/java/org/apache/doris/qe/Coordinator.java | 3 ---
.../src/main/java/org/apache/doris/qe/SessionVariable.java | 4 +++-
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/be/src/pipeline/exec/scan_operator.cpp
b/be/src/pipeline/exec/scan_operator.cpp
index 0c0cfb18c77..507039b1f5e 100644
--- a/be/src/pipeline/exec/scan_operator.cpp
+++ b/be/src/pipeline/exec/scan_operator.cpp
@@ -1200,18 +1200,12 @@ Status ScanOperatorX<LocalStateType>::init(const
TPlanNode& tnode, RuntimeState*
}
}
} else {
-
DCHECK(query_options.__isset.adaptive_pipeline_task_serial_read_on_limit);
// The set of enable_adaptive_pipeline_task_serial_read_on_limit
// is checked in previous branch.
if (query_options.enable_adaptive_pipeline_task_serial_read_on_limit) {
- int32_t adaptive_pipeline_task_serial_read_on_limit =
- ADAPTIVE_PIPELINE_TASK_SERIAL_READ_ON_LIMIT_DEFAULT;
- if
(query_options.__isset.adaptive_pipeline_task_serial_read_on_limit) {
- adaptive_pipeline_task_serial_read_on_limit =
-
query_options.adaptive_pipeline_task_serial_read_on_limit;
- }
-
- if (tnode.limit > 0 && tnode.limit <=
adaptive_pipeline_task_serial_read_on_limit) {
+
DCHECK(query_options.__isset.adaptive_pipeline_task_serial_read_on_limit);
+ if (tnode.limit > 0 &&
+ tnode.limit <=
query_options.adaptive_pipeline_task_serial_read_on_limit) {
_should_run_serial = true;
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
index e0ec272cf4c..b1ea3772deb 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
@@ -426,15 +426,12 @@ public class Coordinator implements CoordInterface {
private void initQueryOptions(ConnectContext context) {
this.queryOptions = context.getSessionVariable().toThrift();
- this.queryOptions.setBeExecVersion(Config.be_exec_version);
this.queryOptions.setQueryTimeout(context.getExecTimeout());
this.queryOptions.setExecutionTimeout(context.getExecTimeout());
if (this.queryOptions.getExecutionTimeout() < 1) {
LOG.info("try set timeout less than 1", new RuntimeException(""));
}
-
this.queryOptions.setEnableScanNodeRunSerial(context.getSessionVariable().isEnableScanRunSerial());
this.queryOptions.setFeProcessUuid(ExecuteEnv.getInstance().getProcessUUID());
-
this.queryOptions.setWaitFullBlockScheduleTimes(context.getSessionVariable().getWaitFullBlockScheduleTimes());
this.queryOptions.setMysqlRowBinaryFormat(
context.getCommand() == MysqlCommand.COM_STMT_EXECUTE);
}
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 438afdaea53..94cf0cb3469 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
@@ -1045,7 +1045,7 @@ public class SessionVariable implements Serializable,
Writable {
@VariableMgr.VarAttr(name = PARALLEL_SCAN_MIN_ROWS_PER_SCANNER, fuzzy =
true,
varType = VariableAnnotation.EXPERIMENTAL, needForward = true)
- private long parallelScanMinRowsPerScanner = 2097152; // 16K
+ private long parallelScanMinRowsPerScanner = 2097152; // 2M
@VariableMgr.VarAttr(name = IGNORE_STORAGE_DATA_DISTRIBUTION, fuzzy =
false,
varType = VariableAnnotation.EXPERIMENTAL, needForward = true)
@@ -3656,6 +3656,7 @@ public class SessionVariable implements Serializable,
Writable {
tResult.setTrimTailingSpacesForExternalTableQuery(trimTailingSpacesForExternalTableQuery);
tResult.setEnableShareHashTableForBroadcastJoin(enableShareHashTableForBroadcastJoin);
tResult.setEnableHashJoinEarlyStartProbe(enableHashJoinEarlyStartProbe);
+ tResult.setEnableScanNodeRunSerial(enableScanRunSerial);
tResult.setBatchSize(batchSize);
tResult.setDisableStreamPreaggregations(disableStreamPreaggregations);
@@ -3686,6 +3687,7 @@ public class SessionVariable implements Serializable,
Writable {
tResult.setResourceLimit(resourceLimit);
}
+ tResult.setWaitFullBlockScheduleTimes(waitFullBlockScheduleTimes);
tResult.setEnableFunctionPushdown(enableFunctionPushdown);
tResult.setEnableCommonExprPushdown(enableCommonExprPushdown);
tResult.setCheckOverflowForDecimal(checkOverflowForDecimal);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
