Michael Smith has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/21684 )
Change subject: IMPALA-13302: Restore registering all conjuncts ...................................................................... IMPALA-13302: Restore registering all conjuncts Reverts an optimization in IMPALA-12164 that skipped registering remaining conjuncts if they were expected to be removed by a rewrite rule, then call markConjunctsAssigned on them. In some cases the rewrite rule is not applied in the first pass, only during reAnalyze. During the first pass, the Expr would have registerConjunct called and an ID assigned because there were no constant false conjuncts. During reAnalyze, there would be a constant false conjunct after rewrite, so the Expr would skip registerConjunct but then have markConjunctsAssigned with its existing ID. Later a new Expr gets the same ID from registerConjunct and skips markConjunctsAssigned because it's believed to already be assigned, skipping slot materialization. Incomplete rule rewriting is handled separately as IMPALA-13344. Logs tuple id for eqJoinConjunct and cleans up logging calls with parameter substitution. Also returns more slot context on Precondition. Adds ExprRewriteRules tests that previously hit the new Precondition in markConjunctAssigned, and rewrite PlannerTest. Change-Id: I5959a3b3e18302e00b1d37e5f50410ebdb224cb0 Reviewed-on: http://gerrit.cloudera.org:8080/21684 Reviewed-by: Riza Suminto <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- M fe/src/main/java/org/apache/impala/analysis/Analyzer.java M fe/src/main/java/org/apache/impala/analysis/SlotRef.java M fe/src/test/java/org/apache/impala/analysis/ExprRewriteRulesTest.java M fe/src/test/java/org/apache/impala/planner/PlannerTest.java A testdata/workloads/functional-planner/queries/PlannerTest/rewrite.test 5 files changed, 193 insertions(+), 8 deletions(-) Approvals: Riza Suminto: Looks good to me, approved Impala Public Jenkins: Verified -- To view, visit http://gerrit.cloudera.org:8080/21684 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-Project: Impala-ASF Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5959a3b3e18302e00b1d37e5f50410ebdb224cb0 Gerrit-Change-Number: 21684 Gerrit-PatchSet: 11 Gerrit-Owner: Michael Smith <[email protected]> Gerrit-Reviewer: Csaba Ringhofer <[email protected]> Gerrit-Reviewer: Impala Public Jenkins <[email protected]> Gerrit-Reviewer: Joe McDonnell <[email protected]> Gerrit-Reviewer: Michael Smith <[email protected]> Gerrit-Reviewer: Quanlong Huang <[email protected]> Gerrit-Reviewer: Riza Suminto <[email protected]> Gerrit-Reviewer: Zoltan Borok-Nagy <[email protected]>
