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 2014/07/23 02:48:23 UTC

[7/7] git commit: TAJO-837: Register index meta information at Catalog. (jihoon)

TAJO-837: Register index meta information at Catalog. (jihoon)


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

Branch: refs/heads/index_support
Commit: c9b8f511e646f1315469f305d9da08216a93152a
Parents: 7cd5706
Author: Jihoon Son <ji...@apache.org>
Authored: Wed Jul 23 09:47:32 2014 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Wed Jul 23 09:47:32 2014 +0900

----------------------------------------------------------------------
 CHANGES                                         |   4 +
 .../org/apache/tajo/algebra/CreateTable.java    |   2 +-
 .../java/org/apache/tajo/algebra/DropIndex.java |  69 ++++++++
 .../java/org/apache/tajo/algebra/OpType.java    |   1 +
 .../tajo/catalog/AbstractCatalogClient.java     |  42 -----
 .../org/apache/tajo/catalog/CatalogService.java |   5 -
 .../src/main/proto/CatalogProtocol.proto        |   2 -
 .../java/org/apache/tajo/catalog/Column.java    |   1 -
 .../java/org/apache/tajo/catalog/IndexDesc.java | 146 +++++++++++++---
 .../src/main/proto/CatalogProtos.proto          |  17 +-
 .../org/apache/tajo/catalog/TestIndexDesc.java  |  59 ++++---
 .../org/apache/tajo/catalog/CatalogServer.java  |  44 -----
 .../tajo/catalog/store/AbstractDBStore.java     | 163 ++++++------------
 .../apache/tajo/catalog/store/CatalogStore.java |  11 +-
 .../apache/tajo/catalog/store/DerbyStore.java   |   6 -
 .../org/apache/tajo/catalog/store/MemStore.java |  32 +---
 .../main/resources/schemas/derby/indexes.sql    |  11 +-
 .../main/resources/schemas/mariadb/indexes.sql  |  13 +-
 .../main/resources/schemas/mysql/indexes.sql    |  13 +-
 .../org/apache/tajo/catalog/TestCatalog.java    |  31 ++--
 .../java/org/apache/tajo/client/TajoClient.java |  49 +++++-
 tajo-client/src/main/proto/ClientProtos.proto   |   4 +
 .../main/proto/TajoMasterClientProtocol.proto   |   4 +
 .../org/apache/tajo/engine/parser/SQLParser.g4  |  11 +-
 .../apache/tajo/engine/parser/SQLAnalyzer.java  |   7 +-
 .../tajo/engine/planner/AlgebraVisitor.java     |   1 +
 .../tajo/engine/planner/BaseAlgebraVisitor.java |   8 +
 .../engine/planner/BasicLogicalPlanVisitor.java |   9 +
 .../engine/planner/LogicalPlanPreprocessor.java |   7 +
 .../tajo/engine/planner/LogicalPlanVisitor.java |   3 +
 .../tajo/engine/planner/LogicalPlanner.java     |  10 +-
 .../apache/tajo/engine/planner/PlannerUtil.java |  16 +-
 .../engine/planner/logical/CreateIndexNode.java |  18 ++
 .../engine/planner/logical/DropIndexNode.java   |  89 ++++++++++
 .../tajo/engine/planner/logical/NodeType.java   |   1 +
 .../engine/planner/physical/StoreIndexExec.java |  15 +-
 .../org/apache/tajo/master/GlobalEngine.java    | 169 ++++++++++++++++---
 .../tajo/master/TajoMasterClientService.java    |  42 ++++-
 .../apache/tajo/worker/TaskAttemptContext.java  |   8 -
 .../java/org/apache/tajo/QueryTestCaseBase.java |  23 ++-
 .../tajo/engine/planner/TestLogicalPlanner.java |   1 -
 .../planner/physical/TestPhysicalPlanner.java   |   3 +-
 .../tajo/engine/query/TestCreateIndex.java      |  32 +++-
 43 files changed, 819 insertions(+), 383 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8a1aae6..69bc8cf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,10 @@ Release 0.9.0 - unreleased
 
   NEW FEATURES 
 
