You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/04/02 13:05:54 UTC

[1/7] tajo git commit: TAJO-1424: Investigate the problem of too many "Try to connect" messeges during Travic CI build.

Repository: tajo
Updated Branches:
  refs/heads/index_support 1c53ccf7a -> 3c182347d


TAJO-1424: Investigate the problem of too many "Try to connect" messeges during Travic CI build.

Closes #488

Signed-off-by: Jihoon Son <ji...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/7c2a2409
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/7c2a2409
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/7c2a2409

Branch: refs/heads/index_support
Commit: 7c2a2409032c1bcd1fa9c636f0ef49982a995362
Parents: fdb098b
Author: navis.ryu <na...@apache.org>
Authored: Thu Apr 2 11:24:52 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Thu Apr 2 11:25:11 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |  3 +++
 .../org/apache/tajo/rpc/NettyClientBase.java    | 26 +++++++++++---------
 .../org/apache/tajo/rpc/RpcConnectionPool.java  | 19 +++++++-------
 3 files changed, 27 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/7c2a2409/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 12bf84e..c3bce7d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -107,6 +107,9 @@ Release 0.11.0 - unreleased
   
   TASKS
 
+    TAJO-1424: Investigate the problem of too many "Try to connect" messeges 
+    during Travic CI build. (Contributed by navis, Committed by jihoon)
+
     TAJO-1482: Cleanup the legacy cluster mode. (jinho)
 
     TAJO-1439: Some method name is written wrongly. 

