Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/9190/ (3/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage-jre10/27/ (1/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/4260/ (9/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/3723/ (2/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/4174/ (6/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/3681/ (10/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/7653/ (12/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/4152/ (7/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/1729/ (5/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/3634/ (8/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/3937/ (4/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/3710/ (11/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Steven Jacobs has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/2703
Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in
InlineAllNtsInSubplanVisitor
..
[COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor
Makes the visitor correctly allow substitution of the input ops
for the output op in future operators
Added test
Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc
---
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.1.ddl.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.2.update.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.3.query.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.4.query.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/results/upsert/upsert-case-returning/upsert-case-returning.3.adm
A
asterixdb/asterix-app/src/test/resources/runtimets/results/upsert/upsert-case-returning/upsert-case-returning.4.adm
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
8 files changed, 184 insertions(+), 2 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/03/2703/1
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
index a98a9f4..4d646f3 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
@@ -562,8 +562,8 @@
// Update the variable mappings
List>
varTriples = op.getVariableMappings();
for (Triple triple
: varTriples) {
-updateInputToOutputVarMapping(triple.third, triple.first, false);
-updateInputToOutputVarMapping(triple.second, triple.first, false);
+updateInputToOutputVarMapping(triple.first, triple.third, false);
+updateInputToOutputVarMapping(triple.second, triple.third, false);
}
return op;
}
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.1.ddl.sqlpp
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.1.ddl.sqlpp
new file mode 100644
index 000..d3162f4
--- /dev/null
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.1.ddl.sqlpp
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description : Test for issue ASTERIXDB-2400
+ * Expected Res : Success
+ * Date : Jun 2018
+ */
+
+drop dataverse test if exists;
+create dataverse test;
+use test;
+
+create type sub as {
+ subscriptionId: uuid
+};
+
+create dataset subscriptions(sub) primary key subscriptionId;
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.2.update.sqlpp
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.2.update.sqlpp
new file mode 100644
index 000..c4ba876
--- /dev/null
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.2.update.sqlpp
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright own
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Anon. E. Moose #1000171 has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Contrib-2 Analytics Compatibility Compilation Failed https://goo.gl/v2WYgZ : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/6584/ -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/3683/ (2/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/7655/ (4/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/4262/ (3/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/3712/ (1/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/3939/ (6/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/3636/ (5/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/1731/ (7/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/9192/ (8/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage-jre10/29/ (9/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Anon. E. Moose #1000171 has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Analytics Compatibility Compilation Successful https://goo.gl/CAUrfT : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/3725/ (10/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/4154/ (11/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/4176/ (12/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-java10/27/ (13/13) -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/6586/ -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3260/ -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Contrib+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3260/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Jenkins has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/6586/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Anon. E. Moose #1000171 has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Contrib+1 Analytics Compatibility Tests Successful https://goo.gl/De4Pnu : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Dmitry Lychagin has posted comments on this change. Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/2703 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven Jacobs Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInS...
Steven Jacobs has submitted this change and it was merged.
Change subject: [COMP][ASTERIXDB-2400] Fix UNION handling in
InlineAllNtsInSubplanVisitor
..
[COMP][ASTERIXDB-2400] Fix UNION handling in InlineAllNtsInSubplanVisitor
Makes the visitor correctly allow substitution of the input ops
for the output op in future operators
Added test
Change-Id: I8b7e3e24749ed88e27d6cd38be5584ea748f39fc
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2703
Sonar-Qube: Jenkins
Tested-by: Jenkins
Contrib: Jenkins
Integration-Tests: Jenkins
Reviewed-by: Dmitry Lychagin
---
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.1.ddl.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.2.update.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.3.query.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.4.query.sqlpp
A
asterixdb/asterix-app/src/test/resources/runtimets/results/upsert/upsert-case-returning/upsert-case-returning.3.adm
A
asterixdb/asterix-app/src/test/resources/runtimets/results/upsert/upsert-case-returning/upsert-case-returning.4.adm
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
8 files changed, 184 insertions(+), 2 deletions(-)
Approvals:
Anon. E. Moose #1000171:
Jenkins: Verified; No violations found; ; Verified
Dmitry Lychagin: Looks good to me, approved
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
index a98a9f4..4d646f3 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java
@@ -562,8 +562,8 @@
// Update the variable mappings
List>
varTriples = op.getVariableMappings();
for (Triple triple
: varTriples) {
-updateInputToOutputVarMapping(triple.third, triple.first, false);
-updateInputToOutputVarMapping(triple.second, triple.first, false);
+updateInputToOutputVarMapping(triple.first, triple.third, false);
+updateInputToOutputVarMapping(triple.second, triple.third, false);
}
return op;
}
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.1.ddl.sqlpp
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.1.ddl.sqlpp
new file mode 100644
index 000..d3162f4
--- /dev/null
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.1.ddl.sqlpp
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description : Test for issue ASTERIXDB-2400
+ * Expected Res : Success
+ * Date : Jun 2018
+ */
+
+drop dataverse test if exists;
+create dataverse test;
+use test;
+
+create type sub as {
+ subscriptionId: uuid
+};
+
+create dataset subscriptions(sub) primary key subscriptionId;
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.2.update.sqlpp
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.2.update.sqlpp
new file mode 100644
index 000..c4ba876
--- /dev/null
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-case-returning/upsert-case-returning.2.update.sqlpp
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apa
