You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by ti...@apache.org on 2014/04/04 21:44:11 UTC
[1/5] git commit: fix serialization for empty elements
Repository: incubator-vxquery
Updated Branches:
refs/heads/master a09d1f5dd -> 80436f854
fix serialization for empty elements
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/71c71087
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/71c71087
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/71c71087
Branch: refs/heads/master
Commit: 71c71087db747af7195decfe2523a803f3f7ec95
Parents: a09d1f5
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 10:25:13 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Thu Apr 3 10:25:13 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/vxquery/serializer/XMLSerializer.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/71c71087/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
index 51670e8..189ae24 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
@@ -369,14 +369,16 @@ public class XMLSerializer implements IPrinter {
printSequence(ps, seqp);
}
- ps.append('>');
enp.getChildrenSequence(ntp, seqp);
if (seqp.getByteArray() != null) {
+ ps.append('>');
printSequence(ps, seqp);
+ ps.append("</");
+ printPrefixedQName(ps, cqp, utf8sp);
+ ps.append('>');
+ } else {
+ ps.append("/>");
}
- ps.append("</");
- printPrefixedQName(ps, cqp, utf8sp);
- ps.append('>');
} finally {
pp.giveBack(seqp);
pp.giveBack(utf8sp);
[5/5] git commit: fix serialization of empty elements
Posted by ti...@apache.org.
fix serialization of empty elements
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/80436f85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/80436f85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/80436f85
Branch: refs/heads/master
Commit: 80436f854d4378ddf8b17714b37d95c048109390
Parents: 3b603b8 71c7108
Author: Till Westmann <we...@gmail.com>
Authored: Fri Apr 4 12:21:45 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Fri Apr 4 12:21:45 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/vxquery/serializer/XMLSerializer.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[4/5] git commit: small fixes
Posted by ti...@apache.org.
small fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/3b603b86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/3b603b86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/3b603b86
Branch: refs/heads/master
Commit: 3b603b86a8e53b600ae3b90aa63e95674c35bb7a
Parents: bc54c0d 44faa1f
Author: Till Westmann <we...@gmail.com>
Authored: Fri Apr 4 12:21:25 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Fri Apr 4 12:21:25 2014 -0700
----------------------------------------------------------------------
.../org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
[2/5] git commit: add NullableTypeComputer to avoid NPE
Posted by ti...@apache.org.
add NullableTypeComputer to avoid NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/44faa1f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/44faa1f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/44faa1f3
Branch: refs/heads/master
Commit: 44faa1f3f369268fd05b04fd3348a8404c112eee
Parents: a09d1f5
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 10:47:21 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Thu Apr 3 10:47:21 2014 -0700
----------------------------------------------------------------------
.../org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/44faa1f3/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index e6a9007..a3f5e93 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -41,6 +41,7 @@ import org.apache.vxquery.xmlquery.translator.XMLQueryTranslator;
import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException;
import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
import edu.uci.ics.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder;
import edu.uci.ics.hyracks.algebricks.compiler.api.ICompiler;
@@ -142,6 +143,12 @@ public class XMLQueryCompiler {
return null;
}
});
+ builder.setNullableTypeComputer(new INullableTypeComputer() {
+ @Override
+ public Object makeNullableType(Object type) throws AlgebricksException {
+ throw new NotImplementedException("NullableTypeComputer is not implented");
+ }
+ });
builder.setNullWriterFactory(new VXQueryNullWriterFactory());
builder.setClusterLocations(new AlgebricksAbsolutePartitionConstraint(nodeList));
cFactory = builder.create();
[3/5] git commit: avoid a few exceptions
Posted by ti...@apache.org.
avoid a few exceptions
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/bc54c0d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/bc54c0d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/bc54c0d8
Branch: refs/heads/master
Commit: bc54c0d83ae55c6b8fc67c454b5fc3b959a99f26
Parents: a09d1f5
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 22:05:49 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Thu Apr 3 22:05:49 2014 -0700
----------------------------------------------------------------------
...ueryLogicalExpressionPrettyPrintVisitor.java | 28 ++++++++++++++++----
1 file changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/bc54c0d8/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
index c630837..e6d8dd1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
@@ -40,6 +40,7 @@ import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.StatefulFunctionC
import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
import edu.uci.ics.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor;
import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
@@ -90,7 +91,23 @@ public class VXQueryLogicalExpressionPrettyPrintVisitor implements ILogicalExpre
@Override
public String visitAggregateFunctionCallExpression(AggregateFunctionCallExpression expr, Integer indent)
throws AlgebricksException {
- return appendFunction(new StringBuilder(), expr, indent).toString();
+ if (expr.isTwoStep()) {
+ IFunctionInfo step1Agg = expr.getStepOneAggregate();
+ String step1 = (step1Agg != null ? step1Agg.getFunctionIdentifier().toString() : "null");
+ IFunctionInfo step2Agg = expr.getStepTwoAggregate();
+ String step2 = (step2Agg != null ? step2Agg.getFunctionIdentifier().toString() : "null");
+ StringBuilder sb = new StringBuilder();
+ sb.append("function-call: [" + step1 + "|" + step2 + "], Args:");
+ appendArguments(sb, expr.getArguments(), indent + 2);
+ return sb.toString();
+ } else if (expr.getFunctionInfo() == null) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("function-call: [null], Args:");
+ appendArguments(sb, expr.getArguments(), indent + 2);
+ return sb.toString();
+ } else {
+ return appendFunction(new StringBuilder(), expr, indent).toString();
+ }
}
@Override
@@ -138,15 +155,16 @@ public class VXQueryLogicalExpressionPrettyPrintVisitor implements ILogicalExpre
throws AlgebricksException {
assert expr.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL;
FunctionIdentifier fi = expr.getFunctionIdentifier();
- if (identifiesTypeOperator(fi) || identifiesPathStep(fi)) {
- final ILogicalExpression typeEx = expr.getArguments().get(1).getValue();
+ List<Mutable<ILogicalExpression>> args = expr.getArguments();
+ if ((identifiesTypeOperator(fi) || identifiesPathStep(fi)) && args.size() > 1) {
+ final ILogicalExpression typeEx = args.get(1).getValue();
assert typeEx.getExpressionTag() == LogicalExpressionTag.CONSTANT;
SequenceType type = getSequenceType((ConstantExpression) typeEx);
sb.append(fi + " <" + type + ">, Args:");
- appendArgument(sb, expr.getArguments().get(0), indent + 2);
+ appendArgument(sb, args.get(0), indent + 2);
} else {
sb.append("function-call: " + fi + ", Args:");
- appendArguments(sb, expr.getArguments(), indent + 2);
+ appendArguments(sb, args, indent + 2);
}
return sb;
}