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
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 7be03c4b72 fix merge conflict
7be03c4b72 is described below
commit 7be03c4b72b7aa3c34cd163fd41590f4c7db5cbe
Author: Kang <[email protected]>
AuthorDate: Sat Aug 5 21:48:38 2023 +0800
fix merge conflict
---
fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Memo.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Memo.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Memo.java
index 33242b013a..ad7b3d402d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Memo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Memo.java
@@ -49,6 +49,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Optional;
import java.util.PriorityQueue;
import java.util.stream.Collectors;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
