This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch selectdb-doris-2.0-ikas in repository https://gitbox.apache.org/repos/asf/doris.git
commit 5ca337f5a5c07d9de6fad5d524e140667a40b246 Author: yiguolei <[email protected]> AuthorDate: Tue Apr 23 22:24:27 2024 +0800 spotfire bugfix --- fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java | 3 --- 1 file changed, 3 deletions(-) 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 4af3fef704d..5cb7f3afc02 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 @@ -69,11 +69,8 @@ public class SessionVariable implements Serializable, Writable { public static final String EXEC_MEM_LIMIT = "exec_mem_limit"; public static final String SCAN_QUEUE_MEM_LIMIT = "scan_queue_mem_limit"; public static final String QUERY_TIMEOUT = "query_timeout"; -<<<<<<< HEAD public static final String ANALYZE_TIMEOUT = "analyze_timeout"; -======= ->>>>>>> 29b4448635 (Fixed spotfire sql force limit) public static final String MAX_EXECUTION_TIME = "max_execution_time"; public static final String INSERT_TIMEOUT = "insert_timeout"; public static final String ENABLE_REWRITE_LIMIT = "enable_rewrite_limit"; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