+    TAJO-837: Register index meta information at Catalog. (jihoon)
+
+    TAJO-836: create index support. (jihoon)
+
     TAJO-20: INSERT INTO ... SELECT. (Hyoungjun Kim via hyunsik)
 
     TAJO-774: Implement logical plan part and physical executor for window 

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java
----------------------------------------------------------------------
diff --git a/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java b/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java
index 3121711..ad1a6f4 100644
--- a/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java
+++ b/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java
@@ -24,9 +24,9 @@ import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import org.apache.tajo.util.TUtil;
 
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-algebra/src/main/java/org/apache/tajo/algebra/DropIndex.java
----------------------------------------------------------------------
diff --git a/tajo-algebra/src/main/java/org/apache/tajo/algebra/DropIndex.java b/tajo-algebra/src/main/java/org/apache/tajo/algebra/DropIndex.java
new file mode 100644
index 0000000..f72a12a
--- /dev/null
+++ b/tajo-algebra/src/main/java/org/apache/tajo/algebra/DropIndex.java
@@ -0,0 +1,69 @@
+/*
+ * 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.algebra;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import org.apache.tajo.util.TUtil;
+
+import java.util.Objects;
+
+public class DropIndex extends Expr {
+
+  @Expose @SerializedName("IndexName")
+  private String indexName;
+  @Expose @SerializedName("IfExists")
+  private boolean ifExists;
+
+  public DropIndex(String indexName, boolean ifExists) {
+    super(OpType.DropIndex);
+    this.indexName = indexName;
+    this.ifExists = ifExists;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(indexName, ifExists);
+  }
+
+  @Override
+  boolean equalsTo(Expr expr) {
+    if (expr instanceof DropIndex) {
+      DropIndex another = (DropIndex) expr;
+      return TUtil.checkEquals(indexName, another.indexName) &&
+          ifExists == another.ifExists;
+    }
+    return false;
+  }
+
+  public Object clone() throws CloneNotSupportedException {
+    DropIndex clone = (DropIndex) super.clone();
+    clone.indexName = indexName;
+    clone.ifExists = ifExists;
+    return clone;
+  }
+
+  public String getIndexName() {
+    return indexName;
+  }
+
+  public boolean isIfExists() {
+    return ifExists;
+  }
+}

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-algebra/src/main/java/org/apache/tajo/algebra/OpType.java
----------------------------------------------------------------------
diff --git a/tajo-algebra/src/main/java/org/apache/tajo/algebra/OpType.java b/tajo-algebra/src/main/java/org/apache/tajo/algebra/OpType.java
index 2ef22f7..11c5ad2 100644
--- a/tajo-algebra/src/main/java/org/apache/tajo/algebra/OpType.java
+++ b/tajo-algebra/src/main/java/org/apache/tajo/algebra/OpType.java
@@ -51,6 +51,7 @@ public enum OpType {
   AlterTablespace(AlterTablespace.class),
   AlterTable(AlterTable.class),
   CreateIndex(CreateIndex.class),
+  DropIndex(DropIndex.class),
   TruncateTable(TruncateTable.class),
 
   // Insert or Update

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java b/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java
index 542214b..49151cd 100644
--- a/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java
+++ b/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java
@@ -431,26 +431,6 @@ public abstract class AbstractCatalogClient implements CatalogService {
   }
 
   @Override
-  public boolean existIndexByColumn(final String databaseName, final String tableName, final String columnName) {
-    try {
-      return new ServerCallable<Boolean>(this.pool, catalogServerAddr, CatalogProtocol.class, false) {
-        public Boolean call(NettyClientBase client) throws ServiceException {
-
-          GetIndexByColumnRequest.Builder builder = GetIndexByColumnRequest.newBuilder();
-          builder.setTableIdentifier(CatalogUtil.buildTableIdentifier(databaseName, tableName));
-          builder.setColumnName(columnName);
-
-          CatalogProtocolService.BlockingInterface stub = getStub(client);
-          return stub.existIndexByColumn(null, builder.build()).getValue();
-        }
-      }.withRetries();
-    } catch (ServiceException e) {
-      LOG.error(e.getMessage(), e);
-      return false;
-    }
-  }
-
-  @Override
   public final IndexDesc getIndexByName(final String databaseName, final String indexName) {
     try {
       return new ServerCallable<IndexDesc>(this.pool, catalogServerAddr, CatalogProtocol.class, false) {
@@ -471,28 +451,6 @@ public abstract class AbstractCatalogClient implements CatalogService {
   }
 
   @Override
-  public final IndexDesc getIndexByColumn(final String databaseName,
-                                          final String tableName,
-                                          final String columnName) {
-    try {
-      return new ServerCallable<IndexDesc>(this.pool, catalogServerAddr, CatalogProtocol.class, false) {
-        public IndexDesc call(NettyClientBase client) throws ServiceException {
-
-          GetIndexByColumnRequest.Builder builder = GetIndexByColumnRequest.newBuilder();
-          builder.setTableIdentifier(CatalogUtil.buildTableIdentifier(databaseName, tableName));
-          builder.setColumnName(columnName);
-
-          CatalogProtocolService.BlockingInterface stub = getStub(client);
-          return new IndexDesc(stub.getIndexByColumn(null, builder.build()));
-        }
-      }.withRetries();
-    } catch (ServiceException e) {
-      LOG.error(e.getMessage(), e);
-      return null;
-    }
-  }
-
-  @Override
   public boolean dropIndex(final String databaseName,
                            final String indexName) {
     try {

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/CatalogService.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/CatalogService.java b/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/CatalogService.java
index 667ee88..76ab8ba 100644
--- a/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/CatalogService.java
+++ b/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/CatalogService.java
@@ -19,7 +19,6 @@
 package org.apache.tajo.catalog;
 
 import org.apache.tajo.catalog.partition.PartitionMethodDesc;
-import org.apache.tajo.catalog.proto.CatalogProtos;
 import org.apache.tajo.common.TajoDataTypes.DataType;
 
 import java.util.Collection;
@@ -155,12 +154,8 @@ public interface CatalogService {
 
   boolean existIndexByName(String databaseName, String indexName);
 
-  boolean existIndexByColumn(String databaseName, String tableName, String columnName);
-
   IndexDesc getIndexByName(String databaseName, String indexName);
 
-  IndexDesc getIndexByColumn(String databaseName, String tableName, String columnName);
-
   boolean dropIndex(String databaseName, String indexName);
 
   boolean createFunction(FunctionDesc funcDesc);

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtocol.proto
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtocol.proto b/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtocol.proto
index c5cb528..ee8dbc4 100644
--- a/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtocol.proto
+++ b/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtocol.proto
@@ -59,9 +59,7 @@ service CatalogProtocolService {
   rpc createIndex(IndexDescProto) returns (BoolProto);
   rpc dropIndex(IndexNameProto) returns (BoolProto);
   rpc existIndexByName(IndexNameProto) returns (BoolProto);
-  rpc existIndexByColumn(GetIndexByColumnRequest) returns (BoolProto);
   rpc getIndexByName(IndexNameProto) returns (IndexDescProto);
-  rpc getIndexByColumn(GetIndexByColumnRequest) returns (IndexDescProto);
 
   rpc createFunction(FunctionDescProto) returns (BoolProto);
   rpc dropFunction(UnregisterFunctionRequest) returns (BoolProto);

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/Column.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/Column.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/Column.java
index aceb6f1..115ee6f 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/Column.java
+++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/Column.java
@@ -145,5 +145,4 @@ public class Column implements ProtoObject<ColumnProto>, GsonObject {
 	public String toJson() {
 		return CatalogGsonHelper.toJson(this, Column.class);
 	}
-
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/IndexDesc.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/IndexDesc.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/IndexDesc.java
index cff2059..c8c6cd3 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/IndexDesc.java
+++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/IndexDesc.java
@@ -23,8 +23,12 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import org.apache.tajo.catalog.proto.CatalogProtos;
 import org.apache.tajo.catalog.proto.CatalogProtos.IndexDescProto;
+import org.apache.tajo.catalog.proto.CatalogProtos.IndexKeyProto;
 import org.apache.tajo.catalog.proto.CatalogProtos.IndexMethod;
 import org.apache.tajo.common.ProtoObject;
+import org.apache.tajo.util.TUtil;
+
+import java.util.List;
 
 public class IndexDesc implements ProtoObject<IndexDescProto>, Cloneable {
   private IndexDescProto.Builder builder;
@@ -32,35 +36,42 @@ public class IndexDesc implements ProtoObject<IndexDescProto>, Cloneable {
   private String indexName;            // required
   private String databaseName;         // required
   private String tableName;            // required
-  private Column column;               // required
   private IndexMethod indexMethod;     // required
+  private List<IndexKey> keys;
   private boolean isUnique = false;    // optional [default = false]
   private boolean isClustered = false; // optional [default = false]
-  private boolean isAscending = false; // optional [default = false]
+  private String predicate;            // optional
   
   public IndexDesc() {
     this.builder = IndexDescProto.newBuilder();
   }
   
-  public IndexDesc(String idxName, String databaseName, String tableName, Column column,
-                   IndexMethod type,  boolean isUnique, boolean isClustered, boolean isAscending) {
+  public IndexDesc(String idxName, String databaseName, String tableName, IndexMethod type,
+                   List<IndexKey> keys, boolean isUnique, boolean isClustered, String predicate) {
     this();
     this.indexName = idxName;
     this.databaseName = databaseName;
     this.tableName = tableName;
-    this.column = column;
     this.indexMethod = type;
+    this.keys = keys;
     this.isUnique = isUnique;
     this.isClustered = isClustered;
-    this.isAscending = isAscending;
+    this.predicate = predicate;
   }
   
   public IndexDesc(IndexDescProto proto) {
-    this(proto.getIndexName(),
-        proto.getTableIdentifier().getDatabaseName(),
-        proto.getTableIdentifier().getTableName(),
-        new Column(proto.getColumn()),
-        proto.getIndexMethod(), proto.getIsUnique(), proto.getIsClustered(), proto.getIsAscending());
+    this();
+    this.indexName = proto.getIndexName();
+    this.databaseName = proto.getTableIdentifier().getDatabaseName();
+    this.tableName = proto.getTableIdentifier().getTableName();
+    this.indexMethod = proto.getMethod();
+    this.keys = TUtil.newList();
+    for (IndexKeyProto eachProto : proto.getKeysList()) {
+      this.keys.add(new IndexKey(eachProto));
+    }
+    this.isUnique = proto.getIsUnique();
+    this.isClustered = proto.getIsClustered();
+    this.predicate = proto.hasPredicate() ? proto.getPredicate() : null;
   }
   
   public String getIndexName() {
@@ -71,10 +82,6 @@ public class IndexDesc implements ProtoObject<IndexDescProto>, Cloneable {
     return tableName;
   }
   
-  public Column getColumn() {
-    return column;
-  }
-  
   public IndexMethod getIndexMethod() {
     return this.indexMethod;
   }
@@ -87,14 +94,24 @@ public class IndexDesc implements ProtoObject<IndexDescProto>, Cloneable {
     return this.isUnique;
   }
   
-  public boolean isAscending() {
-    return this.isAscending;
+  public List<IndexKey> getKeys() {
+    return keys;
+  }
+
+  public String getPredicate() {
+    return predicate;
+  }
+
+  public boolean hasPredicate() {
+    return predicate != null;
   }
 
   @Override
   public IndexDescProto getProto() {
     if (builder == null) {
       builder = IndexDescProto.newBuilder();
+    } else {
+      builder.clear();
     }
 
     CatalogProtos.TableIdentifierProto.Builder tableIdentifierBuilder = CatalogProtos.TableIdentifierProto.newBuilder();
@@ -107,11 +124,15 @@ public class IndexDesc implements ProtoObject<IndexDescProto>, Cloneable {
 
     builder.setTableIdentifier(tableIdentifierBuilder.build());
     builder.setIndexName(this.indexName);
-    builder.setColumn(this.column.getProto());
-    builder.setIndexMethod(indexMethod);
+    builder.setMethod(indexMethod);
     builder.setIsUnique(this.isUnique);
     builder.setIsClustered(this.isClustered);
-    builder.setIsAscending(this.isAscending);
+    for (IndexKey eachKey : keys) {
+      builder.addKeys(eachKey.getProto());
+    }
+    if (this.predicate != null) {
+      builder.setPredicate(this.predicate);
+    }
 
     return builder.build();
   }
@@ -121,30 +142,33 @@ public class IndexDesc implements ProtoObject<IndexDescProto>, Cloneable {
       IndexDesc other = (IndexDesc) obj;
       return getIndexName().equals(other.getIndexName())
           && getTableName().equals(other.getTableName())
-          && getColumn().equals(other.getColumn())
           && getIndexMethod().equals(other.getIndexMethod())
           && isUnique() == other.isUnique()
           && isClustered() == other.isClustered()
-          && isAscending() == other.isAscending();
+          && TUtil.checkEquals(getKeys(), other.getKeys())
+          && TUtil.checkEquals(getPredicate(), other.getPredicate());
     } else {
       return false;
     }
   }
   
   public int hashCode() {
-    return Objects.hashCode(getIndexName(), getTableName(), getColumn(),
-        getIndexMethod(), isUnique(), isClustered(), isAscending());
+    return Objects.hashCode(getIndexName(), getTableName(), getIndexMethod(),
+        isUnique(), isClustered(), getKeys(), getPredicate());
   }
 
   public Object clone() throws CloneNotSupportedException {
     IndexDesc desc = (IndexDesc) super.clone();
     desc.indexName = indexName;
     desc.tableName = tableName;
-    desc.column = column;
     desc.indexMethod = indexMethod;
     desc.isUnique = isUnique;
     desc.isClustered = isClustered;
-    desc.isAscending = isAscending;
+    desc.keys = TUtil.newList();
+    for (IndexKey eachKey : keys) {
+      desc.keys.add((IndexKey) eachKey.clone());
+    }
+    desc.predicate = predicate;
     return desc;
   }
   
@@ -152,4 +176,74 @@ public class IndexDesc implements ProtoObject<IndexDescProto>, Cloneable {
     Gson gson = new GsonBuilder().setPrettyPrinting().create();
     return gson.toJson(this);
   }
+
+  public static class IndexKey implements ProtoObject<IndexKeyProto>, Cloneable {
+    private final IndexKeyProto.Builder builder;
+    private String keyJson;
+    private boolean ascending = true;
+    private boolean nullFirst = false;
+
+    public IndexKey() {
+      builder = IndexKeyProto.newBuilder();
+    }
+
+    public IndexKey(final String keyJson, final boolean ascending, final boolean nullFirst) {
+      this();
+      this.keyJson = keyJson;
+      this.ascending = ascending;
+      this.nullFirst = nullFirst;
+    }
+
+    public IndexKey(IndexKeyProto proto) {
+      this(proto.getKeyJson(), proto.getAscending(), proto.getNullFirst());
+    }
+
+    @Override
+    public IndexKeyProto getProto() {
+      if (builder != null) {
+        builder.clear();
+      }
+      builder.setKeyJson(keyJson);
+      builder.setAscending(ascending);
+      builder.setNullFirst(nullFirst);
+      return builder.build();
+    }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+      IndexKey clone = (IndexKey) super.clone();
+      clone.keyJson = this.keyJson;
+      clone.ascending = this.ascending;
+      clone.nullFirst = this.nullFirst;
+      return clone;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (o instanceof IndexKey) {
+        IndexKey other = (IndexKey) o;
+        return this.keyJson.equals(other.keyJson) &&
+            this.ascending == other.ascending &&
+            this.nullFirst == other.nullFirst;
+      }
+      return false;
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hashCode(keyJson, ascending, nullFirst);
+    }
+
+    public String getKeyJson() {
+      return keyJson;
+    }
+
+    public boolean isAscending() {
+      return ascending;
+    }
+
+    public boolean isNullFirst() {
+      return nullFirst;
+    }
+  }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
index 367d0b8..90929a2 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
+++ b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
@@ -137,14 +137,21 @@ message FunctionDescProto {
   optional string detail = 8;
 }
 
+message IndexKeyProto {
+  required string keyJson = 1;
+  optional bool ascending = 2 [default = true];
+  optional bool nullFirst = 3 [default = false];
+}
+
 message IndexDescProto {
-  required TableIdentifierProto tableIdentifier = 1;
-  required string indexName = 2;
-  required ColumnProto column = 3;
-  required IndexMethod indexMethod = 4;
+  required string indexName = 1;
+  required TableIdentifierProto tableIdentifier = 2;
+  required IndexMethod method = 3;
+  repeated IndexKeyProto keys = 4;
   optional bool isUnique = 5 [default = false];
   optional bool isClustered = 6 [default = false];
-  optional bool isAscending = 7 [default = false];
+  optional string predicate = 7;
+  // optional string path = 8;
 }
 
 enum IndexMethod {

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestIndexDesc.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestIndexDesc.java b/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestIndexDesc.java
index 3fa8f53..6f9f785 100644
--- a/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestIndexDesc.java
+++ b/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestIndexDesc.java
@@ -18,34 +18,55 @@
 
 package org.apache.tajo.catalog;
 
+import org.apache.tajo.catalog.IndexDesc.IndexKey;
 import org.apache.tajo.catalog.proto.CatalogProtos.IndexDescProto;
 import org.apache.tajo.catalog.proto.CatalogProtos.IndexMethod;
-import org.apache.tajo.common.TajoDataTypes.Type;
+import org.apache.tajo.util.TUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.util.List;
+
 import static org.apache.tajo.TajoConstants.DEFAULT_DATABASE_NAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.*;
 
 public class TestIndexDesc {
   static IndexDesc desc1;
   static IndexDesc desc2;
   static IndexDesc desc3;
-  
+  static List<IndexKey> keys1;
+  static List<IndexKey> keys2;
+  static List<IndexKey> keys3;
+  static String pred2;
+
   static {
-    desc1 = new IndexDesc(
-        "idx_test", DEFAULT_DATABASE_NAME, "indexed", new Column("id", Type.INT4),
-        IndexMethod.TWO_LEVEL_BIN_TREE, true, true, true);
-    
-    desc2 = new IndexDesc(
-        "idx_test2", DEFAULT_DATABASE_NAME, "indexed", new Column("score", Type.FLOAT8),
-        IndexMethod.TWO_LEVEL_BIN_TREE, false, false, false);
-    
-    desc3 = new IndexDesc(
-        "idx_test", DEFAULT_DATABASE_NAME, "indexed", new Column("id", Type.INT4),
-        IndexMethod.TWO_LEVEL_BIN_TREE, true, true, true);
+    keys1 = TUtil.newList();
+    keys1.add(new IndexKey("{\"name\":\"id\",\"dataType\":{\"type\":\"INT4\"}}", true, true));
+    desc1 = new IndexDesc("idx_test", DEFAULT_DATABASE_NAME, "indexed",
+        IndexMethod.TWO_LEVEL_BIN_TREE, keys1, true, true, null);
+
+    keys2 = TUtil.newList();
+    keys2.add(new IndexKey("{\"name\":\"score\",\"dataType\":{\"type\":\"FLOAT8\"}}", false, false));
+    pred2 = "{\n" +
+        "  \"LeftExpr\": {\n" +
+        "    \"ColumnName\": \"score\",\n" +
+        "    \"OpType\": \"Column\"\n" +
+        "  },\n" +
+        "  \"RightExpr\": {\n" +
+        "    \"Value\": \"10\",\n" +
+        "    \"ValueType\": \"Unsigned_Integer\",\n" +
+        "    \"OpType\": \"Literal\"\n" +
+        "  },\n" +
+        "  \"OpType\": \"Equals\"\n" +
+        "}";
+    desc2 = new IndexDesc("idx_test2", DEFAULT_DATABASE_NAME, "indexed",
+        IndexMethod.TWO_LEVEL_BIN_TREE, keys2, false, false, pred2);
+
+    keys3 = TUtil.newList();
+    keys3.add(new IndexKey("{\"name\":\"id\",\"dataType\":{\"type\":\"INT4\"}}", true, true));
+    desc3 = new IndexDesc("idx_test", DEFAULT_DATABASE_NAME, "indexed",
+        IndexMethod.TWO_LEVEL_BIN_TREE, keys3, true, true, null);
   }
 
   @BeforeClass
@@ -67,19 +88,19 @@ public class TestIndexDesc {
   public void testGetFields() {
     assertEquals("idx_test", desc1.getIndexName());
     assertEquals("indexed", desc1.getTableName());
-    assertEquals(new Column("id", Type.INT4), desc1.getColumn());
     assertEquals(IndexMethod.TWO_LEVEL_BIN_TREE, desc1.getIndexMethod());
+    assertTrue(keys1.equals(desc1.getKeys()));
     assertEquals(true, desc1.isUnique());
     assertEquals(true, desc1.isClustered());
-    assertEquals(true, desc1.isAscending());
+    assertNull(desc1.getPredicate());
     
     assertEquals("idx_test2", desc2.getIndexName());
     assertEquals("indexed", desc2.getTableName());
-    assertEquals(new Column("score", Type.FLOAT8), desc2.getColumn());
     assertEquals(IndexMethod.TWO_LEVEL_BIN_TREE, desc2.getIndexMethod());
+    assertTrue(keys2.equals(desc2.getKeys()));
     assertEquals(false, desc2.isUnique());
     assertEquals(false, desc2.isClustered());
-    assertEquals(false, desc2.isAscending());
+    assertEquals(pred2, desc2.getPredicate());
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java
index 4e391aa..55a4745 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java
@@ -739,27 +739,6 @@ public class CatalogServer extends AbstractService {
     }
 
     @Override
-    public BoolProto existIndexByColumn(RpcController controller, GetIndexByColumnRequest request)
-        throws ServiceException {
-
-      TableIdentifierProto identifier = request.getTableIdentifier();
-      String databaseName = identifier.getDatabaseName();
-      String tableName = identifier.getTableName();
-      String columnName = request.getColumnName();
-
-      rlock.lock();
-      try {
-        return store.existIndexByColumn(databaseName, tableName, columnName) ?
-            ProtoUtil.TRUE : ProtoUtil.FALSE;
-      } catch (Exception e) {
-        LOG.error(e);
-        return BoolProto.newBuilder().setValue(false).build();
-      } finally {
-        rlock.unlock();
-      }
-    }
-
-    @Override
     public IndexDescProto getIndexByName(RpcController controller, IndexNameProto request)
         throws ServiceException {
 
@@ -781,29 +760,6 @@ public class CatalogServer extends AbstractService {
     }
 
     @Override
-    public IndexDescProto getIndexByColumn(RpcController controller, GetIndexByColumnRequest request)
-        throws ServiceException {
-
-      TableIdentifierProto identifier = request.getTableIdentifier();
-      String databaseName = identifier.getDatabaseName();
-      String tableName = identifier.getTableName();
-      String columnName = request.getColumnName();
-
-      rlock.lock();
-      try {
-        if (!store.existIndexByColumn(databaseName, tableName, columnName)) {
-          throw new NoSuchIndexException(databaseName, columnName);
-        }
-        return store.getIndexByColumn(databaseName, tableName, columnName);
-      } catch (Exception e) {
-        LOG.error("ERROR : cannot get index for " + tableName + "." + columnName, e);
-        return null;
-      } finally {
-        rlock.unlock();
-      }
-    }
-
-    @Override
     public BoolProto dropIndex(RpcController controller, IndexNameProto request)
         throws ServiceException {
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
index bcf6774..449ec74 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
@@ -35,15 +35,11 @@ import org.apache.tajo.catalog.proto.CatalogProtos.*;
 import org.apache.tajo.common.TajoDataTypes.Type;
 import org.apache.tajo.exception.InternalException;
 import org.apache.tajo.exception.UnimplementedException;
-import org.apache.tajo.rpc.protocolrecords.PrimitiveProtos;
 import org.apache.tajo.util.FileUtil;
 import org.apache.tajo.util.Pair;
 
 import java.io.IOException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.*;
 import java.util.*;
 
 import static org.apache.tajo.catalog.proto.CatalogProtos.AlterTablespaceProto.AlterTablespaceCommand;
@@ -683,20 +679,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
         pstmt.close();
       }
 
-      String tidSql =
-          "SELECT TID from " + TB_TABLES + " WHERE " + COL_DATABASES_PK + "=? AND " + COL_TABLES_NAME + "=?";
-      pstmt = conn.prepareStatement(tidSql);
-      pstmt.setInt(1, dbid);
-      pstmt.setString(2, tableName);
-      res = pstmt.executeQuery();
-
-      if (!res.next()) {
-        throw new CatalogException("ERROR: there is no TID matched to " + table.getTableName());
-      }
-
-      int tableId = res.getInt("TID");
-      res.close();
-      pstmt.close();
+      int tableId = getTableId(dbid, databaseName, tableName);
 
       String colSql =
           "INSERT INTO " + TB_COLUMNS + " (TID, COLUMN_NAME, ORDINAL_POSITION, DATA_TYPE, TYPE_LENGTH) VALUES(?, ?, ?, ?, ?) ";
@@ -1610,7 +1593,6 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
 
     String databaseName = proto.getTableIdentifier().getDatabaseName();
     String tableName = proto.getTableIdentifier().getTableName();
-    String columnName = CatalogUtil.extractSimpleName(proto.getColumn().getName());
 
     try {
       int databaseId = getDatabaseId(databaseName);
@@ -1618,12 +1600,25 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
 
       String sql = "INSERT INTO " + TB_INDEXES +
           " (" + COL_DATABASES_PK + ", " + COL_TABLES_PK + ", INDEX_NAME, " +
-          "COLUMN_NAME, DATA_TYPE, INDEX_TYPE, IS_UNIQUE, IS_CLUSTERED, IS_ASCENDING) VALUES (?,?,?,?,?,?,?,?,?)";
+          "METHOD, EXPR_NUM, EXPRS, ASC_ORDERS, NULL_ORDERS, IS_UNIQUE, IS_CLUSTERED, PRED) " +
+          "VALUES (?,?,?,?,?,?,?,?,?,?,?)";
 
       if (LOG.isDebugEnabled()) {
         LOG.debug(sql);
       }
 
+      StringBuilder exprsBuilder = new StringBuilder();
+      StringBuilder ascOrdersBuilder = new StringBuilder();
+      StringBuilder nullOrdersBuilder = new StringBuilder();
+      for (IndexKeyProto eachKey : proto.getKeysList()) {
+        exprsBuilder.append(eachKey.getKeyJson()).append(",");
+        ascOrdersBuilder.append(eachKey.getAscending()).append(",");
+        nullOrdersBuilder.append(eachKey.getNullFirst()).append(",");
+      }
+      exprsBuilder.deleteCharAt(exprsBuilder.length()-1);
+      ascOrdersBuilder.deleteCharAt(ascOrdersBuilder.length()-1);
+      nullOrdersBuilder.deleteCharAt(nullOrdersBuilder.length()-1);
+
       conn = getConnection();
       conn.setAutoCommit(false);
 
@@ -1631,12 +1626,18 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
       pstmt.setInt(1, databaseId);
       pstmt.setInt(2, tableId);
       pstmt.setString(3, proto.getIndexName());
-      pstmt.setString(4, columnName);
-      pstmt.setString(5, proto.getColumn().getDataType().getType().name());
-      pstmt.setString(6, proto.getIndexMethod().toString());
-      pstmt.setBoolean(7, proto.hasIsUnique() && proto.getIsUnique());
-      pstmt.setBoolean(8, proto.hasIsClustered() && proto.getIsClustered());
-      pstmt.setBoolean(9, proto.hasIsAscending() && proto.getIsAscending());
+      pstmt.setString(4, proto.getMethod().name());
+      pstmt.setInt(5, proto.getKeysCount());
+      pstmt.setString(6, exprsBuilder.toString());
+      pstmt.setString(7, ascOrdersBuilder.toString());
+      pstmt.setString(8, nullOrdersBuilder.toString());
+      pstmt.setBoolean(9, proto.hasIsUnique() && proto.getIsUnique());
+      pstmt.setBoolean(10, proto.hasIsClustered() && proto.getIsClustered());
+      if (proto.hasPredicate()) {
+        pstmt.setString(11, proto.getPredicate());
+      } else {
+        pstmt.setNull(11, Types.VARCHAR, "PRED");
+      }
       pstmt.executeUpdate();
       conn.commit();
     } catch (SQLException se) {
@@ -1649,23 +1650,38 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
   @Override
   public void dropIndex(String databaseName, final String indexName) throws CatalogException {
     Connection conn = null;
-    PreparedStatement pstmt = null;
 
     try {
-      int databaseId = getDatabaseId(databaseName);
-      String sql = "DELETE FROM " + TB_INDEXES + " WHERE " + COL_DATABASES_PK + "=? AND INDEX_NAME=?";
+      conn = getConnection();
+      conn.setAutoCommit(false);
+      dropIndexInternal(conn, databaseName, indexName);
+      conn.commit();
+    } catch (SQLException se) {
+      try {
+        conn.rollback();
+      } catch (SQLException e) {
+        LOG.error(e);
+      }
+    } finally {
+      CatalogUtil.closeQuietly(conn);
+    }
+  }
 
+  private void dropIndexInternal(Connection conn, final String databaseName, final String indexName)
+      throws SQLException {
+    PreparedStatement pstmt = null;
+    try {
+      int databaseId = getDatabaseId(databaseName);
+      String sql = "DELETE FROM " + TB_INDEXES +
+          " WHERE " + COL_DATABASES_PK + "=? AND INDEX_NAME=?";
       if (LOG.isDebugEnabled()) {
         LOG.debug(sql);
       }
 
-      conn = getConnection();
       pstmt = conn.prepareStatement(sql);
       pstmt.setInt(1, databaseId);
       pstmt.setString(2, indexName);
       pstmt.executeUpdate();
-    } catch (SQLException se) {
-      throw new CatalogException(se);
     } finally {
       CatalogUtil.closeQuietly(pstmt);
     }
@@ -1690,8 +1706,8 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
   }
 
   final static String GET_INDEXES_SQL =
-      "SELECT " + COL_TABLES_PK + ", INDEX_NAME, COLUMN_NAME, DATA_TYPE, INDEX_TYPE, IS_UNIQUE, " +
-          "IS_CLUSTERED, IS_ASCENDING FROM " + TB_INDEXES;
+      "SELECT " + COL_TABLES_PK + ", INDEX_NAME, EXPRS, METHOD, IS_UNIQUE, " +
+          "IS_CLUSTERED FROM " + TB_INDEXES;
 
 
   @Override
@@ -1734,46 +1750,6 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
   }
 
   @Override
-  public IndexDescProto getIndexByColumn(final String databaseName,
-                                         final String tableName,
-                                         final String columnName) throws CatalogException {
-    Connection conn = null;
-    ResultSet res = null;
-    PreparedStatement pstmt = null;
-    IndexDescProto proto = null;
-
-    try {
-      int databaseId = getDatabaseId(databaseName);
-
-      String sql = GET_INDEXES_SQL + " WHERE " + COL_DATABASES_PK + "=? AND COLUMN_NAME=?";
-
-      if (LOG.isDebugEnabled()) {
-        LOG.debug(sql);
-      }
-
-      conn = getConnection();
-      pstmt = conn.prepareStatement(sql);
-      pstmt.setInt(1, databaseId);
-      ;
-      pstmt.setString(2, columnName);
-      res = pstmt.executeQuery();
-      if (!res.next()) {
-        throw new CatalogException("ERROR: there is no index matched to " + columnName);
-      }
-      IndexDescProto.Builder builder = IndexDescProto.newBuilder();
-      resultToIndexDescProtoBuilder(builder, res);
-      builder.setTableIdentifier(CatalogUtil.buildTableIdentifier(databaseName, tableName));
-      proto = builder.build();
-    } catch (SQLException se) {
-      throw new CatalogException(se);
-    } finally {
-      CatalogUtil.closeQuietly(pstmt, res);
-    }
-
-    return proto;
-  }
-
-  @Override
   public boolean existIndexByName(String databaseName, final String indexName) throws CatalogException {
     Connection conn = null;
     ResultSet res = null;
@@ -1807,39 +1783,6 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
   }
 
   @Override
-  public boolean existIndexByColumn(String databaseName, String tableName, String columnName)
-      throws CatalogException {
-    Connection conn = null;
-    ResultSet res = null;
-    PreparedStatement pstmt = null;
-
-    boolean exist = false;
-
-    try {
-      int databaseId = getDatabaseId(databaseName);
-
-      String sql =
-          "SELECT INDEX_NAME FROM " + TB_INDEXES + " WHERE " + COL_DATABASES_PK + "=? AND COLUMN_NAME=?";
-
-      if (LOG.isDebugEnabled()) {
-        LOG.debug(sql);
-      }
-
-      conn = getConnection();
-      pstmt = conn.prepareStatement(sql);
-      pstmt.setInt(1, databaseId);
-      pstmt.setString(2, columnName);
-      res = pstmt.executeQuery();
-      exist = res.next();
-    } catch (SQLException se) {
-      throw new CatalogException(se);
-    } finally {
-      CatalogUtil.closeQuietly(pstmt, res);
-    }
-    return exist;
-  }
-
-  @Override
   public IndexDescProto[] getIndexes(String databaseName, final String tableName)
       throws CatalogException {
     Connection conn = null;
@@ -1884,11 +1827,9 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
   private void resultToIndexDescProtoBuilder(IndexDescProto.Builder builder,
                                              final ResultSet res) throws SQLException {
     builder.setIndexName(res.getString("index_name"));
-    builder.setColumn(indexResultToColumnProto(res));
-    builder.setIndexMethod(getIndexMethod(res.getString("index_type").trim()));
+    builder.setMethod(getIndexMethod(res.getString("method").trim()));
     builder.setIsUnique(res.getBoolean("is_unique"));
     builder.setIsClustered(res.getBoolean("is_clustered"));
-    builder.setIsAscending(res.getBoolean("is_ascending"));
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/CatalogStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/CatalogStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/CatalogStore.java
index 5de9633..ce4ea79 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/CatalogStore.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/CatalogStore.java
@@ -19,12 +19,11 @@
 package org.apache.tajo.catalog.store;
 
 import org.apache.tajo.catalog.FunctionDesc;
+import org.apache.tajo.catalog.exception.CatalogException;
 import org.apache.tajo.catalog.proto.CatalogProtos;
-import org.apache.tajo.catalog.proto.CatalogProtos.IndexDescProto;
+import org.apache.tajo.catalog.proto.CatalogProtos.*;
 
 import java.io.Closeable;
-import org.apache.tajo.catalog.exception.CatalogException;
-
 import java.util.Collection;
 import java.util.List;
 
@@ -106,14 +105,8 @@ public interface CatalogStore extends Closeable {
   
   IndexDescProto getIndexByName(String databaseName, String indexName) throws CatalogException;
   
-  IndexDescProto getIndexByColumn(String databaseName, String tableName, String columnName)
-      throws CatalogException;
-  
   boolean existIndexByName(String databaseName, String indexName) throws CatalogException;
   
-  boolean existIndexByColumn(String databaseName, String tableName, String columnName)
-      throws CatalogException;
-
   IndexDescProto [] getIndexes(String databaseName, String tableName) throws CatalogException;
 
   /************************** FUNCTION *****************************/

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/DerbyStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/DerbyStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/DerbyStore.java
index d6f9fc3..6a3b13c 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/DerbyStore.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/DerbyStore.java
@@ -204,12 +204,6 @@ public class DerbyStore extends AbstractDBStore {
         }
         stmt.addBatch(sql);
 
