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 26bc749afd8 [bugfix](set_var) fix sql level exec_mem_limit does not
take effect (#25043)
26bc749afd8 is described below
commit 26bc749afd8651626b8142f3bbe621518fae9200
Author: Guangdong Liu <[email protected]>
AuthorDate: Sat Oct 7 20:15:25 2023 +0800
[bugfix](set_var) fix sql level exec_mem_limit does not take effect (#25043)
---
fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 9be2abb0d48..a8a08fb0e62 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
@@ -380,7 +380,9 @@ public class Coordinator implements CoordInterface {
this.queryOptions.setResourceLimit(resourceLimit);
}
// set exec mem limit
- long memLimit =
Env.getCurrentEnv().getAuth().getExecMemLimit(qualifiedUser);
+ long maxExecMemByte =
connectContext.getSessionVariable().getMaxExecMemByte();
+ long memLimit = maxExecMemByte > 0 ? maxExecMemByte :
+ Env.getCurrentEnv().getAuth().getExecMemLimit(qualifiedUser);
if (memLimit > 0) {
// overwrite the exec_mem_limit from session variable;
this.queryOptions.setMemLimit(memLimit);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
