Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Dmitry Lychagin has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3460 )
Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator
..
[NO ISSUE][COMP] Fix variable handling in Intersect operator
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Create separate lists for output compare and
extra variables in Intersect logical operator
- Align accessor method for input extra variables
with the one for input compare variables
- Remove getInputVariables() from Intersect operator
because these variables are already provided by
getInputCompareVariables() and getInputExtraVariables()
Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3460
Contrib: Jenkins
Tested-by: Jenkins
Integration-Tests: Jenkins
Reviewed-by: Dmitry Lychagin
Reviewed-by: Ali Alsuliman
---
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IntersectOperator.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismVariableMappingVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/ProducedVariableVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SubstituteVariableVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/IntersectPOperator.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/LogicalOperatorDotVisitor.java
14 files changed, 292 insertions(+), 205 deletions(-)
Approvals:
Jenkins: Verified; ; Verified
Dmitry Lychagin: Looks good to me, but someone else must approve
Ali Alsuliman: Looks good to me, approved
Objections:
Jenkins: Violations found
Anon. E. Moose (1000171): Violations found
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
index bd5b7c4..42af276 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
@@ -320,16 +320,13 @@
private IntersectOperator createIntersectWithFilter(List
outputFilterVars,
List> filterVars, IntersectOperator
intersect) throws AlgebricksException {
-List outputVars = new ArrayList<>();
-outputVars.addAll(intersect.getOutputVars());
-outputVars.addAll(outputFilterVars);
-
-List> compareVars = new
ArrayList<>(intersect.getNumInput());
-for (int i = 0; i < intersect.getNumInput(); i++) {
-compareVars.add(new ArrayList<>(intersect.getCompareVariables(i)));
+int nInput = intersect.getNumInput();
+List> inputCompareVars = new ArrayList<>(nInput);
+for (int i = 0; i < nInput; i++) {
+inputCompareVars.add(new
ArrayList<>(intersect.getInputCompareVariables(i)));
}
-
-IntersectOperator intersectWithFilter = new
IntersectOperator(outputVars, compareVars, filterVars);
+IntersectOperator intersectWithFilter = new
IntersectOperator(intersect.getOutputCompareVariables(),
+
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Ali Alsuliman has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/3460/1/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IntersectOperator.java File hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IntersectOperator.java: https://asterix-gerrit.ics.uci.edu/#/c/3460/1/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IntersectOperator.java@137 PS1, Line 137: inputExtraVars0 I wonder why they check type consistency for compare variables but not extra variables -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 26 Jun 2019 17:51:36 + Gerrit-HasComments: Yes
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Ali Alsuliman has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 26 Jun 2019 17:51:38 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Anon. E. Moose (1000171) has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Contrib-2 Analytics Compatibility Tests Failed https://cbjenkins.page.link/D3CbZ641JeLHYtDL6 : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 26 Jun 2019 01:07:42 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Dmitry Lychagin has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Code-Review+1 -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 26 Jun 2019 00:27:47 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/8781/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 26 Jun 2019 00:21:35 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Contrib+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/4605/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:22:50 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/8781/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:08:33 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/4605/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:08:31 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/6226/ (15/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:06:15 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/4010/ (16/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:06:15 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/1372/ (13/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:06:14 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/6376/ (14/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:06:14 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/1276/ (12/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:06:14 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/6587/ (11/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:06:14 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Anon. E. Moose (1000171) has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Analytics Compatibility Compilation Successful https://cbjenkins.page.link/tVukFvDiadcKHFCLA : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:04:51 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/6165/ (9/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:04:27 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-txnlog/1183/ (10/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:04:27 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. 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/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:04:27 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/9969/ (8/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:03:12 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/6005/ (7/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:01:31 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Dmitry Lychagin has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/3460
Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator
..
[NO ISSUE][COMP] Fix variable handling in Intersect operator
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Create separate lists for output compare and
extra variables in Intersect logical operator
- Align accessor method for input extra variables
with the one for input compare variables
- Remove getInputVariables() from Intersect operator
because these variables are already provided by
getInputCompareVariables() and getInputExtraVariables()
Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c
---
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IntersectOperator.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismVariableMappingVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/ProducedVariableVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SubstituteVariableVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/IntersectPOperator.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/LogicalOperatorDotVisitor.java
14 files changed, 292 insertions(+), 205 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/60/3460/1
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
index bd5b7c4..42af276 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
@@ -320,16 +320,13 @@
private IntersectOperator createIntersectWithFilter(List
outputFilterVars,
List> filterVars, IntersectOperator
intersect) throws AlgebricksException {
-List outputVars = new ArrayList<>();
-outputVars.addAll(intersect.getOutputVars());
-outputVars.addAll(outputFilterVars);
-
-List> compareVars = new
ArrayList<>(intersect.getNumInput());
-for (int i = 0; i < intersect.getNumInput(); i++) {
-compareVars.add(new ArrayList<>(intersect.getCompareVariables(i)));
+int nInput = intersect.getNumInput();
+List> inputCompareVars = new ArrayList<>(nInput);
+for (int i = 0; i < nInput; i++) {
+inputCompareVars.add(new
ArrayList<>(intersect.getInputCompareVariables(i)));
}
-
-IntersectOperator intersectWithFilter = new
IntersectOperator(outputVars, compareVars, filterVars);
+IntersectOperator intersectWithFilter = new
IntersectOperator(intersect.getOutputCompareVariables(),
+outputFilterVars, inputCompareVars, filterVars);
intersectWithFilter.setSourceLocation(intersect.getSourceLocation());
intersectWithFilter.getInputs().addAll(intersect.getInputs());
return intersectWithFilter;
diff --git
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ssl-compression/782/ (4/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:00:36 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/11497/ (3/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:00:36 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/5925/ (5/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:00:37 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/6028/ (1/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:00:36 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/5988/ (2/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:00:36 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Fix variable handling in Intersect operator
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3460 ) Change subject: [NO ISSUE][COMP] Fix variable handling in Intersect operator .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-spidersilk-tests/943/ (6/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3460 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f436566e743d7e908a72bfa502c138ae7b99c6c Gerrit-Change-Number: 3460 Gerrit-PatchSet: 1 Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Tue, 25 Jun 2019 23:00:37 + Gerrit-HasComments: No
