fix schema path serialization
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/b32c9edd Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/b32c9edd Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/b32c9edd Branch: refs/heads/master Commit: b32c9edd96553a8947a853d2735277f043d56cee Parents: 2c8094b Author: Ben Becker <[email protected]> Authored: Mon Aug 12 13:30:53 2013 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Thu Aug 15 18:31:31 2013 -0700 ---------------------------------------------------------------------- .../apache/drill/common/expression/ExpressionStringBuilder.java | 2 -- .../src/main/java/org/apache/drill/exec/expr/fn/impl/Hash.java | 3 +-- .../exec/java-exec/src/test/resources/sender/hash_exchange.json | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b32c9edd/sandbox/prototype/common/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/common/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java b/sandbox/prototype/common/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java index 09a7d57..bce660d 100644 --- a/sandbox/prototype/common/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java +++ b/sandbox/prototype/common/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java @@ -66,9 +66,7 @@ public class ExpressionStringBuilder extends AbstractExprVisitor<Void, StringBui @Override public Void visitSchemaPath(SchemaPath path, StringBuilder sb) throws RuntimeException { - sb.append("'"); sb.append(path.getPath()); - sb.append("'"); return null; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b32c9edd/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash.java index 2ffd389..18f7509 100644 --- a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash.java +++ b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash.java @@ -18,7 +18,6 @@ package org.apache.drill.exec.expr.fn.impl; -import com.google.common.hash.Hashing; import org.apache.drill.common.expression.*; import org.apache.drill.exec.expr.DrillFunc; import org.apache.drill.exec.expr.annotations.FunctionTemplate; @@ -40,7 +39,7 @@ public class Hash implements DrillFunc { public void eval() { // TODO: implement hash function for other types - out.value = Hashing.murmur3_128().hashLong(in.value).asInt(); + out.value = com.google.common.hash.Hashing.murmur3_128().hashLong(in.value).asInt(); } public static class Provider implements CallProvider{ http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b32c9edd/sandbox/prototype/exec/java-exec/src/test/resources/sender/hash_exchange.json ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/sender/hash_exchange.json b/sandbox/prototype/exec/java-exec/src/test/resources/sender/hash_exchange.json index 38116e7..78f3394 100644 --- a/sandbox/prototype/exec/java-exec/src/test/resources/sender/hash_exchange.json +++ b/sandbox/prototype/exec/java-exec/src/test/resources/sender/hash_exchange.json @@ -28,7 +28,7 @@ @id: 2, child: 1, pop: "hash-to-random-exchange", - expr: "hash(1)" + expr: "hash(red)" }, { @id: 3,