http://git-wip-us.apache.org/repos/asf/tajo/blob/7c2a2409/tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/NettyClientBase.java
----------------------------------------------------------------------
diff --git a/tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/NettyClientBase.java b/tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/NettyClientBase.java
index 72278f2..cdc4cc6 100644
--- a/tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/NettyClientBase.java
+++ b/tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/NettyClientBase.java
@@ -46,6 +46,7 @@ public abstract class NettyClientBase implements Closeable {
 
   private Bootstrap bootstrap;
   private volatile ChannelFuture channelFuture;
+  private volatile long lastConnected = -1;
 
   protected final Class<?> protocol;
   protected final AtomicInteger sequence = new AtomicInteger(0);
@@ -106,20 +107,20 @@ public abstract class NettyClientBase implements Closeable {
   }
 
   private boolean checkConnection(long timeout) {
-    if (isConnected()) {
-      return true;
-    }
+    return isConnected() || handleConnectionInternally(key.addr, timeout);
+  }
 
-    InetSocketAddress addr = key.addr;
-    if (addr.isUnresolved()) {
-      addr = RpcUtils.createSocketAddr(addr.getHostName(), addr.getPort());
+  private InetSocketAddress resolveAddress(InetSocketAddress address) {
+    if (address.isUnresolved()) {
+      return RpcUtils.createSocketAddr(address.getHostName(), address.getPort());
     }
-
-    return handleConnectionInternally(addr, timeout);
+    return address;
   }
 
   private void connectUsingNetty(InetSocketAddress address, GenericFutureListener<ChannelFuture> listener) {
-    LOG.warn("Try to connect : " + address);
+    if (lastConnected > 0) {
+      LOG.warn("Try to reconnect : " + address);
+    }
     this.channelFuture = bootstrap.clone().group(RpcChannelFactory.getSharedClientEventloopGroup())
             .connect(address)
             .addListener(listener);
@@ -139,7 +140,8 @@ public abstract class NettyClientBase implements Closeable {
     }
 
     if (ticket == granted) {
-      connectUsingNetty(addr, new RetryConnectionListener(addr, granted));
+      InetSocketAddress address = resolveAddress(addr);
+      connectUsingNetty(address, new RetryConnectionListener(address, granted));
     }
 
     try {
@@ -173,12 +175,11 @@ public abstract class NettyClientBase implements Closeable {
         channelFuture.channel().close();
 
         if (numRetries > retryCount.getAndIncrement()) {
-          final GenericFutureListener<ChannelFuture> currentListener = this;
 
           RpcChannelFactory.getSharedClientEventloopGroup().schedule(new Runnable() {
             @Override
             public void run() {
-              connectUsingNetty(address, currentListener);
+              connectUsingNetty(address, RetryConnectionListener.this);
             }
           }, PAUSE, TimeUnit.MILLISECONDS);
 
@@ -192,6 +193,7 @@ public abstract class NettyClientBase implements Closeable {
       }
       else {
         latch.countDown();
+        lastConnected = System.currentTimeMillis();
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/tajo/blob/7c2a2409/tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/RpcConnectionPool.java
----------------------------------------------------------------------
diff --git a/tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/RpcConnectionPool.java b/tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/RpcConnectionPool.java
index 6d1f479..b0ff910 100644
--- a/tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/RpcConnectionPool.java
+++ b/tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/RpcConnectionPool.java
@@ -94,26 +94,27 @@ public class RpcConnectionPool {
   }
 
   public void releaseConnection(NettyClientBase client) {
-    release(client, false);
+    if (client != null) {
+      release(client, false);
+    }
   }
 
   public void closeConnection(NettyClientBase client) {
-    release(client, true);
+    if (client != null) {
+      release(client, true);
+    }
   }
 
   private void release(NettyClientBase client, boolean close) {
-    if (client == null) {
-      return;
-    }
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("Close connection [" + client.getKey() + "]");
-    }
     try {
       if (returnToPool(client, close)) {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Closing connection [" + client.getKey() + "]");
+        }
         client.close();
       }
       if (LOG.isDebugEnabled()) {
-        LOG.debug("Current Connections [" + connections.size() + "]");
+        LOG.debug("Current Connections in pool [" + connections.size() + "]");
       }
     } catch (Exception e) {
       LOG.error("Can't close connection:" + client.getKey() + ":" + e.getMessage(), e);


[6/7] tajo git commit: TAJO-1436: Add Bind method to EvalNode.

Posted by ji...@apache.org.
TAJO-1436: Add Bind method to EvalNode.

Closes #456

Signed-off-by: Jihoon Son <ji...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/f4c9e54c
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/f4c9e54c
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/f4c9e54c

Branch: refs/heads/index_support
Commit: f4c9e54c88fb9e69023da2b0a74ead76ad2a6f8d
Parents: bda2d62
Author: navis.ryu <na...@apache.org>
Authored: Thu Apr 2 20:04:27 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Thu Apr 2 20:04:27 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |  3 +
 .../java/org/apache/tajo/conf/TajoConf.java     |  2 +-
 .../tajo/engine/codegen/CaseWhenEmitter.java    |  4 +-
 .../tajo/engine/codegen/EvalCodeGenContext.java |  2 +-
 .../tajo/engine/codegen/EvalCodeGenerator.java  | 22 ++----
 .../apache/tajo/engine/planner/Projector.java   |  9 ++-
 .../planner/physical/AggregationExec.java       | 11 ++-
 .../engine/planner/physical/BNLJoinExec.java    | 43 +----------
 .../planner/physical/BSTIndexScanExec.java      |  6 +-
 .../engine/planner/physical/CommonJoinExec.java | 79 ++++++++++++++++++++
 .../DistinctGroupbyFirstAggregationExec.java    | 20 +++--
 .../DistinctGroupbyHashAggregationExec.java     | 33 ++++----
 .../DistinctGroupbySecondAggregationExec.java   |  8 +-
 .../DistinctGroupbyThirdAggregationExec.java    |  7 +-
 .../engine/planner/physical/EvalExprExec.java   |  6 +-
 .../planner/physical/HashAggregateExec.java     |  4 +-
 .../planner/physical/HashFullOuterJoinExec.java | 33 +-------
 .../engine/planner/physical/HashJoinExec.java   | 32 +-------
 .../planner/physical/HashLeftAntiJoinExec.java  |  2 +-
 .../planner/physical/HashLeftOuterJoinExec.java |  9 ++-
 .../planner/physical/HashLeftSemiJoinExec.java  | 14 +---
 .../engine/planner/physical/HavingExec.java     |  8 +-
 .../physical/MergeFullOuterJoinExec.java        | 34 +--------
 .../engine/planner/physical/MergeJoinExec.java  | 30 +-------
 .../engine/planner/physical/NLJoinExec.java     | 30 +-------
 .../planner/physical/NLLeftOuterJoinExec.java   | 28 +------
 .../physical/RightOuterMergeJoinExec.java       | 35 +--------
 .../engine/planner/physical/SelectionExec.java  |  8 +-
 .../engine/planner/physical/SeqScanExec.java    | 31 +++++---
 .../planner/physical/SortAggregateExec.java     |  6 +-
 .../engine/planner/physical/WindowAggExec.java  | 11 ++-
 .../org/apache/tajo/engine/utils/TupleUtil.java |  4 +-
 .../NonForwardQueryResultSystemScanner.java     |  2 +-
 .../apache/tajo/master/exec/QueryExecutor.java  |  2 +-
 .../apache/tajo/engine/eval/ExprTestBase.java   |  3 +-
 .../apache/tajo/engine/eval/TestEvalTree.java   | 68 +++++++++--------
 .../tajo/engine/eval/TestEvalTreeUtil.java      | 12 +--
 .../org/apache/tajo/plan/LogicalPlanner.java    |  2 +-
 .../plan/expr/AggregationFunctionCallEval.java  | 22 ++----
 .../apache/tajo/plan/expr/AlgebraicUtil.java    |  6 +-
 .../tajo/plan/expr/BetweenPredicateEval.java    | 79 +++++++++++++-------
 .../org/apache/tajo/plan/expr/BinaryEval.java   | 10 ++-
 .../org/apache/tajo/plan/expr/CaseWhenEval.java | 23 +++---
 .../org/apache/tajo/plan/expr/CastEval.java     |  7 +-
 .../org/apache/tajo/plan/expr/ConstEval.java    |  7 +-
 .../org/apache/tajo/plan/expr/EvalNode.java     | 12 ++-
 .../org/apache/tajo/plan/expr/EvalTreeUtil.java |  3 +-
 .../org/apache/tajo/plan/expr/FieldEval.java    | 29 +++----
 .../org/apache/tajo/plan/expr/FunctionEval.java | 50 +++++++------
 .../tajo/plan/expr/GeneralFunctionEval.java     | 25 ++-----
 .../java/org/apache/tajo/plan/expr/InEval.java  |  5 +-
 .../org/apache/tajo/plan/expr/IsNullEval.java   |  6 +-
 .../java/org/apache/tajo/plan/expr/NotEval.java |  6 +-
 .../tajo/plan/expr/PartialBinaryExpr.java       |  5 +-
 .../plan/expr/PatternMatchPredicateEval.java    | 12 +--
 .../apache/tajo/plan/expr/RowConstantEval.java  |  4 +-
 .../org/apache/tajo/plan/expr/SignedEval.java   |  6 +-
 .../org/apache/tajo/plan/expr/UnaryEval.java    |  3 +-
 .../tajo/plan/expr/WindowFunctionEval.java      | 21 +-----
 .../plan/exprrewrite/rules/ConstantFolding.java | 17 +++--
 .../rewrite/rules/PartitionedTableRewriter.java |  3 +-
 61 files changed, 463 insertions(+), 561 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 6eca36d..26b24a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,9 @@ Release 0.11.0 - unreleased
 
   IMPROVEMENT
 
+    TAJO-1436: Add Bind method to EvalNode. (Contributed by navis,
+    Committed by jihoon)
+
     TAJO-1495: Clean up CatalogStore. (jaehwa)
    
     TAJO-1460: Apply TAJO-1407 to ExternalSortExec. (Contributed by navis, 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
index 53773d8..221b341 100644
--- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
+++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
@@ -326,7 +326,7 @@ public class TajoConf extends Configuration {
     $EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD("tajo.executor.groupby.in-memory-hash-threshold-bytes",
         (long)256 * 1048576),
     $MAX_OUTPUT_FILE_SIZE("tajo.query.max-outfile-size-mb", 0), // zero means infinite
-    $CODEGEN("tajo.executor.codegen.enabled", false), // Runtime code generation
+    $CODEGEN("tajo.executor.codegen.enabled", false), // Runtime code generation (todo this is broken)
 
     // Client -----------------------------------------------------------------
     $CLIENT_SESSION_EXPIRY_TIME("tajo.client.session.expiry-time-sec", 3600), // default time is one hour.

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/codegen/CaseWhenEmitter.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/CaseWhenEmitter.java b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/CaseWhenEmitter.java
index 611d815..d09b290 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/CaseWhenEmitter.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/CaseWhenEmitter.java
@@ -197,9 +197,9 @@ class CaseWhenEmitter {
     BinaryEval bin = (BinaryEval) predicate;
 
     if (bin.getLeftExpr().getType() == EvalType.CONST) {
-      return bin.getLeftExpr().eval(null, null).asInt4();
+      return bin.getLeftExpr().eval(null).asInt4();
     } else {
-      return bin.getRightExpr().eval(null, null).asInt4();
+      return bin.getRightExpr().eval(null).asInt4();
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/codegen/EvalCodeGenContext.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/EvalCodeGenContext.java b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/EvalCodeGenContext.java
index 8384de7..c8197b7 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/EvalCodeGenContext.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/EvalCodeGenContext.java
@@ -54,7 +54,7 @@ public class EvalCodeGenContext extends TajoGeneratorAdapter {
     emitConstructor();
 
     String methodName = "eval";
-    String methodDesc = TajoGeneratorAdapter.getMethodDescription(Datum.class, new Class[]{Schema.class, Tuple.class});
+    String methodDesc = TajoGeneratorAdapter.getMethodDescription(Datum.class, new Class[]{Tuple.class});
     MethodVisitor evalMethod = classWriter.visitMethod(Opcodes.ACC_PUBLIC, methodName, methodDesc, null, null);
     evalMethod.visitCode();
     this.methodvisitor = evalMethod;

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/codegen/EvalCodeGenerator.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/EvalCodeGenerator.java b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/EvalCodeGenerator.java
index 1cb3755..cc740e7 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/EvalCodeGenerator.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/EvalCodeGenerator.java
@@ -364,7 +364,7 @@ public class EvalCodeGenerator extends SimpleEvalNodeVisitor<EvalCodeGenContext>
         fieldIdx = context.schema.getColumnIdByName(columnRef.getSimpleName());
       }
 
-      context.methodvisitor.visitVarInsn(Opcodes.ALOAD, 2);
+      context.methodvisitor.visitVarInsn(Opcodes.ALOAD, 1);
       context.push(fieldIdx);
       context.invokeInterface(Tuple.class, "isNull", boolean.class, new Class [] {int.class});
 
@@ -434,7 +434,7 @@ public class EvalCodeGenerator extends SimpleEvalNodeVisitor<EvalCodeGenContext>
         throw new InvalidEvalException(field.getValueType() + " is not supported yet");
       }
 
-      context.methodvisitor.visitVarInsn(Opcodes.ALOAD, 2);
+      context.methodvisitor.visitVarInsn(Opcodes.ALOAD, 1);
       context.push(fieldIdx);
       context.invokeInterface(Tuple.class, methodName, returnType, paramTypes);
 
@@ -740,13 +740,8 @@ public class EvalCodeGenerator extends SimpleEvalNodeVisitor<EvalCodeGenContext>
   public EvalNode visitInPredicate(EvalCodeGenContext context, EvalNode patternEval, Stack<EvalNode> stack) {
     String fieldName = context.symbols.get(patternEval);
     emitGetField(context, context.owner, fieldName, InEval.class);
-    if (context.schema != null) {
-      emitGetField(context, context.owner, "schema", Schema.class);
-    } else {
-      context.methodvisitor.visitInsn(Opcodes.ACONST_NULL);
-    }
-    context.aload(2); // tuple
-    context.invokeVirtual(InEval.class, "eval", Datum.class, new Class[]{Schema.class, Tuple.class});
+    context.aload(1); // tuple
+    context.invokeVirtual(InEval.class, "eval", Datum.class, new Class[]{Tuple.class});
     context.convertToPrimitive(patternEval.getValueType());
 
     return patternEval;
@@ -756,13 +751,8 @@ public class EvalCodeGenerator extends SimpleEvalNodeVisitor<EvalCodeGenContext>
     Class clazz = getStringPatternEvalClass(patternEval.getType());
     String fieldName = context.symbols.get(patternEval);
     emitGetField(context, context.owner, fieldName, clazz);
-    if (context.schema != null) {
-      emitGetField(context, context.owner, "schema", Schema.class);
-    } else {
-      context.methodvisitor.visitInsn(Opcodes.ACONST_NULL);
-    }
-    context.aload(2); // tuple
-    context.invokeVirtual(clazz, "eval", Datum.class, new Class[]{Schema.class, Tuple.class});
+    context.aload(1); // tuple
+    context.invokeVirtual(clazz, "eval", Datum.class, new Class[]{Tuple.class});
     context.convertToPrimitive(patternEval.getValueType());
 
     return patternEval;

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/Projector.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/Projector.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/Projector.java
index 7c2e81f..cec1862 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/Projector.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/Projector.java
@@ -58,11 +58,18 @@ public class Projector {
         evals[i] = this.targets[i].getEvalTree();
       }
     }
+    init();
+  }
+
+  public void init() {
+    for (EvalNode eval : evals) {
+      eval.bind(inSchema);
+    }
   }
 
   public void eval(Tuple in, Tuple out) {
     for (int i = 0; i < evals.length; i++) {
-      out.put(i, evals[i].eval(inSchema, in));
+      out.put(i, evals[i].eval(in));
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/AggregationExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/AggregationExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/AggregationExec.java
index a4b9fe4..6d9e38a 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/AggregationExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/AggregationExec.java
@@ -19,8 +19,8 @@
 package org.apache.tajo.engine.planner.physical;
 
 import org.apache.tajo.catalog.Column;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.plan.expr.AggregationFunctionCallEval;
+import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.logical.GroupbyNode;
 import org.apache.tajo.worker.TaskAttemptContext;
 
@@ -29,7 +29,7 @@ import java.io.IOException;
 public abstract class AggregationExec extends UnaryPhysicalExec {
 
   protected final int groupingKeyNum;
-  protected int groupingKeyIds[];
+  protected final int groupingKeyIds[];
   protected final int aggFunctionsNum;
   protected final AggregationFunctionCallEval aggFunctions[];
 
@@ -60,7 +60,10 @@ public abstract class AggregationExec extends UnaryPhysicalExec {
   }
 
   @Override
-  public void close() throws IOException {
-    super.close();
+  public void init() throws IOException {
+    super.init();
+    for (EvalNode aggFunction : aggFunctions) {
+      aggFunction.bind(inSchema);
+    }
   }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BNLJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BNLJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BNLJoinExec.java
index 8b76097..6e1a553 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BNLJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BNLJoinExec.java
@@ -18,9 +18,7 @@
 
 package org.apache.tajo.engine.planner.physical;
 
-import org.apache.tajo.engine.planner.Projector;
 import org.apache.tajo.plan.util.PlannerUtil;
-import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.logical.JoinNode;
 import org.apache.tajo.storage.FrameTuple;
 import org.apache.tajo.storage.Tuple;
@@ -32,11 +30,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-public class BNLJoinExec extends BinaryPhysicalExec {
-  // from logical plan
-  private JoinNode plan;
-  private final boolean hasJoinQual;
-  private EvalNode joinQual;
+public class BNLJoinExec extends CommonJoinExec {
 
   private List<Tuple> leftTupleSlots;
   private List<Tuple> rightTupleSlots;
@@ -54,19 +48,9 @@ public class BNLJoinExec extends BinaryPhysicalExec {
 
   private final static int TUPLE_SLOT_SIZE = 10000;
 
-  // projection
-  private Projector projector;
-
   public BNLJoinExec(final TaskAttemptContext context, final JoinNode plan,
                      final PhysicalExec leftExec, PhysicalExec rightExec) {
-    super(context, plan.getInSchema(), plan.getOutSchema(), leftExec, rightExec);
-    this.plan = plan;
-    this.joinQual = plan.getJoinQual();
-    if (joinQual != null) { // if join type is not 'cross join'
-      hasJoinQual = true;
-    } else {
-      hasJoinQual = false;
-    }
+    super(context, plan, leftExec, rightExec);
     this.leftTupleSlots = new ArrayList<Tuple>(TUPLE_SLOT_SIZE);
     this.rightTupleSlots = new ArrayList<Tuple>(TUPLE_SLOT_SIZE);
     this.leftIterator = leftTupleSlots.iterator();
@@ -79,24 +63,11 @@ public class BNLJoinExec extends BinaryPhysicalExec {
       plan.setTargets(PlannerUtil.schemaToTargets(outSchema));
     }
 
-    projector = new Projector(context, inSchema, outSchema, plan.getTargets());
-
     // for join
     frameTuple = new FrameTuple();
     outputTuple = new VTuple(outSchema.size());
   }
 
-  @Override
-  protected void compile() {
-    if (hasJoinQual) {
-      joinQual = context.getPrecompiledEval(inSchema, joinQual);
-    }
-  }
-
-  public JoinNode getPlan() {
-    return plan;
-  }
-
   public Tuple next() throws IOException {
 
     if (leftTupleSlots.isEmpty()) {
@@ -191,12 +162,7 @@ public class BNLJoinExec extends BinaryPhysicalExec {
       }
 
       frameTuple.set(leftTuple, rightIterator.next());
-      if (hasJoinQual) {
-        if (joinQual.eval(inSchema, frameTuple).isTrue()) {
-          projector.eval(frameTuple, outputTuple);
-          return outputTuple;
-        }
-      } else {
+      if (!hasJoinQual || joinQual.eval(frameTuple).isTrue()) {
         projector.eval(frameTuple, outputTuple);
         return outputTuple;
       }
@@ -224,8 +190,5 @@ public class BNLJoinExec extends BinaryPhysicalExec {
     leftTupleSlots = null;
     rightIterator = null;
     leftIterator = null;
-    plan = null;
-    joinQual = null;
-    projector = null;
   }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
index 6adc523..be6c046 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
@@ -69,7 +69,11 @@ public class BSTIndexScanExec extends PhysicalExec {
 
   @Override
   public void init() throws IOException {
+    super.init();
     progress = 0.0f;
+    if (qual != null) {
+      qual.bind(inSchema);
+    }
   }
 
   @Override
@@ -111,7 +115,7 @@ public class BSTIndexScanExec extends PhysicalExec {
       }
     } else {
        while(reader.isCurInMemory() && (tuple = fileScanner.next()) != null) {
-         if (qual.eval(inSchema, tuple).isTrue()) {
+         if (qual.eval(tuple).isTrue()) {
            projector.eval(tuple, outTuple);
            return outTuple;
          } else {

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonJoinExec.java
new file mode 100644
index 0000000..0781041
--- /dev/null
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/CommonJoinExec.java
@@ -0,0 +1,79 @@
+/**
+ * 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.planner.physical;
+
+import org.apache.tajo.catalog.SchemaUtil;
+import org.apache.tajo.engine.planner.Projector;
+import org.apache.tajo.plan.expr.EvalNode;
+import org.apache.tajo.plan.logical.JoinNode;
+import org.apache.tajo.worker.TaskAttemptContext;
+
+import java.io.IOException;
+
+// common join exec except HashLeftOuterJoinExec
+public abstract class CommonJoinExec extends BinaryPhysicalExec {
+
+  // from logical plan
+  protected JoinNode plan;
+  protected final boolean hasJoinQual;
+
+  protected EvalNode joinQual;
+
+  // projection
+  protected Projector projector;
+
+  public CommonJoinExec(TaskAttemptContext context, JoinNode plan, PhysicalExec outer,
+                        PhysicalExec inner) {
+    super(context, SchemaUtil.merge(outer.getSchema(), inner.getSchema()),
+        plan.getOutSchema(), outer, inner);
+    this.plan = plan;
+    this.joinQual = plan.getJoinQual();
+    this.hasJoinQual = plan.hasJoinQual();
+
+    // for projection
+    this.projector = new Projector(context, inSchema, outSchema, plan.getTargets());
+  }
+
+  @Override
+  public void init() throws IOException {
+    super.init();
+    if (hasJoinQual) {
+      joinQual.bind(inSchema);
+    }
+  }
+
+  @Override
+  protected void compile() {
+    if (hasJoinQual) {
+      joinQual = context.getPrecompiledEval(inSchema, joinQual);
+    }
+  }
+
+  public JoinNode getPlan() {
+    return plan;
+  }
+
+  @Override
+  public void close() throws IOException {
+    super.close();
+    plan = null;
+    joinQual = null;
+    projector = null;
+  }
+}

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyFirstAggregationExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyFirstAggregationExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyFirstAggregationExec.java
index 2c6cc7e..37bc5a7 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyFirstAggregationExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyFirstAggregationExec.java
@@ -84,17 +84,15 @@ import java.util.Map.Entry;
  *
  */
 
-public class DistinctGroupbyFirstAggregationExec extends PhysicalExec {
+public class DistinctGroupbyFirstAggregationExec extends UnaryPhysicalExec {
   private static Log LOG = LogFactory.getLog(DistinctGroupbyFirstAggregationExec.class);
 
   private DistinctGroupbyNode plan;
   private boolean finished = false;
   private boolean preparedData = false;
-  private PhysicalExec child;
 
   private long totalNumRows;
   private int fetchedRows;
-  private float progress;
 
   private int[] groupingKeyIndexes;
   private NonDistinctHashAggregator nonDistinctHashAggregator;
@@ -104,15 +102,13 @@ public class DistinctGroupbyFirstAggregationExec extends PhysicalExec {
 
   public DistinctGroupbyFirstAggregationExec(TaskAttemptContext context, DistinctGroupbyNode plan, PhysicalExec subOp)
       throws IOException {
-    super(context, plan.getInSchema(), plan.getOutSchema());
-    this.child = subOp;
+    super(context, plan.getInSchema(), plan.getOutSchema(), subOp);
     this.plan = plan;
   }
 
   @Override
   public void init() throws IOException {
     super.init();
-    child.init();
 
     // finding grouping column index
     Column[] groupingColumns = plan.getGroupingColumns();
@@ -248,14 +244,16 @@ public class DistinctGroupbyFirstAggregationExec extends PhysicalExec {
       if (groupbyNode.hasAggFunctions()) {
         aggFunctions = groupbyNode.getAggFunctions();
         aggFunctionsNum = aggFunctions.length;
-        for (AggregationFunctionCallEval eachFunction: aggFunctions) {
-          eachFunction.setFirstPhase();
-        }
       } else {
         aggFunctions = new AggregationFunctionCallEval[0];
         aggFunctionsNum = 0;
       }
 
+      for (AggregationFunctionCallEval eachFunction: aggFunctions) {
+        eachFunction.bind(inSchema);
+        eachFunction.setFirstPhase();
+      }
+
       dummyTuple = new VTuple(aggFunctionsNum);
       for (int i = 0; i < aggFunctionsNum; i++) {
         dummyTuple.put(i, NullDatum.get());
@@ -267,13 +265,13 @@ public class DistinctGroupbyFirstAggregationExec extends PhysicalExec {
       FunctionContext[] contexts = nonDistinctAggrDatas.get(groupingKeyTuple);
       if (contexts != null) {
         for (int i = 0; i < aggFunctions.length; i++) {
-          aggFunctions[i].merge(contexts[i], inSchema, tuple);
+          aggFunctions[i].merge(contexts[i], tuple);
         }
       } else { // if the key occurs firstly
         contexts = new FunctionContext[aggFunctionsNum];
         for (int i = 0; i < aggFunctionsNum; i++) {
           contexts[i] = aggFunctions[i].newContext();
-          aggFunctions[i].merge(contexts[i], inSchema, tuple);
+          aggFunctions[i].merge(contexts[i], tuple);
         }
         nonDistinctAggrDatas.put(groupingKeyTuple, contexts);
       }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyHashAggregationExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyHashAggregationExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyHashAggregationExec.java
index d3178db..e96e750 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyHashAggregationExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyHashAggregationExec.java
@@ -24,6 +24,7 @@ import org.apache.tajo.catalog.statistics.TableStats;
 import org.apache.tajo.datum.DatumFactory;
 import org.apache.tajo.datum.NullDatum;
 import org.apache.tajo.plan.expr.AggregationFunctionCallEval;
+import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.function.FunctionContext;
 import org.apache.tajo.plan.logical.DistinctGroupbyNode;
 import org.apache.tajo.plan.logical.GroupbyNode;
@@ -35,27 +36,29 @@ import java.io.IOException;
 import java.util.*;
 import java.util.Map.Entry;
 
-public class DistinctGroupbyHashAggregationExec extends PhysicalExec {
+public class DistinctGroupbyHashAggregationExec extends UnaryPhysicalExec {
   private boolean finished = false;
 
+  private DistinctGroupbyNode plan;
   private HashAggregator[] hashAggregators;
-  private PhysicalExec child;
   private int distinctGroupingKeyIds[];
   private boolean first = true;
   private int groupbyNodeNum;
   private int outputColumnNum;
   private int totalNumRows;
   private int fetchedRows;
-  private float progress;
 
   private int[] resultColumnIdIndexes;
 
   public DistinctGroupbyHashAggregationExec(TaskAttemptContext context, DistinctGroupbyNode plan, PhysicalExec subOp)
       throws IOException {
-    super(context, plan.getInSchema(), plan.getOutSchema());
+    super(context, plan.getInSchema(), plan.getOutSchema(), subOp);
+    this.plan = plan;
+  }
 
-    this.child = subOp;
-    this.child.init();
+  @Override
+  public void init() throws IOException {
+    super.init();
 
     List<Integer> distinctGroupingKeyIdList = new ArrayList<Integer>();
     for (Column col: plan.getGroupingColumns()) {
@@ -72,7 +75,7 @@ public class DistinctGroupbyHashAggregationExec extends PhysicalExec {
     int idx = 0;
     distinctGroupingKeyIds = new int[distinctGroupingKeyIdList.size()];
     for (Integer intVal: distinctGroupingKeyIdList) {
-      distinctGroupingKeyIds[idx++] = intVal.intValue();
+      distinctGroupingKeyIds[idx++] = intVal;
     }
 
     List<GroupbyNode> groupbyNodes = plan.getSubPlans();
@@ -81,7 +84,7 @@ public class DistinctGroupbyHashAggregationExec extends PhysicalExec {
 
     int index = 0;
     for (GroupbyNode eachGroupby: groupbyNodes) {
-      hashAggregators[index++] = new HashAggregator(eachGroupby);
+      hashAggregators[index++] = new HashAggregator(eachGroupby, inSchema);
     }
 
     outputColumnNum = plan.getOutSchema().size();
@@ -295,10 +298,6 @@ public class DistinctGroupbyHashAggregationExec extends PhysicalExec {
     }
   }
 
-  @Override
-  public void init() throws IOException {
-  }
-
   public void rescan() throws IOException {
     finished = false;
     for (int i = 0; i < hashAggregators.length; i++) {
@@ -337,7 +336,7 @@ public class DistinctGroupbyHashAggregationExec extends PhysicalExec {
 
     int tupleSize;
 
-    public HashAggregator(GroupbyNode groupbyNode) throws IOException {
+    public HashAggregator(GroupbyNode groupbyNode, Schema schema) throws IOException {
 
       hashTable = new HashMap<Tuple, Map<Tuple, FunctionContext[]>>(10000);
 
@@ -375,6 +374,10 @@ public class DistinctGroupbyHashAggregationExec extends PhysicalExec {
         aggFunctionsNum = 0;
       }
 
+      for (EvalNode aggFunction : aggFunctions) {
+        aggFunction.bind(schema);
+      }
+
       tupleSize = groupingKeyIds.length + aggFunctionsNum;
     }
 
@@ -401,13 +404,13 @@ public class DistinctGroupbyHashAggregationExec extends PhysicalExec {
       FunctionContext[] contexts = distinctEntry.get(keyTuple);
       if (contexts != null) {
         for (int i = 0; i < aggFunctions.length; i++) {
-          aggFunctions[i].merge(contexts[i], inSchema, tuple);
+          aggFunctions[i].merge(contexts[i], tuple);
         }
       } else { // if the key occurs firstly
         contexts = new FunctionContext[aggFunctionsNum];
         for (int i = 0; i < aggFunctionsNum; i++) {
           contexts[i] = aggFunctions[i].newContext();
-          aggFunctions[i].merge(contexts[i], inSchema, tuple);
+          aggFunctions[i].merge(contexts[i], tuple);
         }
         distinctEntry.put(keyTuple, contexts);
       }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbySecondAggregationExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbySecondAggregationExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbySecondAggregationExec.java
index cce9a24..7b01a9b 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbySecondAggregationExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbySecondAggregationExec.java
@@ -77,7 +77,6 @@ package org.apache.tajo.engine.planner.physical;
 public class DistinctGroupbySecondAggregationExec extends UnaryPhysicalExec {
   private static Log LOG = LogFactory.getLog(DistinctGroupbySecondAggregationExec.class);
   private DistinctGroupbyNode plan;
-  private PhysicalExec child;
 
   private boolean finished = false;
 
@@ -91,13 +90,11 @@ public class DistinctGroupbySecondAggregationExec extends UnaryPhysicalExec {
       throws IOException {
     super(context, plan.getInSchema(), plan.getOutSchema(), sortExec);
     this.plan = plan;
-    this.child = sortExec;
   }
 
   @Override
   public void init() throws IOException {
-    this.child.init();
-
+    super.init();
     numGroupingColumns = plan.getGroupingColumns().length;
 
     List<GroupbyNode> groupbyNodes = plan.getSubPlans();
@@ -122,6 +119,7 @@ public class DistinctGroupbySecondAggregationExec extends UnaryPhysicalExec {
         nonDistinctAggrFunctions = eachGroupby.getAggFunctions();
         if (nonDistinctAggrFunctions != null) {
           for (AggregationFunctionCallEval eachFunction: nonDistinctAggrFunctions) {
+            eachFunction.bind(inSchema);
             eachFunction.setIntermediatePhase();
           }
           nonDistinctAggrContexts = new FunctionContext[nonDistinctAggrFunctions.length];
@@ -252,7 +250,7 @@ public class DistinctGroupbySecondAggregationExec extends UnaryPhysicalExec {
       return;
     }
     for (int i = 0; i < nonDistinctAggrFunctions.length; i++) {
-      nonDistinctAggrFunctions[i].merge(nonDistinctAggrContexts[i], inSchema, tuple);
+      nonDistinctAggrFunctions[i].merge(nonDistinctAggrContexts[i], tuple);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java
index 26f09da..7bd71e2 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/DistinctGroupbyThirdAggregationExec.java
@@ -40,7 +40,6 @@ import java.util.*;
 public class DistinctGroupbyThirdAggregationExec extends UnaryPhysicalExec {
   private static Log LOG = LogFactory.getLog(DistinctGroupbyThirdAggregationExec.class);
   private DistinctGroupbyNode plan;
-  private PhysicalExec child;
 
   private boolean finished = false;
 
@@ -56,12 +55,11 @@ public class DistinctGroupbyThirdAggregationExec extends UnaryPhysicalExec {
       throws IOException {
     super(context, plan.getInSchema(), plan.getOutSchema(), sortExec);
     this.plan = plan;
-    this.child = sortExec;
   }
 
   @Override
   public void init() throws IOException {
-    this.child.init();
+    super.init();
 
     numGroupingColumns = plan.getGroupingColumns().length;
     resultTupleLength = numGroupingColumns;
@@ -254,6 +252,7 @@ public class DistinctGroupbyThirdAggregationExec extends UnaryPhysicalExec {
       aggrFunctions = groupbyNode.getAggFunctions();
       if (aggrFunctions != null) {
         for (AggregationFunctionCallEval eachFunction: aggrFunctions) {
+          eachFunction.bind(inSchema);
           eachFunction.setFinalPhase();
         }
       }
@@ -269,7 +268,7 @@ public class DistinctGroupbyThirdAggregationExec extends UnaryPhysicalExec {
 
     public void merge(Tuple tuple) {
       for (int i = 0; i < aggrFunctions.length; i++) {
-        aggrFunctions[i].merge(functionContexts[i], inSchema, tuple);
+        aggrFunctions[i].merge(functionContexts[i], tuple);
       }
 
       if (seq == 0 && nonDistinctAggr != null) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/EvalExprExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/EvalExprExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/EvalExprExec.java
index 4e02e67..32ec772 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/EvalExprExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/EvalExprExec.java
@@ -38,7 +38,11 @@ public class EvalExprExec extends PhysicalExec {
 
   @Override
   public void init() throws IOException {
+    super.init();
     progress = 0.0f;
+    for (Target target : plan.getTargets()) {
+      target.getEvalTree().bind(inSchema);
+    }
   }
 
   @Override
@@ -47,7 +51,7 @@ public class EvalExprExec extends PhysicalExec {
       Target [] targets = plan.getTargets();
       Tuple t = new VTuple(targets.length);
       for (int i = 0; i < targets.length; i++) {
-        t.put(i, targets[i].getEvalTree().eval(inSchema, null));
+        t.put(i, targets[i].getEvalTree().eval(null));
       }
 
       executedOnce = true;

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java
index 0d1bf3d..8ffd503 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashAggregateExec.java
@@ -58,13 +58,13 @@ public class HashAggregateExec extends AggregationExec {
       FunctionContext [] contexts = hashTable.get(keyTuple);
       if(contexts != null) {
         for(int i = 0; i < aggFunctions.length; i++) {
-          aggFunctions[i].merge(contexts[i], inSchema, tuple);
+          aggFunctions[i].merge(contexts[i], tuple);
         }
       } else { // if the key occurs firstly
         contexts = new FunctionContext[aggFunctionsNum];
         for(int i = 0; i < aggFunctionsNum; i++) {
           contexts[i] = aggFunctions[i].newContext();
-          aggFunctions[i].merge(contexts[i], inSchema, tuple);
+          aggFunctions[i].merge(contexts[i], tuple);
         }
         hashTable.put(keyTuple, contexts);
       }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashFullOuterJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashFullOuterJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashFullOuterJoinExec.java
index 9cd13fb..6e28ae0 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashFullOuterJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashFullOuterJoinExec.java
@@ -19,12 +19,8 @@
 package org.apache.tajo.engine.planner.physical;
 
 import org.apache.tajo.catalog.Column;
-import org.apache.tajo.engine.codegen.CompilationError;
-import org.apache.tajo.engine.planner.Projector;
 import org.apache.tajo.engine.utils.TupleUtil;
 import org.apache.tajo.plan.util.PlannerUtil;
-import org.apache.tajo.catalog.SchemaUtil;
-import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.logical.JoinNode;
 import org.apache.tajo.storage.FrameTuple;
 import org.apache.tajo.storage.Tuple;
@@ -35,10 +31,7 @@ import java.io.IOException;
 import java.util.*;
 
 
-public class HashFullOuterJoinExec extends BinaryPhysicalExec {
-  // from logical plan
-  protected JoinNode plan;
-  protected EvalNode joinQual;
+public class HashFullOuterJoinExec extends CommonJoinExec {
 
   protected List<Column[]> joinKeyPairs;
 
@@ -57,19 +50,13 @@ public class HashFullOuterJoinExec extends BinaryPhysicalExec {
   protected boolean finished = false;
   protected boolean shouldGetLeftTuple = true;
 
-  // projection
-  protected final Projector projector;
-
   private int rightNumCols;
   private int leftNumCols;
   private Map<Tuple, Boolean> matched;
 
   public HashFullOuterJoinExec(TaskAttemptContext context, JoinNode plan, PhysicalExec outer,
                                PhysicalExec inner) {
-    super(context, SchemaUtil.merge(outer.getSchema(), inner.getSchema()),
-        plan.getOutSchema(), outer, inner);
-    this.plan = plan;
-    this.joinQual = plan.getJoinQual();
+    super(context, plan, outer, inner);
     this.tupleSlots = new HashMap<Tuple, List<Tuple>>(10000);
 
     // this hashmap mirrors the evolution of the tupleSlots, with the same keys. For each join key,
@@ -91,9 +78,6 @@ public class HashFullOuterJoinExec extends BinaryPhysicalExec {
       rightKeyList[i] = inner.getSchema().getColumnId(joinKeyPairs.get(i)[1].getQualifiedName());
     }
 
-    // for projection
-    this.projector = new Projector(context, inSchema, outSchema, plan.getTargets());
-
     // for join
     frameTuple = new FrameTuple();
     outTuple = new VTuple(outSchema.size());
@@ -103,11 +87,6 @@ public class HashFullOuterJoinExec extends BinaryPhysicalExec {
     rightNumCols = inner.getSchema().size();
   }
 
-  @Override
-  protected void compile() throws CompilationError {
-    joinQual = context.getPrecompiledEval(inSchema, joinQual);
-  }
-
   protected void getKeyLeftTuple(final Tuple outerTuple, Tuple keyTuple) {
     for (int i = 0; i < leftKeyList.length; i++) {
       keyTuple.put(i, outerTuple.get(leftKeyList[i]));
@@ -186,7 +165,7 @@ public class HashFullOuterJoinExec extends BinaryPhysicalExec {
       rightTuple = iterator.next();
       frameTuple.set(leftTuple, rightTuple); // evaluate a join condition on both tuples
 
-      if (joinQual.eval(inSchema, frameTuple).isTrue()) { // if both tuples are joinable
+      if (joinQual.eval(frameTuple).isTrue()) { // if both tuples are joinable
         projector.eval(frameTuple, outTuple);
         found = true;
         getKeyLeftTuple(leftTuple, leftKeyTuple);
@@ -247,12 +226,6 @@ public class HashFullOuterJoinExec extends BinaryPhysicalExec {
     tupleSlots = null;
     matched = null;
     iterator = null;
-    plan = null;
-    joinQual = null;
-  }
-
-  public JoinNode getPlan() {
-    return this.plan;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashJoinExec.java
index 3bdf2d4..48f3682 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashJoinExec.java
@@ -19,12 +19,9 @@
 package org.apache.tajo.engine.planner.physical;
 
 import org.apache.tajo.catalog.Column;
-import org.apache.tajo.catalog.SchemaUtil;
 import org.apache.tajo.catalog.statistics.TableStats;
-import org.apache.tajo.engine.planner.Projector;
 import org.apache.tajo.engine.utils.CacheHolder;
 import org.apache.tajo.engine.utils.TableCacheKey;
-import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.logical.JoinNode;
 import org.apache.tajo.plan.util.PlannerUtil;
 import org.apache.tajo.storage.FrameTuple;
@@ -36,10 +33,7 @@ import org.apache.tajo.worker.TaskAttemptContext;
 import java.io.IOException;
 import java.util.*;
 
-public class HashJoinExec extends BinaryPhysicalExec {
-  // from logical plan
-  protected JoinNode plan;
-  protected EvalNode joinQual;
+public class HashJoinExec extends CommonJoinExec {
 
   protected List<Column[]> joinKeyPairs;
 
@@ -58,17 +52,11 @@ public class HashJoinExec extends BinaryPhysicalExec {
   protected boolean finished = false;
   protected boolean shouldGetLeftTuple = true;
 
-  // projection
-  protected final Projector projector;
-
   private TableStats cachedRightTableStats;
 
   public HashJoinExec(TaskAttemptContext context, JoinNode plan, PhysicalExec leftExec,
       PhysicalExec rightExec) {
-    super(context, SchemaUtil.merge(leftExec.getSchema(), rightExec.getSchema()), plan.getOutSchema(),
-        leftExec, rightExec);
-    this.plan = plan;
-    this.joinQual = plan.getJoinQual();
+    super(context, plan, leftExec, rightExec);
 
     // HashJoin only can manage equi join key pairs.
     this.joinKeyPairs = PlannerUtil.getJoinKeyPairs(joinQual, leftExec.getSchema(),
@@ -85,20 +73,12 @@ public class HashJoinExec extends BinaryPhysicalExec {
       rightKeyList[i] = rightExec.getSchema().getColumnId(joinKeyPairs.get(i)[1].getQualifiedName());
     }
 
-    // for projection
-    this.projector = new Projector(context, inSchema, outSchema, plan.getTargets());
-
     // for join
     frameTuple = new FrameTuple();
     outTuple = new VTuple(outSchema.size());
     leftKeyTuple = new VTuple(leftKeyList.length);
   }
 
-  @Override
-  protected void compile() {
-    joinQual = context.getPrecompiledEval(inSchema, joinQual);
-  }
-
   protected void getKeyLeftTuple(final Tuple outerTuple, Tuple keyTuple) {
     for (int i = 0; i < leftKeyList.length; i++) {
       keyTuple.put(i, outerTuple.get(leftKeyList[i]));
@@ -137,7 +117,7 @@ public class HashJoinExec extends BinaryPhysicalExec {
       // getting a next right tuple on in-memory hash table.
       rightTuple = iterator.next();
       frameTuple.set(leftTuple, rightTuple); // evaluate a join condition on both tuples
-      if (joinQual.eval(inSchema, frameTuple).isTrue()) { // if both tuples are joinable
+      if (joinQual.eval(frameTuple).isTrue()) { // if both tuples are joinable
         projector.eval(frameTuple, outTuple);
         found = true;
       }
@@ -232,12 +212,6 @@ public class HashJoinExec extends BinaryPhysicalExec {
     }
 
     iterator = null;
-    plan = null;
-    joinQual = null;
-  }
-
-  public JoinNode getPlan() {
-    return this.plan;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftAntiJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftAntiJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftAntiJoinExec.java
index cceed3e..881bf84 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftAntiJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftAntiJoinExec.java
@@ -92,7 +92,7 @@ public class HashLeftAntiJoinExec extends HashJoinExec {
       while (!context.isStopped() && notFound && iterator.hasNext()) {
         rightTuple = iterator.next();
         frameTuple.set(leftTuple, rightTuple);
-        if (joinQual.eval(inSchema, frameTuple).isTrue()) { // if the matched one is found
+        if (joinQual.eval(frameTuple).isTrue()) { // if the matched one is found
           notFound = false;
         }
       }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftOuterJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftOuterJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftOuterJoinExec.java
index 81ac02c..fa9ba94 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftOuterJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftOuterJoinExec.java
@@ -120,6 +120,11 @@ public class HashLeftOuterJoinExec extends BinaryPhysicalExec {
     leftKeyTuple = new VTuple(leftKeyList.length);
 
     rightNumCols = rightChild.getSchema().size();
+
+    joinQual.bind(inSchema);
+    if (joinFilter != null) {
+      joinFilter.bind(inSchema);
+    }
   }
 
   @Override
@@ -177,8 +182,8 @@ public class HashLeftOuterJoinExec extends BinaryPhysicalExec {
       frameTuple.set(leftTuple, rightTuple); // evaluate a join condition on both tuples
 
       // if there is no join filter, it is always true.
-      boolean satisfiedWithFilter = joinFilter == null ? true : joinFilter.eval(inSchema, frameTuple).isTrue();
-      boolean satisfiedWithJoinCondition = joinQual.eval(inSchema, frameTuple).isTrue();
+      boolean satisfiedWithFilter = joinFilter == null || joinFilter.eval(frameTuple).isTrue();
+      boolean satisfiedWithJoinCondition = joinQual.eval(frameTuple).isTrue();
 
       // if a composited tuple satisfies with both join filter and join condition
       if (satisfiedWithJoinCondition && satisfiedWithFilter) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftSemiJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftSemiJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftSemiJoinExec.java
index 37c6d0e..32e6d08 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftSemiJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashLeftSemiJoinExec.java
@@ -19,10 +19,8 @@
 package org.apache.tajo.engine.planner.physical;
 
 import org.apache.tajo.worker.TaskAttemptContext;
-import org.apache.tajo.datum.NullDatum;
 import org.apache.tajo.plan.logical.JoinNode;
 import org.apache.tajo.storage.Tuple;
-import org.apache.tajo.storage.VTuple;
 
 import java.io.IOException;
 import java.util.List;
@@ -33,20 +31,10 @@ import java.util.List;
  * If found, it returns the tuple of the FROM side table.
  */
 public class HashLeftSemiJoinExec extends HashJoinExec {
-  private Tuple rightNullTuple;
 
   public HashLeftSemiJoinExec(TaskAttemptContext context, JoinNode plan, PhysicalExec fromSideChild,
                               PhysicalExec inSideChild) {
     super(context, plan, fromSideChild, inSideChild);
-    // NUll Tuple
-    rightNullTuple = new VTuple(leftChild.outColumnNum);
-    for (int i = 0; i < leftChild.outColumnNum; i++) {
-      rightNullTuple.put(i, NullDatum.get());
-    }
-  }
-
-  protected void compile() {
-    joinQual = context.getPrecompiledEval(inSchema, joinQual);
   }
 
   /**
@@ -95,7 +83,7 @@ public class HashLeftSemiJoinExec extends HashJoinExec {
       while (notFound && iterator.hasNext()) {
         rightTuple = iterator.next();
         frameTuple.set(leftTuple, rightTuple);
-        if (joinQual.eval(inSchema, frameTuple).isTrue()) { // if the matched one is found
+        if (joinQual.eval(frameTuple).isTrue()) { // if the matched one is found
           notFound = false;
           projector.eval(frameTuple, outTuple);
         }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HavingExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HavingExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HavingExec.java
index e9a7c03..b71c770 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HavingExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HavingExec.java
@@ -37,10 +37,16 @@ public class HavingExec extends UnaryPhysicalExec  {
   }
 
   @Override
+  public void init() throws IOException {
+    super.init();
+    qual.bind(inSchema);
+  }
+
+  @Override
   public Tuple next() throws IOException {
     Tuple tuple;
     while (!context.isStopped() && (tuple = child.next()) != null) {
-      if (qual.eval(inSchema, tuple).isTrue()) {
+      if (qual.eval(tuple).isTrue()) {
         return tuple;
       }
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MergeFullOuterJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MergeFullOuterJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MergeFullOuterJoinExec.java
index 3f2e431..13b73c3 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MergeFullOuterJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MergeFullOuterJoinExec.java
@@ -20,9 +20,7 @@ package org.apache.tajo.engine.planner.physical;
 
 import com.google.common.base.Preconditions;
 import org.apache.tajo.catalog.SortSpec;
-import org.apache.tajo.engine.planner.Projector;
 import org.apache.tajo.engine.utils.TupleUtil;
-import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.logical.JoinNode;
 import org.apache.tajo.storage.FrameTuple;
 import org.apache.tajo.storage.Tuple;
@@ -35,10 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class MergeFullOuterJoinExec extends BinaryPhysicalExec {
-  // from logical plan
-  private JoinNode joinNode;
-  private EvalNode joinQual;
+public class MergeFullOuterJoinExec extends CommonJoinExec {
 
   // temporal tuples and states for nested loop join
   private FrameTuple frameTuple;
@@ -57,9 +52,6 @@ public class MergeFullOuterJoinExec extends BinaryPhysicalExec {
 
   private boolean end = false;
 
-  // projection
-  private Projector projector;
-
   private int rightNumCols;
   private int leftNumCols;
   private int posRightTupleSlots = -1;
@@ -69,12 +61,9 @@ public class MergeFullOuterJoinExec extends BinaryPhysicalExec {
 
   public MergeFullOuterJoinExec(TaskAttemptContext context, JoinNode plan, PhysicalExec leftChild,
                                 PhysicalExec rightChild, SortSpec[] leftSortKey, SortSpec[] rightSortKey) {
-    super(context, plan.getInSchema(), plan.getOutSchema(), leftChild, rightChild);
+    super(context, plan, leftChild, rightChild);
     Preconditions.checkArgument(plan.hasJoinQual(), "Sort-merge join is only used for the equi-join, " +
         "but there is no join condition");
-    this.joinNode = plan;
-    this.joinQual = plan.getJoinQual();
-
     this.leftTupleSlots = new ArrayList<Tuple>(INITIAL_TUPLE_SLOT);
     this.rightTupleSlots = new ArrayList<Tuple>(INITIAL_TUPLE_SLOT);
     SortSpec[][] sortSpecs = new SortSpec[2][];
@@ -86,9 +75,6 @@ public class MergeFullOuterJoinExec extends BinaryPhysicalExec {
     this.tupleComparator = PhysicalPlanUtil.getComparatorsFromJoinQual(
         plan.getJoinQual(), leftChild.getSchema(), rightChild.getSchema());
 
-    // for projection
-    this.projector = new Projector(context, inSchema, outSchema, plan.getTargets());
-
     // for join
     frameTuple = new FrameTuple();
     outTuple = new VTuple(outSchema.size());
@@ -97,15 +83,6 @@ public class MergeFullOuterJoinExec extends BinaryPhysicalExec {
     rightNumCols = rightChild.getSchema().size();
   }
 
-  @Override
-  protected void compile() {
-    joinQual = context.getPrecompiledEval(inSchema, joinQual);
-  }
-
-  public JoinNode getPlan(){
-    return this.joinNode;
-  }
-
   public Tuple next() throws IOException {
     Tuple previous;
 
@@ -292,7 +269,7 @@ public class MergeFullOuterJoinExec extends BinaryPhysicalExec {
           Tuple aTuple = new VTuple(rightTupleSlots.get(posRightTupleSlots));
           posRightTupleSlots = posRightTupleSlots + 1;
           frameTuple.set(leftNext, aTuple);
-          joinQual.eval(inSchema, frameTuple);
+          joinQual.eval(frameTuple);
           projector.eval(frameTuple, outTuple);
           return outTuple;
         } else {
@@ -306,7 +283,7 @@ public class MergeFullOuterJoinExec extends BinaryPhysicalExec {
             posLeftTupleSlots = posLeftTupleSlots + 1;
 
             frameTuple.set(leftNext, aTuple);
-            joinQual.eval(inSchema, frameTuple);
+            joinQual.eval(frameTuple);
             projector.eval(frameTuple, outTuple);
             return outTuple;
           }
@@ -333,8 +310,5 @@ public class MergeFullOuterJoinExec extends BinaryPhysicalExec {
     rightTupleSlots.clear();
     leftTupleSlots = null;
     rightTupleSlots = null;
-    joinNode = null;
-    joinQual = null;
-    projector = null;
   }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MergeJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MergeJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MergeJoinExec.java
index 63f48ac..bf9b4cd 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MergeJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MergeJoinExec.java
@@ -20,8 +20,6 @@ package org.apache.tajo.engine.planner.physical;
 
 import com.google.common.base.Preconditions;
 import org.apache.tajo.catalog.SortSpec;
-import org.apache.tajo.engine.planner.Projector;
-import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.logical.JoinNode;
 import org.apache.tajo.storage.FrameTuple;
 import org.apache.tajo.storage.Tuple;
@@ -34,10 +32,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-public class MergeJoinExec extends BinaryPhysicalExec {
-  // from logical plan
-  private JoinNode joinNode;
-  private EvalNode joinQual;
+public class MergeJoinExec extends CommonJoinExec {
 
   // temporal tuples and states for nested loop join
   private FrameTuple frameTuple;
@@ -58,16 +53,11 @@ public class MergeJoinExec extends BinaryPhysicalExec {
 
   private boolean end = false;
 
-  // projection
-  private Projector projector;
-
   public MergeJoinExec(TaskAttemptContext context, JoinNode plan, PhysicalExec outer,
       PhysicalExec inner, SortSpec[] outerSortKey, SortSpec[] innerSortKey) {
-    super(context, plan.getInSchema(), plan.getOutSchema(), outer, inner);
+    super(context, plan, outer, inner);
     Preconditions.checkArgument(plan.hasJoinQual(), "Sort-merge join is only used for the equi-join, " +
         "but there is no join condition");
-    this.joinNode = plan;
-    this.joinQual = plan.getJoinQual();
 
     this.outerTupleSlots = new ArrayList<Tuple>(INITIAL_TUPLE_SLOT);
     this.innerTupleSlots = new ArrayList<Tuple>(INITIAL_TUPLE_SLOT);
@@ -82,23 +72,11 @@ public class MergeJoinExec extends BinaryPhysicalExec {
     this.outerIterator = outerTupleSlots.iterator();
     this.innerIterator = innerTupleSlots.iterator();
     
-    // for projection
-    this.projector = new Projector(context, inSchema, outSchema, plan.getTargets());
-
     // for join
     frameTuple = new FrameTuple();
     outTuple = new VTuple(outSchema.size());
   }
 
-  @Override
-  protected void compile() {
-    joinQual = context.getPrecompiledEval(inSchema, joinQual);
-  }
-
-  public JoinNode getPlan(){
-    return this.joinNode;
-  }
-
   public Tuple next() throws IOException {
     Tuple previous;
 
@@ -165,7 +143,7 @@ public class MergeJoinExec extends BinaryPhysicalExec {
 
       frameTuple.set(outerNext, innerIterator.next());
 
-      if (joinQual.eval(inSchema, frameTuple).isTrue()) {
+      if (joinQual.eval(frameTuple).isTrue()) {
         projector.eval(frameTuple, outTuple);
         return outTuple;
       }
@@ -192,7 +170,5 @@ public class MergeJoinExec extends BinaryPhysicalExec {
     innerTupleSlots = null;
     outerIterator = null;
     innerIterator = null;
-    joinQual = null;
-    projector = null;
   }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/NLJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/NLJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/NLJoinExec.java
index 5e7ab98..964a523 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/NLJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/NLJoinExec.java
@@ -18,8 +18,6 @@
 
 package org.apache.tajo.engine.planner.physical;
 
-import org.apache.tajo.engine.planner.Projector;
-import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.logical.JoinNode;
 import org.apache.tajo.storage.FrameTuple;
 import org.apache.tajo.storage.Tuple;
@@ -28,11 +26,7 @@ import org.apache.tajo.worker.TaskAttemptContext;
 
 import java.io.IOException;
 
-public class NLJoinExec extends BinaryPhysicalExec {
-  // from logical plan
-  private JoinNode plan;
-  private EvalNode joinQual;
-
+public class NLJoinExec extends CommonJoinExec {
 
   // temporal tuples and states for nested loop join
   private boolean needNewOuter;
@@ -41,31 +35,15 @@ public class NLJoinExec extends BinaryPhysicalExec {
   private Tuple innerTuple = null;
   private Tuple outTuple = null;
 
-  // projection
-  private final Projector projector;
-
   public NLJoinExec(TaskAttemptContext context, JoinNode plan, PhysicalExec outer,
       PhysicalExec inner) {
-    super(context, plan.getInSchema(), plan.getOutSchema(), outer, inner);
-    this.plan = plan;
-
-    if (plan.hasJoinQual()) {
-      this.joinQual = plan.getJoinQual();
-    }
-
-    // for projection
-    projector = new Projector(context, inSchema, outSchema, plan.getTargets());
-
+    super(context, plan, outer, inner);
     // for join
     needNewOuter = true;
     frameTuple = new FrameTuple();
     outTuple = new VTuple(outSchema.size());
   }
 
-  public JoinNode getPlan() {
-    return this.plan;
-  }
-
   public Tuple next() throws IOException {
     while (!context.isStopped()) {
       if (needNewOuter) {
@@ -84,8 +62,8 @@ public class NLJoinExec extends BinaryPhysicalExec {
       }
 
       frameTuple.set(outerTuple, innerTuple);
-      if (joinQual != null) {
-        if (joinQual.eval(inSchema, frameTuple).isTrue()) {
+      if (hasJoinQual) {
+        if (joinQual.eval(frameTuple).isTrue()) {
           projector.eval(frameTuple, outTuple);
           return outTuple;
         }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/NLLeftOuterJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/NLLeftOuterJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/NLLeftOuterJoinExec.java
index 7959d47..735623d 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/NLLeftOuterJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/NLLeftOuterJoinExec.java
@@ -18,9 +18,7 @@
 
 package org.apache.tajo.engine.planner.physical;
 
-import org.apache.tajo.engine.planner.Projector;
 import org.apache.tajo.engine.utils.TupleUtil;
-import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.logical.JoinNode;
 import org.apache.tajo.storage.FrameTuple;
 import org.apache.tajo.storage.Tuple;
@@ -29,11 +27,7 @@ import org.apache.tajo.worker.TaskAttemptContext;
 
 import java.io.IOException;
 
-public class NLLeftOuterJoinExec extends BinaryPhysicalExec {
-  // from logical plan
-  private JoinNode plan;
-  private EvalNode joinQual;
-
+public class NLLeftOuterJoinExec extends CommonJoinExec {
   // temporal tuples and states for nested loop join
   private boolean needNextRightTuple;
   private FrameTuple frameTuple;
@@ -41,24 +35,12 @@ public class NLLeftOuterJoinExec extends BinaryPhysicalExec {
   private Tuple rightTuple = null;
   private Tuple outTuple = null;
 
-  // projection
-  private final Projector projector;
-
   private boolean foundAtLeastOneMatch;
   private int rightNumCols;
 
   public NLLeftOuterJoinExec(TaskAttemptContext context, JoinNode plan, PhysicalExec leftChild,
                              PhysicalExec rightChild) {
-    super(context, plan.getInSchema(), plan.getOutSchema(), leftChild, rightChild);
-    this.plan = plan;
-
-    if (plan.hasJoinQual()) {
-      this.joinQual = plan.getJoinQual();
-    }
-
-    // for projection
-    projector = new Projector(context, inSchema, outSchema, plan.getTargets());
-
+    super(context, plan, leftChild, rightChild);
     // for join
     needNextRightTuple = true;
     frameTuple = new FrameTuple();
@@ -68,10 +50,6 @@ public class NLLeftOuterJoinExec extends BinaryPhysicalExec {
     rightNumCols = rightChild.getSchema().size();
   }
 
-  public JoinNode getPlan() {
-    return this.plan;
-  }
-
   public Tuple next() throws IOException {
     while (!context.isStopped()) {
       if (needNextRightTuple) {
@@ -106,7 +84,7 @@ public class NLLeftOuterJoinExec extends BinaryPhysicalExec {
 
       frameTuple.set(leftTuple, rightTuple);
       ;
-      if (joinQual.eval(inSchema, frameTuple).isTrue()) {
+      if (joinQual.eval(frameTuple).isTrue()) {
         projector.eval(frameTuple, outTuple);
         foundAtLeastOneMatch = true;
         return outTuple;

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RightOuterMergeJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RightOuterMergeJoinExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RightOuterMergeJoinExec.java
index df1c09d..7abfbe6 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RightOuterMergeJoinExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RightOuterMergeJoinExec.java
@@ -21,9 +21,7 @@ package org.apache.tajo.engine.planner.physical;
 import com.google.common.base.Preconditions;
 import org.apache.tajo.catalog.SortSpec;
 import org.apache.tajo.datum.DatumFactory;
-import org.apache.tajo.engine.planner.Projector;
 import org.apache.tajo.engine.utils.TupleUtil;
-import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.logical.JoinNode;
 import org.apache.tajo.storage.FrameTuple;
 import org.apache.tajo.storage.Tuple;
@@ -35,11 +33,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class RightOuterMergeJoinExec extends BinaryPhysicalExec {
-  // from logical plan
-  private JoinNode joinNode;
-  private EvalNode joinQual;
-
+public class RightOuterMergeJoinExec extends CommonJoinExec {
   // temporal tuples and states for nested loop join
   private FrameTuple frameTuple;
   private Tuple leftTuple = null;
@@ -57,9 +51,6 @@ public class RightOuterMergeJoinExec extends BinaryPhysicalExec {
 
   private boolean end = false;
 
-  // projection
-  private Projector projector;
-
   private int leftNumCols;
   private int posRightTupleSlots = -1;
   private int posLeftTupleSlots = -1;
@@ -68,12 +59,9 @@ public class RightOuterMergeJoinExec extends BinaryPhysicalExec {
 
   public RightOuterMergeJoinExec(TaskAttemptContext context, JoinNode plan, PhysicalExec outer,
                                  PhysicalExec inner, SortSpec[] outerSortKey, SortSpec[] innerSortKey) {
-    super(context, plan.getInSchema(), plan.getOutSchema(), outer, inner);
+    super(context, plan, outer, inner);
     Preconditions.checkArgument(plan.hasJoinQual(), "Sort-merge join is only used for the equi-join, " +
         "but there is no join condition");
-    this.joinNode = plan;
-    this.joinQual = plan.getJoinQual();
-
     this.leftTupleSlots = new ArrayList<Tuple>(INITIAL_TUPLE_SLOT);
     this.innerTupleSlots = new ArrayList<Tuple>(INITIAL_TUPLE_SLOT);
     SortSpec[][] sortSpecs = new SortSpec[2][];
@@ -84,9 +72,6 @@ public class RightOuterMergeJoinExec extends BinaryPhysicalExec {
     this.tupleComparator = PhysicalPlanUtil.getComparatorsFromJoinQual(
         plan.getJoinQual(), outer.getSchema(), inner.getSchema());
 
-    // for projection
-    this.projector = new Projector(context, inSchema, outSchema, plan.getTargets());
-
     // for join
     frameTuple = new FrameTuple();
     outTuple = new VTuple(outSchema.size());
@@ -94,15 +79,6 @@ public class RightOuterMergeJoinExec extends BinaryPhysicalExec {
     leftNumCols = outer.getSchema().size();
   }
 
-  @Override
-  protected void compile() {
-    joinQual = context.getPrecompiledEval(inSchema, joinQual);
-  }
-
-  public JoinNode getPlan() {
-    return this.joinNode;
-  }
-
   /**
    * creates a tuple of a given size filled with NULL values in all fields
    */
@@ -302,7 +278,7 @@ public class RightOuterMergeJoinExec extends BinaryPhysicalExec {
           posRightTupleSlots = posRightTupleSlots + 1;
 
           frameTuple.set(nextLeft, aTuple);
-          if (joinQual.eval(inSchema, frameTuple).asBool()) {
+          if (joinQual.eval(frameTuple).asBool()) {
             projector.eval(frameTuple, outTuple);
             return outTuple;
           } else {
@@ -324,7 +300,7 @@ public class RightOuterMergeJoinExec extends BinaryPhysicalExec {
 
             frameTuple.set(nextLeft, aTuple);
 
-            if (joinQual.eval(inSchema, frameTuple).asBool()) {
+            if (joinQual.eval(frameTuple).asBool()) {
               projector.eval(frameTuple, outTuple);
               return outTuple;
             } else {
@@ -357,9 +333,6 @@ public class RightOuterMergeJoinExec extends BinaryPhysicalExec {
     innerTupleSlots.clear();
     leftTupleSlots = null;
     innerTupleSlots = null;
-    joinNode = null;
-    joinQual = null;
-    projector = null;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SelectionExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SelectionExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SelectionExec.java
index b9273fa..c090fa7 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SelectionExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SelectionExec.java
@@ -37,6 +37,12 @@ public class SelectionExec extends UnaryPhysicalExec  {
   }
 
   @Override
+  public void init() throws IOException {
+    super.init();
+    qual.bind(inSchema);
+  }
+
+  @Override
   public void compile() throws CompilationError {
     qual = context.getPrecompiledEval(inSchema, qual);
   }
@@ -45,7 +51,7 @@ public class SelectionExec extends UnaryPhysicalExec  {
   public Tuple next() throws IOException {
     Tuple tuple;
     while (!context.isStopped() && (tuple = child.next()) != null) {
-      if (qual.eval(inSchema, tuple).isTrue()) {
+      if (qual.eval(tuple).isTrue()) {
         return tuple;
       }
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java
index 1078c80..671555c 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java
@@ -27,6 +27,7 @@ import org.apache.tajo.catalog.partition.PartitionMethodDesc;
 import org.apache.tajo.catalog.proto.CatalogProtos;
 import org.apache.tajo.catalog.statistics.TableStats;
 import org.apache.tajo.datum.Datum;
+import org.apache.tajo.datum.NullDatum;
 import org.apache.tajo.engine.codegen.CompilationError;
 import org.apache.tajo.engine.planner.Projector;
 import org.apache.tajo.plan.Target;
@@ -69,9 +70,8 @@ public class SeqScanExec extends ScanExec {
     this.qual = plan.getQual();
     this.fragments = fragments;
 
-    if (fragments != null
-        && plan.getTableDesc().hasPartition()
-        && plan.getTableDesc().getPartitionMethod().getPartitionType() == CatalogProtos.PartitionType.COLUMN) {
+    if (plan.getTableDesc().hasPartition() &&
+        plan.getTableDesc().getPartitionMethod().getPartitionType() == CatalogProtos.PartitionType.COLUMN) {
       rewriteColumnPartitionedTableSchema();
     }
   }
@@ -94,21 +94,26 @@ public class SeqScanExec extends ScanExec {
     // Remove partition key columns from an input schema.
     this.inSchema = plan.getTableDesc().getSchema();
 
-    List<FileFragment> fileFragments = FragmentConvertor.convert(FileFragment.class, fragments);
+    Tuple partitionRow = null;
+    if (fragments != null && fragments.length > 0) {
+      List<FileFragment> fileFragments = FragmentConvertor.convert(FileFragment.class, fragments);
 
-    // Get a partition key value from a given path
-    Tuple partitionRow =
-        PartitionedTableRewriter.buildTupleFromPartitionPath(columnPartitionSchema, fileFragments.get(0).getPath(),
-            false);
+      // Get a partition key value from a given path
+      partitionRow = PartitionedTableRewriter.buildTupleFromPartitionPath(
+              columnPartitionSchema, fileFragments.get(0).getPath(), false);
+    }
 
     // Targets or search conditions may contain column references.
     // However, actual values absent in tuples. So, Replace all column references by constant datum.
     for (Column column : columnPartitionSchema.toArray()) {
       FieldEval targetExpr = new FieldEval(column);
-      Datum datum = targetExpr.eval(columnPartitionSchema, partitionRow);
+      Datum datum = NullDatum.get();
+      if (partitionRow != null) {
+        targetExpr.bind(columnPartitionSchema);
+        datum = targetExpr.eval(partitionRow);
+      }
       ConstEval constExpr = new ConstEval(datum);
 
-
       for (int i = 0; i < plan.getTargets().length; i++) {
         Target target = plan.getTargets()[i];
 
@@ -156,6 +161,10 @@ public class SeqScanExec extends ScanExec {
 
     initScanner(projected);
     super.init();
+
+    if (plan.hasQual()) {
+      qual.bind(inSchema);
+    }
   }
 
   @Override
@@ -211,7 +220,7 @@ public class SeqScanExec extends ScanExec {
       }
     } else {
       while ((tuple = scanner.next()) != null) {
-        if (qual.eval(inSchema, tuple).isTrue()) {
+        if (qual.eval(tuple).isTrue()) {
           projector.eval(tuple, outTuple);
           return outTuple;
         }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SortAggregateExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SortAggregateExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SortAggregateExec.java
index 425eb86..9831d83 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SortAggregateExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SortAggregateExec.java
@@ -73,14 +73,14 @@ public class SortAggregateExec extends AggregationExec {
             // Merge when aggregator doesn't receive NullDatum
             if (!(groupingKeyNum == 0 && aggFunctionsNum == tuple.size()
                 && tuple.get(i) == NullDatum.get())) {
-              aggFunctions[i].merge(contexts[i], inSchema, tuple);
+              aggFunctions[i].merge(contexts[i], tuple);
             }
           }
           lastKey = currentKey;
         } else {
           // aggregate
           for (int i = 0; i < aggFunctionsNum; i++) {
-            aggFunctions[i].merge(contexts[i], inSchema, tuple);
+            aggFunctions[i].merge(contexts[i], tuple);
           }
         }
 
@@ -98,7 +98,7 @@ public class SortAggregateExec extends AggregationExec {
 
         for(int evalIdx = 0; evalIdx < aggFunctionsNum; evalIdx++) {
           contexts[evalIdx] = aggFunctions[evalIdx].newContext();
-          aggFunctions[evalIdx].merge(contexts[evalIdx], inSchema, tuple);
+          aggFunctions[evalIdx].merge(contexts[evalIdx], tuple);
         }
 
         lastKey = currentKey;

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/WindowAggExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/WindowAggExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/WindowAggExec.java
index e2dbf7a..2f1fc46 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/WindowAggExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/WindowAggExec.java
@@ -23,6 +23,7 @@ import org.apache.tajo.catalog.Column;
 import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.catalog.SortSpec;
 import org.apache.tajo.datum.Datum;
+import org.apache.tajo.plan.expr.EvalNode;
 import org.apache.tajo.plan.expr.WindowFunctionEval;
 import org.apache.tajo.plan.function.FunctionContext;
 import org.apache.tajo.plan.logical.WindowAggNode;
@@ -178,6 +179,14 @@ public class WindowAggExec extends UnaryPhysicalExec {
     outputColumnNum = nonFunctionColumnNum + functionNum;
   }
 
+  @Override
+  public void init() throws IOException {
+    super.init();
+    for (EvalNode functionEval : functions) {
+      functionEval.bind(inSchema);
+    }
+  }
+
   private void transition(WindowState state) {
     this.state = state;
   }
@@ -303,7 +312,7 @@ public class WindowAggExec extends UnaryPhysicalExec {
         Tuple inTuple = accumulatedInTuples.get(i);
         Tuple outTuple = evaluatedTuples.get(i);
 
-        functions[idx].merge(contexts[idx], inSchema, inTuple);
+        functions[idx].merge(contexts[idx], inTuple);
 
         if (windowFuncFlags[idx]) {
           Datum result = functions[idx].terminate(contexts[idx]);

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/engine/utils/TupleUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/utils/TupleUtil.java b/tajo-core/src/main/java/org/apache/tajo/engine/utils/TupleUtil.java
index 027da50..6b2c37c 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/utils/TupleUtil.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/utils/TupleUtil.java
@@ -24,7 +24,6 @@ import com.google.common.collect.Maps;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.fs.Path;
 import org.apache.tajo.catalog.Column;
 import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.catalog.SortSpec;
@@ -37,7 +36,6 @@ import org.apache.tajo.storage.RowStoreUtil.RowStoreEncoder;
 import org.apache.tajo.storage.Tuple;
 import org.apache.tajo.storage.TupleRange;
 import org.apache.tajo.storage.VTuple;
-import org.apache.tajo.util.StringUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -219,7 +217,7 @@ public class TupleUtil {
       Tuple tuple;
       while (iterator.hasNext()) {
         tuple = iterator.next();
-        if (qual.eval(schema, tuple).isTrue()) {
+        if (qual.eval(tuple).isTrue()) {
           results.add(tuple);
         }
       }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
index 5901aa7..80bdb86 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
@@ -684,7 +684,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult
       } else {
         while (currentRow < cachedData.size()) {
           aTuple = cachedData.get(currentRow++);
-          if (qual.eval(inSchema, aTuple).isTrue()) {
+          if (qual.eval(aTuple).isTrue()) {
             projector.eval(aTuple, outTuple);
             return outTuple;
           }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
index 75e7762..cec1125 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
@@ -274,7 +274,7 @@ public class QueryExecutor {
     final Tuple outTuple = new VTuple(targets.length);
     for (int i = 0; i < targets.length; i++) {
       EvalNode eval = targets[i].getEvalTree();
-      outTuple.put(i, eval.eval(null, null));
+      outTuple.put(i, eval.eval(null));
     }
     boolean isInsert = rootNode.getChild() != null && rootNode.getChild().getType() == NodeType.INSERT;
     if (isInsert) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java b/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
index 876e3e4..e2dac05 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
@@ -281,8 +281,9 @@ public class ExprTestBase {
         if (queryContext.getBool(SessionVars.CODEGEN)) {
           eval = codegen.compile(inputSchema, eval);
         }
+        eval.bind(inputSchema);
 
-        outTuple.put(i, eval.eval(inputSchema, vtuple));
+        outTuple.put(i, eval.eval(vtuple));
       }
 
       try {

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java b/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java
index 4c1efd6..f03988b 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java
@@ -45,13 +45,15 @@ public class TestEvalTree extends ExprTestBase {
     schema1.addColumn("table1.score", INT4);
     
     BinaryEval expr = new BinaryEval(EvalType.PLUS, e1, e2);
+    expr.bind(schema1);
+
     assertCloneEqual(expr);
     VTuple tuple = new VTuple(2);
     tuple.put(0, DatumFactory.createInt4(1)); // put 0th field
-    tuple.put(1, DatumFactory.createInt4(99)); // put 0th field
+    tuple.put(1, DatumFactory.createInt4(99)); // put 1th field
 
     // the result of evaluation must be 100.
-    assertEquals(expr.eval(schema1, tuple).asInt4(), 100);
+    assertEquals(expr.eval(tuple).asInt4(), 100);
   }
 
   public static class MockTrueEval extends EvalNode {
@@ -76,7 +78,7 @@ public class TestEvalTree extends ExprTestBase {
     }
 
     @Override
-    public Datum eval(Schema schema, Tuple tuple) {
+    public Datum eval(Tuple tuple) {
       return DatumFactory.createBool(true);
     }
 
@@ -108,7 +110,7 @@ public class TestEvalTree extends ExprTestBase {
     }
 
     @Override
-    public Datum eval(Schema schema, Tuple tuple) {
+    public Datum eval(Tuple tuple) {
       return DatumFactory.createBool(false);
     }
 
@@ -154,16 +156,16 @@ public class TestEvalTree extends ExprTestBase {
     MockFalseExpr falseExpr = new MockFalseExpr();
 
     BinaryEval andExpr = new BinaryEval(EvalType.AND, trueExpr, trueExpr);
-    assertTrue(andExpr.eval(null, null).asBool());
+    assertTrue(andExpr.eval(null).asBool());
 
     andExpr = new BinaryEval(EvalType.AND, falseExpr, trueExpr);
-    assertFalse(andExpr.eval(null, null).asBool());
+    assertFalse(andExpr.eval(null).asBool());
 
     andExpr = new BinaryEval(EvalType.AND, trueExpr, falseExpr);
-    assertFalse(andExpr.eval(null, null).asBool());
+    assertFalse(andExpr.eval(null).asBool());
 
     andExpr = new BinaryEval(EvalType.AND, falseExpr, falseExpr);
-    assertFalse(andExpr.eval(null, null).asBool());
+    assertFalse(andExpr.eval(null).asBool());
   }
 
   @Test
@@ -172,16 +174,16 @@ public class TestEvalTree extends ExprTestBase {
     MockFalseExpr falseExpr = new MockFalseExpr();
 
     BinaryEval orExpr = new BinaryEval(EvalType.OR, trueExpr, trueExpr);
-    assertTrue(orExpr.eval(null, null).asBool());
+    assertTrue(orExpr.eval(null).asBool());
 
     orExpr = new BinaryEval(EvalType.OR, falseExpr, trueExpr);
-    assertTrue(orExpr.eval(null, null).asBool());
+    assertTrue(orExpr.eval(null).asBool());
 
     orExpr = new BinaryEval(EvalType.OR, trueExpr, falseExpr);
-    assertTrue(orExpr.eval(null, null).asBool());
+    assertTrue(orExpr.eval(null).asBool());
 
     orExpr = new BinaryEval(EvalType.OR, falseExpr, falseExpr);
-    assertFalse(orExpr.eval(null, null).asBool());
+    assertFalse(orExpr.eval(null).asBool());
   }
 
   @Test
@@ -194,41 +196,41 @@ public class TestEvalTree extends ExprTestBase {
     e1 = new ConstEval(DatumFactory.createInt4(9));
     e2 = new ConstEval(DatumFactory.createInt4(34));
     expr = new BinaryEval(EvalType.LTH, e1, e2);
-    assertTrue(expr.eval(null, null).asBool());
+    assertTrue(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.LEQ, e1, e2);
-    assertTrue(expr.eval(null, null).asBool());
+    assertTrue(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.LTH, e2, e1);
-    assertFalse(expr.eval(null, null).asBool());
+    assertFalse(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.LEQ, e2, e1);
-    assertFalse(expr.eval(null, null).asBool());
+    assertFalse(expr.eval(null).asBool());
 
     expr = new BinaryEval(EvalType.GTH, e2, e1);
-    assertTrue(expr.eval(null, null).asBool());
+    assertTrue(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.GEQ, e2, e1);
-    assertTrue(expr.eval(null, null).asBool());
+    assertTrue(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.GTH, e1, e2);
-    assertFalse(expr.eval(null, null).asBool());
+    assertFalse(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.GEQ, e1, e2);
-    assertFalse(expr.eval(null, null).asBool());
+    assertFalse(expr.eval(null).asBool());
 
     BinaryEval plus = new BinaryEval(EvalType.PLUS, e1, e2);
     expr = new BinaryEval(EvalType.LTH, e1, plus);
-    assertTrue(expr.eval(null, null).asBool());
+    assertTrue(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.LEQ, e1, plus);
-    assertTrue(expr.eval(null, null).asBool());
+    assertTrue(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.LTH, plus, e1);
-    assertFalse(expr.eval(null, null).asBool());
+    assertFalse(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.LEQ, plus, e1);
-    assertFalse(expr.eval(null, null).asBool());
+    assertFalse(expr.eval(null).asBool());
 
     expr = new BinaryEval(EvalType.GTH, plus, e1);
-    assertTrue(expr.eval(null, null).asBool());
+    assertTrue(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.GEQ, plus, e1);
-    assertTrue(expr.eval(null, null).asBool());
+    assertTrue(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.GTH, e1, plus);
-    assertFalse(expr.eval(null, null).asBool());
+    assertFalse(expr.eval(null).asBool());
     expr = new BinaryEval(EvalType.GEQ, e1, plus);
-    assertFalse(expr.eval(null, null).asBool());
+    assertFalse(expr.eval(null).asBool());
   }
 
   @Test
@@ -241,28 +243,28 @@ public class TestEvalTree extends ExprTestBase {
     e1 = new ConstEval(DatumFactory.createInt4(9));
     e2 = new ConstEval(DatumFactory.createInt4(34));
     BinaryEval expr = new BinaryEval(EvalType.PLUS, e1, e2);
-    assertEquals(expr.eval(null, null).asInt4(), 43);
+    assertEquals(expr.eval(null).asInt4(), 43);
     assertCloneEqual(expr);
     
     // MINUS
     e1 = new ConstEval(DatumFactory.createInt4(5));
     e2 = new ConstEval(DatumFactory.createInt4(2));
     expr = new BinaryEval(EvalType.MINUS, e1, e2);
-    assertEquals(expr.eval(null, null).asInt4(), 3);
+    assertEquals(expr.eval(null).asInt4(), 3);
     assertCloneEqual(expr);
     
     // MULTIPLY
     e1 = new ConstEval(DatumFactory.createInt4(5));
     e2 = new ConstEval(DatumFactory.createInt4(2));
     expr = new BinaryEval(EvalType.MULTIPLY, e1, e2);
-    assertEquals(expr.eval(null, null).asInt4(), 10);
+    assertEquals(expr.eval(null).asInt4(), 10);
     assertCloneEqual(expr);
     
     // DIVIDE
     e1 = new ConstEval(DatumFactory.createInt4(10));
     e2 = new ConstEval(DatumFactory.createInt4(5));
     expr = new BinaryEval(EvalType.DIVIDE, e1, e2);
-    assertEquals(expr.eval(null, null).asInt4(), 2);
+    assertEquals(expr.eval(null).asInt4(), 2);
     assertCloneEqual(expr);
   }
 
@@ -278,7 +280,7 @@ public class TestEvalTree extends ExprTestBase {
     assertEquals(CatalogUtil.newSimpleDataType(INT4), expr.getValueType());
 
     expr = new BinaryEval(EvalType.LTH, e1, e2);
-    assertTrue(expr.eval(null, null).asBool());
+    assertTrue(expr.eval(null).asBool());
     assertEquals(CatalogUtil.newSimpleDataType(BOOLEAN), expr.getValueType());
 
     e1 = new ConstEval(DatumFactory.createFloat8(9.3));


[5/7] tajo git commit: TAJO-1436: Add Bind method to EvalNode.

Posted by ji...@apache.org.
http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java b/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
index c8e3745..61c55e1 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
@@ -265,12 +265,12 @@ public class TestEvalTreeUtil {
     FieldEval field = first.getLeftExpr();
     assertEquals(col1, field.getColumnRef());
     assertEquals(EvalType.LTH, first.getType());
-    assertEquals(10, first.getRightExpr().eval(null,  null).asInt4());
+    assertEquals(10, first.getRightExpr().eval(null).asInt4());
     
     field = second.getRightExpr();
     assertEquals(col1, field.getColumnRef());
     assertEquals(EvalType.LTH, second.getType());
-    assertEquals(4, second.getLeftExpr().eval(null,  null).asInt4());
+    assertEquals(4, second.getLeftExpr().eval(null).asInt4());
   }
   
   @Test
@@ -304,10 +304,10 @@ public class TestEvalTreeUtil {
     Target [] targets = getRawTargets(QUERIES[0]);
     EvalNode node = AlgebraicUtil.eliminateConstantExprs(targets[0].getEvalTree());
     assertEquals(EvalType.CONST, node.getType());
-    assertEquals(7, node.eval(null, null).asInt4());
+    assertEquals(7, node.eval(null).asInt4());
     node = AlgebraicUtil.eliminateConstantExprs(targets[1].getEvalTree());
     assertEquals(EvalType.CONST, node.getType());
-    assertTrue(7.0d == node.eval(null, null).asFloat8());
+    assertTrue(7.0d == node.eval(null).asFloat8());
 
     Expr expr = analyzer.parse(QUERIES[1]);
     LogicalPlan plan = planner.createPlan(defaultContext, expr, true);
@@ -335,7 +335,7 @@ public class TestEvalTreeUtil {
     assertEquals(EvalType.GTH, transposed.getType());
     FieldEval field = transposed.getLeftExpr();
     assertEquals(col1, field.getColumnRef());
-    assertEquals(1, transposed.getRightExpr().eval(null, null).asInt4());
+    assertEquals(1, transposed.getRightExpr().eval(null).asInt4());
 
     node = getRootSelection(QUERIES[4]);
     // we expect that score < 3
@@ -343,7 +343,7 @@ public class TestEvalTreeUtil {
     assertEquals(EvalType.LTH, transposed.getType());
     field = transposed.getLeftExpr();
     assertEquals(col1, field.getColumnRef());
-    assertEquals(2, transposed.getRightExpr().eval(null, null).asInt4());
+    assertEquals(2, transposed.getRightExpr().eval(null).asInt4());
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
index 5e91b0c..7edf74a 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
@@ -810,7 +810,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex
     limitNode.setInSchema(child.getOutSchema());
     limitNode.setOutSchema(child.getOutSchema());
 
-    limitNode.setFetchFirst(firstFetNum.eval(null, null).asInt8());
+    limitNode.setFetchFirst(firstFetNum.eval(null).asInt8());
 
     return limitNode;
   }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AggregationFunctionCallEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AggregationFunctionCallEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AggregationFunctionCallEval.java
index 3ffe20e..984d18c 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AggregationFunctionCallEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AggregationFunctionCallEval.java
@@ -21,13 +21,11 @@ package org.apache.tajo.plan.expr;
 import com.google.gson.annotations.Expose;
 
 import org.apache.tajo.catalog.FunctionDesc;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes.DataType;
 import org.apache.tajo.datum.Datum;
 import org.apache.tajo.plan.function.AggFunction;
 import org.apache.tajo.plan.function.FunctionContext;
 import org.apache.tajo.storage.Tuple;
-import org.apache.tajo.storage.VTuple;
 import org.apache.tajo.util.TUtil;
 
 public class AggregationFunctionCallEval extends FunctionEval implements Cloneable {
@@ -36,7 +34,6 @@ public class AggregationFunctionCallEval extends FunctionEval implements Cloneab
   @Expose String alias;
 
   protected AggFunction instance;
-  private Tuple params;
 
   protected AggregationFunctionCallEval(EvalType type, FunctionDesc desc, AggFunction instance, EvalNode[] givenArgs) {
     super(type, desc, givenArgs);
@@ -52,17 +49,11 @@ public class AggregationFunctionCallEval extends FunctionEval implements Cloneab
     return instance.newContext();
   }
 
-  public void merge(FunctionContext context, Schema schema, Tuple tuple) {
-    if (params == null) {
-      this.params = new VTuple(argEvals.length);
-    }
-
-    if (argEvals != null) {
-      for (int i = 0; i < argEvals.length; i++) {
-        params.put(i, argEvals[i].eval(schema, tuple));
-      }
-    }
+  public void merge(FunctionContext context, Tuple tuple) {
+    mergeParam(context, evalParams(tuple));
+  }
 
+  protected void mergeParam(FunctionContext context, Tuple params) {
     if (!intermediatePhase && !finalPhase) {
       // firstPhase
       instance.eval(context, params);
@@ -72,8 +63,8 @@ public class AggregationFunctionCallEval extends FunctionEval implements Cloneab
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
-    throw new UnsupportedOperationException("Cannot execute eval() of aggregation function");
+  public <T extends Datum> T eval(Tuple tuple) {
+    throw new IllegalStateException("Cannot execute aggregation function in generic expression");
   }
 
   public Datum terminate(FunctionContext context) {
@@ -151,7 +142,6 @@ public class AggregationFunctionCallEval extends FunctionEval implements Cloneab
     result = prime * result + (finalPhase ? 1231 : 1237);
     result = prime * result + ((instance == null) ? 0 : instance.hashCode());
     result = prime * result + (intermediatePhase ? 1231 : 1237);
-    result = prime * result + ((params == null) ? 0 : params.hashCode());
     return result;
   }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java
index 9ecb93c..f697968 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java
@@ -149,7 +149,7 @@ public class AlgebraicUtil {
       }
 
       if (lhs.getType() == EvalType.CONST && rhs.getType() == EvalType.CONST) {
-        return new ConstEval(binaryEval.eval(null, null));
+        return new ConstEval(binaryEval.eval(null));
       }
 
       return binaryEval;
@@ -162,7 +162,7 @@ public class AlgebraicUtil {
       stack.pop();
 
       if (child.getType() == EvalType.CONST) {
-        return new ConstEval(unaryEval.eval(null, null));
+        return new ConstEval(unaryEval.eval(null));
       }
 
       return unaryEval;
@@ -184,7 +184,7 @@ public class AlgebraicUtil {
       }
 
       if (constantOfAllDescendents && evalNode.getType() == EvalType.FUNCTION) {
-        return new ConstEval(evalNode.eval(null, null));
+        return new ConstEval(evalNode.eval(null));
       } else {
         return evalNode;
       }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/BetweenPredicateEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/BetweenPredicateEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/BetweenPredicateEval.java
index b0fbd5e..3969f63 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/BetweenPredicateEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/BetweenPredicateEval.java
@@ -80,7 +80,8 @@ public class BetweenPredicateEval extends EvalNode implements Cloneable {
   }
 
   private static interface Checker {
-    Datum eval(Schema schema, Tuple param);
+    void bind(Schema schema);
+    Datum eval(Tuple param);
   }
 
   private static class ConstantChecker implements Checker {
@@ -102,8 +103,13 @@ public class BetweenPredicateEval extends EvalNode implements Cloneable {
     }
 
     @Override
-    public Datum eval(Schema schema, Tuple param) {
-      Datum predicandValue = predicand.eval(schema, param);
+    public void bind(Schema schema) {
+      predicand.bind(schema);
+    }
+
+    @Override
+    public Datum eval(Tuple param) {
+      Datum predicandValue = predicand.eval(param);
 
       if (!predicandValue.isNull()) {
         return DatumFactory.createBool(not ^ (predicandValue.greaterThanEqual(begin).asBool()
@@ -128,10 +134,17 @@ public class BetweenPredicateEval extends EvalNode implements Cloneable {
     }
 
     @Override
-    public Datum eval(Schema schema, Tuple param) {
-      Datum predicandValue = predicand.eval(schema, param);
-      Datum beginValue = begin.eval(schema, param);
-      Datum endValue = end.eval(schema, param);
+    public void bind(Schema schema) {
+      predicand.bind(schema);
+      begin.bind(schema);
+      end.bind(schema);
+    }
+
+    @Override
+    public Datum eval(Tuple param) {
+      Datum predicandValue = predicand.eval(param);
+      Datum beginValue = begin.eval(param);
+      Datum endValue = end.eval(param);
 
       if (!(predicandValue.isNull() || beginValue.isNull() || endValue.isNull())) {
         return
@@ -157,10 +170,17 @@ public class BetweenPredicateEval extends EvalNode implements Cloneable {
     }
 
     @Override
-    public Datum eval(Schema schema, Tuple param) {
-      Datum predicandValue = predicand.eval(schema, param);
-      Datum beginValue = begin.eval(schema, param);
-      Datum endValue = end.eval(schema, param);
+    public void bind(Schema schema) {
+      predicand.bind(schema);
+      begin.bind(schema);
+      end.bind(schema);
+    }
+
+    @Override
+    public Datum eval(Tuple param) {
+      Datum predicandValue = predicand.eval(param);
+      Datum beginValue = begin.eval(param);
+      Datum endValue = end.eval(param);
 
       if (!(predicandValue.isNull()|| beginValue.isNull() || endValue.isNull())) {
         return DatumFactory.createBool( not ^
@@ -207,27 +227,30 @@ public class BetweenPredicateEval extends EvalNode implements Cloneable {
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
-    if (checker == null) {
-      if (begin.getType() == EvalType.CONST && end.getType() == EvalType.CONST) {
-        Datum beginValue = ((ConstEval)begin).getValue();
-        Datum endValue = ((ConstEval)end).getValue();
-
-        if (symmetric || beginValue.compareTo(endValue) <= 0) {
-          checker = new ConstantChecker(not, predicand, beginValue, endValue);
-        } else {
-          checker = new AsymmetricChecker(not, predicand, begin, end);
-        }
+  public void bind(Schema schema) {
+    if (begin.getType() == EvalType.CONST && end.getType() == EvalType.CONST) {
+      Datum beginValue = ((ConstEval)begin).getValue();
+      Datum endValue = ((ConstEval)end).getValue();
+
+      if (symmetric || beginValue.compareTo(endValue) <= 0) {
+        checker = new ConstantChecker(not, predicand, beginValue, endValue);
       } else {
-        if (symmetric) {
-          checker = new SymmetricChecker(not, predicand, begin, end);
-        } else {
-          checker = new AsymmetricChecker(not, predicand, begin, end);
-        }
+        checker = new AsymmetricChecker(not, predicand, begin, end);
+      }
+    } else {
+      if (symmetric) {
+        checker = new SymmetricChecker(not, predicand, begin, end);
+      } else {
+        checker = new AsymmetricChecker(not, predicand, begin, end);
       }
     }
+    checker.bind(schema);
+  }
 
-    return checker.eval(schema, tuple);
+  @Override
+  @SuppressWarnings("unchecked")
+  public Datum eval(Tuple tuple) {
+    return checker.eval(tuple);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/BinaryEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/BinaryEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/BinaryEval.java
index faeefcd..e189a36 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/BinaryEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/BinaryEval.java
@@ -21,7 +21,6 @@ package org.apache.tajo.plan.expr;
 import com.google.common.base.Objects;
 import com.google.gson.annotations.Expose;
 import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes.DataType;
 import org.apache.tajo.datum.Datum;
 import org.apache.tajo.datum.DatumFactory;
@@ -77,6 +76,7 @@ public class BinaryEval extends EvalNode implements Cloneable {
     this.leftExpr = expr;
   }
 
+ @SuppressWarnings("unchecked")
   public <T extends EvalNode> T getLeftExpr() {
     return (T) this.leftExpr;
   }
@@ -85,6 +85,7 @@ public class BinaryEval extends EvalNode implements Cloneable {
     this.rightExpr = expr;
   }
 
+ @SuppressWarnings("unchecked")
   public <T extends EvalNode> T getRightExpr() {
     return (T) this.rightExpr;
   }
@@ -116,9 +117,10 @@ public class BinaryEval extends EvalNode implements Cloneable {
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
-    Datum lhs = leftExpr.eval(schema, tuple);
-    Datum rhs = rightExpr.eval(schema, tuple);
+  @SuppressWarnings("unchecked")
+  public Datum eval(Tuple tuple) {
+    Datum lhs = leftExpr.eval(tuple);
+    Datum rhs = rightExpr.eval(tuple);
 
     switch(type) {
     case AND:

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/CaseWhenEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/CaseWhenEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/CaseWhenEval.java
index 4d42db5..c25ad45 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/CaseWhenEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/CaseWhenEval.java
@@ -22,7 +22,6 @@ import com.google.common.collect.Lists;
 import com.google.gson.annotations.Expose;
 
 import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes;
 import org.apache.tajo.common.TajoDataTypes.DataType;
 import org.apache.tajo.common.TajoDataTypes.Type;
@@ -105,15 +104,17 @@ public class CaseWhenEval extends EvalNode implements GsonObject {
     return "?";
   }
 
-  public Datum eval(Schema schema, Tuple tuple) {
-    for (int i = 0; i < whens.size(); i++) {
-      if (whens.get(i).checkIfCondition(schema, tuple)) {
-        return whens.get(i).eval(schema, tuple);
+  @Override
+  @SuppressWarnings("unchecked")
+  public Datum eval(Tuple tuple) {
+    for (IfThenEval eval : whens) {
+      if (eval.checkIfCondition(tuple)) {
+        return eval.eval(tuple);
       }
     }
 
     if (elseResult != null) { // without else clause
-      return elseResult.eval(schema, tuple);
+      return elseResult.eval(tuple);
     }
 
     return NullDatum.get();
@@ -225,12 +226,14 @@ public class CaseWhenEval extends EvalNode implements GsonObject {
       return "when?";
     }
 
-    public boolean checkIfCondition(Schema schema, Tuple tuple) {
-      return condition.eval(schema, tuple).isTrue();
+    public boolean checkIfCondition(Tuple tuple) {
+      return condition.eval(tuple).isTrue();
     }
 
-    public Datum eval(Schema schema, Tuple tuple) {
-      return result.eval(schema, tuple);
+    @Override
+    @SuppressWarnings("unchecked")
+    public Datum eval(Tuple tuple) {
+      return result.eval(tuple);
     }
 
     public void setCondition(EvalNode condition) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/CastEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/CastEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/CastEval.java
index 9f7f69f..5a26593 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/CastEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/CastEval.java
@@ -22,7 +22,6 @@ import com.google.gson.annotations.Expose;
 
 import org.apache.tajo.OverridableConf;
 import org.apache.tajo.SessionVars;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.datum.Datum;
 import org.apache.tajo.datum.DatumFactory;
 import org.apache.tajo.storage.Tuple;
@@ -68,8 +67,10 @@ public class CastEval extends UnaryEval {
     return target.getType().name();
   }
 
-  public Datum eval(Schema schema, Tuple tuple) {
-    Datum operandDatum = child.eval(schema, tuple);
+  @Override
+  @SuppressWarnings("unchecked")
+  public Datum eval(Tuple tuple) {
+    Datum operandDatum = child.eval(tuple);
     if (operandDatum.isNull()) {
       return operandDatum;
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/ConstEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/ConstEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/ConstEval.java
index b9f48a9..82e4e8e 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/ConstEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/ConstEval.java
@@ -21,7 +21,6 @@ package org.apache.tajo.plan.expr;
 import com.google.common.base.Objects;
 import com.google.gson.annotations.Expose;
 import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes.DataType;
 import org.apache.tajo.datum.Datum;
 import org.apache.tajo.storage.Tuple;
@@ -37,13 +36,15 @@ public class ConstEval extends EvalNode implements Comparable<ConstEval>, Clonea
   public Datum getValue() {
     return this.datum;
   }
-	
+
+  @Override
 	public String toString() {
 		return datum.toString();
 	}
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
+  @SuppressWarnings("unchecked")
+  public Datum eval(Tuple tuple) {
     return datum;
   }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalNode.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalNode.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalNode.java
index dcb7285..f57302a 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalNode.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalNode.java
@@ -59,11 +59,17 @@ public abstract class EvalNode implements Cloneable, GsonObject, ProtoObject<Pla
 	public String toJson() {
     return PlanGsonHelper.toJson(this, EvalNode.class);
 	}
-	
-	public abstract <T extends Datum> T eval(Schema schema, Tuple tuple);
+
+  public void bind(Schema schema) {
+    for (int i = 0; i < childNum(); i++) {
+      getChild(i).bind(schema);
+    }
+  }
+
+	public abstract <T extends Datum> T eval(Tuple tuple);
 
   @Deprecated
-  public abstract  void preOrder(EvalNodeVisitor visitor);
+  public abstract void preOrder(EvalNodeVisitor visitor);
 
   @Deprecated
   public abstract void postOrder(EvalNodeVisitor visitor);

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java
index 0d0ea88..5e3843c 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java
@@ -571,7 +571,8 @@ public class EvalTreeUtil {
   }
 
   public static Datum evaluateImmediately(EvalNode evalNode) {
-    return evalNode.eval(null, null);
+    evalNode.bind(null);
+    return evalNode.eval(null);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/FieldEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/FieldEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/FieldEval.java
index c42768d..11b3b6d 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/FieldEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/FieldEval.java
@@ -39,19 +39,22 @@ public class FieldEval extends EvalNode implements Cloneable {
 	  this.column = column;
 	}
 
+  @Override
+  public void bind(Schema schema) {
+    // TODO - column namespace should be improved to simplify name handling and resolving.
+    if (column.hasQualifier()) {
+      fieldId = schema.getColumnId(column.getQualifiedName());
+    } else {
+      fieldId = schema.getColumnIdByName(column.getSimpleName());
+    }
+    if (fieldId == -1) {
+      throw new IllegalStateException("No Such Column Reference: " + column + ", schema: " + schema);
+    }
+  }
+
 	@Override
-	public Datum eval(Schema schema, Tuple tuple) {
-	  if (fieldId == -1) {
-      // TODO - column namespace should be improved to simplify name handling and resolving.
-      if (column.hasQualifier()) {
-        fieldId = schema.getColumnId(column.getQualifiedName());
-      } else {
-        fieldId = schema.getColumnIdByName(column.getSimpleName());
-      }
-      if (fieldId == -1) {
-        throw new IllegalStateException("No Such Column Reference: " + column + ", schema: " + schema);
-      }
-	  }
+  @SuppressWarnings("unchecked")
+	public Datum eval(Tuple tuple) {
 	  return tuple.get(fieldId);
   }
 
@@ -90,7 +93,7 @@ public class FieldEval extends EvalNode implements Cloneable {
 	public String getName() {
 		return this.column.getQualifiedName();
 	}
-	
+
 	public String toString() {
 	  return this.column.toString();
 	}

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/FunctionEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/FunctionEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/FunctionEval.java
index ec8d7da..0c60c8d 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/FunctionEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/FunctionEval.java
@@ -25,8 +25,8 @@ import org.apache.tajo.catalog.FunctionDesc;
 import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes;
 import org.apache.tajo.common.TajoDataTypes.DataType;
-import org.apache.tajo.datum.Datum;
 import org.apache.tajo.storage.Tuple;
+import org.apache.tajo.storage.VTuple;
 import org.apache.tajo.util.TUtil;
 
 import static org.apache.tajo.catalog.proto.CatalogProtos.FunctionType.DISTINCT_AGGREGATION;
@@ -40,13 +40,27 @@ public abstract class FunctionEval extends EvalNode implements Cloneable {
   @Expose protected FunctionDesc funcDesc;
 	@Expose protected EvalNode [] argEvals;
 
+  private transient Tuple params;
+
 	public FunctionEval(EvalType type, FunctionDesc funcDesc, EvalNode[] argEvals) {
 		super(type);
 		this.funcDesc = funcDesc;
-    Preconditions.checkArgument(argEvals != null, "argEvals cannot be null");
-    this.argEvals = argEvals;
+    setArgs(argEvals);
 	}
 
+  @Override
+  public void bind(Schema schema) {
+    super.bind(schema);
+    this.params = new VTuple(argEvals.length);
+  }
+
+  protected final Tuple evalParams(Tuple tuple) {
+    for (int i = 0; i < argEvals.length; i++) {
+      params.put(i, argEvals[i].eval(tuple));
+    }
+    return params;
+  }
+
   public FunctionDesc getFuncDesc() {
     return funcDesc;
   }
@@ -80,16 +94,13 @@ public abstract class FunctionEval extends EvalNode implements Cloneable {
   }
 
   public void setArgs(EvalNode [] args) {
+    Preconditions.checkArgument(args != null, "argEvals cannot be null");
     this.argEvals = args;
   }
 
   @Override
   public int childNum() {
-    if (argEvals != null) {
-      return argEvals.length;
-    } else {
-      return 0;
-    }
+    return argEvals.length;
   }
 
   @Override
@@ -103,9 +114,6 @@ public abstract class FunctionEval extends EvalNode implements Cloneable {
 	}
 
 	@Override
-	public abstract Datum eval(Schema schema, Tuple tuple);
-
-	@Override
 	public String getName() {
 		return funcDesc.getFunctionName();
 	}
@@ -144,31 +152,25 @@ public abstract class FunctionEval extends EvalNode implements Cloneable {
   public Object clone() throws CloneNotSupportedException {
     FunctionEval eval = (FunctionEval) super.clone();
     eval.funcDesc = (FunctionDesc) funcDesc.clone();
-    if (argEvals != null) {
-      eval.argEvals = new EvalNode[argEvals.length];
-      for (int i = 0; i < argEvals.length; i++) {
-        eval.argEvals[i] = (EvalNode) argEvals[i].clone();
-      }
+    eval.argEvals = new EvalNode[argEvals.length];
+    for (int i = 0; i < argEvals.length; i++) {
+      eval.argEvals[i] = (EvalNode) argEvals[i].clone();
     }
     return eval;
   }
 	
 	@Override
   public void preOrder(EvalNodeVisitor visitor) {
-    if (argEvals != null) {
-      for (EvalNode eval : argEvals) {
-        eval.postOrder(visitor);
-      }
+    for (EvalNode eval : argEvals) {
+      eval.postOrder(visitor);
     }
     visitor.visit(this);
   }
 	
 	@Override
 	public void postOrder(EvalNodeVisitor visitor) {
-    if (argEvals != null) {
-      for (EvalNode eval : argEvals) {
-        eval.postOrder(visitor);
-      }
+    for (EvalNode eval : argEvals) {
+      eval.postOrder(visitor);
     }
 	  visitor.visit(this);
 	}

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/GeneralFunctionEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/GeneralFunctionEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/GeneralFunctionEval.java
index 0c6f1e2..747e8ba 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/GeneralFunctionEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/GeneralFunctionEval.java
@@ -22,18 +22,15 @@ import com.google.common.base.Objects;
 import com.google.gson.annotations.Expose;
 import org.apache.tajo.OverridableConf;
 import org.apache.tajo.catalog.FunctionDesc;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.datum.Datum;
 import org.apache.tajo.plan.function.GeneralFunction;
 import org.apache.tajo.storage.Tuple;
-import org.apache.tajo.storage.VTuple;
 import org.apache.tajo.util.TUtil;
 
 import javax.annotation.Nullable;
 
 public class GeneralFunctionEval extends FunctionEval {
   @Expose protected GeneralFunction instance;
-  private Tuple params = null;
 
 	public GeneralFunctionEval(@Nullable OverridableConf queryContext, FunctionDesc desc, GeneralFunction instance,
                              EvalNode[] givenArgs) {
@@ -42,24 +39,12 @@ public class GeneralFunctionEval extends FunctionEval {
     this.instance.init(queryContext, getParamType());
   }
 
-  /* (non-Javadoc)
-    * @see nta.query.executor.eval.Expr#evalVal(Tuple)
-    */
-	@Override
-	public Datum eval(Schema schema, Tuple tuple) {
-    if (this.params == null) {
-      params = new VTuple(argEvals.length);
-    }
-    if(argEvals != null) {
-      params.clear();
-      for(int i=0;i < argEvals.length; i++) {
-        params.put(i, argEvals[i].eval(schema, tuple));
-      }
-    }
+  @Override
+  @SuppressWarnings("unchecked")
+  public Datum eval(Tuple tuple) {
+    return instance.eval(evalParams(tuple));
+  }
 
-    return instance.eval(params);
-	}
-	
 	@Override
 	public boolean equals(Object obj) {
 	  if (obj instanceof GeneralFunctionEval) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/InEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/InEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/InEval.java
index e60b68a..c222bef 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/InEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/InEval.java
@@ -23,7 +23,6 @@ import com.google.common.collect.Sets;
 import com.google.gson.annotations.Expose;
 
 import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes;
 import org.apache.tajo.datum.Datum;
 import org.apache.tajo.datum.DatumFactory;
@@ -58,12 +57,12 @@ public class InEval extends BinaryEval {
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
+  public Datum eval(Tuple tuple) {
     if (values == null) {
       values = Sets.newHashSet(((RowConstantEval)rightExpr).getValues());
     }
 
-    Datum leftValue = leftExpr.eval(schema, tuple);
+    Datum leftValue = leftExpr.eval(tuple);
 
     if (leftValue.isNull()) {
       return NullDatum.get();

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/IsNullEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/IsNullEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/IsNullEval.java
index 16fc4f0..496f64d 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/IsNullEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/IsNullEval.java
@@ -21,7 +21,6 @@ package org.apache.tajo.plan.expr;
 import com.google.gson.annotations.Expose;
 
 import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes;
 import org.apache.tajo.common.TajoDataTypes.DataType;
 import org.apache.tajo.datum.Datum;
@@ -57,8 +56,9 @@ public class IsNullEval extends UnaryEval {
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
-    boolean isNull = child.eval(schema, tuple).isNull();
+  @SuppressWarnings("unchecked")
+  public Datum eval(Tuple tuple) {
+    boolean isNull = child.eval(tuple).isNull();
     return DatumFactory.createBool(isNot ^ isNull);
   }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/NotEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/NotEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/NotEval.java
index 916c1f7..ccec0fe 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/NotEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/NotEval.java
@@ -19,7 +19,6 @@
 package org.apache.tajo.plan.expr;
 
 import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes;
 import org.apache.tajo.common.TajoDataTypes.DataType;
 import org.apache.tajo.datum.Datum;
@@ -44,8 +43,9 @@ public class NotEval extends UnaryEval implements Cloneable {
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
-    Datum datum = child.eval(schema, tuple);
+  @SuppressWarnings("unchecked")
+  public Datum eval(Tuple tuple) {
+    Datum datum = child.eval(tuple);
     return !datum.isNull() ? DatumFactory.createBool(!datum.asBool()) : datum;
   }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/PartialBinaryExpr.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/PartialBinaryExpr.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/PartialBinaryExpr.java
index 9f6d6d6..1b1ee44 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/PartialBinaryExpr.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/PartialBinaryExpr.java
@@ -18,7 +18,6 @@
 
 package org.apache.tajo.plan.expr;
 
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes.DataType;
 import org.apache.tajo.datum.Datum;
 import org.apache.tajo.exception.InvalidOperationException;
@@ -48,8 +47,8 @@ public class PartialBinaryExpr extends BinaryEval {
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
-    throw new InvalidOperationException("ERROR: the partial binary expression cannot be evluated: "
+  public Datum eval(Tuple tuple) {
+    throw new InvalidOperationException("ERROR: the partial binary expression cannot be evaluated: "
             + this.toString());
   }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/PatternMatchPredicateEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/PatternMatchPredicateEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/PatternMatchPredicateEval.java
index 1d83d60..a5d055d 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/PatternMatchPredicateEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/PatternMatchPredicateEval.java
@@ -74,12 +74,14 @@ public abstract class PatternMatchPredicateEval extends BinaryEval {
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
-    if (this.compiled == null) {
-      compile(this.pattern);
-    }
+  public void bind(Schema schema) {
+    super.bind(schema);
+    compile(pattern);
+  }
 
-    Datum predicand = leftExpr.eval(schema, tuple);
+  @Override
+  public Datum eval(Tuple tuple) {
+    Datum predicand = leftExpr.eval(tuple);
     if (predicand.isNull()) {
       return NullDatum.get();
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/RowConstantEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/RowConstantEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/RowConstantEval.java
index a581700..b81c352 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/RowConstantEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/RowConstantEval.java
@@ -23,7 +23,6 @@ import java.util.Arrays;
 import com.google.gson.annotations.Expose;
 
 import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.datum.Datum;
 import org.apache.tajo.datum.NullDatum;
 import org.apache.tajo.storage.Tuple;
@@ -60,7 +59,8 @@ public class RowConstantEval extends EvalNode {
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
+  @SuppressWarnings("unchecked")
+  public Datum eval(Tuple tuple) {
     return NullDatum.get();
   }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/SignedEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/SignedEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/SignedEval.java
index 36f7e2f..9d077ba 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/SignedEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/SignedEval.java
@@ -20,7 +20,6 @@ package org.apache.tajo.plan.expr;
 
 import com.google.common.base.Objects;
 import com.google.gson.annotations.Expose;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes.DataType;
 import org.apache.tajo.datum.Datum;
 import org.apache.tajo.datum.NumericDatum;
@@ -49,8 +48,9 @@ public class SignedEval extends UnaryEval implements Cloneable {
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
-    NumericDatum result = child.eval(schema, tuple);
+  @SuppressWarnings("unchecked")
+  public Datum eval(Tuple tuple) {
+    NumericDatum result = child.eval(tuple);
     if (negative) {
       return result.inverseSign();
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/UnaryEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/UnaryEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/UnaryEval.java
index 7d45776..237db00 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/UnaryEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/UnaryEval.java
@@ -21,7 +21,6 @@ package org.apache.tajo.plan.expr;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.gson.annotations.Expose;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.common.TajoDataTypes;
 import org.apache.tajo.datum.Datum;
 import org.apache.tajo.storage.Tuple;
@@ -67,7 +66,7 @@ public abstract class UnaryEval extends EvalNode implements Cloneable {
   }
 
   @Override
-  public <T extends Datum> T eval(Schema schema, Tuple tuple) {
+  public <T extends Datum> T eval(Tuple tuple) {
     return null;
   }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/expr/WindowFunctionEval.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/WindowFunctionEval.java b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/WindowFunctionEval.java
index 1a1f138..33f9a3d 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/expr/WindowFunctionEval.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/expr/WindowFunctionEval.java
@@ -23,7 +23,6 @@ import java.util.Arrays;
 import com.google.gson.annotations.Expose;
 
 import org.apache.tajo.catalog.FunctionDesc;
-import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.catalog.SortSpec;
 import org.apache.tajo.common.TajoDataTypes.DataType;
 import org.apache.tajo.datum.Datum;
@@ -31,13 +30,11 @@ import org.apache.tajo.plan.function.AggFunction;
 import org.apache.tajo.plan.function.FunctionContext;
 import org.apache.tajo.plan.logical.WindowSpec;
 import org.apache.tajo.storage.Tuple;
-import org.apache.tajo.storage.VTuple;
 import org.apache.tajo.util.TUtil;
 
 public class WindowFunctionEval extends AggregationFunctionCallEval implements Cloneable {
   @Expose private SortSpec [] sortSpecs;
   @Expose WindowSpec.WindowFrame windowFrame;
-  private Tuple params;
 
   public WindowFunctionEval(FunctionDesc desc, AggFunction instance, EvalNode[] givenArgs,
                             WindowSpec.WindowFrame windowFrame) {
@@ -62,24 +59,11 @@ public class WindowFunctionEval extends AggregationFunctionCallEval implements C
   }
 
   @Override
-  public Datum eval(Schema schema, Tuple tuple) {
-    throw new UnsupportedOperationException("Cannot execute eval() of aggregation function");
-  }
-
-  public void merge(FunctionContext context, Schema schema, Tuple tuple) {
-    if (params == null) {
-      this.params = new VTuple(argEvals.length);
-    }
-
-    if (argEvals != null) {
-      for (int i = 0; i < argEvals.length; i++) {
-        params.put(i, argEvals[i].eval(schema, tuple));
-      }
-    }
-
+  protected void mergeParam(FunctionContext context, Tuple params) {
     instance.eval(context, params);
   }
 
+  @Override
   public Datum terminate(FunctionContext context) {
     return instance.terminate(context);
   }
@@ -93,7 +77,6 @@ public class WindowFunctionEval extends AggregationFunctionCallEval implements C
   public int hashCode() {
     final int prime = 31;
     int result = super.hashCode();
-    result = prime * result + ((params == null) ? 0 : params.hashCode());
     result = prime * result + Arrays.hashCode(sortSpecs);
     result = prime * result + ((windowFrame == null) ? 0 : windowFrame.hashCode());
     return result;

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/exprrewrite/rules/ConstantFolding.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/exprrewrite/rules/ConstantFolding.java b/tajo-plan/src/main/java/org/apache/tajo/plan/exprrewrite/rules/ConstantFolding.java
index 0e115e2..d77f072 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/exprrewrite/rules/ConstantFolding.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/exprrewrite/rules/ConstantFolding.java
@@ -49,7 +49,8 @@ public class ConstantFolding extends SimpleEvalNodeVisitor<LogicalPlanner.PlanCo
     }
 
     if (lhs.getType() == EvalType.CONST && rhs.getType() == EvalType.CONST) {
-      return new ConstEval(binaryEval.eval(null, null));
+      binaryEval.bind(null);
+      return new ConstEval(binaryEval.eval(null));
     }
 
     return binaryEval;
@@ -62,7 +63,8 @@ public class ConstantFolding extends SimpleEvalNodeVisitor<LogicalPlanner.PlanCo
     stack.pop();
 
     if (child.getType() == EvalType.CONST) {
-      return new ConstEval(unaryEval.eval(null, null));
+      unaryEval.bind(null);
+      return new ConstEval(unaryEval.eval(null));
     }
 
     return unaryEval;
@@ -75,16 +77,15 @@ public class ConstantFolding extends SimpleEvalNodeVisitor<LogicalPlanner.PlanCo
     if ("sleep".equals(evalNode.getFuncDesc().getFunctionName())) {
       constantOfAllDescendents = false;
     } else {
-      if (evalNode.getArgs() != null) {
-        for (EvalNode arg : evalNode.getArgs()) {
-          arg = visit(context, arg, stack);
-          constantOfAllDescendents &= (arg.getType() == EvalType.CONST);
-        }
+      for (EvalNode arg : evalNode.getArgs()) {
+        arg = visit(context, arg, stack);
+        constantOfAllDescendents &= (arg.getType() == EvalType.CONST);
       }
     }
 
     if (constantOfAllDescendents && evalNode.getType() == EvalType.FUNCTION) {
-      return new ConstEval(evalNode.eval(null, null));
+      evalNode.bind(null);
+      return new ConstEval(evalNode.eval(null));
     } else {
       return evalNode;
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/f4c9e54c/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/PartitionedTableRewriter.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/PartitionedTableRewriter.java b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/PartitionedTableRewriter.java
index 7604c53..c49d51b 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/PartitionedTableRewriter.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/PartitionedTableRewriter.java
@@ -86,6 +86,7 @@ public class PartitionedTableRewriter implements LogicalPlanRewriteRule {
     public PartitionPathFilter(Schema schema, EvalNode partitionFilter) {
       this.schema = schema;
       this.partitionFilter = partitionFilter;
+      partitionFilter.bind(schema);
     }
 
     @Override
@@ -95,7 +96,7 @@ public class PartitionedTableRewriter implements LogicalPlanRewriteRule {
         return false;
       }
 
-      return partitionFilter.eval(schema, tuple).asBool();
+      return partitionFilter.eval(tuple).asBool();
     }
 
     @Override


[3/7] tajo git commit: TAJO-1360: VALUES_ field in OPTIONS table of catalog store should be longer.

Posted by ji...@apache.org.
TAJO-1360: VALUES_ field in OPTIONS table of catalog store should be longer.

Closes #436

Signed-off-by: Jihun Kang <ji...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/d6735fb9
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/d6735fb9
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/d6735fb9

Branch: refs/heads/index_support
Commit: d6735fb929daf86df3c8adb729a4e64bce95462b
Parents: 6e7f1c7
Author: DaeMyung Kang <ch...@naver.com>
Authored: Thu Apr 2 16:12:56 2015 +0900
Committer: Jihun Kang <ji...@apache.org>
Committed: Thu Apr 2 16:12:56 2015 +0900

----------------------------------------------------------------------
 CHANGES                                                           | 3 +++
 .../src/main/resources/schemas/derby/derby.xml                    | 2 +-
 .../src/main/resources/schemas/mariadb/table_properties.sql       | 2 +-
 .../src/main/resources/schemas/mysql/table_properties.sql         | 2 +-
 .../src/main/resources/schemas/oracle/oracle.xml                  | 2 +-
 .../src/main/resources/schemas/postgresql/postgresql.xml          | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/d6735fb9/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1ccd016..71c5159 100644
--- a/CHANGES
+++ b/CHANGES
@@ -52,6 +52,9 @@ Release 0.11.0 - unreleased
 
   BUG FIXES
 
+    TAJO-1360: VALUES_ field in OPTIONS table of catalog store should be longer.
+    (Contributed by DaeMyung Kang, Committed by jihun)
+
     TAJO-1479: NPE during startup CatalogStore. (jaehwa)
 
     TAJO-1437: Resolve findbug warnings on Tajo JDBC Module. 

http://git-wip-us.apache.org/repos/asf/tajo/blob/d6735fb9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
index 1e60d15..a239e68 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
@@ -92,7 +92,7 @@
 				CREATE TABLE OPTIONS (
   				TID INT NOT NULL REFERENCES TABLES (TID) ON DELETE CASCADE,
   				KEY_ VARCHAR(255) NOT NULL,
-  				VALUE_ VARCHAR(255) NOT NULL,
+  				VALUE_ VARCHAR(4000) NOT NULL,
   				CONSTRAINT C_OPTIONS_UNIQUE UNIQUE (TID, KEY_, VALUE_)
 				)]]>
 				</tns:sql>

http://git-wip-us.apache.org/repos/asf/tajo/blob/d6735fb9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql
index 7ce5362..b9a84e0 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql
@@ -1,7 +1,7 @@
 CREATE TABLE OPTIONS (
   TID INT NOT NULL,
   KEY_ VARCHAR(255) BINARY NOT NULL,
-  VALUE_ VARCHAR(255) NOT NULL,
+  VALUE_ VARCHAR(4000) NOT NULL,
   PRIMARY KEY (TID, KEY_),
   FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
 )

http://git-wip-us.apache.org/repos/asf/tajo/blob/d6735fb9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql
index 7ce5362..b9a84e0 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql
@@ -1,7 +1,7 @@
 CREATE TABLE OPTIONS (
   TID INT NOT NULL,
   KEY_ VARCHAR(255) BINARY NOT NULL,
-  VALUE_ VARCHAR(255) NOT NULL,
+  VALUE_ VARCHAR(4000) NOT NULL,
   PRIMARY KEY (TID, KEY_),
   FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
 )

http://git-wip-us.apache.org/repos/asf/tajo/blob/d6735fb9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
index c39f9c8..8c28b97 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
@@ -135,7 +135,7 @@
   			CREATE TABLE OPTIONS (
 					TID INT NOT NULL,
 					KEY_ VARCHAR2(255) NOT NULL,
-					VALUE_ VARCHAR2(255) NOT NULL,
+					VALUE_ VARCHAR2(4000) NOT NULL,
 					CONSTRAINT OPTIONS_PKEY PRIMARY KEY (TID, KEY_),
 					FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
 				)]]>

http://git-wip-us.apache.org/repos/asf/tajo/blob/d6735fb9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
index b51451b..56bc3a3 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
@@ -94,7 +94,7 @@ xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.
 				CREATE TABLE OPTIONS (
   				TID INT NOT NULL,
   				KEY_ VARCHAR(255) NOT NULL,
-  				VALUE_ VARCHAR(255) NOT NULL,
+  				VALUE_ VARCHAR(4000) NOT NULL,
   				CONSTRAINT OPTIONS_PKEY PRIMARY KEY (TID, KEY_),
   				FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
 				)]]>


[7/7] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support

Posted by ji...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support

Conflicts:
	tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql
	tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/3c182347
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/3c182347
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/3c182347

Branch: refs/heads/index_support
Commit: 3c182347dc9dec633fcce1a77fc66a2a6b89272f
Parents: 1c53ccf f4c9e54
Author: Jihoon Son <ji...@apache.org>
Authored: Thu Apr 2 20:05:41 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Thu Apr 2 20:05:41 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |  14 +
 .../store/AbstractMySQLMariaDBStore.java        | 311 --------------
 .../apache/tajo/catalog/store/MariaDBStore.java |  26 +-
 .../apache/tajo/catalog/store/MySQLStore.java   |  29 +-
 .../src/main/resources/schemas/common/meta.sql  |   1 -
 .../src/main/resources/schemas/derby/derby.xml  |  16 +-
 .../main/resources/schemas/mariadb/columns.sql  |  10 -
 .../resources/schemas/mariadb/databases.sql     |   7 -
 .../main/resources/schemas/mariadb/indexes.sql  |  19 -
 .../main/resources/schemas/mariadb/mariadb.xml  | 161 ++++++++
 .../schemas/mariadb/partition_keys.sql          |   6 -
 .../schemas/mariadb/partition_methods.sql       |   7 -
 .../resources/schemas/mariadb/partitions.sql    |   7 -
 .../main/resources/schemas/mariadb/stats.sql    |   6 -
 .../schemas/mariadb/table_properties.sql        |   7 -
 .../main/resources/schemas/mariadb/tables.sql   |  11 -
 .../resources/schemas/mariadb/tablespaces.sql   |   7 -
 .../main/resources/schemas/mysql/columns.sql    |  10 -
 .../main/resources/schemas/mysql/databases.sql  |   7 -
 .../main/resources/schemas/mysql/indexes.sql    |  19 -
 .../src/main/resources/schemas/mysql/mysql.xml  | 162 ++++++++
 .../resources/schemas/mysql/partition_keys.sql  |   6 -
 .../schemas/mysql/partition_methods.sql         |   7 -
 .../main/resources/schemas/mysql/partitions.sql |   7 -
 .../src/main/resources/schemas/mysql/stats.sql  |   6 -
 .../schemas/mysql/table_properties.sql          |   7 -
 .../src/main/resources/schemas/mysql/tables.sql |  11 -
 .../resources/schemas/mysql/tablespaces.sql     |   7 -
 .../main/resources/schemas/oracle/oracle.xml    |  21 +-
 .../resources/schemas/postgresql/postgresql.xml |  28 +-
 .../java/org/apache/tajo/conf/TajoConf.java     |   2 +-
 .../tajo/engine/codegen/CaseWhenEmitter.java    |   4 +-
 .../tajo/engine/codegen/EvalCodeGenContext.java |   2 +-
 .../tajo/engine/codegen/EvalCodeGenerator.java  |  22 +-
 .../apache/tajo/engine/planner/Projector.java   |   9 +-
 .../planner/physical/AggregationExec.java       |  11 +-
 .../engine/planner/physical/BNLJoinExec.java    |  43 +-
 .../planner/physical/BSTIndexScanExec.java      |   6 +-
 .../engine/planner/physical/CommonJoinExec.java |  79 ++++
 .../planner/physical/ComparableVector.java      | 411 +++++++++++++++++++
 .../DistinctGroupbyFirstAggregationExec.java    |  20 +-
 .../DistinctGroupbyHashAggregationExec.java     |  33 +-
 .../DistinctGroupbySecondAggregationExec.java   |   8 +-
 .../DistinctGroupbyThirdAggregationExec.java    |   7 +-
 .../engine/planner/physical/EvalExprExec.java   |   6 +-
 .../planner/physical/ExternalSortExec.java      | 238 ++++-------
 .../planner/physical/HashAggregateExec.java     |   4 +-
 .../planner/physical/HashFullOuterJoinExec.java |  33 +-
 .../engine/planner/physical/HashJoinExec.java   |  32 +-
 .../planner/physical/HashLeftAntiJoinExec.java  |   2 +-
 .../planner/physical/HashLeftOuterJoinExec.java |   9 +-
 .../planner/physical/HashLeftSemiJoinExec.java  |  14 +-
 .../engine/planner/physical/HavingExec.java     |   8 +-
 .../engine/planner/physical/MemSortExec.java    |  19 +-
 .../physical/MergeFullOuterJoinExec.java        |  34 +-
 .../engine/planner/physical/MergeJoinExec.java  |  30 +-
 .../engine/planner/physical/NLJoinExec.java     |  30 +-
 .../planner/physical/NLLeftOuterJoinExec.java   |  28 +-
 .../physical/RightOuterMergeJoinExec.java       |  35 +-
 .../engine/planner/physical/SelectionExec.java  |   8 +-
 .../engine/planner/physical/SeqScanExec.java    |  31 +-
 .../planner/physical/SortAggregateExec.java     |   6 +-
 .../tajo/engine/planner/physical/SortExec.java  |  10 +-
 .../engine/planner/physical/TupleSorter.java    |  24 +-
 .../planner/physical/VectorizedSorter.java      | 155 +------
 .../engine/planner/physical/WindowAggExec.java  |  11 +-
 .../org/apache/tajo/engine/utils/TupleUtil.java |   4 +-
 .../NonForwardQueryResultSystemScanner.java     |   2 +-
 .../apache/tajo/master/exec/QueryExecutor.java  |   2 +-
 .../apache/tajo/engine/eval/ExprTestBase.java   |   3 +-
 .../apache/tajo/engine/eval/TestEvalTree.java   |  68 +--
 .../tajo/engine/eval/TestEvalTreeUtil.java      |  12 +-
 .../planner/physical/TestExternalSortExec.java  |   4 +-
 .../planner/physical/TestTupleSorter.java       |   2 +-
 .../testCrossJoinWithAsterisk1.sql              |   2 +-
 .../testCrossJoinWithAsterisk2.sql              |   2 +-
 .../testCrossJoinWithAsterisk3.sql              |   2 +-
 .../testCrossJoinWithAsterisk4.sql              |   2 +-
 .../TestJoinQuery/testComplexJoinCondition7.sql |   2 +-
 .../testCrossJoinWithAsterisk1.sql              |   2 +-
 .../testCrossJoinWithAsterisk2.sql              |   2 +-
 .../testCrossJoinWithAsterisk3.sql              |   2 +-
 .../testCrossJoinWithAsterisk4.sql              |   2 +-
 .../queries/TestJoinQuery/testJoinWithJson.json |   8 +
 .../testComplexJoinCondition7.result            |   4 +-
 .../org/apache/tajo/plan/LogicalPlanner.java    |   2 +-
 .../plan/expr/AggregationFunctionCallEval.java  |  22 +-
 .../apache/tajo/plan/expr/AlgebraicUtil.java    |   6 +-
 .../tajo/plan/expr/BetweenPredicateEval.java    |  79 ++--
 .../org/apache/tajo/plan/expr/BinaryEval.java   |  10 +-
 .../org/apache/tajo/plan/expr/CaseWhenEval.java |  23 +-
 .../org/apache/tajo/plan/expr/CastEval.java     |   7 +-
 .../org/apache/tajo/plan/expr/ConstEval.java    |   7 +-
 .../org/apache/tajo/plan/expr/EvalNode.java     |  12 +-
 .../org/apache/tajo/plan/expr/EvalTreeUtil.java |   3 +-
 .../org/apache/tajo/plan/expr/FieldEval.java    |  29 +-
 .../org/apache/tajo/plan/expr/FunctionEval.java |  50 +--
 .../tajo/plan/expr/GeneralFunctionEval.java     |  25 +-
 .../java/org/apache/tajo/plan/expr/InEval.java  |   5 +-
 .../org/apache/tajo/plan/expr/IsNullEval.java   |   6 +-
 .../java/org/apache/tajo/plan/expr/NotEval.java |   6 +-
 .../tajo/plan/expr/PartialBinaryExpr.java       |   5 +-
 .../plan/expr/PatternMatchPredicateEval.java    |  12 +-
 .../apache/tajo/plan/expr/RowConstantEval.java  |   4 +-
 .../org/apache/tajo/plan/expr/SignedEval.java   |   6 +-
 .../org/apache/tajo/plan/expr/UnaryEval.java    |   3 +-
 .../tajo/plan/expr/WindowFunctionEval.java      |  21 +-
 .../plan/exprrewrite/rules/ConstantFolding.java |  17 +-
 .../rewrite/rules/PartitionedTableRewriter.java |   3 +-
 .../org/apache/tajo/rpc/NettyClientBase.java    |  26 +-
 .../org/apache/tajo/rpc/RpcConnectionPool.java  |  19 +-
 .../apache/tajo/storage/AbstractScanner.java    |  80 ++++
 .../org/apache/tajo/storage/MemoryUtil.java     |   4 +
 113 files changed, 1535 insertions(+), 1451 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
----------------------------------------------------------------------
diff --cc tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
index fa3559f,221b341..3c70cb2
--- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
+++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
@@@ -326,12 -326,8 +326,12 @@@ public class TajoConf extends Configura
      $EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD("tajo.executor.groupby.in-memory-hash-threshold-bytes",
          (long)256 * 1048576),
      $MAX_OUTPUT_FILE_SIZE("tajo.query.max-outfile-size-mb", 0), // zero means infinite
-     $CODEGEN("tajo.executor.codegen.enabled", false), // Runtime code generation
+     $CODEGEN("tajo.executor.codegen.enabled", false), // Runtime code generation (todo this is broken)
  
 +    // for index
 +    $INDEX_ENABLED("tajo.query.index.enabled", false),
 +    $INDEX_SELECTIVITY_THRESHOLD("tajo.query.index.selectivity.threshold", 0.05f),
 +
      // Client -----------------------------------------------------------------
      $CLIENT_SESSION_EXPIRY_TIME("tajo.client.session.expiry-time-sec", 3600), // default time is one hour.
  

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
----------------------------------------------------------------------
diff --cc tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
index 3e4c62d,be6c046..c7169bb
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
@@@ -92,26 -67,13 +92,30 @@@ public class BSTIndexScanExec extends P
      this.reader.open();
    }
  
 +  private static Schema mergeSubSchemas(Schema originalSchema, Schema subSchema, Target[] targets, EvalNode qual) {
 +    Schema mergedSchema = new Schema();
 +    Set<Column> qualAndTargets = TUtil.newHashSet();
 +    qualAndTargets.addAll(EvalTreeUtil.findUniqueColumns(qual));
 +    for (Target target : targets) {
 +      qualAndTargets.addAll(EvalTreeUtil.findUniqueColumns(target.getEvalTree()));
 +    }
 +    for (Column column : originalSchema.getColumns()) {
 +      if (subSchema.contains(column)
 +          || qualAndTargets.contains(column)
 +          || qualAndTargets.contains(column)) {
 +        mergedSchema.addColumn(column);
 +      }
 +    }
 +    return mergedSchema;
 +  }
 +
    @Override
    public void init() throws IOException {
+     super.init();
      progress = 0.0f;
+     if (qual != null) {
+       qual.bind(inSchema);
+     }
    }
  
    @Override

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-plan/src/main/java/org/apache/tajo/plan/expr/AlgebraicUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-plan/src/main/java/org/apache/tajo/plan/expr/EvalTreeUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3c182347/tajo-plan/src/main/java/org/apache/tajo/plan/rewrite/rules/PartitionedTableRewriter.java
----------------------------------------------------------------------


[2/7] tajo git commit: TAJO-1460 Apply TAJO-1407 to ExternalSortExec

Posted by ji...@apache.org.
TAJO-1460 Apply TAJO-1407 to ExternalSortExec

Closes #474


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/6e7f1c7b
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/6e7f1c7b
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/6e7f1c7b

Branch: refs/heads/index_support
Commit: 6e7f1c7b0561c7299a498b81dfb6148883a76a0d
Parents: 7c2a240
Author: babokim <ba...@gmail.com>
Authored: Thu Apr 2 15:22:37 2015 +0900
Committer: babokim <ba...@gmail.com>
Committed: Thu Apr 2 15:22:37 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |   3 +
 .../planner/physical/ComparableVector.java      | 411 +++++++++++++++++++
 .../planner/physical/ExternalSortExec.java      | 238 ++++-------
 .../engine/planner/physical/MemSortExec.java    |  19 +-
 .../tajo/engine/planner/physical/SortExec.java  |  10 +-
 .../engine/planner/physical/TupleSorter.java    |  24 +-
 .../planner/physical/VectorizedSorter.java      | 155 +------
 .../planner/physical/TestExternalSortExec.java  |   4 +-
 .../planner/physical/TestTupleSorter.java       |   2 +-
 .../testCrossJoinWithAsterisk1.sql              |   2 +-
 .../testCrossJoinWithAsterisk2.sql              |   2 +-
 .../testCrossJoinWithAsterisk3.sql              |   2 +-
 .../testCrossJoinWithAsterisk4.sql              |   2 +-
 .../TestJoinQuery/testComplexJoinCondition7.sql |   2 +-
 .../testCrossJoinWithAsterisk1.sql              |   2 +-
 .../testCrossJoinWithAsterisk2.sql              |   2 +-
 .../testCrossJoinWithAsterisk3.sql              |   2 +-
 .../testCrossJoinWithAsterisk4.sql              |   2 +-
 .../queries/TestJoinQuery/testJoinWithJson.json |   8 +
 .../testComplexJoinCondition7.result            |   4 +-
 .../apache/tajo/storage/AbstractScanner.java    |  80 ++++
 .../org/apache/tajo/storage/MemoryUtil.java     |   4 +
 22 files changed, 655 insertions(+), 325 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c3bce7d..1ccd016 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@ Release 0.11.0 - unreleased
     (jihun)
 
   IMPROVEMENT
+   
+    TAJO-1460: Apply TAJO-1407 to ExternalSortExec. (Contributed by navis, 
+    Committed by hyoungjun)
 
     TAJO-1350: Refactor FilterPushDownRule::visitJoin() into well-defined, 
     small methods. (jihoon)

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ComparableVector.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ComparableVector.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ComparableVector.java
new file mode 100644
index 0000000..39b8c8a
--- /dev/null
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ComparableVector.java
@@ -0,0 +1,411 @@
+/**
+ * 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.planner.physical;
+
+import com.google.common.primitives.Booleans;
+import com.google.common.primitives.Doubles;
+import com.google.common.primitives.Floats;
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.Longs;
+import com.google.common.primitives.Shorts;
+import com.google.common.primitives.UnsignedInts;
+import org.apache.tajo.catalog.Schema;
+import org.apache.tajo.catalog.SortSpec;
+import org.apache.tajo.common.TajoDataTypes;
+import org.apache.tajo.datum.Datum;
+import org.apache.tajo.datum.DatumFactory;
+import org.apache.tajo.datum.NullDatum;
+import org.apache.tajo.datum.TextDatum;
+import org.apache.tajo.exception.UnsupportedException;
+import org.apache.tajo.storage.Tuple;
+import org.apache.tajo.storage.VTuple;
+
+import java.util.Arrays;
+import java.util.BitSet;
+
+/**
+ * Extract raw level values (primitive or String/byte[]) from each of key columns for compare
+ */
+public class ComparableVector {
+
+  protected final Tuple[] tuples;         // source tuples
+  protected final TupleVector[] vectors;  // values of key columns
+  protected final int[] keyIndex;
+
+  public ComparableVector(int length, SortSpec[] sortKeys, int[] keyIndex) {
+    tuples = new Tuple[length];
+    vectors = new TupleVector[sortKeys.length];
+    for (int i = 0; i < vectors.length; i++) {
+      TajoDataTypes.Type type = sortKeys[i].getSortKey().getDataType().getType();
+      boolean nullFirst = sortKeys[i].isNullFirst();
+      boolean ascending = sortKeys[i].isAscending();
+      boolean nullInvert = nullFirst && ascending || !nullFirst && !ascending;
+      vectors[i] = new TupleVector(vectorType(type), tuples.length, nullInvert, ascending);
+    }
+    this.keyIndex = keyIndex;
+  }
+
+  public int compare(final int i1, final int i2) {
+    for (TupleVector vector : vectors) {
+      int compare = vector.compare(i1, i2);
+      if (compare != 0) {
+        return compare;
+      }
+    }
+    return 0;
+  }
+
+  public void set(int index, Tuple tuple) {
+    for (int i = 0; i < vectors.length; i++) {
+      vectors[i].set(index, tuple, keyIndex[i]);
+    }
+  }
+
+  protected static class TupleVector {
+
+    private final int type;
+    private final BitSet nulls;
+    private final boolean nullInvert;
+    private final boolean ascending;
+
+    private boolean[] booleans;
+    private byte[] bits;
+    private short[] shorts;
+    private int[] ints;
+    private long[] longs;
+    private float[] floats;
+    private double[] doubles;
+    private byte[][] bytes;
+
+    private int index;
+
+    private TupleVector(int type, int length, boolean nullInvert, boolean ascending) {
+      this.type = type;
+      this.nulls = new BitSet(length);
+      this.nullInvert = nullInvert;
+      this.ascending = ascending;
+      switch (type) {
+        case 0: booleans = new boolean[length]; break;
+        case 1: bits = new byte[length]; break;
+        case 2: shorts = new short[length]; break;
+        case 3: ints = new int[length]; break;
+        case 4: longs = new long[length]; break;
+        case 5: floats = new float[length]; break;
+        case 6: doubles = new double[length]; break;
+        case 7: bytes = new byte[length][]; break;
+        case 8: ints = new int[length]; break;
+        case -1: break;
+        default:
+          throw new IllegalArgumentException();
+      }
+    }
+
+    protected final void append(Tuple tuple, int field) {
+      set(index++, tuple, field);
+    }
+
+    protected final void set(int index, Tuple tuple, int field) {
+      if (tuple.isNull(field)) {
+        nulls.set(index);
+        return;
+      }
+      nulls.clear(index);
+      switch (type) {
+        case 0: booleans[index] = tuple.getBool(field); break;
+        case 1: bits[index] = tuple.getByte(field); break;
+        case 2: shorts[index] = tuple.getInt2(field); break;
+        case 3: ints[index] = tuple.getInt4(field); break;
+        case 4: longs[index] = tuple.getInt8(field); break;
+        case 5: floats[index] = tuple.getFloat4(field); break;
+        case 6: doubles[index] = tuple.getFloat8(field); break;
+        case 7: bytes[index] = tuple.getBytes(field); break;
+        case 8: ints[index] = tuple.getInt4(field); break;
+        default:
+          throw new IllegalArgumentException();
+      }
+    }
+
+    protected final int compare(int index1, int index2) {
+      final boolean n1 = nulls.get(index1);
+      final boolean n2 = nulls.get(index2);
+      if (n1 && n2) {
+        return 0;
+      }
+      if (n1 ^ n2) {
+        int compVal = n1 ? 1 : -1;
+        return nullInvert ? -compVal : compVal;
+      }
+      int compare;
+      switch (type) {
+        case 0: compare = Booleans.compare(booleans[index1], booleans[index2]); break;
+        case 1: compare = bits[index1] - bits[index2]; break;
+        case 2: compare = Shorts.compare(shorts[index1], shorts[index2]); break;
+        case 3: compare = Ints.compare(ints[index1], ints[index2]); break;
+        case 4: compare = Longs.compare(longs[index1], longs[index2]); break;
+        case 5: compare = Floats.compare(floats[index1], floats[index2]); break;
+        case 6: compare = Doubles.compare(doubles[index1], doubles[index2]); break;
+        case 7: compare = TextDatum.COMPARATOR.compare(bytes[index1], bytes[index2]); break;
+        case 8: compare = UnsignedInts.compare(ints[index1], ints[index2]); break;
+        default:
+          throw new IllegalArgumentException();
+      }
+      return ascending ? compare : -compare;
+    }
+  }
+
+  public static class ComparableTuple {
+
+    private final TupleType[] keyTypes;
+    private final int[] keyIndex;
+    private final Object[] keys;
+
+    public ComparableTuple(Schema schema, int[] keyIndex) {
+      this(tupleTypes(schema, keyIndex), keyIndex);
+    }
+
+    public ComparableTuple(Schema schema, int start, int end) {
+      this(schema, toKeyIndex(start, end));
+    }
+
+    private ComparableTuple(TupleType[] keyTypes, int[] keyIndex) {
+      this.keyTypes = keyTypes;
+      this.keyIndex = keyIndex;
+      this.keys = new Object[keyIndex.length];
+    }
+
+    public int size() {
+      return keyIndex.length;
+    }
+
+    public void set(Tuple tuple) {
+      for (int i = 0; i < keyTypes.length; i++) {
+        final int field = keyIndex[i];
+        if (tuple.isNull(field)) {
+          keys[i] = null;
+          continue;
+        }
+        switch (keyTypes[i]) {
+          case BOOLEAN: keys[i] = tuple.getBool(field); break;
+          case BIT: keys[i] = tuple.getByte(field); break;
+          case INT1:
+          case INT2: keys[i] = tuple.getInt2(field); break;
+          case INT4:
+          case DATE:
+          case INET4: keys[i] = tuple.getInt4(field); break;
+          case INT8:
+          case TIME:
+          case TIMESTAMP: keys[i] = tuple.getInt8(field); break;
+          case FLOAT4: keys[i] = tuple.getFloat4(field); break;
+          case FLOAT8: keys[i] = tuple.getFloat8(field); break;
+          case TEXT:
+          case CHAR:
+          case BLOB: keys[i] = tuple.getBytes(field); break;
+          case DATUM: keys[i] = tuple.get(field); break;
+          default:
+            throw new IllegalArgumentException();
+        }
+      }
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      ComparableTuple other = (ComparableTuple)obj;
+      for (int i = 0; i < keys.length; i++) {
+        final boolean n1 = keys[i] == null;
+        final boolean n2 = other.keys[i] == null;
+        if (n1 && n2) {
+          continue;
+        }
+        if (n1 ^ n2) {
+          return false;
+        }
+        switch (keyTypes[i]) {
+          case TEXT:
+          case CHAR:
+          case BLOB: if (!Arrays.equals((byte[])keys[i], (byte[])other.keys[i])) return false; continue;
+          default: if (!keys[i].equals(other.keys[i])) return false; continue;
+        }
+      }
+      return true;
+    }
+
+    public boolean equals(Tuple tuple) {
+      for (int i = 0; i < keys.length; i++) {
+        final int field = keyIndex[i];
+        final boolean n1 = keys[i] == null;
+        final boolean n2 = tuple.isNull(field);
+        if (n1 && n2) {
+          continue;
+        }
+        if (n1 ^ n2) {
+          return false;
+        }
+        switch (keyTypes[i]) {
+          case BOOLEAN: if ((Boolean)keys[i] != tuple.getBool(field)) return false; continue;
+          case BIT: if ((Byte)keys[i] != tuple.getByte(field)) return false; continue;
+          case INT1:
+          case INT2: if ((Short)keys[i] != tuple.getInt2(field)) return false; continue;
+          case INT4:
+          case DATE:
+          case INET4: if ((Integer)keys[i] != tuple.getInt4(field)) return false; continue;
+          case INT8:
+          case TIME:
+          case TIMESTAMP: if ((Long)keys[i] != tuple.getInt8(field)) return false; continue;
+          case FLOAT4: if ((Float)keys[i] != tuple.getFloat4(field)) return false; continue;
+          case FLOAT8: if ((Double)keys[i] != tuple.getFloat8(field)) return false; continue;
+          case TEXT:
+          case CHAR:
+          case BLOB: if (!Arrays.equals((byte[])keys[i], tuple.getBytes(field))) return false; continue;
+          case DATUM: if (!keys[i].equals(tuple.get(field))) return false; continue;
+        }
+      }
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int result = 1;
+      for (Object key : keys) {
+        int hash = key == null ? 0 :
+            key instanceof byte[] ? Arrays.hashCode((byte[])key) : key.hashCode();
+        result = 31 * result + hash;
+      }
+      return result;
+    }
+
+    public ComparableTuple copy() {
+      ComparableTuple copy = emptyCopy();
+      System.arraycopy(keys, 0, copy.keys, 0, keys.length);
+      return copy;
+    }
+
+    public ComparableTuple emptyCopy() {
+      return new ComparableTuple(keyTypes, keyIndex);
+    }
+
+    public VTuple toVTuple() {
+      VTuple vtuple = new VTuple(keyIndex.length);
+      for (int i = 0; i < keyIndex.length; i++) {
+        vtuple.put(i, toDatum(i));
+      }
+      return vtuple;
+    }
+
+    public Datum toDatum(int i) {
+      if (keys[i] == null) {
+        return NullDatum.get();
+      }
+      switch (keyTypes[i]) {
+        case NULL_TYPE: return NullDatum.get();
+        case BOOLEAN: return DatumFactory.createBool((Boolean) keys[i]);
+        case BIT: return DatumFactory.createBit((Byte)keys[i]);
+        case INT1:
+        case INT2: return DatumFactory.createInt2((Short) keys[i]);
+        case INT4: return DatumFactory.createInt4((Integer) keys[i]);
+        case DATE: return DatumFactory.createDate((Integer) keys[i]);
+        case INET4: return DatumFactory.createInet4((Integer) keys[i]);
+        case INT8: return DatumFactory.createInt8((Long) keys[i]);
+        case TIME: return DatumFactory.createTime((Long) keys[i]);
+        case TIMESTAMP: return DatumFactory.createTimestamp((Long) keys[i]);
+        case FLOAT4: return DatumFactory.createFloat4((Float) keys[i]);
+        case FLOAT8: return DatumFactory.createFloat8((Double) keys[i]);
+        case TEXT: return DatumFactory.createText((byte[]) keys[i]);
+        case CHAR: return DatumFactory.createChar((byte[]) keys[i]);
+        case BLOB: return DatumFactory.createBlob((byte[]) keys[i]);
+        case DATUM: return (Datum)keys[i];
+        default:
+          throw new IllegalArgumentException();
+      }
+    }
+  }
+
+  public static boolean isVectorizable(SortSpec[] sortKeys) {
+    if (sortKeys.length == 0) {
+      return false;
+    }
+    for (SortSpec spec : sortKeys) {
+      try {
+        vectorType(spec.getSortKey().getDataType().getType());
+      } catch (Exception e) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  private static int vectorType(TajoDataTypes.Type type) {
+    switch (type) {
+      case BOOLEAN: return 0;
+      case BIT: return 1;
+      case INT1: case INT2: return 2;
+      case INT4: case DATE: return 3;
+      case INT8: case TIME: case TIMESTAMP: case INTERVAL: return 4;
+      case FLOAT4: return 5;
+      case FLOAT8: return 6;
+      case TEXT: case CHAR: case BLOB: return 7;
+      case INET4: return 8;
+      case NULL_TYPE: return -1;
+    }
+    // todo
+    throw new UnsupportedException(type.name());
+  }
+
+  private static TupleType[] tupleTypes(Schema schema, int[] keyIndex) {
+    TupleType[] types = new TupleType[keyIndex.length];
+    for (int i = 0; i < keyIndex.length; i++) {
+      types[i] = tupleType(schema.getColumn(keyIndex[i]).getDataType().getType());
+    }
+    return types;
+  }
+
+  private static TupleType tupleType(TajoDataTypes.Type type) {
+    switch (type) {
+      case BOOLEAN: return TupleType.BOOLEAN;
+      case BIT: return TupleType.BIT;
+      case INT1: return TupleType.INT1;
+      case INT2: return TupleType.INT2;
+      case INT4: return TupleType.INT4;
+      case DATE: return TupleType.DATE;
+      case INT8: return TupleType.INT8;
+      case TIME: return TupleType.TIME;
+      case TIMESTAMP: return TupleType.TIMESTAMP;
+      case FLOAT4: return TupleType.FLOAT4;
+      case FLOAT8: return TupleType.FLOAT8;
+      case TEXT: return TupleType.TEXT;
+      case CHAR: return TupleType.CHAR;
+      case BLOB: return TupleType.BLOB;
+      case INET4: return TupleType.INET4;
+      case NULL_TYPE: return TupleType.NULL_TYPE;
+      default: return TupleType.DATUM;
+    }
+  }
+
+  private static int[] toKeyIndex(int start, int end) {
+    int[] keyIndex = new int[end - start];
+    for (int i = 0; i < keyIndex.length; i++) {
+      keyIndex[i] = start + i;
+    }
+    return keyIndex;
+  }
+
+  private static enum TupleType {
+    NULL_TYPE, BOOLEAN, BIT, INT1, INT2, INT4, DATE, INET4, INT8, TIME, TIMESTAMP,
+    FLOAT4, FLOAT8, TEXT, CHAR, BLOB, DATUM
+  }
+}

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
index b3ebfb2..355f015 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
@@ -28,7 +28,6 @@ import org.apache.hadoop.fs.RawLocalFileSystem;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.tajo.SessionVars;
 import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Column;
 import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.catalog.TableMeta;
 import org.apache.tajo.catalog.proto.CatalogProtos;
@@ -168,14 +167,14 @@ public class ExternalSortExec extends SortExec {
     int rowNum = tupleBlock.size();
 
     long sortStart = System.currentTimeMillis();
-    Collections.sort(tupleBlock, getComparator());
+    Iterable<Tuple> sorted = getSorter(tupleBlock).sort();
     long sortEnd = System.currentTimeMillis();
 
     long chunkWriteStart = System.currentTimeMillis();
     Path outputPath = getChunkPathForWrite(0, chunkId);
     final RawFileAppender appender = new RawFileAppender(context.getConf(), null, inSchema, meta, outputPath);
     appender.init();
-    for (Tuple t : tupleBlock) {
+    for (Tuple t : sorted) {
       appender.addTuple(t);
     }
     appender.close();
@@ -236,18 +235,13 @@ public class ExternalSortExec extends SortExec {
       }
     }
 
-    if (inMemoryTable.size() > 0) { // if there are at least one or more input tuples
-      if (!memoryResident) { // check if data exceeds a sort buffer. If so, it store the remain data into a chunk.
-        if (inMemoryTable.size() > 0) {
-          long start = System.currentTimeMillis();
-          int rowNum = inMemoryTable.size();
-          chunkPaths.add(sortAndStoreChunk(chunkId, inMemoryTable));
-          long end = System.currentTimeMillis();
-          info(LOG, "Last Chunk #" + chunkId + " " + rowNum + " rows written (" + (end - start) + " msec)");
-        }
-      } else { // this case means that all data does not exceed a sort buffer
-        Collections.sort(inMemoryTable, getComparator());
-      }
+    if (!memoryResident && !inMemoryTable.isEmpty()) { // if there are at least one or more input tuples
+      // check if data exceeds a sort buffer. If so, it store the remain data into a chunk.
+      long start = System.currentTimeMillis();
+      int rowNum = inMemoryTable.size();
+      chunkPaths.add(sortAndStoreChunk(chunkId, inMemoryTable));
+      long end = System.currentTimeMillis();
+      info(LOG, "Last Chunk #" + chunkId + " " + rowNum + " rows written (" + (end - start) + " msec)");
     }
 
     // get total loaded (or stored) bytes and total row numbers
@@ -285,7 +279,8 @@ public class ExternalSortExec extends SortExec {
         info(LOG, "Chunks creation time: " + (endTimeOfChunkSplit - startTimeOfChunkSplit) + " msec");
 
         if (memoryResident) { // if all sorted data reside in a main-memory table.
-          this.result = new MemTableScanner();
+          TupleSorter sorter = getSorter(inMemoryTable);
+          result = new MemTableScanner(sorter.sort(), inMemoryTable.size(), sortAndStoredBytes);
         } else { // if input data exceeds main-memory at least once
 
           try {
@@ -314,7 +309,7 @@ public class ExternalSortExec extends SortExec {
     return result.next();
   }
 
-  private int calculateFanout(int remainInputChunks, int intputNum, int outputNum, int startIdx) {
+  private int calculateFanout(int remainInputChunks, int inputNum, int outputNum, int startIdx) {
     int computedFanout = Math.min(remainInputChunks, defaultFanout);
 
     // Why should we detect an opportunity for unbalanced merge?
@@ -322,9 +317,9 @@ public class ExternalSortExec extends SortExec {
     // Assume that a fanout is given by 8 and there are 10 chunks.
     // If we firstly merge 3 chunks into one chunk, there remain only 8 chunks.
     // Then, we can just finish the merge phase even though we don't complete merge phase on all chunks.
-    if (checkIfCanBeUnbalancedMerged(intputNum - (startIdx + computedFanout), outputNum + 1)) {
+    if (checkIfCanBeUnbalancedMerged(inputNum - (startIdx + computedFanout), outputNum + 1)) {
       int candidateFanout = computedFanout;
-      while(checkIfCanBeUnbalancedMerged(intputNum - (startIdx + candidateFanout), outputNum + 1)) {
+      while (checkIfCanBeUnbalancedMerged(inputNum - (startIdx + candidateFanout), outputNum + 1)) {
         candidateFanout--;
       }
       int beforeFanout = computedFanout;
@@ -354,7 +349,7 @@ public class ExternalSortExec extends SortExec {
       int remainInputRuns = inputFiles.size();
       int outChunkId = 0;
       int outputFileNum = 0;
-      List<Future> futures = TUtil.newList();
+      List<Future<FileFragment>> futures = TUtil.newList();
       // the number of files being merged in threads.
       List<Integer> numberOfMergingFiles = TUtil.newList();
 
@@ -419,7 +414,7 @@ public class ExternalSortExec extends SortExec {
        */
       int numDeletedFiles = 0;
       for (FileFragment frag : inputFiles) {
-        if (frag.getTableName().contains(INTERMEDIATE_FILE_PREFIX) == true) {
+        if (frag.getTableName().contains(INTERMEDIATE_FILE_PREFIX)) {
           localFS.delete(frag.getPath(), true);
           numDeletedFiles++;
           LOG.info("Delete merged intermediate file: " + frag);
@@ -527,28 +522,38 @@ public class ExternalSortExec extends SortExec {
       throws IOException {
     if (num > 1) {
       final int mid = (int) Math.ceil((float)num / 2);
-      return new PairWiseMerger(inSchema,
-          createKWayMergerInternal(sources, startIdx, mid),
-          createKWayMergerInternal(sources, startIdx + mid, num - mid), getComparator());
+      Scanner left = createKWayMergerInternal(sources, startIdx, mid);
+      Scanner right = createKWayMergerInternal(sources, startIdx + mid, num - mid);
+      if (ComparableVector.isVectorizable(sortSpecs)) {
+        return new VectorComparePairWiseMerger(inSchema, left, right, comparator);
+      }
+      return new PairWiseMerger(inSchema, left, right, comparator);
     } else {
       return sources[startIdx];
     }
   }
 
-  private class MemTableScanner implements Scanner {
-    Iterator<Tuple> iterator;
+  private static class MemTableScanner extends AbstractScanner {
+    final Iterable<Tuple> iterable;
+    final long sortAndStoredBytes;
+    final int totalRecords;
 
+    Iterator<Tuple> iterator;
     // for input stats
     float scannerProgress;
     int numRecords;
-    int totalRecords;
     TableStats scannerTableStats;
 
+    public MemTableScanner(Iterable<Tuple> iterable, int length, long inBytes) {
+      this.iterable = iterable;
+      this.totalRecords = length;
+      this.sortAndStoredBytes = inBytes;
+    }
+
     @Override
     public void init() throws IOException {
-      iterator = inMemoryTable.iterator();
+      iterator = iterable.iterator();
 
-      totalRecords = inMemoryTable.size();
       scannerProgress = 0.0f;
       numRecords = 0;
 
@@ -581,34 +586,6 @@ public class ExternalSortExec extends SortExec {
     }
 
     @Override
-    public boolean isProjectable() {
-      return false;
-    }
-
-    @Override
-    public void setTarget(Column[] targets) {
-    }
-
-    @Override
-    public boolean isSelectable() {
-      return false;
-    }
-
-    @Override
-    public void setSearchCondition(Object expr) {
-    }
-
-    @Override
-    public boolean isSplittable() {
-      return false;
-    }
-
-    @Override
-    public Schema getSchema() {
-      return null;
-    }
-
-    @Override
     public float getProgress() {
       if (iterator != null && numRecords > 0) {
         return (float)numRecords / (float)totalRecords;
@@ -630,19 +607,43 @@ public class ExternalSortExec extends SortExec {
     CLOSED
   }
 
+  private static class VectorComparePairWiseMerger extends PairWiseMerger {
+
+    private ComparableVector comparable;
+
+    public VectorComparePairWiseMerger(Schema schema, Scanner leftScanner, Scanner rightScanner,
+                                       BaseTupleComparator comparator) throws IOException {
+      super(schema, leftScanner, rightScanner, null);
+      comparable = new ComparableVector(2, comparator.getSortSpecs(), comparator.getSortKeyIds());
+    }
+
+    @Override
+    protected Tuple prepare(int index, Tuple tuple) {
+      if (tuple != null) {
+        comparable.set(index, tuple);
+      }
+      return tuple;
+    }
+
+    @Override
+    protected int compare() {
+      return comparable.compare(0, 1);
+    }
+  }
+
   /**
    * Two-way merger scanner that reads two input sources and outputs one output tuples sorted in some order.
    */
-  private static class PairWiseMerger implements Scanner {
-    private Scanner leftScan;
-    private Scanner rightScan;
+  private static class PairWiseMerger extends AbstractScanner {
 
-    private VTuple outTuple;
-    private VTuple leftTuple;
-    private VTuple rightTuple;
+    protected final Schema schema;
+    protected final Comparator<Tuple> comparator;
 
-    private final Schema schema;
-    private final Comparator<Tuple> comparator;
+    protected final Scanner leftScan;
+    protected final Scanner rightScan;
+
+    private Tuple leftTuple;
+    private Tuple rightTuple;
 
     private float mergerProgress;
     private TableStats mergerInputStats;
@@ -679,74 +680,30 @@ public class ExternalSortExec extends SortExec {
     }
 
     private void prepareTuplesForFirstComparison() throws IOException {
-      Tuple lt = leftScan.next();
-      if (lt != null) {
-        leftTuple = new VTuple(lt);
-      } else {
-        leftTuple = null; // TODO - missed free
-      }
-
-      Tuple rt = rightScan.next();
-      if (rt != null) {
-        rightTuple = new VTuple(rt);
-      } else {
-        rightTuple = null; // TODO - missed free
-      }
+      leftTuple = prepare(0, leftScan.next());
+      rightTuple = prepare(1, rightScan.next());
     }
 
-    public Tuple next() throws IOException {
+    protected Tuple prepare(int index, Tuple tuple) {
+      return tuple == null ? null : new VTuple(tuple);
+    }
 
-      if (leftTuple != null && rightTuple != null) {
-        if (comparator.compare(leftTuple, rightTuple) < 0) {
-          outTuple = new VTuple(leftTuple);
+    protected int compare() {
+      return comparator.compare(leftTuple, rightTuple);
+    }
 
-          Tuple lt = leftScan.next();
-          if (lt != null) {
-            leftTuple = new VTuple(lt);
-          } else {
-            leftTuple = null; // TODO - missed free
-          }
-        } else {
-          outTuple = new VTuple(rightTuple);
-
-          Tuple rt = rightScan.next();
-          if (rt != null) {
-            rightTuple = new VTuple(rt);
-          } else {
-            rightTuple = null; // TODO - missed free
-          }
-        }
-        return outTuple;
+    public Tuple next() throws IOException {
+      if (leftTuple == null && rightTuple == null) {
+        return null;
       }
-
-      if (leftTuple == null) {
-        if (rightTuple != null) {
-          outTuple = new VTuple(rightTuple);
-        } else {
-          outTuple = null;
-        }
-
-        Tuple rt = rightScan.next();
-        if (rt != null) {
-          rightTuple = new VTuple(rt);
-        } else {
-          rightTuple = null; // TODO - missed free
-        }
-      } else {
-        if (leftTuple != null) {
-          outTuple = new VTuple(leftTuple);
-        } else {
-          outTuple = null;
-        }
-
-        Tuple lt = leftScan.next();
-        if (lt != null) {
-          leftTuple = new VTuple(lt);
-        } else {
-          leftTuple = null; // TODO - missed free
-        }
+      if (rightTuple == null || (leftTuple != null && compare() < 0)) {
+        Tuple tuple = leftTuple;
+        leftTuple = prepare(0, leftScan.next());
+        return tuple;
       }
-      return outTuple;
+      Tuple tuple = rightTuple;
+      rightTuple = prepare(1, rightScan.next());
+      return tuple;
     }
 
     @Override
@@ -755,7 +712,6 @@ public class ExternalSortExec extends SortExec {
         leftScan.reset();
         rightScan.reset();
 
-        outTuple = null;
         leftTuple = null;
         rightTuple = null;
 
@@ -765,39 +721,15 @@ public class ExternalSortExec extends SortExec {
       }
     }
 
+    @Override
     public void close() throws IOException {
       IOUtils.cleanup(LOG, leftScan, rightScan);
       getInputStats();
-      leftScan = null;
-      rightScan = null;
       mergerProgress = 1.0f;
       setState(State.CLOSED);
     }
 
     @Override
-    public boolean isProjectable() {
-      return false;
-    }
-
-    @Override
-    public void setTarget(Column[] targets) {
-    }
-
-    @Override
-    public boolean isSelectable() {
-      return false;
-    }
-
-    @Override
-    public void setSearchCondition(Object expr) {
-    }
-
-    @Override
-    public boolean isSplittable() {
-      return false;
-    }
-
-    @Override
     public Schema getSchema() {
       return schema;
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MemSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MemSortExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MemSortExec.java
index a2e039c..f76e356 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MemSortExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/MemSortExec.java
@@ -25,11 +25,10 @@ import org.apache.tajo.storage.VTuple;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-public class MemSortExec extends SortExec implements TupleSorter {
+public class MemSortExec extends SortExec {
   private SortNode plan;
   private List<Tuple> tupleSlots;
   private boolean sorted = false;
@@ -54,7 +53,7 @@ public class MemSortExec extends SortExec implements TupleSorter {
       while (!context.isStopped() && (tuple = child.next()) != null) {
         tupleSlots.add(new VTuple(tuple));
       }
-      iterator = getSorter().sort();
+      iterator = getSorter(tupleSlots).sort().iterator();
       sorted = true;
     }
 
@@ -65,14 +64,6 @@ public class MemSortExec extends SortExec implements TupleSorter {
     }
   }
 
-  private TupleSorter getSorter() {
-    try {
-      return new VectorizedSorter(tupleSlots, sortSpecs, comparator.getSortKeyIds());
-    } catch (Exception e) {
-      return this;
-    }
-  }
-
   @Override
   public void rescan() throws IOException {
     super.rescan();
@@ -92,10 +83,4 @@ public class MemSortExec extends SortExec implements TupleSorter {
   public SortNode getPlan() {
     return this.plan;
   }
-
-  @Override
-  public Iterator<Tuple> sort() {
-    Collections.sort(tupleSlots, comparator);
-    return tupleSlots.iterator();
-  }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SortExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SortExec.java
index fb6a3b2..28be9de 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SortExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SortExec.java
@@ -22,13 +22,14 @@ import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.catalog.SortSpec;
 import org.apache.tajo.storage.BaseTupleComparator;
 import org.apache.tajo.storage.Tuple;
-import org.apache.tajo.storage.TupleComparator;
 import org.apache.tajo.worker.TaskAttemptContext;
 
 import java.io.IOException;
 import java.util.Comparator;
+import java.util.List;
 
 public abstract class SortExec extends UnaryPhysicalExec {
+
   protected final BaseTupleComparator comparator;
   protected final SortSpec [] sortSpecs;
 
@@ -39,6 +40,13 @@ public abstract class SortExec extends UnaryPhysicalExec {
     this.comparator = new BaseTupleComparator(inSchema, sortSpecs);
   }
 
+  protected TupleSorter getSorter(List<Tuple> tupleSlots) {
+    if (!tupleSlots.isEmpty() && ComparableVector.isVectorizable(sortSpecs)) {
+      return new VectorizedSorter(tupleSlots, sortSpecs, comparator.getSortKeyIds());
+    }
+    return new TupleSorter.DefaultSorter(tupleSlots, comparator);
+  }
+
   public SortSpec[] getSortSpecs() {
     return sortSpecs;
   }

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/TupleSorter.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/TupleSorter.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/TupleSorter.java
index d240e4a..57fe816 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/TupleSorter.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/TupleSorter.java
@@ -19,9 +19,29 @@
 package org.apache.tajo.engine.planner.physical;
 
 import org.apache.tajo.storage.Tuple;
+import org.apache.tajo.storage.TupleComparator;
 
-import java.util.Iterator;
+import java.util.Collections;
+import java.util.List;
 
 public interface TupleSorter {
-  Iterator<Tuple> sort();
+
+  Iterable<Tuple> sort();
+
+  public static class DefaultSorter implements TupleSorter {
+
+    private final List<Tuple> target;
+    private final TupleComparator comparator;
+
+    public DefaultSorter(List<Tuple> target, TupleComparator comparator) {
+      this.target = target;
+      this.comparator = comparator;
+    }
+
+    @Override
+    public Iterable<Tuple> sort() {
+      Collections.sort(target, comparator);
+      return target;
+    }
+  }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/VectorizedSorter.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/VectorizedSorter.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/VectorizedSorter.java
index 891d104..18d853f 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/VectorizedSorter.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/VectorizedSorter.java
@@ -18,22 +18,12 @@
 
 package org.apache.tajo.engine.planner.physical;
 
-import com.google.common.primitives.Booleans;
-import com.google.common.primitives.Doubles;
-import com.google.common.primitives.Floats;
-import com.google.common.primitives.Ints;
-import com.google.common.primitives.Longs;
-import com.google.common.primitives.Shorts;
 import org.apache.hadoop.util.IndexedSortable;
 import org.apache.hadoop.util.QuickSort;
 import org.apache.tajo.catalog.SortSpec;
-import org.apache.tajo.common.TajoDataTypes;
-import org.apache.tajo.datum.Datum;
-import org.apache.tajo.datum.TextDatum;
 import org.apache.tajo.exception.UnsupportedException;
 import org.apache.tajo.storage.Tuple;
 
-import java.util.BitSet;
 import java.util.Iterator;
 import java.util.List;
 
@@ -41,26 +31,17 @@ import java.util.List;
  * Extract raw level values (primitive or String/byte[]) from each of key columns before sorting
  * Uses indirection for efficient swapping
  */
-public class VectorizedSorter implements IndexedSortable, TupleSorter {
+public class VectorizedSorter extends ComparableVector implements IndexedSortable, TupleSorter {
 
-  private final Tuple[] tuples;         // source tuples
-  private final TupleVector[] vectors;  // values of key columns
   private final int[] mappings;         // index indirection
 
   public VectorizedSorter(List<Tuple> source, SortSpec[] sortKeys, int[] keyIndex) {
-    this.tuples = source.toArray(new Tuple[source.size()]);
-    vectors = new TupleVector[sortKeys.length];
+    super(source.size(), sortKeys, keyIndex);
+    source.toArray(tuples);   // wish it's array list
     mappings = new int[tuples.length];
-    for (int i = 0; i < vectors.length; i++) {
-      TajoDataTypes.Type type = sortKeys[i].getSortKey().getDataType().getType();
-      boolean nullFirst = sortKeys[i].isNullFirst();
-      boolean ascending = sortKeys[i].isAscending();
-      boolean nullInvert = nullFirst && ascending || !nullFirst && !ascending;
-      vectors[i] = new TupleVector(TupleVector.getType(type), tuples.length, nullInvert, ascending);
-    }
     for (int i = 0; i < tuples.length; i++) {
       for (int j = 0; j < keyIndex.length; j++) {
-        vectors[j].add(tuples[i].get(keyIndex[j]));
+        vectors[j].append(tuples[i], keyIndex[j]);
       }
       mappings[i] = i;
     }
@@ -68,15 +49,7 @@ public class VectorizedSorter implements IndexedSortable, TupleSorter {
 
   @Override
   public int compare(int i1, int i2) {
-    final int index1 = mappings[i1];
-    final int index2 = mappings[i2];
-    for (TupleVector vector : vectors) {
-      int compare = vector.compare(index1, index2);
-      if (compare != 0) {
-        return compare;
-      }
-    }
-    return 0;
+    return super.compare(mappings[i1], mappings[i2]);
   }
 
   @Override
@@ -87,112 +60,18 @@ public class VectorizedSorter implements IndexedSortable, TupleSorter {
   }
 
   @Override
-  public Iterator<Tuple> sort() {
-    new QuickSort().sort(VectorizedSorter.this, 0, mappings.length);
-    return new Iterator<Tuple>() {
-      int index;
-      public boolean hasNext() { return index < mappings.length; }
-      public Tuple next() { return tuples[mappings[index++]]; }
-      public void remove() { throw new UnsupportedException(); }
-    };
-  }
-
-  private static class TupleVector {
-
-    private final int type;
-    private final BitSet nulls;
-    private final boolean nullInvert;
-    private final boolean ascending;
-
-    private boolean[] booleans;
-    private byte[] bits;
-    private short[] shorts;
-    private int[] ints;
-    private long[] longs;
-    private float[] floats;
-    private double[] doubles;
-    private byte[][] bytes;
-
-    private int index;
-
-    private TupleVector(int type, int length, boolean nullInvert, boolean ascending) {
-      this.type = type;
-      this.nulls = new BitSet(length);
-      this.nullInvert = nullInvert;
-      this.ascending = ascending;
-      switch (type) {
-        case 0: booleans = new boolean[length]; break;
-        case 1: bits = new byte[length]; break;
-        case 2: shorts = new short[length]; break;
-        case 3: ints = new int[length]; break;
-        case 4: longs = new long[length]; break;
-        case 5: floats = new float[length]; break;
-        case 6: doubles = new double[length]; break;
-        case 7: bytes = new byte[length][]; break;
-        default:
-          throw new IllegalArgumentException();
-      }
-    }
-
-    private void add(Datum datum) {
-      if (datum.isNull()) {
-        nulls.set(index++);
-        return;
-      }
-      switch (type) {
-        case 0: booleans[index] = datum.asBool(); break;
-        case 1: bits[index] = datum.asByte(); break;
-        case 2: shorts[index] = datum.asInt2(); break;
-        case 3: ints[index] = datum.asInt4(); break;
-        case 4: longs[index] = datum.asInt8(); break;
-        case 5: floats[index] = datum.asFloat4(); break;
-        case 6: doubles[index] = datum.asFloat8(); break;
-        case 7: bytes[index] = datum.asByteArray(); break;
-        default:
-          throw new IllegalArgumentException();
-      }
-      index++;
-    }
-
-    private int compare(int index1, int index2) {
-      final boolean n1 = nulls.get(index1);
-      final boolean n2 = nulls.get(index2);
-      if (n1 && n2) {
-        return 0;
-      }
-      if (n1 ^ n2) {
-        int compVal = n1 ? 1 : -1;
-        return nullInvert ? -compVal : compVal;
+  public Iterable<Tuple> sort() {
+    new QuickSort().sort(this, 0, mappings.length);
+    return new Iterable<Tuple>() {
+      @Override
+      public Iterator<Tuple> iterator() {
+        return new Iterator<Tuple>() {
+          int index;
+          public boolean hasNext() { return index < mappings.length; }
+          public Tuple next() { return tuples[mappings[index++]]; }
+          public void remove() { throw new UnsupportedException(); }
+        };
       }
-      int compare;
-      switch (type) {
-        case 0: compare = Booleans.compare(booleans[index1], booleans[index2]); break;
-        case 1: compare = bits[index1] - bits[index2]; break;
-        case 2: compare = Shorts.compare(shorts[index1], shorts[index2]); break;
-        case 3: compare = Ints.compare(ints[index1], ints[index2]); break;
-        case 4: compare = Longs.compare(longs[index1], longs[index2]); break;
-        case 5: compare = Floats.compare(floats[index1], floats[index2]); break;
-        case 6: compare = Doubles.compare(doubles[index1], doubles[index2]); break;
-        case 7: compare = TextDatum.COMPARATOR.compare(bytes[index1], bytes[index2]); break;
-        default:
-          throw new IllegalArgumentException();
-      }
-      return ascending ? compare : -compare;
-    }
-
-    public static int getType(TajoDataTypes.Type type) {
-      switch (type) {
-        case BOOLEAN: return 0;
-        case BIT: case INT1: return 1;
-        case INT2: return 2;
-        case INT4: case DATE: case INET4: return 3;
-        case INT8: case TIME: case TIMESTAMP: case INTERVAL: return 4;
-        case FLOAT4: return 5;
-        case FLOAT8: return 6;
-        case TEXT: case CHAR: case BLOB: return 7;
-      }
-      // todo
-      throw new UnsupportedException(type.name());
-    }
+    };
   }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
index 5d9d46d..946e0f3 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
@@ -61,7 +61,7 @@ public class TestExternalSortExec {
   private LogicalPlanner planner;
   private Path testDir;
 
-  private final int numTuple = 100000;
+  private final int numTuple = 3000000;
   private Random rnd = new Random(System.currentTimeMillis());
 
   private TableDesc employee;
@@ -161,7 +161,7 @@ public class TestExternalSortExec {
       if (preVal != null) {
         assertTrue("prev: " + preVal + ", but cur: " + curVal, comparator.compare(preVal, curVal) <= 0);
       }
-      preVal = curVal;
+      preVal = new VTuple(curVal);
       cnt++;
     }
     long end = System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestTupleSorter.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestTupleSorter.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestTupleSorter.java
index fc43d42..9cc477a 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestTupleSorter.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestTupleSorter.java
@@ -93,7 +93,7 @@ public class TestTupleSorter {
 
       long start = System.currentTimeMillis();
       VectorizedSorter sorter = new VectorizedSorter(target, sortKeys, keyIndices);
-      Iterator<Tuple> iterator = sorter.sort();
+      Iterator<Tuple> iterator = sorter.sort().iterator();
 
       String[] result1 = new String[SAMPLING];
       for (int i = 0; i < result1.length; i++) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk1.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk1.sql b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk1.sql
index 5451b4a..111a371 100644
--- a/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk1.sql
+++ b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk1.sql
@@ -1 +1 @@
-select region.*, customer.* from region, customer order by r_regionkey,r_name;
\ No newline at end of file
+select region.*, customer.* from region, customer order by r_regionkey,r_name,c_custkey;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk2.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk2.sql b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk2.sql
index e9dac51..ca1672e 100644
--- a/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk2.sql
+++ b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk2.sql
@@ -1 +1 @@
-select region.*, customer.* from customer, region order by r_regionkey,r_name;
\ No newline at end of file
+select region.*, customer.* from customer, region order by r_regionkey,r_name,c_custkey;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk3.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk3.sql b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk3.sql
index c98e19f..fd44916 100644
--- a/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk3.sql
+++ b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk3.sql
@@ -1 +1 @@
-select * from customer, region order by c_custkey,c_name;
\ No newline at end of file
+select * from customer, region order by c_custkey,c_name,r_regionkey;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk4.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk4.sql b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk4.sql
index 7130def..fc5b1c3 100644
--- a/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk4.sql
+++ b/tajo-core/src/test/resources/queries/TestJoinBroadcast/testCrossJoinWithAsterisk4.sql
@@ -1 +1 @@
-select length(r_comment) as len, *, c_custkey*10 from customer, region order by len,r_regionkey,r_name;
\ No newline at end of file
+select length(r_comment) as len, *, c_custkey*10 from customer, region order by len,r_regionkey,r_name,c_custkey;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/queries/TestJoinQuery/testComplexJoinCondition7.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testComplexJoinCondition7.sql b/tajo-core/src/test/resources/queries/TestJoinQuery/testComplexJoinCondition7.sql
index ddd669c..d2114cf 100644
--- a/tajo-core/src/test/resources/queries/TestJoinQuery/testComplexJoinCondition7.sql
+++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testComplexJoinCondition7.sql
@@ -3,4 +3,4 @@ select
   n1.n_name,
   n2.n_name
 from nation n1 join (select * from nation union select * from nation) n2 on substr(n1.n_name, 1, 4) = substr(n2.n_name, 1, 4)
-order by n1.n_nationkey;
\ No newline at end of file
+order by n1.n_nationkey,n2.n_name;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk1.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk1.sql b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk1.sql
index 5451b4a..111a371 100644
--- a/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk1.sql
+++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk1.sql
@@ -1 +1 @@
-select region.*, customer.* from region, customer order by r_regionkey,r_name;
\ No newline at end of file
+select region.*, customer.* from region, customer order by r_regionkey,r_name,c_custkey;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk2.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk2.sql b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk2.sql
index e9dac51..ca1672e 100644
--- a/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk2.sql
+++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk2.sql
@@ -1 +1 @@
-select region.*, customer.* from customer, region order by r_regionkey,r_name;
\ No newline at end of file
+select region.*, customer.* from customer, region order by r_regionkey,r_name,c_custkey;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk3.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk3.sql b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk3.sql
index c98e19f..fd44916 100644
--- a/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk3.sql
+++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk3.sql
@@ -1 +1 @@
-select * from customer, region order by c_custkey,c_name;
\ No newline at end of file
+select * from customer, region order by c_custkey,c_name,r_regionkey;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk4.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk4.sql b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk4.sql
index 7130def..fc5b1c3 100644
--- a/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk4.sql
+++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testCrossJoinWithAsterisk4.sql
@@ -1 +1 @@
-select length(r_comment) as len, *, c_custkey*10 from customer, region order by len,r_regionkey,r_name;
\ No newline at end of file
+select length(r_comment) as len, *, c_custkey*10 from customer, region order by len,r_regionkey,r_name,c_custkey;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithJson.json
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithJson.json b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithJson.json
index bfccc6c..f6b34cd 100644
--- a/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithJson.json
+++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithJson.json
@@ -63,6 +63,14 @@
                 },
                 "IsAsc": true,
                 "IsNullFirst": false
+            },
+            {
+                "SortKey": {
+                    "ColumnName": "c_custkey",
+                    "OpType": "Column"
+                },
+                "IsAsc": true,
+                "IsNullFirst": false
             }
         ],
         "Expr": {

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-core/src/test/resources/results/TestJoinQuery/testComplexJoinCondition7.result
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/results/TestJoinQuery/testComplexJoinCondition7.result b/tajo-core/src/test/resources/results/TestJoinQuery/testComplexJoinCondition7.result
index edd83cd..bed2968 100644
--- a/tajo-core/src/test/resources/results/TestJoinQuery/testComplexJoinCondition7.result
+++ b/tajo-core/src/test/resources/results/TestJoinQuery/testComplexJoinCondition7.result
@@ -47,10 +47,10 @@ n_nationkey,n_name,n_name
 22,RUSSIA,RUSSIA
 22,RUSSIA,RUSSIA
 23,UNITED KINGDOM,UNITED KINGDOM
-23,UNITED KINGDOM,UNITED STATES
 23,UNITED KINGDOM,UNITED KINGDOM
 23,UNITED KINGDOM,UNITED STATES
+23,UNITED KINGDOM,UNITED STATES
 24,UNITED STATES,UNITED KINGDOM
-24,UNITED STATES,UNITED STATES
 24,UNITED STATES,UNITED KINGDOM
+24,UNITED STATES,UNITED STATES
 24,UNITED STATES,UNITED STATES
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/AbstractScanner.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/AbstractScanner.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/AbstractScanner.java
new file mode 100644
index 0000000..3719412
--- /dev/null
+++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/AbstractScanner.java
@@ -0,0 +1,80 @@
+/**
+ * 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.storage;
+
+import org.apache.tajo.catalog.Column;
+import org.apache.tajo.catalog.Schema;
+import org.apache.tajo.catalog.statistics.TableStats;
+
+import java.io.IOException;
+
+// dummy scanner
+public abstract class AbstractScanner implements Scanner {
+
+  @Override
+  public void init() throws IOException {
+
+  }
+
+  @Override
+  public void reset() throws IOException {
+  }
+
+  @Override
+  public void close() throws IOException {
+  }
+
+  @Override
+  public boolean isProjectable() {
+    return false;
+  }
+
+  @Override
+  public void setTarget(Column[] targets) {
+  }
+
+  @Override
+  public boolean isSelectable() {
+    return false;
+  }
+
+  @Override
+  public void setSearchCondition(Object expr) {
+  }
+
+  @Override
+  public boolean isSplittable() {
+    return false;
+  }
+
+  @Override
+  public float getProgress() {
+    return 0;
+  }
+
+  @Override
+  public TableStats getInputStats() {
+    return null;
+  }
+
+  @Override
+  public Schema getSchema() {
+    return null;
+  }
+}

http://git-wip-us.apache.org/repos/asf/tajo/blob/6e7f1c7b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/MemoryUtil.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/MemoryUtil.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/MemoryUtil.java
index f19b61f..16477cd 100644
--- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/MemoryUtil.java
+++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/MemoryUtil.java
@@ -141,6 +141,10 @@ public class MemoryUtil {
         total += TEXT_DATUM + datum.size();
         break;
 
+      case BLOB:
+        total += BLOB_DATUM + datum.size();
+        break;
+
       case DATE:
         total += DATE_DATUM;
         break;


[4/7] tajo git commit: TAJO-1495: Clean up CatalogStore. (jaehwa)

Posted by ji...@apache.org.
TAJO-1495: Clean up CatalogStore. (jaehwa)

Closes #491


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/bda2d623
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/bda2d623
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/bda2d623

Branch: refs/heads/index_support
Commit: bda2d6236df1db352206e831b0da93b31de701bf
Parents: d6735fb
Author: JaeHwa Jung <bl...@apache.org>
Authored: Thu Apr 2 18:08:52 2015 +0900
Committer: JaeHwa Jung <bl...@apache.org>
Committed: Thu Apr 2 18:08:52 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |   2 +
 .../store/AbstractMySQLMariaDBStore.java        | 311 -------------------
 .../apache/tajo/catalog/store/MariaDBStore.java |  26 +-
 .../apache/tajo/catalog/store/MySQLStore.java   |  29 +-
 .../src/main/resources/schemas/common/meta.sql  |   1 -
 .../src/main/resources/schemas/derby/derby.xml  |  14 +-
 .../main/resources/schemas/mariadb/columns.sql  |  10 -
 .../resources/schemas/mariadb/databases.sql     |   7 -
 .../main/resources/schemas/mariadb/indexes.sql  |  16 -
 .../main/resources/schemas/mariadb/mariadb.xml  | 161 ++++++++++
 .../schemas/mariadb/partition_keys.sql          |   6 -
 .../schemas/mariadb/partition_methods.sql       |   7 -
 .../resources/schemas/mariadb/partitions.sql    |   7 -
 .../main/resources/schemas/mariadb/stats.sql    |   6 -
 .../schemas/mariadb/table_properties.sql        |   7 -
 .../main/resources/schemas/mariadb/tables.sql   |  11 -
 .../resources/schemas/mariadb/tablespaces.sql   |   7 -
 .../main/resources/schemas/mysql/columns.sql    |  10 -
 .../main/resources/schemas/mysql/databases.sql  |   7 -
 .../main/resources/schemas/mysql/indexes.sql    |  16 -
 .../src/main/resources/schemas/mysql/mysql.xml  | 162 ++++++++++
 .../resources/schemas/mysql/partition_keys.sql  |   6 -
 .../schemas/mysql/partition_methods.sql         |   7 -
 .../main/resources/schemas/mysql/partitions.sql |   7 -
 .../src/main/resources/schemas/mysql/stats.sql  |   6 -
 .../schemas/mysql/table_properties.sql          |   7 -
 .../src/main/resources/schemas/mysql/tables.sql |  11 -
 .../resources/schemas/mysql/tablespaces.sql     |   7 -
 .../main/resources/schemas/oracle/oracle.xml    |  19 +-
 .../resources/schemas/postgresql/postgresql.xml |  26 +-
 30 files changed, 384 insertions(+), 535 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 71c5159..6eca36d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,8 @@ Release 0.11.0 - unreleased
     (jihun)
 
   IMPROVEMENT
+
+    TAJO-1495: Clean up CatalogStore. (jaehwa)
    
     TAJO-1460: Apply TAJO-1407 to ExternalSortExec. (Contributed by navis, 
     Committed by hyoungjun)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractMySQLMariaDBStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractMySQLMariaDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractMySQLMariaDBStore.java
deleted file mode 100644
index 6f1b765..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractMySQLMariaDBStore.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/**
- * 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.catalog.store;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.exception.CatalogException;
-import org.apache.tajo.exception.InternalException;
-
-import java.sql.*;
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class AbstractMySQLMariaDBStore extends AbstractDBStore  {
-  protected String getCatalogDriverName(){
-    throw new CatalogException("you can't use this directly.");
-  }
-
-  public AbstractMySQLMariaDBStore(final Configuration conf) throws InternalException {
-    super(conf);
-  }
-
-  @Override
-  public int getDriverVersion() {
-    throw new CatalogException("you can't use this directly.");
-  }
-
-  protected Connection createConnection(Configuration conf) throws SQLException {
-    Connection con = DriverManager.getConnection(getCatalogUri(), this.connectionId,
-        this.connectionPassword);
-    //TODO con.setAutoCommit(false);
-    return con;
-  }
-
-  @Override
-  protected boolean isConnValid(int timeout) throws CatalogException {
-    boolean isValid = false;
-
-    try {
-      isValid = super.isConnValid(timeout);
-    } catch (NullPointerException e) {
-      LOG.info("Conn abortion when checking isValid; retrieve false to create another Conn.");
-    }
-    return isValid;
-  }
-
-  @Override
-  public String readSchemaFile(String filename) throws CatalogException {
-      return super.readSchemaFile(filename);
-  }
-
-  // TODO - DDL and index statements should be renamed
-  @Override
-  protected void createBaseTable() throws CatalogException {
-    Statement stmt = null;
-    Connection conn = null;
-
-    try {
-      conn = getConnection();
-      stmt = conn.createStatement();
-
-
-      // META
-      if (!baseTableMaps.get(TB_META)) {
-        String sql = super.readSchemaFile("common/meta.sql");
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql.toString());
-        }
-
-        stmt.executeUpdate(sql.toString());
-        LOG.info("Table '" + TB_META + " is created.");
-        baseTableMaps.put(TB_META, true);
-      }
-
-      // TABLE SPACES
-      if (!baseTableMaps.get(TB_SPACES)) {
-        String sql = readSchemaFile("tablespaces.sql");
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql);
-        }
-
-        stmt.executeUpdate(sql);
-
-        LOG.info("Table '" + TB_SPACES + "' is created.");
-        baseTableMaps.put(TB_SPACES, true);
-      }
-
-      // DATABASES
-      if (!baseTableMaps.get(TB_DATABASES)) {
-        String sql = readSchemaFile("databases.sql");
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql);
-        }
-        LOG.info("Table '" + TB_DATABASES + "' is created.");
-        baseTableMaps.put(TB_DATABASES, true);
-        stmt.executeUpdate(sql);
-      }
-
-      // TABLES
-      if (!baseTableMaps.get(TB_TABLES)) {
-        String sql = readSchemaFile("tables.sql");
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql);
-        }
-        stmt.executeUpdate(sql);
-        LOG.info("Table '" + TB_TABLES + "' is created.");
-        baseTableMaps.put(TB_TABLES, true);
-      }
-
-      // COLUMNS
-      if (!baseTableMaps.get(TB_COLUMNS)) {
-        String sql = readSchemaFile("columns.sql");
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql);
-        }
-
-        stmt.executeUpdate(sql.toString());
-        LOG.info("Table '" + TB_COLUMNS + " is created.");
-        baseTableMaps.put(TB_COLUMNS, true);
-      }
-
-      // OPTIONS
-      if (!baseTableMaps.get(TB_OPTIONS)) {
-        String sql = readSchemaFile("table_properties.sql");
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql.toString());
-        }
-
-        stmt.executeUpdate(sql.toString());
-        LOG.info("Table '" + TB_OPTIONS + " is created.");
-        baseTableMaps.put(TB_OPTIONS, true);
-      }
-
-      // INDEXES
-      if (!baseTableMaps.get(TB_INDEXES)) {
-        String sql = readSchemaFile("indexes.sql");
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql.toString());
-        }
-
-        stmt.executeUpdate(sql.toString());
-        LOG.info("Table '" + TB_INDEXES + "' is created.");
-        baseTableMaps.put(TB_INDEXES, true);
-      }
-
-      if (!baseTableMaps.get(TB_STATISTICS)) {
-        String sql = readSchemaFile("stats.sql");
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql.toString());
-        }
-
-        stmt.executeUpdate(sql.toString());
-        LOG.info("Table '" + TB_STATISTICS + "' is created.");
-        baseTableMaps.put(TB_STATISTICS, true);
-      }
-
-      // PARTITION_METHODS
-      if (!baseTableMaps.get(TB_PARTITION_METHODS)) {
-        String sql = readSchemaFile("partition_methods.sql");
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql);
-        }
-
-        stmt.executeUpdate(sql);
-        LOG.info("Table '" + TB_PARTITION_METHODS + "' is created.");
-        baseTableMaps.put(TB_PARTITION_METHODS, true);
-      }
-
-      // PARTITIONS
-      if (!baseTableMaps.get(TB_PARTTIONS)) {
-        String sql = readSchemaFile("partitions.sql");
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql.toString());
-        }
-
-        stmt.executeUpdate(sql.toString());
-        LOG.info("Table '" + TB_PARTTIONS + "' is created.");
-        baseTableMaps.put(TB_PARTTIONS, true);
-      }
-
-      // PARTITION_KEYS
-      if (!baseTableMaps.get(TB_PARTTION_KEYS)) {
-        String sql = readSchemaFile("partition_keys.sql");
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql.toString());
-        }
-
-        stmt.executeUpdate(sql.toString());
-        LOG.info("Table '" + TB_PARTTION_KEYS + "' is created.");
-        baseTableMaps.put(TB_PARTTION_KEYS, true);
-      }
-
-      insertSchemaVersion();
-
-    } catch (SQLException se) {
-      throw new CatalogException("failed to create base tables for MySQL catalog store", se);
-    } finally {
-      CatalogUtil.closeQuietly(stmt);
-    }
-  }
-
-  @Override
-  protected void dropBaseTable() throws CatalogException {
-    Connection conn = null;
-    Statement stmt = null;
-    Map<String, Boolean> droppedTable = new HashMap<String, Boolean>();
-
-    try {
-      conn = getConnection();
-      stmt = conn.createStatement();
-      StringBuilder sql = new StringBuilder();
-
-      for(Map.Entry<String, Boolean> entry : baseTableMaps.entrySet()) {
-        if(entry.getValue() && !entry.getKey().equals(TB_TABLES)) {
-          sql.delete(0, sql.length());
-          sql.append("DROP TABLE ").append(entry.getKey());
-          stmt.addBatch(sql.toString());
-          droppedTable.put(entry.getKey(), true);
-        }
-      }
-      if(baseTableMaps.get(TB_TABLES)) {
-        sql.delete(0, sql.length());
-        sql.append("DROP TABLE ").append(TB_TABLES);
-        stmt.addBatch(sql.toString());
-        droppedTable.put(TB_TABLES, true);
-      }
-      stmt.executeBatch();
-
-      for(String tableName : droppedTable.keySet()) {
-        LOG.info("Table '" + tableName + "' is dropped");
-      }
-    } catch (SQLException se) {
-      throw new CatalogException(se);
-    } finally {
-      CatalogUtil.closeQuietly(stmt);
-    }
-  }
-
-  @Override
-  protected boolean isInitialized() throws CatalogException {
-    Connection conn;
-    ResultSet res = null;
-
-    try {
-      conn = getConnection();
-      res = conn.getMetaData().getTables(null, null, null,
-          new String[]{"TABLE"});
-
-      baseTableMaps.put(TB_META, false);
-      baseTableMaps.put(TB_SPACES, false);
-      baseTableMaps.put(TB_DATABASES, false);
-      baseTableMaps.put(TB_TABLES, false);
-      baseTableMaps.put(TB_COLUMNS, false);
-      baseTableMaps.put(TB_OPTIONS, false);
-      baseTableMaps.put(TB_STATISTICS, false);
-      baseTableMaps.put(TB_INDEXES, false);
-      baseTableMaps.put(TB_PARTITION_METHODS, false);
-      baseTableMaps.put(TB_PARTTIONS, false);
-      baseTableMaps.put(TB_PARTTION_KEYS, false);
-
-      if (res.wasNull())
-        return false;
-
-      while (res.next()) {
-        // if my.cnf has lower_case_table_names = 1,
-        // TABLE_NAME returns lower case even it created by upper case.
-        baseTableMaps.put(res.getString("TABLE_NAME").toUpperCase(), true);
-      }
-
-      for(Map.Entry<String, Boolean> entry : baseTableMaps.entrySet()) {
-        if (!entry.getValue()) {
-          return false;
-        }
-      }
-
-    } catch(SQLException se) {
-      throw new CatalogException(se);
-    } finally {
-      CatalogUtil.closeQuietly(res);
-    }
-
-    return  true;
-  }
-}

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java
index 0159b31..cb661ac 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java
@@ -25,29 +25,33 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.tajo.catalog.exception.CatalogException;
 import org.apache.tajo.exception.InternalException;
 
-public class MariaDBStore extends AbstractMySQLMariaDBStore {
-  /** 3 - 2015-03-12: Nested Schema (TAJO-1329) */
-  /** 2 - First versioning */
-  private static final int MARIADB_CATALOG_STORE_VERSION = 3;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
 
+public class MariaDBStore extends AbstractDBStore {
   private static final String CATALOG_DRIVER = "org.mariadb.jdbc.Driver";
 
+  public MariaDBStore(Configuration conf) throws InternalException {
+    super(conf);
+  }
+
   @Override
-  protected String getCatalogDriverName(){
+  protected String getCatalogDriverName() {
     return CATALOG_DRIVER;
   }
 
-  public MariaDBStore(final Configuration conf) throws InternalException {
-    super(conf);
+  @Override
+  protected String getCatalogSchemaPath() {
+    return "schemas/mariadb";
   }
 
   @Override
-  public int getDriverVersion() {
-    return MARIADB_CATALOG_STORE_VERSION;
+  protected Connection createConnection(Configuration conf) throws SQLException {
+    return DriverManager.getConnection(getCatalogUri(), this.connectionId, this.connectionPassword);
   }
 
   @Override
-  public String readSchemaFile(String filename) throws CatalogException {
-    return super.readSchemaFile("mariadb/" + filename);
+  protected void createDatabaseDependants() throws CatalogException {
   }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java
index f7f1b1b..d6e902a 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java
@@ -25,30 +25,33 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.tajo.catalog.exception.CatalogException;
 import org.apache.tajo.exception.InternalException;
 
-public class MySQLStore extends AbstractMySQLMariaDBStore  {
-
-  /** 3 - 2015-03-12: Nested Schema (TAJO-1329) */
-  /** 2 - 2014-06-09: First versioning */
-  /** 1-  Before 2013-03-20 */
-  private static final int MYSQL_CATALOG_STORE_VERSION = 3;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
 
+public class MySQLStore extends AbstractDBStore {
   private static final String CATALOG_DRIVER = "com.mysql.jdbc.Driver";
+
+  public MySQLStore(Configuration conf) throws InternalException {
+    super(conf);
+  }
+
   @Override
-  protected String getCatalogDriverName(){
+  protected String getCatalogDriverName() {
     return CATALOG_DRIVER;
   }
 
-  public MySQLStore(final Configuration conf) throws InternalException {
-    super(conf);
+  @Override
+  protected String getCatalogSchemaPath() {
+    return "schemas/mysql";
   }
 
   @Override
-  public int getDriverVersion() {
-    return MYSQL_CATALOG_STORE_VERSION;
+  protected Connection createConnection(Configuration conf) throws SQLException {
+    return DriverManager.getConnection(getCatalogUri(), this.connectionId, this.connectionPassword);
   }
 
   @Override
-  public String readSchemaFile(String filename) throws CatalogException {
-    return super.readSchemaFile("mysql/" + filename);
+  protected void createDatabaseDependants() throws CatalogException {
   }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/common/meta.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/common/meta.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/common/meta.sql
deleted file mode 100644
index 066c5f8..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/common/meta.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE TABLE META (VERSION INT NOT NULL)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
index a239e68..a4ff00f 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
@@ -17,12 +17,14 @@
   limitations under the License.
   -->
 <tns:store xmlns:tns="http://tajo.apache.org/catalogstore" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd ">
-
-  <!-- Version History -->
-  <!-- 3 - 2015-03-12: Nested Schema (TAJO-1329) -->
-  <!-- 2 - First versioning -->
-
-	<tns:base version="3">
+  <!--
+      Catalog base version history
+      * 4 - 2015-03-27: Partition Schema (TAJO-1284)
+      * 3 - 2015-03-12: Nested Schema (TAJO-1329)
+      * 2 - 2014-06-09: First versioning
+      * 1-  Before 2013-03-20
+    -->
+	<tns:base version="4">
 		<tns:objects>
 			<tns:Object order="0" type="table" name="META">
 				<tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql>

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/columns.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/columns.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/columns.sql
deleted file mode 100644
index 5b8ed26..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/columns.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE COLUMNS (
-  TID INT NOT NULL,
-  COLUMN_NAME VARCHAR(255) BINARY NOT NULL,
-  ORDINAL_POSITION INT NOT NULL,
-  NESTED_FIELD_NUM INT NOT NULL,
-  DATA_TYPE CHAR(16),
-  TYPE_LENGTH INTEGER,
-  PRIMARY KEY (TID, ORDINAL_POSITION),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/databases.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/databases.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/databases.sql
deleted file mode 100644
index 2f351cf..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/databases.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE DATABASES_ (
-  DB_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  DB_NAME VARCHAR(128) BINARY NOT NULL UNIQUE,
-  SPACE_ID INT NOT NULL,
-  FOREIGN KEY (SPACE_ID) REFERENCES TABLESPACES (SPACE_ID),
-  UNIQUE INDEX IDX_NAME (DB_NAME)
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql
deleted file mode 100644
index f58b17c..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-CREATE TABLE INDEXES (
-  DB_ID INT NOT NULL,
-  TID INT NOT NULL,
-  INDEX_NAME VARCHAR(128) BINARY NOT NULL,
-  COLUMN_NAME VARCHAR(128) BINARY NOT NULL,
-  DATA_TYPE VARCHAR(128) NOT NULL,
-  INDEX_TYPE CHAR(32) NOT NULL,
-  IS_UNIQUE BOOLEAN NOT NULL,
-  IS_CLUSTERED BOOLEAN NOT NULL,
-  IS_ASCENDING BOOLEAN NOT NULL,
-  PRIMARY KEY (DB_ID, INDEX_NAME),
-  FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID) ON DELETE CASCADE,
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE,
-  UNIQUE INDEX IDX_DB_ID_NAME (DB_ID, INDEX_NAME),
-  INDEX IDX_TID_COLUMN_NAME (TID, COLUMN_NAME)
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml
new file mode 100644
index 0000000..79ccd0a
--- /dev/null
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+  -->
+<tns:store xmlns:tns="http://tajo.apache.org/catalogstore" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd ">
+  <!--
+      Catalog base version history
+      * 4 - 2015-03-27: Partition Schema (TAJO-1284)
+      * 3 - 2015-03-12: Nested Schema (TAJO-1329)
+      * 2 - 2014-06-09: First versioning
+      * 1-  Before 2013-03-20
+    -->
+  <tns:base version="4">
+    <tns:objects>
+      <tns:Object order="0" type="table" name="META">
+        <tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql>
+      </tns:Object>
+      <tns:Object order="1" type="table" name="TABLESPACES">
+        <tns:sql><![CDATA[
+        CREATE TABLE TABLESPACES (
+          SPACE_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+          SPACE_NAME VARCHAR(128) BINARY NOT NULL UNIQUE,
+          SPACE_HANDLER VARCHAR (1024) DEFAULT 'HDFS',
+          SPACE_URI VARCHAR (4096) BINARY NOT NULL,
+          UNIQUE INDEX IDX_NAME (SPACE_NAME)
+				)]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="2" type="table" name="DATABASES_">
+        <tns:sql><![CDATA[
+        CREATE TABLE DATABASES_ (
+          DB_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+          DB_NAME VARCHAR(128) BINARY NOT NULL UNIQUE,
+          SPACE_ID INT NOT NULL,
+          FOREIGN KEY (SPACE_ID) REFERENCES TABLESPACES (SPACE_ID),
+          UNIQUE INDEX IDX_NAME (DB_NAME)
+				)]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="3" type="table" name="TABLES">
+        <tns:sql><![CDATA[
+        CREATE TABLE TABLES (
+          TID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+          DB_ID INT NOT NULL,
+          TABLE_NAME VARCHAR(128) BINARY NOT NULL,
+          TABLE_TYPE VARCHAR(128) NOT NULL,
+          PATH VARCHAR(4096) BINARY,
+          STORE_TYPE CHAR(16),
+          FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID),
+          INDEX IDX_DB_ID (DB_ID),
+          UNIQUE INDEX IDX_TABLE_ID (DB_ID, TABLE_NAME)
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="4" type="table" name="COLUMNS">
+        <tns:sql><![CDATA[
+        CREATE TABLE COLUMNS (
+          TID INT NOT NULL,
+          COLUMN_NAME VARCHAR(255) BINARY NOT NULL,
+          ORDINAL_POSITION INT NOT NULL,
+          NESTED_FIELD_NUM INT NOT NULL,
+          DATA_TYPE CHAR(16),
+          TYPE_LENGTH INTEGER,
+          PRIMARY KEY (TID, ORDINAL_POSITION),
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="5" type="table" name="OPTIONS">
+        <tns:sql><![CDATA[
+        CREATE TABLE OPTIONS (
+          TID INT NOT NULL,
+          KEY_ VARCHAR(255) BINARY NOT NULL,
+          VALUE_ VARCHAR(4000) NOT NULL,
+          PRIMARY KEY (TID, KEY_),
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="6" type="table" name="INDEXES">
+        <tns:sql><![CDATA[
+        CREATE TABLE INDEXES (
+          DB_ID INT NOT NULL,
+          TID INT NOT NULL,
+          INDEX_NAME VARCHAR(128) BINARY NOT NULL,
+          COLUMN_NAME VARCHAR(128) BINARY NOT NULL,
+          DATA_TYPE VARCHAR(128) NOT NULL,
+          INDEX_TYPE CHAR(32) NOT NULL,
+          IS_UNIQUE BOOLEAN NOT NULL,
+          IS_CLUSTERED BOOLEAN NOT NULL,
+          IS_ASCENDING BOOLEAN NOT NULL,
+          PRIMARY KEY (DB_ID, INDEX_NAME),
+          FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID) ON DELETE CASCADE,
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE,
+          UNIQUE INDEX IDX_DB_ID_NAME (DB_ID, INDEX_NAME),
+          INDEX IDX_TID_COLUMN_NAME (TID, COLUMN_NAME)
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="7" type="table" name="STATS">
+        <tns:sql><![CDATA[
+        CREATE TABLE STATS (
+          TID INT NOT NULL PRIMARY KEY,
+          NUM_ROWS BIGINT,
+          NUM_BYTES BIGINT,
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="8" type="table" name="PARTITION_METHODS">
+        <tns:sql><![CDATA[
+        CREATE TABLE PARTITION_METHODS (
+          TID INT NOT NULL PRIMARY KEY,
+          PARTITION_TYPE VARCHAR(10) NOT NULL,
+          EXPRESSION VARCHAR(1024) NOT NULL,
+          EXPRESSION_SCHEMA VARCHAR(1024) NOT NULL,
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="9" type="table" name="PARTITIONS">
+        <tns:sql><![CDATA[
+        CREATE TABLE PARTITIONS (
+          PARTITION_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+          TID INT NOT NULL,
+          PARTITION_NAME VARCHAR(255) BINARY,
+          PATH VARCHAR(4096) BINARY,
+          CONSTRAINT CONST_PARTITION_UNIQUE UNIQUE (PARTITION_NAME),
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="10" type="table" name="PARTITION_KEYS">
+        <tns:sql><![CDATA[
+        CREATE TABLE PARTITION_KEYS (
+          PARTITION_ID INT NOT NULL,
+          COLUMN_NAME VARCHAR(255) BINARY NOT NULL,
+          PARTITION_VALUE VARCHAR(255) BINARY NOT NULL,
+          UNIQUE INDEX PARTITION_KEYS_IDX (PARTITION_ID, COLUMN_NAME, PARTITION_VALUE),
+          FOREIGN KEY (PARTITION_ID) REFERENCES PARTITIONS (PARTITION_ID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+    </tns:objects>
+  </tns:base>
+
+</tns:store>

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_keys.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_keys.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_keys.sql
deleted file mode 100644
index 6f2f238..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_keys.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE PARTITION_KEYS (
-  PARTITION_ID INT NOT NULL,
-  COLUMN_NAME VARCHAR(255) BINARY NOT NULL,
-  PARTITION_VALUE VARCHAR(255) NOT NULL,
-  UNIQUE INDEX PARTITION_KEYS_IDX (PARTITION_ID, COLUMN_NAME, PARTITION_VALUE),
-  FOREIGN KEY (PARTITION_ID) REFERENCES PARTITIONS (PARTITION_ID) ON DELETE CASCADE)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_methods.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_methods.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_methods.sql
deleted file mode 100644
index 060c4c8..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_methods.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE PARTITION_METHODS (
-  TID INT NOT NULL PRIMARY KEY,
-  PARTITION_TYPE VARCHAR(10) NOT NULL,
-  EXPRESSION VARCHAR(1024) NOT NULL,
-  EXPRESSION_SCHEMA VARCHAR(1024) NOT NULL,
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partitions.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partitions.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partitions.sql
deleted file mode 100644
index 7b279af..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partitions.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE PARTITIONS (
-  PARTITION_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  TID INT NOT NULL,
-  PARTITION_NAME VARCHAR(767) BINARY,
-  PATH VARCHAR(4096),
-  UNIQUE INDEX PARTITIONS_IDX (PARTITION_ID, TID, PARTITION_NAME),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/stats.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/stats.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/stats.sql
deleted file mode 100644
index bba8ee7..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/stats.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE STATS (
-  TID INT NOT NULL PRIMARY KEY,
-  NUM_ROWS BIGINT,
-  NUM_BYTES BIGINT,
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql
deleted file mode 100644
index b9a84e0..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE OPTIONS (
-  TID INT NOT NULL,
-  KEY_ VARCHAR(255) BINARY NOT NULL,
-  VALUE_ VARCHAR(4000) NOT NULL,
-  PRIMARY KEY (TID, KEY_),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tables.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tables.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tables.sql
deleted file mode 100644
index a31f0e3..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tables.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE TABLE TABLES (
-  TID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  DB_ID INT NOT NULL,
-  TABLE_NAME VARCHAR(128) BINARY NOT NULL,
-  TABLE_TYPE VARCHAR(128) NOT NULL,
-  PATH VARCHAR(4096),
-  STORE_TYPE CHAR(16),
-  FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID),
-  INDEX IDX_DB_ID (DB_ID),
-  UNIQUE INDEX IDX_TABLE_ID (DB_ID, TABLE_NAME)
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tablespaces.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tablespaces.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tablespaces.sql
deleted file mode 100644
index ab3edaa..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tablespaces.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE TABLESPACES (
-  SPACE_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  SPACE_NAME VARCHAR(128) BINARY NOT NULL UNIQUE,
-  SPACE_HANDLER VARCHAR (1024) DEFAULT 'HDFS',
-  SPACE_URI VARCHAR (4096) NOT NULL,
-  UNIQUE INDEX IDX_NAME (SPACE_NAME)
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/columns.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/columns.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/columns.sql
deleted file mode 100644
index 5b8ed26..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/columns.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE COLUMNS (
-  TID INT NOT NULL,
-  COLUMN_NAME VARCHAR(255) BINARY NOT NULL,
-  ORDINAL_POSITION INT NOT NULL,
-  NESTED_FIELD_NUM INT NOT NULL,
-  DATA_TYPE CHAR(16),
-  TYPE_LENGTH INTEGER,
-  PRIMARY KEY (TID, ORDINAL_POSITION),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/databases.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/databases.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/databases.sql
deleted file mode 100644
index 2f351cf..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/databases.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE DATABASES_ (
-  DB_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  DB_NAME VARCHAR(128) BINARY NOT NULL UNIQUE,
-  SPACE_ID INT NOT NULL,
-  FOREIGN KEY (SPACE_ID) REFERENCES TABLESPACES (SPACE_ID),
-  UNIQUE INDEX IDX_NAME (DB_NAME)
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql
deleted file mode 100644
index f58b17c..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-CREATE TABLE INDEXES (
-  DB_ID INT NOT NULL,
-  TID INT NOT NULL,
-  INDEX_NAME VARCHAR(128) BINARY NOT NULL,
-  COLUMN_NAME VARCHAR(128) BINARY NOT NULL,
-  DATA_TYPE VARCHAR(128) NOT NULL,
-  INDEX_TYPE CHAR(32) NOT NULL,
-  IS_UNIQUE BOOLEAN NOT NULL,
-  IS_CLUSTERED BOOLEAN NOT NULL,
-  IS_ASCENDING BOOLEAN NOT NULL,
-  PRIMARY KEY (DB_ID, INDEX_NAME),
-  FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID) ON DELETE CASCADE,
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE,
-  UNIQUE INDEX IDX_DB_ID_NAME (DB_ID, INDEX_NAME),
-  INDEX IDX_TID_COLUMN_NAME (TID, COLUMN_NAME)
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml
new file mode 100644
index 0000000..34337fb
--- /dev/null
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+  -->
+<tns:store xmlns:tns="http://tajo.apache.org/catalogstore" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd ">
+  <!--
+    Catalog base version history
+    * 4 - 2015-03-27: Partition Schema (TAJO-1284)
+    * 3 - 2015-03-12: Nested Schema (TAJO-1329)
+    * 2 - 2014-06-09: First versioning
+    * 1-  Before 2013-03-20
+  -->
+  <tns:base version="4">
+    <tns:objects>
+      <tns:Object order="0" type="table" name="META">
+        <tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql>
+      </tns:Object>
+      <tns:Object order="1" type="table" name="TABLESPACES">
+        <tns:sql><![CDATA[
+        CREATE TABLE TABLESPACES (
+          SPACE_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+          SPACE_NAME VARCHAR(128) BINARY NOT NULL UNIQUE,
+          SPACE_HANDLER VARCHAR (1024) DEFAULT 'HDFS',
+          SPACE_URI VARCHAR (4096) BINARY NOT NULL,
+          UNIQUE INDEX IDX_NAME (SPACE_NAME)
+				)]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="2" type="table" name="DATABASES_">
+        <tns:sql><![CDATA[
+        CREATE TABLE DATABASES_ (
+          DB_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+          DB_NAME VARCHAR(128) BINARY NOT NULL UNIQUE,
+          SPACE_ID INT NOT NULL,
+          FOREIGN KEY (SPACE_ID) REFERENCES TABLESPACES (SPACE_ID),
+          UNIQUE INDEX IDX_NAME (DB_NAME)
+				)]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="3" type="table" name="TABLES">
+        <tns:sql><![CDATA[
+        CREATE TABLE TABLES (
+          TID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+          DB_ID INT NOT NULL,
+          TABLE_NAME VARCHAR(128) BINARY NOT NULL,
+          TABLE_TYPE VARCHAR(128) NOT NULL,
+          PATH VARCHAR(4096) BINARY,
+          STORE_TYPE CHAR(16),
+          FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID),
+          INDEX IDX_DB_ID (DB_ID),
+          UNIQUE INDEX IDX_TABLE_ID (DB_ID, TABLE_NAME)
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="4" type="table" name="COLUMNS">
+        <tns:sql><![CDATA[
+        CREATE TABLE COLUMNS (
+          TID INT NOT NULL,
+          COLUMN_NAME VARCHAR(255) BINARY NOT NULL,
+          ORDINAL_POSITION INT NOT NULL,
+          NESTED_FIELD_NUM INT NOT NULL,
+          DATA_TYPE CHAR(16),
+          TYPE_LENGTH INTEGER,
+          PRIMARY KEY (TID, ORDINAL_POSITION),
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="5" type="table" name="OPTIONS">
+        <tns:sql><![CDATA[
+        CREATE TABLE OPTIONS (
+          TID INT NOT NULL,
+          KEY_ VARCHAR(255) BINARY NOT NULL,
+          VALUE_ VARCHAR(4000) NOT NULL,
+          PRIMARY KEY (TID, KEY_),
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+
+      <tns:Object order="6" type="table" name="INDEXES">
+        <tns:sql><![CDATA[
+        CREATE TABLE INDEXES (
+          DB_ID INT NOT NULL,
+          TID INT NOT NULL,
+          INDEX_NAME VARCHAR(128) BINARY NOT NULL,
+          COLUMN_NAME VARCHAR(128) BINARY NOT NULL,
+          DATA_TYPE VARCHAR(128) NOT NULL,
+          INDEX_TYPE CHAR(32) NOT NULL,
+          IS_UNIQUE BOOLEAN NOT NULL,
+          IS_CLUSTERED BOOLEAN NOT NULL,
+          IS_ASCENDING BOOLEAN NOT NULL,
+          PRIMARY KEY (DB_ID, INDEX_NAME),
+          FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID) ON DELETE CASCADE,
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE,
+          UNIQUE INDEX IDX_DB_ID_NAME (DB_ID, INDEX_NAME),
+          INDEX IDX_TID_COLUMN_NAME (TID, COLUMN_NAME)
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="7" type="table" name="STATS">
+        <tns:sql><![CDATA[
+        CREATE TABLE STATS (
+          TID INT NOT NULL PRIMARY KEY,
+          NUM_ROWS BIGINT,
+          NUM_BYTES BIGINT,
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="8" type="table" name="PARTITION_METHODS">
+        <tns:sql><![CDATA[
+        CREATE TABLE PARTITION_METHODS (
+          TID INT NOT NULL PRIMARY KEY,
+          PARTITION_TYPE VARCHAR(10) NOT NULL,
+          EXPRESSION VARCHAR(1024) NOT NULL,
+          EXPRESSION_SCHEMA VARCHAR(1024) NOT NULL,
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="9" type="table" name="PARTITIONS">
+        <tns:sql><![CDATA[
+        CREATE TABLE PARTITIONS (
+          PARTITION_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+          TID INT NOT NULL,
+          PARTITION_NAME VARCHAR(255) BINARY,
+          PATH VARCHAR(4096) BINARY,
+          CONSTRAINT CONST_PARTITION_UNIQUE UNIQUE (PARTITION_NAME),
+          FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+      <tns:Object order="10" type="table" name="PARTITION_KEYS">
+        <tns:sql><![CDATA[
+        CREATE TABLE PARTITION_KEYS (
+          PARTITION_ID INT NOT NULL,
+          COLUMN_NAME VARCHAR(255) BINARY NOT NULL,
+          PARTITION_VALUE VARCHAR(255) BINARY NOT NULL,
+          UNIQUE INDEX PARTITION_KEYS_IDX (PARTITION_ID, COLUMN_NAME, PARTITION_VALUE),
+          FOREIGN KEY (PARTITION_ID) REFERENCES PARTITIONS (PARTITION_ID) ON DELETE CASCADE
+        )]]>
+        </tns:sql>
+      </tns:Object>
+    </tns:objects>
+  </tns:base>
+
+</tns:store>

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_keys.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_keys.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_keys.sql
deleted file mode 100644
index 6f2f238..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_keys.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE PARTITION_KEYS (
-  PARTITION_ID INT NOT NULL,
-  COLUMN_NAME VARCHAR(255) BINARY NOT NULL,
-  PARTITION_VALUE VARCHAR(255) NOT NULL,
-  UNIQUE INDEX PARTITION_KEYS_IDX (PARTITION_ID, COLUMN_NAME, PARTITION_VALUE),
-  FOREIGN KEY (PARTITION_ID) REFERENCES PARTITIONS (PARTITION_ID) ON DELETE CASCADE)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_methods.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_methods.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_methods.sql
deleted file mode 100644
index 060c4c8..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_methods.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE PARTITION_METHODS (
-  TID INT NOT NULL PRIMARY KEY,
-  PARTITION_TYPE VARCHAR(10) NOT NULL,
-  EXPRESSION VARCHAR(1024) NOT NULL,
-  EXPRESSION_SCHEMA VARCHAR(1024) NOT NULL,
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partitions.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partitions.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partitions.sql
deleted file mode 100644
index 7b279af..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partitions.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE PARTITIONS (
-  PARTITION_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  TID INT NOT NULL,
-  PARTITION_NAME VARCHAR(767) BINARY,
-  PATH VARCHAR(4096),
-  UNIQUE INDEX PARTITIONS_IDX (PARTITION_ID, TID, PARTITION_NAME),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/stats.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/stats.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/stats.sql
deleted file mode 100644
index bba8ee7..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/stats.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE STATS (
-  TID INT NOT NULL PRIMARY KEY,
-  NUM_ROWS BIGINT,
-  NUM_BYTES BIGINT,
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql
deleted file mode 100644
index b9a84e0..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE OPTIONS (
-  TID INT NOT NULL,
-  KEY_ VARCHAR(255) BINARY NOT NULL,
-  VALUE_ VARCHAR(4000) NOT NULL,
-  PRIMARY KEY (TID, KEY_),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tables.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tables.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tables.sql
deleted file mode 100644
index 0fe8bf2..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tables.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE TABLE TABLES (
-  TID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  DB_ID INT NOT NULL,
-  TABLE_NAME VARCHAR(128) BINARY NOT NULL,
-  TABLE_TYPE VARCHAR(128) NOT NULL,
-  PATH VARCHAR(4096) BINARY,
-  STORE_TYPE CHAR(16),
-  FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID),
-  INDEX IDX_DB_ID (DB_ID),
-  UNIQUE INDEX IDX_TABLE_ID (DB_ID, TABLE_NAME)
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tablespaces.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tablespaces.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tablespaces.sql
deleted file mode 100644
index 3cfbb40..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tablespaces.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE TABLESPACES (
-  SPACE_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  SPACE_NAME VARCHAR(128) BINARY NOT NULL UNIQUE,
-  SPACE_HANDLER VARCHAR (1024) DEFAULT 'HDFS',
-  SPACE_URI VARCHAR (4096) BINARY NOT NULL,
-  UNIQUE INDEX IDX_NAME (SPACE_NAME)
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
index 8c28b97..323e22c 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
@@ -17,12 +17,14 @@
   limitations under the License.
   -->
 <tns:store xmlns:tns="http://tajo.apache.org/catalogstore" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd ">
-
-  <!-- Version History -->
-  <!-- 3 - 2015-03-12: Nested Schema (TAJO-1329) -->
-  <!-- 2 - First versioning -->
-
-  <tns:base version="3">
+  <!--
+      Catalog base version history
+      * 4 - 2015-03-27: Partition Schema (TAJO-1284)
+      * 3 - 2015-03-12: Nested Schema (TAJO-1329)
+      * 2 - 2014-06-09: First versioning
+      * 1-  Before 2013-03-20
+    -->
+  <tns:base version="4">
     <tns:objects>
   		<tns:Object order="0" type="table" name="meta">
   			<tns:sql><![CDATA[
@@ -211,10 +213,7 @@
 				END;]]>
         </tns:sql>
       </tns:Object>
-  		<tns:Object order="21" type="index" name="PARTITIONS_IDX" dependsOn="PARTITIONS">
-  			<tns:sql><![CDATA[CREATE INDEX PARTITIONS_IDX on PARTITIONS (PARTITION_ID, TID, PARTITION_NAME)]]></tns:sql>
-  		</tns:Object>
-      <tns:Object order="22" type="table" name="PARTITION_KEYS">
+      <tns:Object order="21" type="table" name="PARTITION_KEYS">
         <tns:sql><![CDATA[
           CREATE TABLE PARTITION_KEYS (
             PARTITION_ID INT NOT NULL,

http://git-wip-us.apache.org/repos/asf/tajo/blob/bda2d623/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
index 56bc3a3..554acd5 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
@@ -19,12 +19,14 @@
 <tns:store xmlns:tns="http://tajo.apache.org/catalogstore" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd ">
-
-  <!-- Version History -->
-  <!-- 3 - 2015-03-12: Nested Schema (TAJO-1329) -->
-  <!-- 2 - First versioning -->
-
-	<tns:base version="3">
+  <!--
+      Catalog base version history
+      * 4 - 2015-03-27: Partition Schema (TAJO-1284)
+      * 3 - 2015-03-12: Nested Schema (TAJO-1329)
+      * 2 - 2014-06-09: First versioning
+      * 1-  Before 2013-03-20
+    -->
+	<tns:base version="4">
 		<tns:objects>
 			<tns:Object name="META" type="table" order="0">
 				<tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql>
@@ -154,17 +156,11 @@ xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.
   				PARTITION_VALUE VARCHAR(1024),
   				PATH VARCHAR(4096),
   				FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE,
-  				CONSTRAINT C_PARTITION_UNIQUE UNIQUE (TID, PARTITION_NAME)
+  				CONSTRAINT C_PARTITION_UNIQUE UNIQUE (PARTITION_NAME)
 				)]]>
 				</tns:sql>
 			</tns:Object>
-			<tns:Object name="PARTITIONS_IDX_TID" type="index" order="16" dependsOn="PARTITIONS">
-				<tns:sql><![CDATA[CREATE INDEX PARTITIONS_IDX_TID on PARTITIONS (TID)]]></tns:sql>
-			</tns:Object>
-			<tns:Object name="IDX_TID_NAME" type="index" order="17" dependsOn="PARTITIONS">
-				<tns:sql><![CDATA[CREATE UNIQUE INDEX IDX_TID_NAME on PARTITIONS (TID, PARTITION_NAME)]]></tns:sql>
-			</tns:Object>
-      <tns:Object name="PARTITION_KEYS" type="table" order="18">
+      <tns:Object name="PARTITION_KEYS" type="table" order="16">
         <tns:sql><![CDATA[
           CREATE TABLE PARTITION_KEYS (
             PARTITION_ID INT NOT NULL,
@@ -174,7 +170,7 @@ xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.
 				)]]>
         </tns:sql>
       </tns:Object>
-      <tns:Object name="PARTITION_KEYS_IDX" type="index" order="19" dependsOn="PARTITION_KEYS">
+      <tns:Object name="PARTITION_KEYS_IDX" type="index" order="17" dependsOn="PARTITION_KEYS">
         <tns:sql><![CDATA[CREATE INDEX PARTITION_KEYS_IDX on PARTITION_KEYS (PARTITION_ID, COLUMN_NAME, PARTITION_VALUE)]]></tns:sql>
       </tns:Object>
 		</tns:objects>