Change in asterixdb[master]: Merge commit 'f4c7fe7464' from 'stabilization-f69489'

[Michael Blow (Code Review)]

Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/3329

Change subject: Merge commit 'f4c7fe7464' from 'stabilization-f69489'
......................................................................

Merge commit 'f4c7fe7464' from 'stabilization-f69489'

Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630
---
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M 
asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
2 files changed, 11 insertions(+), 16 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/29/3329/1

diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index f6e5055..cd04fe6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -4837,14 +4837,14 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="group-by">
-<<<<<<< HEAD   (1632f2 [NO ISSUE] Use RuntimeMXBean.getPid() when available)
       <compilation-unit name="sugar-08-negative">
         <output-dir compare="Text">core-01</output-dir>
         <expected-error>ASX1103: Illegal use of identifier: x</expected-error>
-=======
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="group-by">
       <compilation-unit name="sugar-09">
         <output-dir compare="Text">sugar-09</output-dir>
->>>>>>> BRANCH (f4c7fe [NO ISSUE][RT] Fix Secondary Indexes Bulkload/Upsert)
       </compilation-unit>
     </test-case>
     <test-case FilePath="group-by">
diff --git 
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
 
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
index 1cbc940..72686ea 100644
--- 
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
+++ 
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
@@ -36,11 +36,8 @@
 import org.apache.asterix.lang.common.expression.GbyVariableExpressionPair;
 import org.apache.asterix.lang.common.expression.QuantifiedExpression;
 import org.apache.asterix.lang.common.expression.VariableExpr;
-<<<<<<< HEAD   (1632f2 [NO ISSUE] Use RuntimeMXBean.getPid() when available)
 import org.apache.asterix.lang.common.struct.Identifier;
-=======
 import org.apache.asterix.lang.common.struct.QuantifiedPair;
->>>>>>> BRANCH (f4c7fe [NO ISSUE][RT] Fix Secondary Indexes Bulkload/Upsert)
 import org.apache.asterix.lang.common.struct.VarIdentifier;
 import org.apache.asterix.lang.sqlpp.clause.AbstractBinaryCorrelateClause;
 import org.apache.asterix.lang.sqlpp.clause.FromClause;
@@ -197,7 +194,14 @@
         return bindingVars;
     }
 
-<<<<<<< HEAD   (1632f2 [NO ISSUE] Use RuntimeMXBean.getPid() when available)
+    public static List<VariableExpr> getBindingVariables(QuantifiedExpression 
qe) {
+        List<QuantifiedPair> quantifiedList = qe.getQuantifiedList();
+        List<VariableExpr> bindingVars = new 
ArrayList<>(quantifiedList.size());
+        for (QuantifiedPair qp : quantifiedList) {
+            bindingVars.add(qp.getVarExpr());
+        }
+        return bindingVars;
+    }
     public static Map<Expression, Identifier> 
createFieldVariableMap(List<Pair<Expression, Identifier>> fieldList) {
         Map<Expression, Identifier> fieldVars = new HashMap<>();
         for (Pair<Expression, Identifier> p : fieldList) {
@@ -211,14 +215,5 @@
         VariableExpr newVarExpr = new VariableExpr(var);
         newVarExpr.setSourceLocation(varExpr.getSourceLocation());
         outFieldList.add(new Pair<>(newVarExpr, 
toUserDefinedVariableName(var)));
-=======
-    public static List<VariableExpr> getBindingVariables(QuantifiedExpression 
qe) {
-        List<QuantifiedPair> quantifiedList = qe.getQuantifiedList();
-        List<VariableExpr> bindingVars = new 
ArrayList<>(quantifiedList.size());
-        for (QuantifiedPair qp : quantifiedList) {
-            bindingVars.add(qp.getVarExpr());
-        }
-        return bindingVars;
->>>>>>> BRANCH (f4c7fe [NO ISSUE][RT] Fix Secondary Indexes Bulkload/Upsert)
     }
 }

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3329
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b0d2756d839b0bc2e7c59723306921e698a7630
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>