-        sql = "CREATE INDEX idx_indexes_columns ON " + TB_INDEXES + "(" + COL_DATABASES_PK + ",column_name)";
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(sql);
-        }
-        stmt.addBatch(sql);
         stmt.executeBatch();
         LOG.info("Table '" + TB_INDEXES + "' is created.");
         baseTableMaps.put(TB_INDEXES, true);

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
index ca99160..db9b8f2 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
@@ -120,6 +120,8 @@ public class MemStore implements CatalogStore {
     }
 
     databases.put(databaseName, new HashMap<String, CatalogProtos.TableDescProto>());
+    indexes.put(databaseName, new HashMap<String, IndexDescProto>());
+    indexesByColumn.put(databaseName, new HashMap<String, IndexDescProto>());
   }
 
   @Override
@@ -368,9 +370,11 @@ public class MemStore implements CatalogStore {
       throw new AlreadyExistsIndexException(proto.getIndexName());
     }
 
-    index.put(proto.getIndexName(), proto);
-    indexByColumn.put(proto.getTableIdentifier().getTableName() + "."
-        + CatalogUtil.extractSimpleName(proto.getColumn().getName()), proto);
+    String indexName = proto.getIndexName();
+    if (CatalogUtil.isFQTableName(indexName)) {
+      indexName = CatalogUtil.splitFQTableName(indexName)[1];
+    }
+    index.put(indexName, proto);
   }
 
   /* (non-Javadoc)
@@ -398,21 +402,6 @@ public class MemStore implements CatalogStore {
     return index.get(indexName);
   }
 
-  /* (non-Javadoc)
-   * @see CatalogStore#getIndexByName(java.lang.String, java.lang.String)
-   */
-  @Override
-  public IndexDescProto getIndexByColumn(String databaseName, String tableName, String columnName)
-      throws CatalogException {
-
-    Map<String, IndexDescProto> indexByColumn = checkAndGetDatabaseNS(indexesByColumn, databaseName);
-    if (!indexByColumn.containsKey(columnName)) {
-      throw new NoSuchIndexException(columnName);
-    }
-
-    return indexByColumn.get(columnName);
-  }
-
   @Override
   public boolean existIndexByName(String databaseName, String indexName) throws CatalogException {
     Map<String, IndexDescProto> index = checkAndGetDatabaseNS(indexes, databaseName);
@@ -420,13 +409,6 @@ public class MemStore implements CatalogStore {
   }
 
   @Override
-  public boolean existIndexByColumn(String databaseName, String tableName, String columnName)
-      throws CatalogException {
-    Map<String, IndexDescProto> indexByColumn = checkAndGetDatabaseNS(indexesByColumn, databaseName);
-    return indexByColumn.containsKey(columnName);
-  }
-
-  @Override
   public IndexDescProto[] getIndexes(String databaseName, String tableName) throws CatalogException {
     List<IndexDescProto> protos = new ArrayList<IndexDescProto>();
     Map<String, IndexDescProto> indexByColumn = checkAndGetDatabaseNS(indexesByColumn, databaseName);

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/indexes.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/indexes.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/indexes.sql
index c4cfc25..45ed144 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/indexes.sql
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/indexes.sql
@@ -1,12 +1,15 @@
 CREATE TABLE INDEXES (
+--   INDEX_ID INT NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
   DB_ID INT NOT NULL REFERENCES DATABASES_ (DB_ID) ON DELETE CASCADE,
   TID INT NOT NULL REFERENCES TABLES (TID) ON DELETE CASCADE,
   INDEX_NAME VARCHAR(128) NOT NULL,
-  COLUMN_NAME VARCHAR(128) NOT NULL,
-  DATA_TYPE VARCHAR(128) NOT NULL,
-  INDEX_TYPE CHAR(32) NOT NULL,
+  METHOD CHAR(32) NOT NULL,
+  EXPR_NUM INT NOT NULL,
+  EXPRS VARCHAR(1024) NOT NULL,
+  ASC_ORDERS VARCHAR(1024) NOT NULL,
+  NULL_ORDERS VARCHAR(1024) NOT NULL,
   IS_UNIQUE BOOLEAN NOT NULL,
   IS_CLUSTERED BOOLEAN NOT NULL,
-  IS_ASCENDING BOOLEAN NOT NULL,
+  PRED VARCHAR(4096),
   CONSTRAINT C_INDEXES_PK PRIMARY KEY (DB_ID, INDEX_NAME)
 )
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/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
index 62feb36..b375a48 100644
--- 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
@@ -1,16 +1,17 @@
 CREATE TABLE INDEXES (
+--   INDEX_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
   DB_ID INT NOT NULL,
   TID INT NOT NULL,
   INDEX_NAME VARCHAR(128) NOT NULL,
-  COLUMN_NAME VARCHAR(128) NOT NULL,
-  DATA_TYPE VARCHAR(128) NOT NULL,
-  INDEX_TYPE CHAR(32) NOT NULL,
+  METHOD CHAR(32) NOT NULL,
+  EXPR_NUM INT NOT NULL,
+  EXPRS VARCHAR(1024) NOT NULL,
+  ASC_ORDERS VARCHAR(1024) NOT NULL,
+  NULL_ORDERS VARCHAR(1024) NOT NULL,
   IS_UNIQUE BOOLEAN NOT NULL,
   IS_CLUSTERED BOOLEAN NOT NULL,
-  IS_ASCENDING BOOLEAN NOT NULL,
-  PRIMARY KEY (DB_ID, INDEX_NAME),
+  PRED VARCHAR(4096),
   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)
 )
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/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
index 62feb36..b375a48 100644
--- 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
@@ -1,16 +1,17 @@
 CREATE TABLE INDEXES (
+--   INDEX_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
   DB_ID INT NOT NULL,
   TID INT NOT NULL,
   INDEX_NAME VARCHAR(128) NOT NULL,
-  COLUMN_NAME VARCHAR(128) NOT NULL,
-  DATA_TYPE VARCHAR(128) NOT NULL,
-  INDEX_TYPE CHAR(32) NOT NULL,
+  METHOD CHAR(32) NOT NULL,
+  EXPR_NUM INT NOT NULL,
+  EXPRS VARCHAR(1024) NOT NULL,
+  ASC_ORDERS VARCHAR(1024) NOT NULL,
+  NULL_ORDERS VARCHAR(1024) NOT NULL,
   IS_UNIQUE BOOLEAN NOT NULL,
   IS_CLUSTERED BOOLEAN NOT NULL,
-  IS_ASCENDING BOOLEAN NOT NULL,
-  PRIMARY KEY (DB_ID, INDEX_NAME),
+  PRED VARCHAR(4096),
   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)
 )
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
index 4039ff2..9f15aae 100644
--- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
+++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
@@ -21,6 +21,7 @@ package org.apache.tajo.catalog;
 import com.google.common.collect.Sets;
 import org.apache.hadoop.fs.Path;
 import org.apache.tajo.TajoConstants;
