You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2014/03/21 02:40:16 UTC
[1/3] git commit: Updated the job specifications print out to use the
JSON printer.
Repository: incubator-vxquery
Updated Branches:
refs/heads/prestonc/hash_join 60b36d3fc -> 85af9d42d
Updated the job specifications print out to use the JSON printer.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/a94fed6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/a94fed6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/a94fed6a
Branch: refs/heads/prestonc/hash_join
Commit: a94fed6a5589b595d4ac94e0284dabce6e16d168
Parents: 60b36d3
Author: Preston Carman <pr...@apache.org>
Authored: Thu Mar 20 16:28:26 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Mar 20 16:28:26 2014 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/vxquery/cli/VXQuery.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a94fed6a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index 7e3abfc..9a6d8d6 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -41,6 +41,7 @@ import org.apache.vxquery.xmlquery.ast.ModuleNode;
import org.apache.vxquery.xmlquery.query.Module;
import org.apache.vxquery.xmlquery.query.XMLQueryCompiler;
import org.apache.vxquery.xmlquery.query.XQueryCompilationListener;
+import org.json.JSONException;
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.Option;
@@ -187,7 +188,12 @@ public class VXQuery {
public void notifyCodegenResult(Module module) {
if (opts.showRP) {
JobSpecification jobSpec = module.getHyracksJobSpecification();
- System.err.println(jobSpec.toString());
+ try {
+ System.err.println(jobSpec.toJSON().toString(2));
+ } catch (JSONException e) {
+ e.printStackTrace();
+ System.err.println(jobSpec.toString());
+ }
}
}
[2/3] git commit: Change the hash function to be generic and
consistent for both family and factory.
Posted by pr...@apache.org.
Change the hash function to be generic and consistent for both family and factory.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/6b83900e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/6b83900e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/6b83900e
Branch: refs/heads/prestonc/hash_join
Commit: 6b83900eeb183d2e4db13a3a1329f2528a8eeca7
Parents: a94fed6
Author: Preston Carman <pr...@apache.org>
Authored: Thu Mar 20 16:29:21 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Mar 20 16:29:21 2014 -0700
----------------------------------------------------------------------
.../hashfunction/VXQueryRawBinaryHashFunctionFactory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/6b83900e/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
index e9b1529..3f9a5ad 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
@@ -18,7 +18,7 @@ package org.apache.vxquery.runtime.factory.hashfunction;
import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunction;
import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunctionFactory;
-import edu.uci.ics.hyracks.data.std.accessors.UTF8StringBinaryHashFunctionFamily;
+import edu.uci.ics.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily;
public class VXQueryRawBinaryHashFunctionFactory implements IBinaryHashFunctionFactory {
private static final long serialVersionUID = 1L;
@@ -32,7 +32,7 @@ public class VXQueryRawBinaryHashFunctionFactory implements IBinaryHashFunctionF
@Override
public IBinaryHashFunction createBinaryHashFunction() {
- return UTF8StringBinaryHashFunctionFamily.INSTANCE.createBinaryHashFunction(1);
+ return MurmurHash3BinaryHashFunctionFamily.INSTANCE.createBinaryHashFunction(1);
}
[3/3] git commit: Changed hash seed to match AsterixDB default.
Posted by pr...@apache.org.
Changed hash seed to match AsterixDB default.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/85af9d42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/85af9d42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/85af9d42
Branch: refs/heads/prestonc/hash_join
Commit: 85af9d42d045060c7092bcac9c0ea8246fadb1f1
Parents: 6b83900
Author: Preston Carman <pr...@apache.org>
Authored: Thu Mar 20 18:39:52 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Mar 20 18:39:52 2014 -0700
----------------------------------------------------------------------
.../factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/85af9d42/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
index 3f9a5ad..4f9437b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java
@@ -32,7 +32,7 @@ public class VXQueryRawBinaryHashFunctionFactory implements IBinaryHashFunctionF
@Override
public IBinaryHashFunction createBinaryHashFunction() {
- return MurmurHash3BinaryHashFunctionFamily.INSTANCE.createBinaryHashFunction(1);
+ return MurmurHash3BinaryHashFunctionFamily.INSTANCE.createBinaryHashFunction(0);
}