[doris] 02/02: fix pick conflict

[kxiao]

This is an automated email from the ASF dual-hosted git repository.

kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git

commit e85850d92867b5d5d1e21481b263fa2668dc5f4f
Author: Kang <kxiao.ti...@gmail.com>
AuthorDate: Fri Aug 11 23:55:13 2023 +0800

    fix pick conflict
---
 .../src/main/java/org/apache/doris/datasource/InternalCatalog.java       | 1 -
 fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
index 0f3bdc6ec9..661e3eab04 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
@@ -1885,7 +1885,6 @@ public class InternalCatalog implements 
CatalogIf<Database> {
                 if (!countDownLatch.getStatus().ok()) {
                     errMsg += " Error: " + 
countDownLatch.getStatus().getErrorMsg();
                 } else {
-                    List<Entry<Long, Long>> unfinishedMarks = 
countDownLatch.getLeftMarks();
                     errMsg += "Timeout:" + (timeout / 1000) + " seconds.";
                     // only show at most 3 results
                     List<String> subList = 
countDownLatch.getLeftMarks().stream().limit(3)
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 5325ca7871..36afda4d3b 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
@@ -182,6 +182,7 @@ public class SessionVariable implements Serializable, 
Writable {
 
     public static final String ENABLE_BUSHY_TREE = "enable_bushy_tree";
 
+    public static final String MAX_JOIN_NUMBER_BUSHY_TREE = 
"max_join_number_bushy_tree";
     public static final String ENABLE_PARTITION_TOPN = "enable_partition_topn";
 
     public static final String ENABLE_INFER_PREDICATE = 
"enable_infer_predicate";


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org