+import org.apache.tajo.catalog.IndexDesc.IndexKey;
 import org.apache.tajo.catalog.exception.CatalogException;
 import org.apache.tajo.catalog.exception.NoSuchFunctionException;
 import org.apache.tajo.catalog.function.Function;
@@ -30,8 +31,8 @@ import org.apache.tajo.catalog.proto.CatalogProtos.FunctionType;
 import org.apache.tajo.catalog.proto.CatalogProtos.IndexMethod;
 import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
 import org.apache.tajo.catalog.store.DerbyStore;
-import org.apache.tajo.catalog.store.MySQLStore;
 import org.apache.tajo.catalog.store.MariaDBStore;
+import org.apache.tajo.catalog.store.MySQLStore;
 import org.apache.tajo.common.TajoDataTypes;
 import org.apache.tajo.common.TajoDataTypes.Type;
 import org.apache.tajo.conf.TajoConf;
@@ -51,7 +52,6 @@ import static org.apache.tajo.catalog.proto.CatalogProtos.AlterTablespaceProto;
 import static org.apache.tajo.catalog.proto.CatalogProtos.AlterTablespaceProto.AlterTablespaceType;
 import static org.apache.tajo.catalog.proto.CatalogProtos.AlterTablespaceProto.SetLocation;
 import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
 
 public class TestCatalog {
 	static final String FieldName1="f1";
@@ -373,17 +373,20 @@ public class TestCatalog {
   static IndexDesc desc3;
 
   static {
-    desc1 = new IndexDesc(
-        "idx_test", DEFAULT_DATABASE_NAME, "indexed", new Column("id", Type.INT4),
-        IndexMethod.TWO_LEVEL_BIN_TREE, true, true, true);
+    List<IndexKey> indexKeys = new ArrayList<IndexKey>();
+    indexKeys.add(new IndexKey(new Column("id", Type.INT4).toJson(), true, true));
+    desc1 = new IndexDesc("idx_test", DEFAULT_DATABASE_NAME, "indexed", IndexMethod.TWO_LEVEL_BIN_TREE,
+        indexKeys, true, true, null);
 
-    desc2 = new IndexDesc(
-        "idx_test2", DEFAULT_DATABASE_NAME, "indexed", new Column("score", Type.FLOAT8),
-        IndexMethod.TWO_LEVEL_BIN_TREE, false, false, false);
+    indexKeys = new ArrayList<IndexKey>();
+    indexKeys.add(new IndexKey(new Column("score", Type.FLOAT8).toJson(), false, false));
+    desc2 = new IndexDesc("idx_test2", DEFAULT_DATABASE_NAME, "indexed", IndexMethod.TWO_LEVEL_BIN_TREE,
+        indexKeys, false, false, null);
 
-    desc3 = new IndexDesc(
-        "idx_test", DEFAULT_DATABASE_NAME, "indexed", new Column("id", Type.INT4),
-        IndexMethod.TWO_LEVEL_BIN_TREE, true, true, true);
+    indexKeys = new ArrayList<IndexKey>();
+    indexKeys.add(new IndexKey(new Column("id", Type.INT4).toJson(), true, true));
+    desc3 = new IndexDesc("idx_test", DEFAULT_DATABASE_NAME, "indexed", IndexMethod.TWO_LEVEL_BIN_TREE,
+        indexKeys, true, true, null);
   }
 
   public static TableDesc prepareTable() throws IOException {
@@ -439,18 +442,14 @@ public class TestCatalog {
 	  assertTrue(catalog.createTable(desc));
 	  
 	  assertFalse(catalog.existIndexByName("db1", desc1.getIndexName()));
-	  assertFalse(catalog.existIndexByColumn(DEFAULT_DATABASE_NAME, "indexed", "id"));
 	  catalog.createIndex(desc1);
 	  assertTrue(catalog.existIndexByName(DEFAULT_DATABASE_NAME, desc1.getIndexName()));
-	  assertTrue(catalog.existIndexByColumn(DEFAULT_DATABASE_NAME, "indexed", "id"));
 
 
 	  assertFalse(catalog.existIndexByName(DEFAULT_DATABASE_NAME, desc2.getIndexName()));
-	  assertFalse(catalog.existIndexByColumn(DEFAULT_DATABASE_NAME, "indexed", "score"));
 	  catalog.createIndex(desc2);
 	  assertTrue(catalog.existIndexByName(DEFAULT_DATABASE_NAME, desc2.getIndexName()));
-	  assertTrue(catalog.existIndexByColumn(DEFAULT_DATABASE_NAME, "indexed", "score"));
-	  
+
 	  catalog.dropIndex(DEFAULT_DATABASE_NAME, desc1.getIndexName());
 	  assertFalse(catalog.existIndexByName(DEFAULT_DATABASE_NAME, desc1.getIndexName()));
 	  catalog.dropIndex(DEFAULT_DATABASE_NAME, desc2.getIndexName());

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java b/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
index 333c8d6..b466b96 100644
--- a/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
+++ b/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
@@ -29,7 +29,10 @@ import org.apache.tajo.TajoIdProtos;
 import org.apache.tajo.TajoProtos.QueryState;
 import org.apache.tajo.annotation.Nullable;
 import org.apache.tajo.annotation.ThreadSafe;
-import org.apache.tajo.catalog.*;
+import org.apache.tajo.catalog.CatalogUtil;
+import org.apache.tajo.catalog.Schema;
+import org.apache.tajo.catalog.TableDesc;
+import org.apache.tajo.catalog.TableMeta;
 import org.apache.tajo.catalog.proto.CatalogProtos;
 import org.apache.tajo.cli.InvalidClientSessionException;
 import org.apache.tajo.conf.TajoConf;
@@ -762,6 +765,50 @@ public class TajoClient implements Closeable {
 
   }
 
+  /**
+   * Drop an index
+   *
+   * @param indexName The index name to be dropped. This name is case sensitive.
+   * @return True if the index is dropped successfully.
+   */
+  public boolean dropIndex(final String indexName) throws ServiceException {
+    return new ServerCallable<Boolean>(connPool, tajoMasterAddr,
+        TajoMasterClientProtocol.class, false, true) {
+      public Boolean call(NettyClientBase client) throws ServiceException {
+        checkSessionAndGet(client);
+
+        TajoMasterClientProtocolService.BlockingInterface tajoMasterService = client.getStub();
+
+        SessionedStringProto.Builder builder = SessionedStringProto.newBuilder();
+        builder.setSessionId(sessionId);
+        builder.setValue(indexName);
+        return tajoMasterService.dropIndex(null, builder.build()).getValue();
+      }
+    }.withRetries();
+  }
+
+  /**
+   * Does the index exist?
+   *
+   * @param indexName The index name to be checked. This name is case sensitive.
+   * @return True if so.
+   */
+  public boolean existIndex(final String indexName) throws ServiceException {
+    return new ServerCallable<Boolean>(connPool, tajoMasterAddr,
+        TajoMasterClientProtocol.class, false, true) {
+      public Boolean call(NettyClientBase client) throws ServiceException {
+        checkSessionAndGet(client);
+
+        TajoMasterClientProtocolService.BlockingInterface tajoMasterService = client.getStub();
+
+        SessionedStringProto.Builder builder = SessionedStringProto.newBuilder();
+        builder.setSessionId(sessionId);
+        builder.setValue(indexName);
+        return tajoMasterService.existIndex(null, builder.build()).getValue();
+      }
+    }.withRetries();
+  }
+
   public List<BriefQueryInfo> getRunningQueryList() throws ServiceException {
     return new ServerCallable<List<BriefQueryInfo>>(connPool, tajoMasterAddr,
         TajoMasterClientProtocol.class, false, true) {

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-client/src/main/proto/ClientProtos.proto
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/proto/ClientProtos.proto b/tajo-client/src/main/proto/ClientProtos.proto
index c66b228..f56383e 100644
--- a/tajo-client/src/main/proto/ClientProtos.proto
+++ b/tajo-client/src/main/proto/ClientProtos.proto
@@ -224,3 +224,7 @@ message FunctionResponse {
   repeated FunctionDescProto functions = 2;
   optional string errorMessage = 3;
 }
+
+message CreateIndexRequest {
+  required IndexDescProto desc = 1;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-client/src/main/proto/TajoMasterClientProtocol.proto
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/proto/TajoMasterClientProtocol.proto b/tajo-client/src/main/proto/TajoMasterClientProtocol.proto
index 9495fb1..79f7c27 100644
--- a/tajo-client/src/main/proto/TajoMasterClientProtocol.proto
+++ b/tajo-client/src/main/proto/TajoMasterClientProtocol.proto
@@ -65,4 +65,8 @@ service TajoMasterClientProtocolService {
   rpc getTableList(GetTableListRequest) returns (GetTableListResponse);
   rpc getTableDesc(GetTableDescRequest) returns (TableResponse);
   rpc getFunctionList(SessionedStringProto) returns (FunctionResponse);
+
+  // Index Management APIs
+  rpc existIndex(SessionedStringProto) returns (BoolProto);
+  rpc dropIndex(SessionedStringProto) returns (BoolProto);
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/antlr4/org/apache/tajo/engine/parser/SQLParser.g4
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/antlr4/org/apache/tajo/engine/parser/SQLParser.g4 b/tajo-core/src/main/antlr4/org/apache/tajo/engine/parser/SQLParser.g4
index 706c973..438a255 100644
--- a/tajo-core/src/main/antlr4/org/apache/tajo/engine/parser/SQLParser.g4
+++ b/tajo-core/src/main/antlr4/org/apache/tajo/engine/parser/SQLParser.g4
@@ -68,10 +68,19 @@ schema_statement
   ;
 
 index_statement
-  : CREATE (u=UNIQUE)? INDEX identifier ON table_name (method_specifier)?
+  : create_index_statement
+  | drop_index_statement
+  ;
+
+create_index_statement
+  : CREATE (u=UNIQUE)? INDEX (if_not_exists)? identifier ON table_name (method_specifier)?
     LEFT_PAREN sort_specifier_list RIGHT_PAREN param_clause? (where_clause)?
   ;
 
+drop_index_statement
+  : DROP INDEX (if_exists)? index_name = identifier
+  ;
+
 database_definition
   : CREATE DATABASE (if_not_exists)? dbname = identifier
   ;

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java b/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java
index faf0212..08f7939 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java
@@ -1142,7 +1142,7 @@ public class SQLAnalyzer extends SQLParserBaseVisitor<Expr> {
   }
 
   @Override
-  public Expr visitIndex_statement(SQLParser.Index_statementContext ctx) {
+  public Expr visitCreate_index_statement(@NotNull SQLParser.Create_index_statementContext ctx) {
     String indexName = ctx.identifier().getText();
     String tableName = ctx.table_name().getText();
     Relation relation = new Relation(tableName);
@@ -1178,6 +1178,11 @@ public class SQLAnalyzer extends SQLParserBaseVisitor<Expr> {
   }
 
   @Override
+  public Expr visitDrop_index_statement(@NotNull SQLParser.Drop_index_statementContext ctx) {
+    return new DropIndex(ctx.index_name.getText(), checkIfExist(ctx.if_exists()));
+  }
+
+  @Override
   public Expr visitDatabase_definition(@NotNull SQLParser.Database_definitionContext ctx) {
     return new CreateDatabase(ctx.identifier().getText(), null, checkIfExist(ctx.if_not_exists()));
   }

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/AlgebraVisitor.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/AlgebraVisitor.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/AlgebraVisitor.java
index eb8a21f..0d73dfc 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/AlgebraVisitor.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/AlgebraVisitor.java
@@ -49,6 +49,7 @@ public interface AlgebraVisitor<CONTEXT, RESULT> {
   RESULT visitAlterTablespace(CONTEXT ctx, Stack<Expr> stack, AlterTablespace expr) throws PlanningException;
   RESULT visitAlterTable(CONTEXT ctx, Stack<Expr> stack, AlterTable expr) throws PlanningException;
   RESULT visitCreateIndex(CONTEXT ctx, Stack<Expr> stack, CreateIndex expr) throws PlanningException;
+  RESULT visitDropIndex(CONTEXT ctx, Stack<Expr> stack, DropIndex expr) throws PlanningException;
   RESULT visitTruncateTable(CONTEXT ctx, Stack<Expr> stack, TruncateTable expr) throws PlanningException;
 
     // Insert or Update

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/BaseAlgebraVisitor.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/BaseAlgebraVisitor.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/BaseAlgebraVisitor.java
index b93541b..4c9932a 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/BaseAlgebraVisitor.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/BaseAlgebraVisitor.java
@@ -121,6 +121,9 @@ public class BaseAlgebraVisitor<CONTEXT, RESULT> implements AlgebraVisitor<CONTE
     case CreateIndex:
       current = visitCreateIndex(ctx, stack, (CreateIndex) expr);
       break;
+    case DropIndex:
+      current = visitDropIndex(ctx, stack, (DropIndex) expr);
+      break;
     case TruncateTable:
       current = visitTruncateTable(ctx, stack, (TruncateTable)expr);
       break;
@@ -479,6 +482,11 @@ public class BaseAlgebraVisitor<CONTEXT, RESULT> implements AlgebraVisitor<CONTE
   }
 
   @Override
+  public RESULT visitDropIndex(CONTEXT ctx, Stack<Expr> stack, DropIndex expr) throws PlanningException {
+    return null;
+  }
+
+  @Override
   public RESULT visitTruncateTable(CONTEXT ctx, Stack<Expr> stack, TruncateTable expr) throws PlanningException {
     return null;
   }

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/BasicLogicalPlanVisitor.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/BasicLogicalPlanVisitor.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/BasicLogicalPlanVisitor.java
index 59422f1..75cb3af 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/BasicLogicalPlanVisitor.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/BasicLogicalPlanVisitor.java
@@ -132,6 +132,9 @@ public class BasicLogicalPlanVisitor<CONTEXT, RESULT> implements LogicalPlanVisi
       case CREATE_INDEX:
         current = visitCreateIndex(context, plan, block, (CreateIndexNode) node, stack);
         break;
+      case DROP_INDEX:
+        current = visitDropIndex(context, plan, block, (DropIndexNode) node, stack);
+        break;
       case TRUNCATE_TABLE:
         current = visitTruncateTable(context, plan, block, (TruncateTableNode) node, stack);
         break;
@@ -358,6 +361,12 @@ public class BasicLogicalPlanVisitor<CONTEXT, RESULT> implements LogicalPlanVisi
   }
 
   @Override
+  public RESULT visitDropIndex(CONTEXT context, LogicalPlan plan, QueryBlock block, DropIndexNode node,
+                        Stack<LogicalNode> stack) throws PlanningException {
+    return null;
+  }
+
+  @Override
   public RESULT visitTruncateTable(CONTEXT context, LogicalPlan plan, LogicalPlan.QueryBlock block,
                                    TruncateTableNode node, Stack<LogicalNode> stack) throws PlanningException {
     return null;

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanPreprocessor.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanPreprocessor.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanPreprocessor.java
index 0ed3bdd..7932072 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanPreprocessor.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanPreprocessor.java
@@ -460,6 +460,13 @@ public class LogicalPlanPreprocessor extends BaseAlgebraVisitor<LogicalPlanPrepr
     return createIndex;
   }
 
+  @Override
+  public LogicalNode visitDropIndex(PreprocessContext ctx, Stack<Expr> stack, DropIndex expr)
+      throws PlanningException {
+    DropIndexNode dropIndexNode = ctx.plan.createNode(DropIndexNode.class);
+    return dropIndexNode;
+  }
+
   public LogicalNode visitTruncateTable(PreprocessContext ctx, Stack<Expr> stack, TruncateTable expr)
       throws PlanningException {
     TruncateTableNode truncateTableNode = ctx.plan.createNode(TruncateTableNode.class);

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanVisitor.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanVisitor.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanVisitor.java
index 57f943e..7369ff7 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanVisitor.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanVisitor.java
@@ -97,6 +97,9 @@ public interface LogicalPlanVisitor<CONTEXT, RESULT> {
   RESULT visitCreateIndex(CONTEXT context, LogicalPlan plan, QueryBlock block, CreateIndexNode node,
                                Stack<LogicalNode> stack) throws PlanningException;
 
+  RESULT visitDropIndex(CONTEXT context, LogicalPlan plan, QueryBlock block, DropIndexNode node,
+                        Stack<LogicalNode> stack) throws PlanningException;
+
   RESULT visitTruncateTable(CONTEXT context, LogicalPlan plan, LogicalPlan.QueryBlock block, TruncateTableNode node,
                          Stack<LogicalNode> stack) throws PlanningException;
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java
index fc7259b..0e2b26c 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java
@@ -46,8 +46,8 @@ import org.apache.tajo.engine.planner.rewrite.ProjectionPushDownRule;
 import org.apache.tajo.engine.utils.SchemaUtil;
 import org.apache.tajo.master.session.Session;
 import org.apache.tajo.storage.StorageUtil;
-import org.apache.tajo.util.Pair;
 import org.apache.tajo.util.KeyValueSet;
+import org.apache.tajo.util.Pair;
 import org.apache.tajo.util.TUtil;
 
 import java.util.*;
@@ -1888,11 +1888,19 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex
       createIndexNode.setOptions(keyValueSet);
     }
 
+    createIndexNode.setInSchema(child.getOutSchema());
     createIndexNode.setChild(child);
     return createIndexNode;
   }
 
   @Override
+  public LogicalNode visitDropIndex(PlanContext context, Stack<Expr> stack, DropIndex dropIndex) {
+    DropIndexNode dropIndexNode = context.queryBlock.getNodeFromExpr(dropIndex);
+    dropIndexNode.init(dropIndex.getIndexName(), dropIndex.isIfExists());
+    return dropIndexNode;
+  }
+
+  @Override
   public LogicalNode visitTruncateTable(PlanContext context, Stack<Expr> stack, TruncateTable truncateTable)
       throws PlanningException {
     TruncateTableNode truncateTableNode = context.queryBlock.getNodeFromExpr(truncateTable);

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/PlannerUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/PlannerUtil.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PlannerUtil.java
index 55892ee..d80c945 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/PlannerUtil.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PlannerUtil.java
@@ -39,6 +39,18 @@ import java.util.*;
 
 public class PlannerUtil {
 
+  public static boolean checkIfCreateIndexPlan(LogicalNode node) {
+    LogicalNode baseNode = node;
+    if (node instanceof LogicalRootNode) {
+      baseNode = ((LogicalRootNode) node).getChild();
+    }
+
+    NodeType type = baseNode.getType();
+
+    return
+        baseNode.getType() == NodeType.CREATE_INDEX;
+  }
+
   public static boolean checkIfDDLPlan(LogicalNode node) {
     LogicalNode baseNode = node;
     if (node instanceof LogicalRootNode) {
@@ -54,7 +66,9 @@ public class PlannerUtil {
             baseNode.getType() == NodeType.DROP_TABLE ||
             baseNode.getType() == NodeType.ALTER_TABLESPACE ||
             baseNode.getType() == NodeType.ALTER_TABLE ||
-            baseNode.getType() == NodeType.TRUNCATE_TABLE;
+            baseNode.getType() == NodeType.TRUNCATE_TABLE ||
+            baseNode.getType() == NodeType.CREATE_INDEX ||
+            baseNode.getType() == NodeType.DROP_INDEX;
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/CreateIndexNode.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/CreateIndexNode.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/CreateIndexNode.java
index 1dca608..4c33958 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/CreateIndexNode.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/CreateIndexNode.java
@@ -29,10 +29,12 @@ import static org.apache.tajo.catalog.proto.CatalogProtos.IndexMethod;
 
 public class CreateIndexNode extends UnaryNode implements Cloneable {
   @Expose private boolean isUnique;
+  @Expose private boolean isClustered;
   @Expose private String indexName;
   @Expose private SortSpec[] sortSpecs;
   @Expose private IndexMethod indexType = IndexMethod.TWO_LEVEL_BIN_TREE;
   @Expose private KeyValueSet options;
+  @Expose private boolean ifNotExists;
 
   public CreateIndexNode(int pid) {
     super(pid, NodeType.CREATE_INDEX);
@@ -78,6 +80,14 @@ public class CreateIndexNode extends UnaryNode implements Cloneable {
     return this.options;
   }
 
+  public boolean isIfNotExists() {
+    return ifNotExists;
+  }
+
+  public void setIfNotExists(boolean ifNotExists) {
+    this.ifNotExists = ifNotExists;
+  }
+
   @Override
   public int hashCode() {
     return Objects.hashCode(isUnique, indexName, sortSpecs, indexType, options);
@@ -130,4 +140,12 @@ public class CreateIndexNode extends UnaryNode implements Cloneable {
   public PlanString getPlanString() {
     return new PlanString(this);
   }
+
+  public boolean isClustered() {
+    return isClustered;
+  }
+
+  public void setClustered(boolean isClustered) {
+    this.isClustered = isClustered;
+  }
 }

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/DropIndexNode.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/DropIndexNode.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/DropIndexNode.java
new file mode 100644
index 0000000..e50c0b9
--- /dev/null
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/DropIndexNode.java
@@ -0,0 +1,89 @@
+/*
+ * 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.logical;
+
+import com.google.common.base.Objects;
+import com.google.gson.annotations.Expose;
+import org.apache.tajo.engine.planner.PlanString;
+import org.apache.tajo.util.TUtil;
+
+public class DropIndexNode extends LogicalNode implements Cloneable {
+  @Expose private String indexName;
+  @Expose private boolean ifExists;
+
+  public DropIndexNode(int pid) {
+    super(pid, NodeType.DROP_INDEX);
+  }
+
+  public void init(String indexName, boolean ifExists) {
+    this.indexName = indexName;
+    this.ifExists = ifExists;
+  }
+
+  @Override
+  public void preOrder(LogicalNodeVisitor visitor) {
+    visitor.visit(this);
+  }
+
+  @Override
+  public void postOrder(LogicalNodeVisitor visitor) {
+    visitor.visit(this);
+  }
+
+  @Override
+  public PlanString getPlanString() {
+    return new PlanString(this).appendTitle(ifExists ? " IF EXISTS" : "");
+  }
+
+  @Override
+  public String toString() {
+    return "DROP INDEX " + (ifExists ? "IF EXISTS " : "") + indexName;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(indexName, ifExists);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o instanceof DropIndexNode) {
+      DropIndexNode other = (DropIndexNode) o;
+      return TUtil.checkEquals(this.indexName, other.indexName) &&
+          this.ifExists == other.ifExists;
+    }
+    return false;
+  }
+
+  @Override
+  public Object clone() throws CloneNotSupportedException {
+    DropIndexNode clone = (DropIndexNode) super.clone();
+    clone.indexName = this.indexName;
+    clone.ifExists = this.ifExists;
+    return clone;
+  }
+
+  public String getIndexName() {
+    return indexName;
+  }
+
+  public boolean isIfExists() {
+    return ifExists;
+  }
+}

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/NodeType.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/NodeType.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/NodeType.java
index 2e9e0da..b8ba248 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/NodeType.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/logical/NodeType.java
@@ -56,6 +56,7 @@ public enum NodeType {
   ALTER_TABLESPACE (AlterTablespaceNode.class),
   ALTER_TABLE (AlterTableNode.class),
   CREATE_INDEX(CreateIndexNode.class),
+  DROP_INDEX(DropIndexNode.class),
   TRUNCATE_TABLE (TruncateTableNode.class);
 
   private final Class<? extends LogicalNode> baseClass;

http://git-wip-us.apache.org/repos/asf/tajo/blob/c9b8f511/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreIndexExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreIndexExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreIndexExec.java
index 91b5322..5f1189a 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreIndexExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreIndexExec.java
@@ -26,13 +26,14 @@ import org.apache.tajo.catalog.Column;
 import org.apache.tajo.catalog.Schema;
 import org.apache.tajo.catalog.SortSpec;
 import org.apache.tajo.conf.TajoConf;
-import org.apache.tajo.conf.TajoConf.ConfVars;
 import org.apache.tajo.engine.planner.PlannerUtil;
 import org.apache.tajo.engine.planner.logical.CreateIndexNode;
 import org.apache.tajo.storage.RowStoreUtil;
 import org.apache.tajo.storage.Tuple;
 import org.apache.tajo.storage.TupleComparator;
 import org.apache.tajo.storage.VTuple;
+import org.apache.tajo.storage.fragment.FileFragment;
+import org.apache.tajo.storage.fragment.FragmentConvertor;
 import org.apache.tajo.storage.index.bst.BSTIndex;
 import org.apache.tajo.storage.index.bst.BSTIndex.BSTIndexWriter;
 import org.apache.tajo.worker.TaskAttemptContext;
@@ -53,6 +54,14 @@ public class StoreIndexExec extends UnaryPhysicalExec {
     this.logicalPlan = logicalPlan;
   }
 
+  private Path getIndexPath(TajoConf conf, String dbName, String indexName) {
+    // assume that there is only one fragment for each task
+    String table = context.getInputTables().iterator().next();
+    FileFragment fragment = FragmentConvertor.convert(FileFragment.class, context.getTable(table));
+    return new Path(TajoConf.getWarehouseDir(conf), dbName + "/" + indexName + "/" +
+        fragment.getStartKey() + "_" + fragment.getEndKey());
+  }
+
   @Override
   public void init() throws IOException {
     super.init();
@@ -70,9 +79,7 @@ public class StoreIndexExec extends UnaryPhysicalExec {
     TajoConf conf = context.getConf();
 
     String[] splits = logicalPlan.getIndexName().split("\\.");
-    Path indexPath = new Path(conf.getVar(ConfVars.WAREHOUSE_DIR), splits[0] + "/" + splits[1] + "/" +
-        context.getUniqueKeyFromFragments());
-    System.out.println("exec: " + indexPath);
+    Path indexPath = getIndexPath(conf, splits[0], splits[1]);
     // TODO: Create factory using reflection
     BSTIndex bst = new BSTIndex(conf);
     this.comparator = new TupleComparator(keySchema, sortSpecs);