You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2013/11/29 03:30:05 UTC
git commit: TAJO-290: TajoDataType.Type.NULL should be NULL_TYPE.
(DaeMyung Kang via jinho)
Updated Branches:
refs/heads/master 87437f171 -> 2e27a0232
TAJO-290: TajoDataType.Type.NULL should be NULL_TYPE. (DaeMyung Kang via jinho)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/2e27a023
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/2e27a023
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/2e27a023
Branch: refs/heads/master
Commit: 2e27a0232ac1bf48fe277a22a818d282866216c7
Parents: 87437f1
Author: jinossy <ji...@gmail.com>
Authored: Fri Nov 29 11:29:18 2013 +0900
Committer: jinossy <ji...@gmail.com>
Committed: Fri Nov 29 11:29:18 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../java/org/apache/tajo/datum/CharDatum.java | 4 ++--
.../org/apache/tajo/datum/DatumFactory.java | 2 +-
.../java/org/apache/tajo/datum/Float4Datum.java | 14 +++++++-------
.../java/org/apache/tajo/datum/Float8Datum.java | 14 +++++++-------
.../java/org/apache/tajo/datum/Int2Datum.java | 20 +++++++++-----------
.../java/org/apache/tajo/datum/Int4Datum.java | 14 +++++++-------
.../java/org/apache/tajo/datum/Int8Datum.java | 14 +++++++-------
.../java/org/apache/tajo/datum/NullDatum.java | 2 +-
.../java/org/apache/tajo/datum/TextDatum.java | 4 ++--
tajo-common/src/main/proto/DataTypes.proto | 4 ++--
.../apache/tajo/engine/eval/FunctionEval.java | 2 +-
.../org/apache/tajo/engine/eval/IsNullEval.java | 4 +---
.../storage/BinarySerializeDeserialize.java | 2 +-
.../java/org/apache/tajo/storage/RawFile.java | 4 ++--
.../java/org/apache/tajo/storage/RowFile.java | 2 +-
.../tajo/storage/TextSerializeDeserialize.java | 2 +-
.../tajo/storage/trevni/TrevniAppender.java | 4 ++--
.../tajo/storage/trevni/TrevniScanner.java | 2 +-
.../org/apache/tajo/storage/TestLazyTuple.java | 2 +-
.../org/apache/tajo/storage/TestStorages.java | 6 +++---
.../apache/tajo/storage/v2/TestStorages.java | 2 +-
22 files changed, 62 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0a7dd47..3cee24e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -48,6 +48,8 @@ Release 0.8.0 - unreleased
BUG FIXES
+ TAJO-290: TajoDataType.Type.NULL should be NULL_TYPE. (DaeMyung Kang via jinho)
+
TAJO-332: Invalid row count of CSVScanner. (jinho)
TAJO-326: In ExecutionBlock, isRoot() and isLeafBlock() return invalid values. (jihoon)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-common/src/main/java/org/apache/tajo/datum/CharDatum.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/datum/CharDatum.java b/tajo-common/src/main/java/org/apache/tajo/datum/CharDatum.java
index 651b00b..94bafb1 100644
--- a/tajo-common/src/main/java/org/apache/tajo/datum/CharDatum.java
+++ b/tajo-common/src/main/java/org/apache/tajo/datum/CharDatum.java
@@ -139,7 +139,7 @@ public class CharDatum extends Datum {
case CHAR:
return DatumFactory.createBool(this.equals(datum));
- case NULL:
+ case NULL_TYPE:
return DatumFactory.createBool(false);
default:
@@ -154,7 +154,7 @@ public class CharDatum extends Datum {
CharDatum other = (CharDatum) datum;
return UnsignedBytes.lexicographicalComparator().compare(bytes, other.bytes);
- case NULL:
+ case NULL_TYPE:
return -1;
default:
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-common/src/main/java/org/apache/tajo/datum/DatumFactory.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/datum/DatumFactory.java b/tajo-common/src/main/java/org/apache/tajo/datum/DatumFactory.java
index b0aa9ca..2ce02d4 100644
--- a/tajo-common/src/main/java/org/apache/tajo/datum/DatumFactory.java
+++ b/tajo-common/src/main/java/org/apache/tajo/datum/DatumFactory.java
@@ -54,7 +54,7 @@ public class DatumFactory {
return Inet4Datum.class;
case ANY:
return NullDatum.class;
- case NULL:
+ case NULL_TYPE:
return NullDatum.class;
default:
throw new UnsupportedOperationException(type.name());
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-common/src/main/java/org/apache/tajo/datum/Float4Datum.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/datum/Float4Datum.java b/tajo-common/src/main/java/org/apache/tajo/datum/Float4Datum.java
index 8de20ee..990b6a4 100644
--- a/tajo-common/src/main/java/org/apache/tajo/datum/Float4Datum.java
+++ b/tajo-common/src/main/java/org/apache/tajo/datum/Float4Datum.java
@@ -134,7 +134,7 @@ public class Float4Datum extends Datum implements NumericDatum {
return DatumFactory.createBool(val == datum.asFloat4());
case FLOAT8:
return DatumFactory.createBool(val == datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return DatumFactory.createBool(false);
default:
throw new InvalidOperationException();
@@ -194,7 +194,7 @@ public class Float4Datum extends Datum implements NumericDatum {
return 0;
}
}
- case NULL:
+ case NULL_TYPE:
return -1;
default:
throw new InvalidOperationException();
@@ -214,7 +214,7 @@ public class Float4Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val + datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val + datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -234,7 +234,7 @@ public class Float4Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val - datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val - datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -254,7 +254,7 @@ public class Float4Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val * datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val * datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException();
@@ -274,7 +274,7 @@ public class Float4Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val / datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val / datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -294,7 +294,7 @@ public class Float4Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val / datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val / datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-common/src/main/java/org/apache/tajo/datum/Float8Datum.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/datum/Float8Datum.java b/tajo-common/src/main/java/org/apache/tajo/datum/Float8Datum.java
index 1857929..bb49e28 100644
--- a/tajo-common/src/main/java/org/apache/tajo/datum/Float8Datum.java
+++ b/tajo-common/src/main/java/org/apache/tajo/datum/Float8Datum.java
@@ -132,7 +132,7 @@ public class Float8Datum extends Datum implements NumericDatum {
return DatumFactory.createBool(val == datum.asFloat4());
case FLOAT8:
return DatumFactory.createBool(val == datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return DatumFactory.createBool(false);
default:
throw new InvalidOperationException();
@@ -192,7 +192,7 @@ public class Float8Datum extends Datum implements NumericDatum {
return 0;
}
}
- case NULL:
+ case NULL_TYPE:
return -1;
default:
throw new InvalidOperationException();
@@ -212,7 +212,7 @@ public class Float8Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val + datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val + datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -232,7 +232,7 @@ public class Float8Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val - datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val - datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -252,7 +252,7 @@ public class Float8Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val * datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val * datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException();
@@ -272,7 +272,7 @@ public class Float8Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val / datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val / datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -292,7 +292,7 @@ public class Float8Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val % datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val % datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-common/src/main/java/org/apache/tajo/datum/Int2Datum.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/datum/Int2Datum.java b/tajo-common/src/main/java/org/apache/tajo/datum/Int2Datum.java
index 000a107..bee8c47 100644
--- a/tajo-common/src/main/java/org/apache/tajo/datum/Int2Datum.java
+++ b/tajo-common/src/main/java/org/apache/tajo/datum/Int2Datum.java
@@ -19,6 +19,8 @@
package org.apache.tajo.datum;
import com.google.gson.annotations.Expose;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.tajo.common.TajoDataTypes;
import org.apache.tajo.datum.exception.InvalidOperationException;
import org.apache.tajo.util.NumberUtil;
@@ -26,10 +28,6 @@ import org.apache.tajo.util.NumberUtil;
import java.nio.ByteBuffer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-
public class Int2Datum extends Datum implements NumericDatum {
private static final int size = 2;
@Expose private short val;
@@ -131,7 +129,7 @@ public class Int2Datum extends Datum implements NumericDatum {
return DatumFactory.createBool(val == datum.asFloat4());
case FLOAT8:
return DatumFactory.createBool(val == datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return DatumFactory.createBool(false);
default:
throw new InvalidOperationException();
@@ -191,7 +189,7 @@ public class Int2Datum extends Datum implements NumericDatum {
return 0;
}
}
- case NULL:
+ case NULL_TYPE:
return -1;
default:
throw new InvalidOperationException();
@@ -211,7 +209,7 @@ public class Int2Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val + datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val + datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -231,7 +229,7 @@ public class Int2Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val - datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val - datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -251,7 +249,7 @@ public class Int2Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val * datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val * datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -271,7 +269,7 @@ public class Int2Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val / datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val / datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -291,7 +289,7 @@ public class Int2Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val % datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val % datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-common/src/main/java/org/apache/tajo/datum/Int4Datum.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/datum/Int4Datum.java b/tajo-common/src/main/java/org/apache/tajo/datum/Int4Datum.java
index a68a5f1..ee66700 100644
--- a/tajo-common/src/main/java/org/apache/tajo/datum/Int4Datum.java
+++ b/tajo-common/src/main/java/org/apache/tajo/datum/Int4Datum.java
@@ -129,7 +129,7 @@ public class Int4Datum extends Datum implements NumericDatum {
return DatumFactory.createBool(val == datum.asFloat4());
case FLOAT8:
return DatumFactory.createBool(val == datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return DatumFactory.createBool(false);
default:
throw new InvalidOperationException();
@@ -189,7 +189,7 @@ public class Int4Datum extends Datum implements NumericDatum {
return 0;
}
}
- case NULL:
+ case NULL_TYPE:
return -1;
default:
throw new InvalidOperationException();
@@ -209,7 +209,7 @@ public class Int4Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val + datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val + datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -229,7 +229,7 @@ public class Int4Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val - datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val - datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -249,7 +249,7 @@ public class Int4Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val * datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val * datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException();
@@ -269,7 +269,7 @@ public class Int4Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val / datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val / datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -289,7 +289,7 @@ public class Int4Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat4(val % datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val % datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-common/src/main/java/org/apache/tajo/datum/Int8Datum.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/datum/Int8Datum.java b/tajo-common/src/main/java/org/apache/tajo/datum/Int8Datum.java
index 985ecd6..a1664c5 100644
--- a/tajo-common/src/main/java/org/apache/tajo/datum/Int8Datum.java
+++ b/tajo-common/src/main/java/org/apache/tajo/datum/Int8Datum.java
@@ -136,7 +136,7 @@ public class Int8Datum extends Datum implements NumericDatum {
return DatumFactory.createBool(val == datum.asFloat4());
case FLOAT8:
return DatumFactory.createBool(val == datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return DatumFactory.createBool(false);
default:
throw new InvalidOperationException();
@@ -196,7 +196,7 @@ public class Int8Datum extends Datum implements NumericDatum {
return 0;
}
}
- case NULL:
+ case NULL_TYPE:
return -1;
default:
throw new InvalidOperationException();
@@ -216,7 +216,7 @@ public class Int8Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val + datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val + datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -236,7 +236,7 @@ public class Int8Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val - datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val - datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -256,7 +256,7 @@ public class Int8Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val * datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val * datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -276,7 +276,7 @@ public class Int8Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val / datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val / datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
@@ -296,7 +296,7 @@ public class Int8Datum extends Datum implements NumericDatum {
return DatumFactory.createFloat8(val % datum.asFloat4());
case FLOAT8:
return DatumFactory.createFloat8(val % datum.asFloat8());
- case NULL:
+ case NULL_TYPE:
return datum;
default:
throw new InvalidOperationException(datum.type());
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-common/src/main/java/org/apache/tajo/datum/NullDatum.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/datum/NullDatum.java b/tajo-common/src/main/java/org/apache/tajo/datum/NullDatum.java
index 2cce626..6a18ef3 100644
--- a/tajo-common/src/main/java/org/apache/tajo/datum/NullDatum.java
+++ b/tajo-common/src/main/java/org/apache/tajo/datum/NullDatum.java
@@ -28,7 +28,7 @@ public class NullDatum extends Datum {
}
private NullDatum() {
- super(Type.NULL);
+ super(Type.NULL_TYPE);
}
public static NullDatum get() {
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-common/src/main/java/org/apache/tajo/datum/TextDatum.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/datum/TextDatum.java b/tajo-common/src/main/java/org/apache/tajo/datum/TextDatum.java
index 76cdc57..779d5ea 100644
--- a/tajo-common/src/main/java/org/apache/tajo/datum/TextDatum.java
+++ b/tajo-common/src/main/java/org/apache/tajo/datum/TextDatum.java
@@ -106,7 +106,7 @@ public class TextDatum extends Datum {
case BLOB:
return UnsignedBytes.lexicographicalComparator().compare(bytes, datum.asByteArray());
- case NULL:
+ case NULL_TYPE:
return -1;
default:
throw new InvalidOperationException();
@@ -131,7 +131,7 @@ public class TextDatum extends Datum {
case BLOB:
return DatumFactory.createBool(UnsignedBytes.lexicographicalComparator()
.compare(bytes, datum.asByteArray()) == 0);
- case NULL:
+ case NULL_TYPE:
return DatumFactory.createBool(false);
default:
throw new InvalidOperationException();
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-common/src/main/proto/DataTypes.proto
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/proto/DataTypes.proto b/tajo-common/src/main/proto/DataTypes.proto
index 0eacdd6..9b5b98f 100644
--- a/tajo-common/src/main/proto/DataTypes.proto
+++ b/tajo-common/src/main/proto/DataTypes.proto
@@ -23,7 +23,7 @@ option java_generic_services = false;
option java_generate_equals_and_hash = true;
enum Type {
- NULL = 0; // NULL type
+ NULL_TYPE = 0; // NULL type
BOOLEAN = 1; // state of true of false [1 byte]
@@ -102,4 +102,4 @@ message DataType {
required Type type = 1;
optional int32 length = 2;
optional string code = 3;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/FunctionEval.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/FunctionEval.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/FunctionEval.java
index df26692..c4906d7 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/FunctionEval.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/FunctionEval.java
@@ -49,7 +49,7 @@ public abstract class FunctionEval extends EvalNode implements Cloneable {
ParamType [] paramTypes = new ParamType[argEvals.length];
for (int i = 0; i < argEvals.length; i++) {
if (argEvals[i].getType() == EvalType.CONST) {
- if (argEvals[i].getValueType().getType() == TajoDataTypes.Type.NULL) {
+ if (argEvals[i].getValueType().getType() == TajoDataTypes.Type.NULL_TYPE) {
paramTypes[i] = ParamType.NULL;
} else {
paramTypes[i] = ParamType.CONSTANT;
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/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 3923a4f..029f4f4 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
@@ -20,14 +20,12 @@ package org.apache.tajo.engine.eval;
import com.google.gson.annotations.Expose;
import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Column;
import org.apache.tajo.catalog.Schema;
import org.apache.tajo.common.TajoDataTypes;
import org.apache.tajo.common.TajoDataTypes.DataType;
import org.apache.tajo.datum.BooleanDatum;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
-import org.apache.tajo.datum.NullDatum;
import org.apache.tajo.storage.Tuple;
public class IsNullEval extends BinaryEval {
@@ -65,7 +63,7 @@ public class IsNullEval extends BinaryEval {
IsNullEvalCtx isNullCtx = (IsNullEvalCtx) ctx;
leftExpr.eval(isNullCtx.predicandContext, schema, tuple);
Datum result = leftExpr.terminate(((IsNullEvalCtx)ctx).predicandContext);
- ((IsNullEvalCtx) ctx).result = DatumFactory.createBool(isNot ^ (result.type() == TajoDataTypes.Type.NULL));
+ ((IsNullEvalCtx) ctx).result = DatumFactory.createBool(isNot ^ (result.type() == TajoDataTypes.Type.NULL_TYPE));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/BinarySerializeDeserialize.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/BinarySerializeDeserialize.java b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/BinarySerializeDeserialize.java
index f1da79b..4c3b6ff 100644
--- a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/BinarySerializeDeserialize.java
+++ b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/BinarySerializeDeserialize.java
@@ -86,7 +86,7 @@ public class BinarySerializeDeserialize implements SerializeDeserialize {
length = bytes.length;
out.write(bytes, 0, length);
break;
- case NULL:
+ case NULL_TYPE:
default:
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/RawFile.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/RawFile.java b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/RawFile.java
index a484643..88a4005 100644
--- a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/RawFile.java
+++ b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/RawFile.java
@@ -231,7 +231,7 @@ public class RawFile {
tuple.put(i, DatumFactory.createInet4(ipv4Bytes));
break;
- case NULL:
+ case NULL_TYPE:
tuple.put(i, NullDatum.get());
break;
@@ -402,7 +402,7 @@ public class RawFile {
}
switch(columnTypes[i].getType()) {
- case NULL:
+ case NULL_TYPE:
nullFlags.set(i);
continue;
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/RowFile.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/RowFile.java b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/RowFile.java
index d805080..bbe0529 100644
--- a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/RowFile.java
+++ b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/RowFile.java
@@ -436,7 +436,7 @@ public class RowFile {
break;
case INET6:
buffer.put(t.getIPv6Bytes(i));
- case NULL:
+ case NULL_TYPE:
nullFlags.set(i);
break;
default:
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/TextSerializeDeserialize.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/TextSerializeDeserialize.java b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/TextSerializeDeserialize.java
index 64b078c..67fb8b8 100644
--- a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/TextSerializeDeserialize.java
+++ b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/TextSerializeDeserialize.java
@@ -92,7 +92,7 @@ public class TextSerializeDeserialize implements SerializeDeserialize {
length = protoBytes.length;
out.write(protoBytes, 0, protoBytes.length);
break;
- case NULL:
+ case NULL_TYPE:
default:
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniAppender.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniAppender.java b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniAppender.java
index 9de3397..3209469 100644
--- a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniAppender.java
+++ b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniAppender.java
@@ -111,7 +111,7 @@ public class TrevniAppender extends FileAppender {
return ValueType.BYTES;
case PROTOBUF:
return ValueType.BYTES;
- case NULL:
+ case NULL_TYPE:
return ValueType.NULL;
default:
return null;
@@ -135,7 +135,7 @@ public class TrevniAppender extends FileAppender {
if (!t.isNull(i)) {
col = schema.getColumn(i);
switch (col.getDataType().getType()) {
- case NULL:
+ case NULL_TYPE:
break;
case BOOLEAN:
case BIT:
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniScanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniScanner.java b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniScanner.java
index d1980e4..4165afe 100644
--- a/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniScanner.java
+++ b/tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniScanner.java
@@ -152,7 +152,7 @@ public class TrevniScanner extends FileScanner {
new BlobDatum(((ByteBuffer) columns[i].nextValue())));
break;
- case NULL:
+ case NULL_TYPE:
tuple.put(tid, NullDatum.get());
break;
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/TestLazyTuple.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/TestLazyTuple.java b/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/TestLazyTuple.java
index b67ea92..4cb0b34 100644
--- a/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/TestLazyTuple.java
+++ b/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/TestLazyTuple.java
@@ -52,7 +52,7 @@ public class TestLazyTuple {
schema.addColumn("col10", TajoDataTypes.Type.BLOB);
schema.addColumn("col11", TajoDataTypes.Type.INET4);
schema.addColumn("col12", TajoDataTypes.Type.INT4);
- schema.addColumn("col13", TajoDataTypes.Type.NULL);
+ schema.addColumn("col13", TajoDataTypes.Type.NULL_TYPE);
StringBuilder sb = new StringBuilder();
sb.append(DatumFactory.createBool(true)).append('|');
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/TestStorages.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/TestStorages.java b/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/TestStorages.java
index 5c2cd8f..2faae7f 100644
--- a/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/TestStorages.java
+++ b/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/TestStorages.java
@@ -201,7 +201,7 @@ public class TestStorages {
schema.addColumn("col9", Type.TEXT);
schema.addColumn("col10", Type.BLOB);
schema.addColumn("col11", Type.INET4);
- schema.addColumn("col12", Type.NULL);
+ schema.addColumn("col12", Type.NULL_TYPE);
schema.addColumn("col13", CatalogUtil.newDataType(Type.PROTOBUF, TajoIdProtos.QueryIdProto.class.getName()));
Options options = new Options();
@@ -263,7 +263,7 @@ public class TestStorages {
schema.addColumn("col9", Type.TEXT);
schema.addColumn("col10", Type.BLOB);
schema.addColumn("col11", Type.INET4);
- schema.addColumn("col12", Type.NULL);
+ schema.addColumn("col12", Type.NULL_TYPE);
schema.addColumn("col13", CatalogUtil.newDataType(Type.PROTOBUF, TajoIdProtos.QueryIdProto.class.getName()));
Options options = new Options();
@@ -326,7 +326,7 @@ public class TestStorages {
schema.addColumn("col9", Type.TEXT);
schema.addColumn("col10", Type.BLOB);
schema.addColumn("col11", Type.INET4);
- schema.addColumn("col12", Type.NULL);
+ schema.addColumn("col12", Type.NULL_TYPE);
schema.addColumn("col13", CatalogUtil.newDataType(Type.PROTOBUF, TajoIdProtos.QueryIdProto.class.getName()));
Options options = new Options();
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/2e27a023/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/v2/TestStorages.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/v2/TestStorages.java b/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/v2/TestStorages.java
index 34781bf..a3d3133 100644
--- a/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/v2/TestStorages.java
+++ b/tajo-core/tajo-core-storage/src/test/java/org/apache/tajo/storage/v2/TestStorages.java
@@ -199,7 +199,7 @@ public class TestStorages {
schema.addColumn("col9", Type.TEXT);
schema.addColumn("col10", Type.BLOB);
schema.addColumn("col11", Type.INET4);
- schema.addColumn("col12", Type.NULL);
+ schema.addColumn("col12", Type.NULL_TYPE);
Options options = new Options();
TableMeta meta = CatalogUtil.newTableMeta(storeType, options);