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

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new be6c15d  Trivial refactoring: remove dead code
be6c15d is described below

commit be6c15ddad48a482044cc07fdb8affeedcd2ed51
Author: Daniel Sun <[email protected]>
AuthorDate: Mon Nov 23 08:16:05 2020 +0800

    Trivial refactoring: remove dead code
---
 .../org/apache/groovy/ginq/provider/collection/GinqAstWalker.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/GinqAstWalker.groovy
 
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/GinqAstWalker.groovy
index bb709fd..4e0ca5b 100644
--- 
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/GinqAstWalker.groovy
+++ 
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/GinqAstWalker.groovy
@@ -514,6 +514,8 @@ class GinqAstWalker implements GinqAstVisitor<Expression>, 
SyntaxErrorReportable
             throw new GroovyBugError("lambdaParamName is null. 
dataSourceExpression:${dataSourceExpression}, expr:${expr}")
         }
 
+        boolean isJoin = dataSourceExpression instanceof JoinExpression
+
         // (1) correct itself
         expr = correctVars(dataSourceExpression, lambdaParamName, expr)
 
@@ -559,9 +561,7 @@ class GinqAstWalker implements GinqAstVisitor<Expression>, 
SyntaxErrorReportable
                                         args(new 
VariableExpression(lambdaParamName), getMetaDataMethodCall(MD_ALIAS_NAME_LIST))
                                     )
                         } else {
-                            transformedExpression = isJoin
-                                    ? correctVarsForJoin(dataSourceExpression, 
expression, new VariableExpression(lambdaParamName))
-                                    : new VariableExpression(lambdaParamName)
+                            transformedExpression = new 
VariableExpression(lambdaParamName)
                         }
                     } else {
                         if 
(groupNameListExpression.getExpressions().stream().map(e -> e.text).anyMatch(e 
-> e == expression.text)

Reply via email to