You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by bl...@apache.org on 2014/03/31 04:07:16 UTC
git commit: TAJO-529: Fix warnings in tajo-algebra. (jaehwa)
Repository: tajo
Updated Branches:
refs/heads/master 2a2f89a28 -> 40851e565
TAJO-529: Fix warnings in tajo-algebra. (jaehwa)
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/40851e56
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/40851e56
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/40851e56
Branch: refs/heads/master
Commit: 40851e56509c9f0952f9034108f3a451954abd01
Parents: 2a2f89a
Author: blrunner <jh...@gruter.com>
Authored: Mon Mar 31 11:06:26 2014 +0900
Committer: blrunner <jh...@gruter.com>
Committed: Mon Mar 31 11:06:26 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../java/org/apache/tajo/algebra/CaseWhenPredicate.java | 2 +-
.../src/main/java/org/apache/tajo/algebra/CreateTable.java | 9 ++++-----
.../src/main/java/org/apache/tajo/algebra/Projection.java | 8 ++++++++
.../java/org/apache/tajo/algebra/TablePrimarySubQuery.java | 2 +-
5 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/40851e56/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a4efd4e..50fa593 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -588,6 +588,8 @@ Release 0.8.0 - unreleased
TASKS
+ TAJO-529: Fix warnings in tajo-algebra. (jaehwa)
+
TAJO-700: Update site, wikis, pom.xml and other resources to point to the
new repository location. (jihoon)
http://git-wip-us.apache.org/repos/asf/tajo/blob/40851e56/tajo-algebra/src/main/java/org/apache/tajo/algebra/CaseWhenPredicate.java
----------------------------------------------------------------------
diff --git a/tajo-algebra/src/main/java/org/apache/tajo/algebra/CaseWhenPredicate.java b/tajo-algebra/src/main/java/org/apache/tajo/algebra/CaseWhenPredicate.java
index 695a7f1..6af1fb2 100644
--- a/tajo-algebra/src/main/java/org/apache/tajo/algebra/CaseWhenPredicate.java
+++ b/tajo-algebra/src/main/java/org/apache/tajo/algebra/CaseWhenPredicate.java
@@ -101,7 +101,7 @@ public class CaseWhenPredicate extends Expr {
public boolean equals(Object obj) {
if (obj instanceof WhenExpr) {
WhenExpr another = (WhenExpr) obj;
- return condition.equals(another.condition) && result.equals(result);
+ return TUtil.checkEquals(condition, another.condition) && TUtil.checkEquals(result, another.result);
}
return false;
http://git-wip-us.apache.org/repos/asf/tajo/blob/40851e56/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java
----------------------------------------------------------------------
diff --git a/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java b/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java
index 42dcc68..eb11ed0 100644
--- a/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java
+++ b/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java
@@ -323,8 +323,8 @@ public class CreateTable extends Expr {
}
public boolean equals(Object object) {
- if (object instanceof HashPartition) {
- HashPartition another = (HashPartition) object;
+ if (object instanceof ListPartition) {
+ ListPartition another = (ListPartition) object;
return type == another.type && TUtil.checkEquals(columns, another.columns) &&
specifiers.equals(another.specifiers);
} else {
@@ -356,13 +356,12 @@ public class CreateTable extends Expr {
}
public boolean equals(Object object) {
- if (object instanceof HashPartition) {
+ if (object instanceof ColumnPartition) {
ColumnPartition another = (ColumnPartition) object;
return type == another.type && TUtil.checkEquals(columns, another.columns) &&
TUtil.checkEquals(isOmitValues, another.isOmitValues);
- } else {
- return false;
}
+ return false;
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/40851e56/tajo-algebra/src/main/java/org/apache/tajo/algebra/Projection.java
----------------------------------------------------------------------
diff --git a/tajo-algebra/src/main/java/org/apache/tajo/algebra/Projection.java b/tajo-algebra/src/main/java/org/apache/tajo/algebra/Projection.java
index ecf92dc..0e8ed46 100644
--- a/tajo-algebra/src/main/java/org/apache/tajo/algebra/Projection.java
+++ b/tajo-algebra/src/main/java/org/apache/tajo/algebra/Projection.java
@@ -65,4 +65,12 @@ public class Projection extends UnaryOperator implements Cloneable {
public String toJson() {
return JsonHelper.toJson(this);
}
+
+ public Projection clone() throws CloneNotSupportedException {
+ Projection projection = (Projection)super.clone();
+ projection.distinct = distinct;
+ projection.targets = targets;
+
+ return projection;
+ }
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/40851e56/tajo-algebra/src/main/java/org/apache/tajo/algebra/TablePrimarySubQuery.java
----------------------------------------------------------------------
diff --git a/tajo-algebra/src/main/java/org/apache/tajo/algebra/TablePrimarySubQuery.java b/tajo-algebra/src/main/java/org/apache/tajo/algebra/TablePrimarySubQuery.java
index 2af90b6..953c080 100644
--- a/tajo-algebra/src/main/java/org/apache/tajo/algebra/TablePrimarySubQuery.java
+++ b/tajo-algebra/src/main/java/org/apache/tajo/algebra/TablePrimarySubQuery.java
@@ -53,7 +53,7 @@ public class TablePrimarySubQuery extends Relation {
@Override
boolean equalsTo(Expr expr) {
TablePrimarySubQuery another = (TablePrimarySubQuery) expr;
- return subquery.equals(subquery) && TUtil.checkEquals(columnNames, another.columnNames);
+ return subquery.equals(another.subquery) && TUtil.checkEquals(columnNames, another.columnNames);
}
public String toJson() {