You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2013/10/13 16:49:42 UTC
git commit: TAJO-245: org.apache.tajo.algebra.FunctionExpr cannot be
cast to org.apache.tajo.algebra.ColumnReferenceExpr. (hyunsik)
Updated Branches:
refs/heads/master 56a8e2404 -> 2bbc3064c
TAJO-245: org.apache.tajo.algebra.FunctionExpr cannot be cast to org.apache.tajo.algebra.ColumnReferenceExpr. (hyunsik)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/2bbc3064
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/2bbc3064
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/2bbc3064
Branch: refs/heads/master
Commit: 2bbc3064c34ed59e990bd55584b980b83effc56f
Parents: 56a8e24
Author: Hyunsik Choi <hy...@apache.org>
Authored: Sun Oct 13 23:49:03 2013 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Sun Oct 13 23:49:03 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 3 ++
.../apache/tajo/algebra/IsNullPredicate.java | 12 ++---
.../org/apache/tajo/engine/eval/IsNullEval.java | 30 +++++-------
.../apache/tajo/engine/parser/SQLAnalyzer.java | 2 +-
.../tajo/engine/planner/LogicalPlanner.java | 2 +-
.../apache/tajo/engine/eval/TestPredicates.java | 50 ++++++++++++++++++++
6 files changed, 72 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2bbc3064/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 98e29c8..0dcb42d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -197,6 +197,9 @@ Release 0.2.0 - unreleased
BUG FIXES
+ TAJO-245: org.apache.tajo.algebra.FunctionExpr cannot be cast to
+ org.apache.tajo.algebra.ColumnReferenceExpr. (hyunsik)
+
TAJO-243: The 'tajo_dump' does not include options of table. (jinho)
TAJO-244: assignToNonLeafTasks causes NPE occurs occasionally. (hyunsik)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2bbc3064/tajo-algebra/src/main/java/org/apache/tajo/algebra/IsNullPredicate.java
----------------------------------------------------------------------
diff --git a/tajo-algebra/src/main/java/org/apache/tajo/algebra/IsNullPredicate.java b/tajo-algebra/src/main/java/org/apache/tajo/algebra/IsNullPredicate.java
index 610a81e..35fc769 100644
--- a/tajo-algebra/src/main/java/org/apache/tajo/algebra/IsNullPredicate.java
+++ b/tajo-algebra/src/main/java/org/apache/tajo/algebra/IsNullPredicate.java
@@ -20,25 +20,25 @@ package org.apache.tajo.algebra;
public class IsNullPredicate extends Expr {
private final boolean not;
- private final ColumnReferenceExpr columnRef;
+ private final Expr predicand;
- public IsNullPredicate(boolean not, ColumnReferenceExpr column) {
+ public IsNullPredicate(boolean not, Expr column) {
super(OpType.IsNullPredicate);
this.not = not;
- this.columnRef = column;
+ this.predicand = column;
}
public boolean isNot() {
return not;
}
- public ColumnReferenceExpr getColumnRef() {
- return columnRef;
+ public Expr getPredicand() {
+ return predicand;
}
@Override
boolean equalsTo(Expr expr) {
IsNullPredicate nullPredicate = (IsNullPredicate) expr;
- return not == nullPredicate.not && columnRef.equals(nullPredicate.columnRef);
+ return not == nullPredicate.not && predicand.equals(nullPredicate.predicand);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2bbc3064/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/IsNullEval.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/IsNullEval.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/IsNullEval.java
index 0a176fb..3923a4f 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/IsNullEval.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/IsNullEval.java
@@ -37,18 +37,17 @@ public class IsNullEval extends BinaryEval {
// persistent variables
@Expose private boolean isNot;
- @Expose private Column columnRef;
- @Expose private Integer fieldId = null;
- public IsNullEval(boolean not, FieldEval field) {
- super(EvalType.IS_NULL, field, DUMMY_EVAL);
+ public IsNullEval(boolean not, EvalNode predicand) {
+ super(EvalType.IS_NULL, predicand, DUMMY_EVAL);
this.isNot = not;
- this.columnRef = field.getColumnRef();
}
@Override
public EvalContext newContext() {
- return new IsNullEvalCtx();
+ IsNullEvalCtx context = new IsNullEvalCtx();
+ context.predicandContext = leftExpr.newContext();
+ return context;
}
@Override
@@ -64,14 +63,9 @@ public class IsNullEval extends BinaryEval {
@Override
public void eval(EvalContext ctx, Schema schema, Tuple tuple) {
IsNullEvalCtx isNullCtx = (IsNullEvalCtx) ctx;
- if (fieldId == null) {
- fieldId = schema.getColumnId(columnRef.getQualifiedName());
- }
- if (isNot) {
- isNullCtx.result.setValue(!(tuple.get(fieldId) instanceof NullDatum));
- } else {
- isNullCtx.result.setValue(tuple.get(fieldId) instanceof NullDatum);
- }
+ leftExpr.eval(isNullCtx.predicandContext, schema, tuple);
+ Datum result = leftExpr.terminate(((IsNullEvalCtx)ctx).predicandContext);
+ ((IsNullEvalCtx) ctx).result = DatumFactory.createBool(isNot ^ (result.type() == TajoDataTypes.Type.NULL));
}
@Override
@@ -87,9 +81,7 @@ public class IsNullEval extends BinaryEval {
public boolean equals(Object obj) {
if (obj instanceof IsNullEval) {
IsNullEval other = (IsNullEval) obj;
- return super.equals(other) &&
- this.columnRef.equals(other.columnRef) &&
- this.fieldId == other.fieldId;
+ return super.equals(other) && isNot == other.isNot();
} else {
return false;
}
@@ -97,13 +89,13 @@ public class IsNullEval extends BinaryEval {
public Object clone() throws CloneNotSupportedException {
IsNullEval isNullEval = (IsNullEval) super.clone();
- isNullEval.columnRef = (Column) columnRef.clone();
- isNullEval.fieldId = fieldId;
+ isNullEval.isNot = isNot;
return isNullEval;
}
private class IsNullEvalCtx implements EvalContext {
+ EvalContext predicandContext;
BooleanDatum result;
IsNullEvalCtx() {
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2bbc3064/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java
index bdd85ce..70d1975 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java
@@ -691,7 +691,7 @@ public class SQLAnalyzer extends SQLParserBaseVisitor<Expr> {
@Override
public IsNullPredicate visitNull_predicate(SQLParser.Null_predicateContext ctx) {
- ColumnReferenceExpr predicand = (ColumnReferenceExpr) visit(ctx.numeric_value_expression());
+ Expr predicand = visit(ctx.numeric_value_expression());
return new IsNullPredicate(ctx.NOT() != null, predicand);
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2bbc3064/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java
index 38f045f..74b6da3 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java
@@ -1114,7 +1114,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex
case IsNullPredicate:
IsNullPredicate nullPredicate = (IsNullPredicate) expr;
return new IsNullEval(nullPredicate.isNot(),
- createFieldEval(plan, block, nullPredicate.getColumnRef()));
+ createEvalTree(plan, block, nullPredicate.getPredicand()));
default:
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2bbc3064/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestPredicates.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestPredicates.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestPredicates.java
new file mode 100644
index 0000000..6346844
--- /dev/null
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestPredicates.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tajo.engine.eval;
+
+import org.apache.tajo.catalog.Schema;
+import org.junit.Test;
+
+import static org.apache.tajo.common.TajoDataTypes.Type.INT4;
+import static org.apache.tajo.common.TajoDataTypes.Type.TEXT;
+
+public class TestPredicates extends ExprTestBase {
+ @Test
+ public void testIsNullPredicate() {
+ Schema schema1 = new Schema();
+ schema1.addColumn("col1", INT4);
+ schema1.addColumn("col2", INT4);
+ testEval(schema1, "table1", "123,", "select col1 is null, col2 is null as a from table1",
+ new String[]{"f", "t"});
+ testEval(schema1, "table1", "123,", "select col1 is not null, col2 is not null as a from table1",
+ new String[]{"t", "f"});
+ }
+
+ @Test
+ public void testIsNullPredicateWithFunction() {
+ Schema schema2 = new Schema();
+ schema2.addColumn("col1", TEXT);
+ schema2.addColumn("col2", TEXT);
+ testEval(schema2, "table1", "_123,", "select ltrim(col1, '_') is null, upper(col2) is null as a from table1",
+ new String[]{"f", "t"});
+
+ testEval(schema2, "table1", "_123,",
+ "select ltrim(col1, '_') is not null, upper(col2) is not null as a from table1", new String[]{"t", "f"});
+ }
+}