[doris] branch dev-1.0.1-v20220707 updated: [tmpfix] rf

[morningman]

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

morningman pushed a commit to branch dev-1.0.1-v20220707
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/dev-1.0.1-v20220707 by this 
push:
     new 08a0042afc [tmpfix] rf
08a0042afc is described below

commit 08a0042afce1b0a1c084fa66f45304e3518fba98
Author: morningman <morning...@apache.org>
AuthorDate: Fri Jul 8 09:04:28 2022 +0800

    [tmpfix] rf
---
 .../main/java/org/apache/doris/analysis/ExprSubstitutionMap.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprSubstitutionMap.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprSubstitutionMap.java
index 8a2f6d0b9b..e0df525ce5 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprSubstitutionMap.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprSubstitutionMap.java
@@ -171,11 +171,14 @@ public final class ExprSubstitutionMap {
         for (int i = 0; i < g.size(); i++) {
             if (f.containsMappingFor(g.lhs_.get(i))) {
                 result.put(f.get(g.lhs_.get(i)), g.rhs_.get(i));
-                if (f.get(g.lhs_.get(i)) instanceof SlotRef && g.lhs_.get(i) 
instanceof SlotRef) {
-                    analyzer.putEquivalentSlot(((SlotRef) 
Objects.requireNonNull(f.get(g.lhs_.get(i)))).getSlotId(), ((SlotRef) 
g.lhs_.get(i)).getSlotId());
+                if (f.get(g.lhs_.get(i)) instanceof SlotRef && g.rhs_.get(i) 
instanceof SlotRef) {
+                    analyzer.putEquivalentSlot(((SlotRef) 
g.rhs_.get(i)).getSlotId(), ((SlotRef) 
Objects.requireNonNull(f.get(g.lhs_.get(i)))).getSlotId());
                 }
             } else {
                 result.put(g.lhs_.get(i), g.rhs_.get(i));
+                if (g.lhs_.get(i) instanceof SlotRef && g.rhs_.get(i) 
instanceof SlotRef) {
+                    analyzer.putEquivalentSlot(((SlotRef) 
g.rhs_.get(i)).getSlotId(), ((SlotRef) g.lhs_.get(i)).getSlotId());
+                }
             }
         }
         return result;


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