Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/8567/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:02:34 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/6370/ (3/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:24 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ssl-compression/569/ (13/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:38 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/1156/ (16/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:09:11 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-spidersilk-tests/728/ (6/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:25 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Anon. E. Moose (1000171) has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Analytics Compatibility Compilation Successful https://cbjenkins.page.link/e7cHo3CjWDZpaACp6 : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:05:30 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN: * asterixdb * hyracks-fullstack PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES! -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:05:31 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/4417/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:04:42 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/5805/ (12/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:36 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/11279/ (14/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:39 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/3799/ (11/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:34 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/5767/ (15/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:41 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/5787/ (9/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:29 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/5956/ (10/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:32 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/6160/ (8/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:28 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-txnlog/966/ (7/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:26 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/1064/ (5/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:25 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/9746/ (4/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:24 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/6010/ (2/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:23 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3399 ) Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/5704/ (1/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3399 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd Gerrit-Change-Number: 3399 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 16 May 2019 09:01:23 + Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE
Ali Alsuliman has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/3399 Change subject: [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE .. [ASTERIXDB-2289][COMP] Fix field access with UNION and CASE - user model changes: no - storage format changes: no - interface changes: no Details: This patch fixes field access in the presense of UNION and CASE. For CASE scenario, push-down-field-access rule throws an exception if the field access has potentially two sources and it could not push down the field access to left or right branch. The exception thinks that the field access has no source when in reality it has but there were two potential sources because of CASE. Don't throw an exception if the field access is a valid one and return false (i.e. field access was not push) instead of throwing an exception. For UNION, if there is an assign operator above UNION, the optimizer will move the assign operator under UNION into both branches. If the assign operator has field access by index, the index is based on the output record of the union operator which could be different from the field index in left and right branches. The fix is to convert the index into a named field, and then move the assign operator. The optimizer will fire by-name-to-by-index rule after this and replace the name with the correct index for each record of left and right branch. by-name-to-by-index rule is already a required rule to be fired after push-assign-under-union rule. Change-Id: I911e4e9018c15e8f226e46fa610d222eb2301fcd --- M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java A asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushAssignBelowUnionAllRule.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushFieldAccessRule.java A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/field_access/field_access.1.ddl.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/field_access/field_access.2.update.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/field_access/field_access.3.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/field_access/field_access.4.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/field_access/field_access.5.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/field_access/field_access.6.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/field_access/field_access.7.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/results/misc/field_access/field_access.3.adm A asterixdb/asterix-app/src/test/resources/runtimets/results/misc/field_access/field_access.4.adm A asterixdb/asterix-app/src/test/resources/runtimets/results/misc/field_access/field_access.5.adm A asterixdb/asterix-app/src/test/resources/runtimets/results/misc/field_access/field_access.6.adm A asterixdb/asterix-app/src/test/resources/runtimets/results/misc/field_access/field_access.7.adm D hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignBelowUnionAllRule.java 16 files changed, 537 insertions(+), 174 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/99/3399/1 diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java index e4c35e4..79f565f 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java @@ -66,6 +66,7 @@ import org.apache.asterix.optimizer.rules.NestGroupByRule; import org.apache.asterix.optimizer.rules.PushAggFuncIntoStandaloneAggregateRule; import org.apache.asterix.optimizer.rules.PushAggregateIntoNestedSubplanRule; +import org.apache.asterix.optimizer.rules.PushAssignBelowUnionAllRule; import org.apache.asterix.optimizer.rules.PushFieldAccessRule; import org.apache.asterix.optimizer.rules.PushGroupByThroughProduct; import org.apache.asterix.optimizer.rules.PushLimitIntoOrderByRule; @@ -117,7 +118,6 @@ import org.apache.hyracks.algebricks.rewriter.rules.IntroduceProjectsRule; import org.apache.hyracks.algebricks.rewriter.rules.IsolateHyracksOperatorsRule; import org.apache.hyracks.algebricks.rewriter.rules.PullSelectOutOfEqJoin; -import org.apache.hyracks.algebricks.rewriter.rules.PushAssignBelowUnionAllRule; import org.apache.hyracks.algebricks.rewriter.rules.PushGroupByIntoSortRule; import org.apache.hyracks.algebricks.rewriter.rules.PushMapOperatorDownThroughProductRule; import