Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3330
Change subject: Merge commit '01c8ed5d74' from 'stabilization-f69489'
......................................................................
Merge commit '01c8ed5d74' from 'stabilization-f69489'
Change-Id: Ifddae7a808031cdc08300d9d56b9ffb755279964
---
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
M
hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
3 files changed, 12 insertions(+), 17 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/30/3330/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 992e499..36bdf77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -4820,14 +4820,14 @@
</compilation-unit>
</test-case>
<test-case FilePath="group-by">
-<<<<<<< HEAD (57645c [NO ISSUE][FUN] Modify array functions to allow
comparing co)
<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 (01c8ed [NO ISSUE] Fix listing of conflicting procs on sample
start)
</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 f88a1e3..3fc5683 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 (57645c [NO ISSUE][FUN] Modify array functions to allow
comparing co)
import org.apache.asterix.lang.common.struct.Identifier;
-=======
import org.apache.asterix.lang.common.struct.QuantifiedPair;
->>>>>>> BRANCH (01c8ed [NO ISSUE] Fix listing of conflicting procs on sample
start)
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,15 @@
return bindingVars;
}
-<<<<<<< HEAD (57645c [NO ISSUE][FUN] Modify array functions to allow
comparing co)
+ 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 +216,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 (01c8ed [NO ISSUE] Fix listing of conflicting procs on sample
start)
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
index 88a6962..ac390e3 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
@@ -33,7 +33,6 @@
import
org.apache.hyracks.storage.am.common.tuples.PermutingFrameTupleReference;
import org.apache.hyracks.storage.common.IIndex;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
-import org.apache.hyracks.util.annotations.CriticalPath;
public class IndexBulkLoadOperatorNodePushable extends
AbstractUnaryInputUnaryOutputOperatorNodePushable {
protected final IHyracksTaskContext ctx;
--
To view, visit https://asterix-gerrit.ics.uci.edu/3330
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifddae7a808031cdc08300d9d56b9ffb755279964
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
