fix or, query uncomment and add absolute reference.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/029c5b89 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/029c5b89 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/029c5b89 Branch: refs/heads/master Commit: 029c5b8980b3cfa0f82ac4461b405e82b650120f Parents: 255d528 Author: Jacques Nadeau <[email protected]> Authored: Mon Mar 31 16:32:07 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Sat Apr 19 18:07:09 2014 -0700 ---------------------------------------------------------------------- .../apache/drill/common/expression/FunctionCallFactory.java | 3 ++- .../java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java | 2 +- exec/java-exec/src/test/resources/queries/tpch/06.sql | 6 +++--- exec/java-exec/src/test/resources/queries/tpch/16.sql | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/029c5b89/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java b/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java index d1f449c..03be80f 100644 --- a/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java +++ b/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java @@ -46,7 +46,8 @@ public class FunctionCallFactory { opToFuncTable.put("%", "modulo"); opToFuncTable.put("^", "xor"); - opToFuncTable.put("||", "or"); + opToFuncTable.put("||", "booleanOr"); + opToFuncTable.put("or", "booleanOr"); opToFuncTable.put("and", "booleanAnd"); opToFuncTable.put("&&", "booleanAnd"); opToFuncTable.put(">", "greater_than"); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/029c5b89/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java index 802595a..1ea4988 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.record.RecordBatch; public class BitFunctions { - @FunctionTemplate(names = {"or", "||"}, scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL) + @FunctionTemplate(names = {"booleanOr", "or", "||"}, scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL) public static class BitOr implements DrillSimpleFunc { @Param BitHolder left; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/029c5b89/exec/java-exec/src/test/resources/queries/tpch/06.sql ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/queries/tpch/06.sql b/exec/java-exec/src/test/resources/queries/tpch/06.sql index f1780b6..6d4fac5 100644 --- a/exec/java-exec/src/test/resources/queries/tpch/06.sql +++ b/exec/java-exec/src/test/resources/queries/tpch/06.sql @@ -5,8 +5,8 @@ select from cp.`tpch/lineitem.parquet` where --- l_shipdate >= date '1997-01-01' --- and l_shipdate < date '1997-01-01' + interval '1' year --- and + l_shipdate >= date '1997-01-01' + and l_shipdate < date '1997-01-01' + interval '1' year + and l_discount between 0.03 - 0.01 and 0.03 + 0.01 and l_quantity < 24; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/029c5b89/exec/java-exec/src/test/resources/queries/tpch/16.sql ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/queries/tpch/16.sql b/exec/java-exec/src/test/resources/queries/tpch/16.sql index 96c5fd4..211f2a0 100644 --- a/exec/java-exec/src/test/resources/queries/tpch/16.sql +++ b/exec/java-exec/src/test/resources/queries/tpch/16.sql @@ -14,11 +14,11 @@ where and p.p_size in (38, 2, 8, 31, 44, 5, 14, 24) and ps.ps_suppkey not in ( select - s_suppkey + s.s_suppkey from - cp.`tpch/supplier.parquet` + cp.`tpch/supplier.parquet` s where - s_comment like '%Customer%Complaints%' + s.s_comment like '%Customer%Complaints%' ) group by p.p_brand,
