You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ja...@apache.org on 2014/11/13 18:18:49 UTC
[05/10] incubator-drill git commit: DRILL-1695: Fix code generator
comparisons
DRILL-1695: Fix code generator comparisons
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/ea2578db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/ea2578db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/ea2578db
Branch: refs/heads/master
Commit: ea2578db67bf1c90061e23ea3f1f1f582cf5da9c
Parents: 523d780
Author: Jacques Nadeau <ja...@apache.org>
Authored: Wed Nov 12 08:59:04 2014 -0800
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Thu Nov 13 09:17:27 2014 -0800
----------------------------------------------------------------------
.../apache/drill/exec/expr/CodeGenerator.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/ea2578db/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CodeGenerator.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CodeGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CodeGenerator.java
index 4495ffe..457b466 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CodeGenerator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CodeGenerator.java
@@ -130,34 +130,35 @@ public class CodeGenerator<T> {
final int prime = 31;
int result = 1;
result = prime * result + ((definition == null) ? 0 : definition.hashCode());
- result = prime * result + ((generatedCode == null) ? 0 : generatedCode.hashCode());
+ result = prime * result + ((generifiedCode == null) ? 0 : generifiedCode.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
- if (this == obj) {
+ if (this == obj){
return true;
}
- if (obj == null) {
+ if (obj == null){
return false;
}
- if (getClass() != obj.getClass()) {
+ if (getClass() != obj.getClass()){
return false;
}
CodeGenerator other = (CodeGenerator) obj;
if (definition == null) {
- if (other.definition != null) {
+ if (other.definition != null){
return false;
}
- } else if (!definition.equals(other.definition)) {
+ } else if (!definition.equals(other.definition)){
return false;
}
- if (generatedCode == null) {
- if (other.generatedCode != null) {
+ if (generifiedCode == null) {
+ if (other.generifiedCode != null){
return false;
}
- } else if (!generatedCode.equals(other.generatedCode)) {
+
+ } else if (!generifiedCode.equals(other.generifiedCode)){
return false;
}
return true;