This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 3cf5d15b49f [fix](fe) avoid setting the value of batch_size
excessively high (#35941) (#40312)
3cf5d15b49f is described below
commit 3cf5d15b49ff54ea322cbaec15ac5db39a8aa4f6
Author: Jerry Hu <[email protected]>
AuthorDate: Tue Sep 3 19:49:26 2024 +0800
[fix](fe) avoid setting the value of batch_size excessively high (#35941)
(#40312)
Issue Number: close #xxx
pick #35941
## Proposed changes
Issue Number: close #xxx
<!--Describe your changes.-->
---
.../src/main/java/org/apache/doris/qe/SessionVariable.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
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 b7d977fd386..375fa5d49a3 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
@@ -56,6 +56,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.io.Serializable;
import java.lang.reflect.Field;
+import java.security.InvalidParameterException;
import java.security.SecureRandom;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
@@ -846,7 +847,7 @@ public class SessionVariable implements Serializable,
Writable {
public boolean haveQueryCache = false;
// 4096 minus 16 + 16 bytes padding that in padding pod array
- @VariableMgr.VarAttr(name = BATCH_SIZE, fuzzy = true)
+ @VariableMgr.VarAttr(name = BATCH_SIZE, fuzzy = true, checker =
"checkBatchSize")
public int batchSize = 4064;
@VariableMgr.VarAttr(name = DISABLE_STREAMING_PREAGGREGATIONS, fuzzy =
true)
@@ -4008,6 +4009,13 @@ public class SessionVariable implements Serializable,
Writable {
}
}
+ public void checkBatchSize(String batchSize) {
+ Long batchSizeValue = Long.valueOf(batchSize);
+ if (batchSizeValue < 1 || batchSizeValue > 65535) {
+ throw new InvalidParameterException("batch_size should be between
1 and 65535)");
+ }
+ }
+
public boolean isEnableInsertGroupCommit() {
return Config.wait_internal_group_commit_finish
|| GroupCommitBlockSink.parseGroupCommit(groupCommit) ==
TGroupCommitMode.ASYNC_MODE
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
