serialize "and" function as "booleanAnd" to not confuse parser
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/8c512489 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/8c512489 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/8c512489 Branch: refs/heads/master Commit: 8c51248948474c2fc114b23d2f1521e8734b934f Parents: 18a24da Author: Steven Phillips <[email protected]> Authored: Mon Mar 31 15:57:12 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Sat Apr 19 18:07:09 2014 -0700 ---------------------------------------------------------------------- .../org/apache/drill/common/expression/FunctionCallFactory.java | 3 ++- .../java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/8c512489/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 71fd8bd..d1f449c 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 @@ -47,7 +47,8 @@ public class FunctionCallFactory { opToFuncTable.put("^", "xor"); opToFuncTable.put("||", "or"); - opToFuncTable.put("&&", "and"); + opToFuncTable.put("and", "booleanAnd"); + opToFuncTable.put("&&", "booleanAnd"); opToFuncTable.put(">", "greater_than"); opToFuncTable.put("<", "less_than"); opToFuncTable.put("==", "equal"); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/8c512489/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 9b75574..802595a 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 @@ -43,7 +43,7 @@ public class BitFunctions { } } - @FunctionTemplate(names = {"and", "&&"}, scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL) + @FunctionTemplate(names = {"booleanAnd", "and", "&&"}, scope = FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL) public static class BitAnd implements DrillSimpleFunc { @Param BitHolder left;
