carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ravipes...@apache.org
Subject [3/9] incubator-carbondata git commit: clean up core
Date Wed, 04 Jan 2017 13:34:57 GMT
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitable/ResolvedFilterInfoVisitable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitable/ResolvedFilterInfoVisitable.java b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitable/ResolvedFilterInfoVisitable.java
deleted file mode 100644
index bb71b96..0000000
--- a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitable/ResolvedFilterInfoVisitable.java
+++ /dev/null
@@ -1,38 +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.carbondata.scan.filter.resolver.resolverinfo.visitable;
-
-import org.apache.carbondata.scan.expression.exception.FilterUnsupportedException;
-import org.apache.carbondata.scan.filter.resolver.metadata.FilterResolverMetadata;
-import org.apache.carbondata.scan.filter.resolver.resolverinfo.visitor.ResolvedFilterInfoVisitorIntf;
-
-public interface ResolvedFilterInfoVisitable {
-  /**
-   * This visitable method will visit through the visitor classes which is passed as parameter
-   * and based on different visitor the visitable filter instance will be resolved.
-   *
-   * @param visitor
-   * @param metadata
-   * @throws QueryExecutionException
-   * @throws FilterUnsupportedException
-   */
-  void populateFilterInfoBasedOnColumnType(ResolvedFilterInfoVisitorIntf visitor,
-      FilterResolverMetadata metadata) throws FilterUnsupportedException;
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
index 95420be..9af4b71 100644
--- a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
+++ b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
@@ -22,9 +22,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.carbondata.common.logging.LogService;
-import org.apache.carbondata.common.logging.LogServiceFactory;
-import org.apache.carbondata.core.carbon.AbsoluteTableIdentifier;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
 import org.apache.carbondata.core.keygenerator.directdictionary.DirectDictionaryGenerator;
 import org.apache.carbondata.core.keygenerator.directdictionary.DirectDictionaryKeyGeneratorFactory;
@@ -37,8 +34,6 @@ import org.apache.carbondata.scan.filter.resolver.metadata.FilterResolverMetadat
 import org.apache.carbondata.scan.filter.resolver.resolverinfo.DimColumnResolvedFilterInfo;
 
 public class CustomTypeDictionaryVisitor implements ResolvedFilterInfoVisitorIntf {
-  private static final LogService LOGGER =
-      LogServiceFactory.getLogService(CustomTypeDictionaryVisitor.class.getName());
 
   /**
    * This Visitor method is been used to resolve or populate the filter details
@@ -60,8 +55,8 @@ public class CustomTypeDictionaryVisitor implements ResolvedFilterInfoVisitorInt
     } catch (FilterIllegalMemberException e) {
       throw new FilterUnsupportedException(e);
     }
-    resolvedFilterObject = getDirectDictionaryValKeyMemberForFilter(metadata.getTableIdentifier(),
-        metadata.getColumnExpression(), evaluateResultListFinal, metadata.isIncludeFilter());
+    resolvedFilterObject = getDirectDictionaryValKeyMemberForFilter(metadata.getColumnExpression(),
+        evaluateResultListFinal, metadata.isIncludeFilter());
     if (!metadata.isIncludeFilter() && null != resolvedFilterObject && !resolvedFilterObject
         .getFilterList().contains(CarbonCommonConstants.MEMBER_DEFAULT_VAL_SURROGATE_KEY)) {
       // Adding default surrogate key of null member inorder to not display the same while
@@ -74,8 +69,8 @@ public class CustomTypeDictionaryVisitor implements ResolvedFilterInfoVisitorInt
   }
 
   private DimColumnFilterInfo getDirectDictionaryValKeyMemberForFilter(
-      AbsoluteTableIdentifier tableIdentifier, ColumnExpression columnExpression,
-      List<String> evaluateResultListFinal, boolean isIncludeFilter) {
+      ColumnExpression columnExpression, List<String> evaluateResultListFinal,
+      boolean isIncludeFilter) {
     List<Integer> surrogates = new ArrayList<Integer>(20);
     DirectDictionaryGenerator directDictionaryGenerator = DirectDictionaryKeyGeneratorFactory
         .getDirectDictionaryGenerator(columnExpression.getDimension().getDataType());

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/DictionaryColumnVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/DictionaryColumnVisitor.java b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/DictionaryColumnVisitor.java
index 6cb2348..532af60 100644
--- a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/DictionaryColumnVisitor.java
+++ b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/DictionaryColumnVisitor.java
@@ -18,13 +18,11 @@
  */
 package org.apache.carbondata.scan.filter.resolver.resolverinfo.visitor;
 
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.carbondata.common.logging.LogService;
-import org.apache.carbondata.common.logging.LogServiceFactory;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
-import org.apache.carbondata.scan.executor.exception.QueryExecutionException;
 import org.apache.carbondata.scan.expression.exception.FilterIllegalMemberException;
 import org.apache.carbondata.scan.expression.exception.FilterUnsupportedException;
 import org.apache.carbondata.scan.filter.DimColumnFilterInfo;
@@ -33,8 +31,6 @@ import org.apache.carbondata.scan.filter.resolver.metadata.FilterResolverMetadat
 import org.apache.carbondata.scan.filter.resolver.resolverinfo.DimColumnResolvedFilterInfo;
 
 public class DictionaryColumnVisitor implements ResolvedFilterInfoVisitorIntf {
-  private static final LogService LOGGER =
-      LogServiceFactory.getLogService(DictionaryColumnVisitor.class.getName());
 
   /**
    * This Visitor method is used to populate the visitableObj with direct dictionary filter details
@@ -44,10 +40,11 @@ public class DictionaryColumnVisitor implements ResolvedFilterInfoVisitorIntf {
    * @param metadata
    * @throws FilterUnsupportedException,if exception occurs while evaluating
    * filter models.
-   * @throws QueryExecutionException
+   * @throws IOException
+   * @throws FilterUnsupportedException
    */
   public void populateFilterResolvedInfo(DimColumnResolvedFilterInfo visitableObj,
-      FilterResolverMetadata metadata) throws FilterUnsupportedException {
+      FilterResolverMetadata metadata) throws FilterUnsupportedException, IOException {
     DimColumnFilterInfo resolvedFilterObject = null;
     List<String> evaluateResultListFinal;
     try {
@@ -55,19 +52,15 @@ public class DictionaryColumnVisitor implements ResolvedFilterInfoVisitorIntf {
     } catch (FilterIllegalMemberException e) {
       throw new FilterUnsupportedException(e);
     }
-    try {
-      resolvedFilterObject = FilterUtil
-          .getFilterValues(metadata.getTableIdentifier(), metadata.getColumnExpression(),
-              evaluateResultListFinal, metadata.isIncludeFilter());
-      if (!metadata.isIncludeFilter() && null != resolvedFilterObject) {
-        // Adding default surrogate key of null member inorder to not display the same while
-        // displaying the report as per hive compatibility.
-        resolvedFilterObject.getFilterList()
-            .add(CarbonCommonConstants.MEMBER_DEFAULT_VAL_SURROGATE_KEY);
-        Collections.sort(resolvedFilterObject.getFilterList());
-      }
-    } catch (QueryExecutionException e) {
-      throw new FilterUnsupportedException(e);
+    resolvedFilterObject = FilterUtil
+        .getFilterValues(metadata.getTableIdentifier(), metadata.getColumnExpression(),
+            evaluateResultListFinal, metadata.isIncludeFilter());
+    if (!metadata.isIncludeFilter() && null != resolvedFilterObject) {
+      // Adding default surrogate key of null member inorder to not display the same while
+      // displaying the report as per hive compatibility.
+      resolvedFilterObject.getFilterList()
+          .add(CarbonCommonConstants.MEMBER_DEFAULT_VAL_SURROGATE_KEY);
+      Collections.sort(resolvedFilterObject.getFilterList());
     }
     visitableObj.setFilterValues(resolvedFilterObject);
   }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/NoDictionaryTypeVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/NoDictionaryTypeVisitor.java b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/NoDictionaryTypeVisitor.java
index e7db0dc..035fd0d 100644
--- a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/NoDictionaryTypeVisitor.java
+++ b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/NoDictionaryTypeVisitor.java
@@ -20,8 +20,6 @@ package org.apache.carbondata.scan.filter.resolver.resolverinfo.visitor;
 
 import java.util.List;
 
-import org.apache.carbondata.common.logging.LogService;
-import org.apache.carbondata.common.logging.LogServiceFactory;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
 import org.apache.carbondata.scan.expression.exception.FilterIllegalMemberException;
 import org.apache.carbondata.scan.expression.exception.FilterUnsupportedException;
@@ -31,8 +29,6 @@ import org.apache.carbondata.scan.filter.resolver.metadata.FilterResolverMetadat
 import org.apache.carbondata.scan.filter.resolver.resolverinfo.DimColumnResolvedFilterInfo;
 
 public class NoDictionaryTypeVisitor implements ResolvedFilterInfoVisitorIntf {
-  private static final LogService LOGGER =
-      LogServiceFactory.getLogService(NoDictionaryTypeVisitor.class.getName());
 
   /**
    * Visitor Method will update the filter related details in visitableObj, For no dictionary
@@ -62,8 +58,7 @@ public class NoDictionaryTypeVisitor implements ResolvedFilterInfoVisitorIntf {
       throw new FilterUnsupportedException(e);
     }
     resolvedFilterObject = FilterUtil
-        .getNoDictionaryValKeyMemberForFilter(metadata.getTableIdentifier(),
-            metadata.getColumnExpression(), evaluateResultListFinal, metadata.isIncludeFilter());
+        .getNoDictionaryValKeyMemberForFilter(evaluateResultListFinal, metadata.isIncludeFilter());
     visitableObj.setFilterValues(resolvedFilterObject);
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/ResolvedFilterInfoVisitorIntf.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/ResolvedFilterInfoVisitorIntf.java b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/ResolvedFilterInfoVisitorIntf.java
index 1b2610d..2c46bde 100644
--- a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/ResolvedFilterInfoVisitorIntf.java
+++ b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/ResolvedFilterInfoVisitorIntf.java
@@ -18,6 +18,8 @@
  */
 package org.apache.carbondata.scan.filter.resolver.resolverinfo.visitor;
 
+import java.io.IOException;
+
 import org.apache.carbondata.scan.expression.exception.FilterUnsupportedException;
 import org.apache.carbondata.scan.filter.resolver.metadata.FilterResolverMetadata;
 import org.apache.carbondata.scan.filter.resolver.resolverinfo.DimColumnResolvedFilterInfo;
@@ -36,5 +38,5 @@ public interface ResolvedFilterInfoVisitorIntf {
    * @throws FilterUnsupportedException
    */
   void populateFilterResolvedInfo(DimColumnResolvedFilterInfo visitableObj,
-      FilterResolverMetadata metadata) throws FilterUnsupportedException;
+      FilterResolverMetadata metadata) throws FilterUnsupportedException, IOException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/model/CarbonQueryPlan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/model/CarbonQueryPlan.java b/core/src/main/java/org/apache/carbondata/scan/model/CarbonQueryPlan.java
index 8ce732d..c77e59e 100644
--- a/core/src/main/java/org/apache/carbondata/scan/model/CarbonQueryPlan.java
+++ b/core/src/main/java/org/apache/carbondata/scan/model/CarbonQueryPlan.java
@@ -68,16 +68,6 @@ public class CarbonQueryPlan implements Serializable {
       new ArrayList<QueryMeasure>(CarbonCommonConstants.CONSTANT_SIZE_TEN);
 
   /**
-   * Limit
-   */
-  private int limit = -1;
-
-  /**
-   * If it is detail query, no need to aggregate in backend
-   */
-  private boolean detailQuery;
-
-  /**
    * expression
    */
   private Expression expression;
@@ -88,33 +78,12 @@ public class CarbonQueryPlan implements Serializable {
   private String queryId;
 
   /**
-   * outLocationPath
-   */
-  private String outLocationPath;
-
-  /**
-   * isCountStarQuery
-   */
-  private boolean isCountStartQuery;
-
-  private List<QueryDimension> sortedDimensions;
-
-  /**
    * If it is raw detail query, no need to aggregate in backend. And it returns with dictionary data
    * with out decoding.
    */
   private boolean rawDetailQuery;
 
   /**
-   * Constructor created with table name.
-   *
-   * @param tableName
-   */
-  public CarbonQueryPlan(String tableName) {
-    this.tableName = tableName;
-  }
-
-  /**
    * Constructor created with database name and table name.
    *
    * @param databaseName
@@ -169,34 +138,6 @@ public class CarbonQueryPlan implements Serializable {
     return tableName;
   }
 
-  /**
-   * @return the limit
-   */
-  public int getLimit() {
-    return limit;
-  }
-
-  /**
-   * @param limit the limit to set
-   */
-  public void setLimit(int limit) {
-    this.limit = limit;
-  }
-
-  /**
-   * @return the detailQuery
-   */
-  public boolean isDetailQuery() {
-    return detailQuery;
-  }
-
-  /**
-   * @param detailQuery the detailQuery to set
-   */
-  public void setDetailQuery(boolean detailQuery) {
-    this.detailQuery = detailQuery;
-  }
-
   public String getQueryId() {
     return queryId;
   }
@@ -205,30 +146,6 @@ public class CarbonQueryPlan implements Serializable {
     this.queryId = queryId;
   }
 
-  public String getOutLocationPath() {
-    return outLocationPath;
-  }
-
-  public void setOutLocationPath(String outLocationPath) {
-    this.outLocationPath = outLocationPath;
-  }
-
-  public boolean isCountStarQuery() {
-    return isCountStartQuery;
-  }
-
-  public void setCountStartQuery(boolean isCountStartQuery) {
-    this.isCountStartQuery = isCountStartQuery;
-  }
-
-  public List<QueryDimension> getSortedDimemsions() {
-    return sortedDimensions;
-  }
-
-  public void setSortedDimemsions(List<QueryDimension> dims) {
-    this.sortedDimensions = dims;
-  }
-
   public boolean isRawDetailQuery() {
     return rawDetailQuery;
   }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/model/QueryColumn.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/model/QueryColumn.java b/core/src/main/java/org/apache/carbondata/scan/model/QueryColumn.java
index 0aa5266..d026227 100644
--- a/core/src/main/java/org/apache/carbondata/scan/model/QueryColumn.java
+++ b/core/src/main/java/org/apache/carbondata/scan/model/QueryColumn.java
@@ -20,8 +20,6 @@ package org.apache.carbondata.scan.model;
 
 import java.io.Serializable;
 
-import org.apache.carbondata.core.constants.CarbonCommonConstants;
-
 /**
  * query column  which will have information about column
  */
@@ -38,40 +36,15 @@ public class QueryColumn implements Serializable {
   protected String columnName;
 
   /**
-   * sort order in which column output will be sorted default it will be none
-   */
-  private SortOrderType sortOrder = SortOrderType.NONE;
-
-  /**
    * query order in which result of the query will be send
    */
   private int queryOrder;
 
-  /**
-   * aggregation function applied on column
-   */
-
-  private String aggregationFunction=CarbonCommonConstants.DUMMY;
-
   public QueryColumn(String columnName) {
     this.columnName = columnName;
   }
 
   /**
-   * @return the sortOrder
-   */
-  public SortOrderType getSortOrder() {
-    return sortOrder;
-  }
-
-  /**
-   * @param sortOrder the sortOrder to set
-   */
-  public void setSortOrder(SortOrderType sortOrder) {
-    this.sortOrder = sortOrder;
-  }
-
-  /**
    * @return the columnName
    */
   public String getColumnName() {
@@ -92,18 +65,4 @@ public class QueryColumn implements Serializable {
     this.queryOrder = queryOrder;
   }
 
-  /**
-   * @return the aggregationFunction
-   */
-  public String getAggregateFunction() {
-    return aggregationFunction;
-  }
-
-  /**
-   * @param aggregationFunction the aggregationFunction to set
-   */
-  public void setAggregateFunction(String aggregationFunction) {
-    this.aggregationFunction = aggregationFunction;
-  }
-
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/model/QueryModel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/model/QueryModel.java b/core/src/main/java/org/apache/carbondata/scan/model/QueryModel.java
index 61332f5..89ac225 100644
--- a/core/src/main/java/org/apache/carbondata/scan/model/QueryModel.java
+++ b/core/src/main/java/org/apache/carbondata/scan/model/QueryModel.java
@@ -56,18 +56,10 @@ public class QueryModel implements Serializable {
    */
   public transient Map<String, Dictionary> columnToDictionaryMapping;
   /**
-   * Number of records to keep in memory.
-   */
-  public int inMemoryRecordSize;
-  /**
    * list of dimension selected for in query
    */
   private List<QueryDimension> queryDimension;
   /**
-   * list of dimension in which sorting is applied
-   */
-  private List<QueryDimension> sortDimension;
-  /**
    * list of measure selected in query
    */
   private List<QueryMeasure> queryMeasures;
@@ -76,54 +68,24 @@ public class QueryModel implements Serializable {
    */
   private String queryId;
   /**
-   * to check if it a aggregate table
-   */
-  private boolean isAggTable;
-  /**
    * filter tree
    */
   private FilterResolverIntf filterExpressionResolverTree;
-  /**
-   * in case of limit query we need to know how many
-   * records will passed from executor
-   */
-  private int limit;
 
   /**
-   * to check if it is a count star query , so processing will be different
-   */
-  private boolean isCountStarQuery;
-  /**
-   * to check whether aggregation is required during query execution
-   */
-  private boolean detailQuery;
-  /**
    * table block information in which query will be executed
    */
   private List<TableBlockInfo> tableBlockInfos;
   /**
-   * sort in which dimension will be get sorted
-   */
-  private byte[] sortOrder;
-  /**
    * absolute table identifier
    */
   private AbsoluteTableIdentifier absoluteTableIdentifier;
   /**
-   * in case of detail query with sort we are spilling to disk
-   * to this location will be used to write the temp file in this location
-   */
-  private String queryTempLocation;
-  /**
    * To handle most of the computation in query engines like spark and hive, carbon should give
    * raw detailed records to it.
    */
   private boolean forcedDetailRawQuery;
   /**
-   * partition column list
-   */
-  private List<String> partitionColumns;
-  /**
    * table on which query will be executed
    * TODO need to remove this ad pass only the path
    * and carbon metadata will load the table from metadata file
@@ -145,9 +107,6 @@ public class QueryModel implements Serializable {
     tableBlockInfos = new ArrayList<TableBlockInfo>();
     queryDimension = new ArrayList<QueryDimension>();
     queryMeasures = new ArrayList<QueryMeasure>();
-    sortDimension = new ArrayList<QueryDimension>();
-    sortOrder = new byte[0];
-    partitionColumns = new ArrayList<String>();
     invalidSegmentIds = new ArrayList<>();
   }
 
@@ -159,11 +118,8 @@ public class QueryModel implements Serializable {
 
     fillQueryModel(queryPlan, carbonTable, queryModel, factTableName);
 
-    queryModel.setLimit(queryPlan.getLimit());
-    queryModel.setDetailQuery(queryPlan.isDetailQuery());
     queryModel.setForcedDetailRawQuery(queryPlan.isRawDetailQuery());
     queryModel.setQueryId(queryPlan.getQueryId());
-    queryModel.setQueryTempLocation(queryPlan.getOutLocationPath());
     return queryModel;
   }
 
@@ -171,36 +127,17 @@ public class QueryModel implements Serializable {
       QueryModel queryModel, String factTableName) {
     queryModel.setAbsoluteTableIdentifier(carbonTable.getAbsoluteTableIdentifier());
     queryModel.setQueryDimension(queryPlan.getDimensions());
-    fillSortInfoInModel(queryModel, queryPlan.getSortedDimemsions());
     queryModel.setQueryMeasures(queryPlan.getMeasures());
     if (null != queryPlan.getFilterExpression()) {
       processFilterExpression(queryPlan.getFilterExpression(),
           carbonTable.getDimensionByTableName(factTableName),
           carbonTable.getMeasureByTableName(factTableName));
     }
-    queryModel.setCountStarQuery(queryPlan.isCountStarQuery());
     //TODO need to remove this code, and executor will load the table
     // from file metadata
     queryModel.setTable(carbonTable);
   }
 
-  private static void fillSortInfoInModel(QueryModel executorModel,
-      List<QueryDimension> sortedDims) {
-    if (null != sortedDims) {
-      byte[] sortOrderByteArray = new byte[sortedDims.size()];
-      int i = 0;
-      for (QueryColumn mdim : sortedDims) {
-        sortOrderByteArray[i++] = (byte) mdim.getSortOrder().ordinal();
-      }
-      executorModel.setSortOrder(sortOrderByteArray);
-      executorModel.setSortDimension(sortedDims);
-    } else {
-      executorModel.setSortOrder(new byte[0]);
-      executorModel.setSortDimension(new ArrayList<QueryDimension>(0));
-    }
-
-  }
-
   public static void processFilterExpression(Expression filterExpression,
       List<CarbonDimension> dimensions, List<CarbonMeasure> measures) {
     if (null != filterExpression) {
@@ -209,13 +146,11 @@ public class QueryModel implements Serializable {
           List<ColumnExpression> listOfCol =
               ((ConditionalExpression) filterExpression).getColumnList();
           for (ColumnExpression expression : listOfCol) {
-            setDimAndMsrColumnNode(dimensions, measures, (ColumnExpression) expression);
+            setDimAndMsrColumnNode(dimensions, measures, expression);
           }
-
         }
       }
       for (Expression expression : filterExpression.getChildren()) {
-
         if (expression instanceof ColumnExpression) {
           setDimAndMsrColumnNode(dimensions, measures, (ColumnExpression) expression);
         } else if (expression instanceof UnknownExpression) {
@@ -316,59 +251,6 @@ public class QueryModel implements Serializable {
   }
 
   /**
-   * @return the isAggTable
-   */
-  public boolean isAggTable() {
-    return isAggTable;
-  }
-
-  /**
-   * @param isAggTable the isAggTable to set
-   */
-  public void setAggTable(boolean isAggTable) {
-    this.isAggTable = isAggTable;
-  }
-
-  /**
-   * @return the limit
-   */
-  public int getLimit() {
-    return limit;
-  }
-
-  /**
-   * @param limit the limit to set
-   */
-  public void setLimit(int limit) {
-    this.limit = limit;
-  }
-
-  /**
-   * @return the isCountStarQuery
-   */
-  public boolean isCountStarQuery() {
-    return isCountStarQuery;
-  }
-
-  /**
-   * @param isCountStarQuery the isCountStarQuery to set
-   */
-  public void setCountStarQuery(boolean isCountStarQuery) {
-    this.isCountStarQuery = isCountStarQuery;
-  }
-
-  /**
-   * @return the isdetailQuery
-   */
-  public boolean isDetailQuery() {
-    return detailQuery;
-  }
-
-  public void setDetailQuery(boolean detailQuery) {
-    this.detailQuery = detailQuery;
-  }
-
-  /**
    * @return the tableBlockInfos
    */
   public List<TableBlockInfo> getTableBlockInfos() {
@@ -383,48 +265,6 @@ public class QueryModel implements Serializable {
   }
 
   /**
-   * @return the queryTempLocation
-   */
-  public String getQueryTempLocation() {
-    return queryTempLocation;
-  }
-
-  /**
-   * @param queryTempLocation the queryTempLocation to set
-   */
-  public void setQueryTempLocation(String queryTempLocation) {
-    this.queryTempLocation = queryTempLocation;
-  }
-
-  /**
-   * @return the sortOrder
-   */
-  public byte[] getSortOrder() {
-    return sortOrder;
-  }
-
-  /**
-   * @param sortOrder the sortOrder to set
-   */
-  public void setSortOrder(byte[] sortOrder) {
-    this.sortOrder = sortOrder;
-  }
-
-  /**
-   * @return the sortDimension
-   */
-  public List<QueryDimension> getSortDimension() {
-    return sortDimension;
-  }
-
-  /**
-   * @param sortDimension the sortDimension to set
-   */
-  public void setSortDimension(List<QueryDimension> sortDimension) {
-    this.sortDimension = sortDimension;
-  }
-
-  /**
    * @return the filterEvaluatorTree
    */
   public FilterResolverIntf getFilterExpressionResolverTree() {
@@ -450,20 +290,6 @@ public class QueryModel implements Serializable {
   }
 
   /**
-   * @return the partitionColumns
-   */
-  public List<String> getPartitionColumns() {
-    return partitionColumns;
-  }
-
-  /**
-   * @param partitionColumns the partitionColumns to set
-   */
-  public void setPartitionColumns(List<String> partitionColumns) {
-    this.partitionColumns = partitionColumns;
-  }
-
-  /**
    * @return the table
    */
   public CarbonTable getTable() {
@@ -499,14 +325,6 @@ public class QueryModel implements Serializable {
     this.columnToDictionaryMapping = columnToDictionaryMapping;
   }
 
-  public int getInMemoryRecordSize() {
-    return inMemoryRecordSize;
-  }
-
-  public void setInMemoryRecordSize(int inMemoryRecordSize) {
-    this.inMemoryRecordSize = inMemoryRecordSize;
-  }
-
   public QueryStatisticsRecorder getStatisticsRecorder() {
     return statisticsRecorder;
   }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/model/SortOrderType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/model/SortOrderType.java b/core/src/main/java/org/apache/carbondata/scan/model/SortOrderType.java
deleted file mode 100644
index ba725b7..0000000
--- a/core/src/main/java/org/apache/carbondata/scan/model/SortOrderType.java
+++ /dev/null
@@ -1,57 +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.carbondata.scan.model;
-
-/**
- * enum for sorting the columns
- */
-public enum SortOrderType {
-
-    /**
-     * Ascending order
-     */
-    ASC(0),
-
-    /**
-     * Descending order.
-     */
-    DSC(1),
-
-    /**
-     * No order mentioned
-     */
-    NONE(-1);
-  /**
-   * Order type in numeric
-   */
-  private int orderType;
-
-  SortOrderType(int orderType) {
-    this.orderType = orderType;
-  }
-
-  /**
-   * Order type in number
-   *
-   * @return orderType int
-   */
-  public int getOrderType() {
-    return orderType;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/processor/AbstractDataBlockIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/processor/AbstractDataBlockIterator.java b/core/src/main/java/org/apache/carbondata/scan/processor/AbstractDataBlockIterator.java
index 95d5836..4fc74b9 100644
--- a/core/src/main/java/org/apache/carbondata/scan/processor/AbstractDataBlockIterator.java
+++ b/core/src/main/java/org/apache/carbondata/scan/processor/AbstractDataBlockIterator.java
@@ -18,11 +18,10 @@
  */
 package org.apache.carbondata.scan.processor;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.apache.carbondata.common.CarbonIterator;
-import org.apache.carbondata.common.logging.LogService;
-import org.apache.carbondata.common.logging.LogServiceFactory;
 import org.apache.carbondata.core.carbon.datastore.DataRefNode;
 import org.apache.carbondata.core.carbon.querystatistics.QueryStatisticsModel;
 import org.apache.carbondata.core.datastorage.store.FileHolder;
@@ -30,8 +29,8 @@ import org.apache.carbondata.scan.collector.ScannedResultCollector;
 import org.apache.carbondata.scan.collector.impl.DictionaryBasedResultCollector;
 import org.apache.carbondata.scan.collector.impl.DictionaryBasedVectorResultCollector;
 import org.apache.carbondata.scan.collector.impl.RawBasedResultCollector;
-import org.apache.carbondata.scan.executor.exception.QueryExecutionException;
 import org.apache.carbondata.scan.executor.infos.BlockExecutionInfo;
+import org.apache.carbondata.scan.expression.exception.FilterUnsupportedException;
 import org.apache.carbondata.scan.result.AbstractScannedResult;
 import org.apache.carbondata.scan.result.vector.CarbonColumnarBatch;
 import org.apache.carbondata.scan.scanner.BlockletScanner;
@@ -44,19 +43,12 @@ import org.apache.carbondata.scan.scanner.impl.NonFilterScanner;
  */
 public abstract class AbstractDataBlockIterator extends CarbonIterator<List<Object[]>> {
 
-  private static final LogService LOGGER =
-      LogServiceFactory.getLogService(AbstractDataBlockIterator.class.getName());
   /**
    * iterator which will be used to iterate over data blocks
    */
   protected CarbonIterator<DataRefNode> dataBlockIterator;
 
   /**
-   * execution details
-   */
-  protected BlockExecutionInfo blockExecutionInfo;
-
-  /**
    * result collector which will be used to aggregate the scanned result
    */
   protected ScannedResultCollector scannerResultAggregator;
@@ -79,11 +71,8 @@ public abstract class AbstractDataBlockIterator extends CarbonIterator<List<Obje
 
   protected AbstractScannedResult scannedResult;
 
-  QueryStatisticsModel queryStatisticsModel;
-
   public AbstractDataBlockIterator(BlockExecutionInfo blockExecutionInfo,
       FileHolder fileReader, int batchSize, QueryStatisticsModel queryStatisticsModel) {
-    this.blockExecutionInfo = blockExecutionInfo;
     dataBlockIterator = new BlockletIterator(blockExecutionInfo.getFirstDataBlock(),
         blockExecutionInfo.getNumberOfBlockToScan());
     blocksChunkHolder = new BlocksChunkHolder(blockExecutionInfo.getTotalNumberDimensionBlock(),
@@ -106,7 +95,6 @@ public abstract class AbstractDataBlockIterator extends CarbonIterator<List<Obje
           new DictionaryBasedResultCollector(blockExecutionInfo);
     }
     this.batchSize = batchSize;
-    this.queryStatisticsModel = queryStatisticsModel;
   }
 
   public boolean hasNext() {
@@ -131,12 +119,13 @@ public abstract class AbstractDataBlockIterator extends CarbonIterator<List<Obje
         }
         return false;
       }
-    } catch (QueryExecutionException ex) {
+    } catch (IOException | FilterUnsupportedException ex) {
       throw new RuntimeException(ex);
     }
   }
 
-  private AbstractScannedResult getNextScannedResult() throws QueryExecutionException {
+  private AbstractScannedResult getNextScannedResult()
+      throws IOException, FilterUnsupportedException {
     if (dataBlockIterator.hasNext()) {
       blocksChunkHolder.setDataBlock(dataBlockIterator.next());
       blocksChunkHolder.reset();

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/result/Result.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/result/Result.java b/core/src/main/java/org/apache/carbondata/scan/result/Result.java
deleted file mode 100644
index 618af73..0000000
--- a/core/src/main/java/org/apache/carbondata/scan/result/Result.java
+++ /dev/null
@@ -1,70 +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.carbondata.scan.result;
-
-import org.apache.carbondata.scan.wrappers.ByteArrayWrapper;
-
-/**
- * Result interface for storing the result
- */
-public interface Result<K, V> {
-  /**
-   * Below method will be used to
-   * add the sccaed result
-   *
-   * @param result
-   */
-  void addScannedResult(K result);
-
-  /**
-   * Returns {@code true} if the iteration has more elements.
-   *
-   * @return {@code true} if the iteration has more elements
-   */
-  boolean hasNext();
-
-  /**
-   * Below method will return the result key
-   *
-   * @return key
-   */
-  ByteArrayWrapper getKey();
-
-  /**
-   * Below code will return the result value
-   *
-   * @return value
-   */
-  V[] getValue();
-
-  void merge(Result<K, V> otherResult);
-
-  /**
-   * Below method will be used to get the result
-   *
-   * @return
-   */
-  K getResult();
-
-  /**
-   * @return size of the result
-   */
-  int size();
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/result/iterator/AbstractDetailQueryResultIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/result/iterator/AbstractDetailQueryResultIterator.java b/core/src/main/java/org/apache/carbondata/scan/result/iterator/AbstractDetailQueryResultIterator.java
index f6b6ba1..5a0d3c1 100644
--- a/core/src/main/java/org/apache/carbondata/scan/result/iterator/AbstractDetailQueryResultIterator.java
+++ b/core/src/main/java/org/apache/carbondata/scan/result/iterator/AbstractDetailQueryResultIterator.java
@@ -173,7 +173,6 @@ public abstract class AbstractDetailQueryResultIterator<E> extends CarbonIterato
     QueryStatistic queryStatisticTotalBlocklet = new QueryStatistic();
     queryStatisticsModel.getStatisticsTypeAndObjMap()
         .put(QueryStatisticsConstants.TOTAL_BLOCKLET_NUM, queryStatisticTotalBlocklet);
-    QueryStatistic queryStatisticScanBlocklet = new QueryStatistic();
     QueryStatistic queryStatisticValidScanBlocklet = new QueryStatistic();
     queryStatisticsModel.getStatisticsTypeAndObjMap()
         .put(QueryStatisticsConstants.VALID_SCAN_BLOCKLET_NUM, queryStatisticValidScanBlocklet);

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/result/iterator/DetailQueryResultIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/result/iterator/DetailQueryResultIterator.java b/core/src/main/java/org/apache/carbondata/scan/result/iterator/DetailQueryResultIterator.java
index 7d944d6..9afe0f5 100644
--- a/core/src/main/java/org/apache/carbondata/scan/result/iterator/DetailQueryResultIterator.java
+++ b/core/src/main/java/org/apache/carbondata/scan/result/iterator/DetailQueryResultIterator.java
@@ -23,7 +23,6 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-import org.apache.carbondata.scan.executor.exception.QueryExecutionException;
 import org.apache.carbondata.scan.executor.infos.BlockExecutionInfo;
 import org.apache.carbondata.scan.model.QueryModel;
 import org.apache.carbondata.scan.result.BatchResult;
@@ -60,15 +59,18 @@ public class DetailQueryResultIterator extends AbstractDetailQueryResultIterator
       }
       totalScanTime += System.currentTimeMillis() - startTime;
     } catch (Exception ex) {
-      fileReader.finish();
-      throw new RuntimeException(ex);
+      try {
+        fileReader.finish();
+      } finally {
+        throw new RuntimeException(ex);
+      }
     }
     return result;
   }
 
   private Future<BatchResult> execute() {
     return execService.submit(new Callable<BatchResult>() {
-      @Override public BatchResult call() throws QueryExecutionException {
+      @Override public BatchResult call() {
         BatchResult batchResult = new BatchResult();
         synchronized (lock) {
           updateDataBlockIterator();

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/result/iterator/RawResultIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/result/iterator/RawResultIterator.java b/core/src/main/java/org/apache/carbondata/scan/result/iterator/RawResultIterator.java
index 4b20627..b37a989 100644
--- a/core/src/main/java/org/apache/carbondata/scan/result/iterator/RawResultIterator.java
+++ b/core/src/main/java/org/apache/carbondata/scan/result/iterator/RawResultIterator.java
@@ -134,7 +134,7 @@ public class RawResultIterator extends CarbonIterator<Object[]> {
     if(hasNext())
     {
       Object[] rawRow = batch.getRawRow(counter);
-      currentConveretedRawRow = convertRow(rawRow);;
+      currentConveretedRawRow = convertRow(rawRow);
       return currentConveretedRawRow;
     }
     else

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/result/vector/CarbonColumnVector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/result/vector/CarbonColumnVector.java b/core/src/main/java/org/apache/carbondata/scan/result/vector/CarbonColumnVector.java
index d89f52f..0af1857 100644
--- a/core/src/main/java/org/apache/carbondata/scan/result/vector/CarbonColumnVector.java
+++ b/core/src/main/java/org/apache/carbondata/scan/result/vector/CarbonColumnVector.java
@@ -20,28 +20,28 @@ import org.apache.spark.sql.types.Decimal;
 
 public interface CarbonColumnVector {
 
-  public void putShort(int rowId, short value);
+  void putShort(int rowId, short value);
 
-  public void putInt(int rowId, int value);
+  void putInt(int rowId, int value);
 
-  public void putLong(int rowId, long value);
+  void putLong(int rowId, long value);
 
-  public void putDecimal(int rowId, Decimal value, int precision);
+  void putDecimal(int rowId, Decimal value, int precision);
 
-  public void putDouble(int rowId, double value);
+  void putDouble(int rowId, double value);
 
-  public void putBytes(int rowId, byte[] value);
+  void putBytes(int rowId, byte[] value);
 
-  public void putBytes(int rowId, int offset, int length, byte[] value);
+  void putBytes(int rowId, int offset, int length, byte[] value);
 
-  public void putNull(int rowId);
+  void putNull(int rowId);
 
-  public boolean isNull(int rowId);
+  boolean isNull(int rowId);
 
-  public void putObject(int rowId, Object obj);
+  void putObject(int rowId, Object obj);
 
-  public Object getData(int rowId);
+  Object getData(int rowId);
 
-  public void reset();
+  void reset();
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/result/vector/MeasureDataVectorProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/result/vector/MeasureDataVectorProcessor.java b/core/src/main/java/org/apache/carbondata/scan/result/vector/MeasureDataVectorProcessor.java
index 9e455e2..c7060a3 100644
--- a/core/src/main/java/org/apache/carbondata/scan/result/vector/MeasureDataVectorProcessor.java
+++ b/core/src/main/java/org/apache/carbondata/scan/result/vector/MeasureDataVectorProcessor.java
@@ -28,7 +28,7 @@ import org.apache.spark.sql.types.Decimal;
 
 public class MeasureDataVectorProcessor {
 
-  public static interface MeasureVectorFiller {
+  public interface MeasureVectorFiller {
 
     void fillMeasureVector(MeasureColumnDataChunk dataChunk, ColumnVectorInfo info);
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/scanner/AbstractBlockletScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/scanner/AbstractBlockletScanner.java b/core/src/main/java/org/apache/carbondata/scan/scanner/AbstractBlockletScanner.java
index cb6a4ad..84c0cb4 100644
--- a/core/src/main/java/org/apache/carbondata/scan/scanner/AbstractBlockletScanner.java
+++ b/core/src/main/java/org/apache/carbondata/scan/scanner/AbstractBlockletScanner.java
@@ -18,11 +18,13 @@
  */
 package org.apache.carbondata.scan.scanner;
 
+import java.io.IOException;
+
 import org.apache.carbondata.core.carbon.querystatistics.QueryStatistic;
 import org.apache.carbondata.core.carbon.querystatistics.QueryStatisticsConstants;
 import org.apache.carbondata.core.carbon.querystatistics.QueryStatisticsModel;
-import org.apache.carbondata.scan.executor.exception.QueryExecutionException;
 import org.apache.carbondata.scan.executor.infos.BlockExecutionInfo;
+import org.apache.carbondata.scan.expression.exception.FilterUnsupportedException;
 import org.apache.carbondata.scan.processor.BlocksChunkHolder;
 import org.apache.carbondata.scan.result.AbstractScannedResult;
 
@@ -48,12 +50,12 @@ public abstract class AbstractBlockletScanner implements BlockletScanner {
   }
 
   @Override public AbstractScannedResult scanBlocklet(BlocksChunkHolder blocksChunkHolder)
-      throws QueryExecutionException {
+      throws IOException, FilterUnsupportedException {
     fillKeyValue(blocksChunkHolder);
     return scannedResult;
   }
 
-  protected void fillKeyValue(BlocksChunkHolder blocksChunkHolder) {
+  protected void fillKeyValue(BlocksChunkHolder blocksChunkHolder) throws IOException {
 
     QueryStatistic totalBlockletStatistic = queryStatisticsModel.getStatisticsTypeAndObjMap()
             .get(QueryStatisticsConstants.TOTAL_BLOCKLET_NUM);

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/scanner/BlockletScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/scanner/BlockletScanner.java b/core/src/main/java/org/apache/carbondata/scan/scanner/BlockletScanner.java
index 0337197..39a20b2 100644
--- a/core/src/main/java/org/apache/carbondata/scan/scanner/BlockletScanner.java
+++ b/core/src/main/java/org/apache/carbondata/scan/scanner/BlockletScanner.java
@@ -18,7 +18,9 @@
  */
 package org.apache.carbondata.scan.scanner;
 
-import org.apache.carbondata.scan.executor.exception.QueryExecutionException;
+import java.io.IOException;
+
+import org.apache.carbondata.scan.expression.exception.FilterUnsupportedException;
 import org.apache.carbondata.scan.processor.BlocksChunkHolder;
 import org.apache.carbondata.scan.result.AbstractScannedResult;
 
@@ -34,8 +36,7 @@ public interface BlockletScanner {
    * @param blocksChunkHolder block chunk which holds the block data
    * @return scannerResult
    * result after processing
-   * @throws QueryExecutionException
    */
   AbstractScannedResult scanBlocklet(BlocksChunkHolder blocksChunkHolder)
-      throws QueryExecutionException;
+      throws IOException, FilterUnsupportedException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/main/java/org/apache/carbondata/scan/scanner/impl/FilterScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/scanner/impl/FilterScanner.java b/core/src/main/java/org/apache/carbondata/scan/scanner/impl/FilterScanner.java
index ac71100..5ff61d4 100644
--- a/core/src/main/java/org/apache/carbondata/scan/scanner/impl/FilterScanner.java
+++ b/core/src/main/java/org/apache/carbondata/scan/scanner/impl/FilterScanner.java
@@ -16,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.carbondata.scan.scanner.impl;
 
+import java.io.IOException;
 import java.util.BitSet;
 
 import org.apache.carbondata.core.carbon.datastore.chunk.DimensionColumnDataChunk;
@@ -28,7 +30,6 @@ import org.apache.carbondata.core.carbon.querystatistics.QueryStatisticsModel;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
 import org.apache.carbondata.core.datastorage.store.FileHolder;
 import org.apache.carbondata.core.util.CarbonProperties;
-import org.apache.carbondata.scan.executor.exception.QueryExecutionException;
 import org.apache.carbondata.scan.executor.infos.BlockExecutionInfo;
 import org.apache.carbondata.scan.expression.exception.FilterUnsupportedException;
 import org.apache.carbondata.scan.filter.executer.FilterExecuter;
@@ -81,16 +82,11 @@ public class FilterScanner extends AbstractBlockletScanner {
    * Below method will be used to process the block
    *
    * @param blocksChunkHolder block chunk holder which holds the data
-   * @throws QueryExecutionException
    * @throws FilterUnsupportedException
    */
   @Override public AbstractScannedResult scanBlocklet(BlocksChunkHolder blocksChunkHolder)
-      throws QueryExecutionException {
-    try {
-      fillScannedResult(blocksChunkHolder);
-    } catch (FilterUnsupportedException e) {
-      throw new QueryExecutionException(e.getMessage());
-    }
+      throws IOException, FilterUnsupportedException {
+    fillScannedResult(blocksChunkHolder);
     return scannedResult;
   }
 
@@ -111,8 +107,7 @@ public class FilterScanner extends AbstractBlockletScanner {
    * @throws FilterUnsupportedException
    */
   private void fillScannedResult(BlocksChunkHolder blocksChunkHolder)
-      throws FilterUnsupportedException {
-
+      throws FilterUnsupportedException, IOException {
     scannedResult.reset();
     QueryStatistic totalBlockletStatistic = queryStatisticsModel.getStatisticsTypeAndObjMap()
         .get(QueryStatisticsConstants.TOTAL_BLOCKLET_NUM);
@@ -167,10 +162,9 @@ public class FilterScanner extends AbstractBlockletScanner {
       }
     }
     for (int i = 0; i < allSelectedDimensionBlocksIndexes.length; i++) {
-      for (int j = allSelectedDimensionBlocksIndexes[i][0];
-           j <= allSelectedDimensionBlocksIndexes[i][1]; j++) {
-        dimensionColumnDataChunk[j] = projectionListDimensionChunk[j];
-      }
+      System.arraycopy(projectionListDimensionChunk, allSelectedDimensionBlocksIndexes[i][0],
+          dimensionColumnDataChunk, allSelectedDimensionBlocksIndexes[i][0],
+          allSelectedDimensionBlocksIndexes[i][1] + 1 - allSelectedDimensionBlocksIndexes[i][0]);
     }
     MeasureColumnDataChunk[] measureColumnDataChunk =
         new MeasureColumnDataChunk[blockExecutionInfo.getTotalNumberOfMeasureBlock()];
@@ -185,10 +179,9 @@ public class FilterScanner extends AbstractBlockletScanner {
       }
     }
     for (int i = 0; i < allSelectedMeasureBlocksIndexes.length; i++) {
-      for (int j = allSelectedMeasureBlocksIndexes[i][0];
-           j <= allSelectedMeasureBlocksIndexes[i][1]; j++) {
-        measureColumnDataChunk[j] = projectionListMeasureChunk[j];
-      }
+      System.arraycopy(projectionListMeasureChunk, allSelectedMeasureBlocksIndexes[i][0],
+          measureColumnDataChunk, allSelectedMeasureBlocksIndexes[i][0],
+          allSelectedMeasureBlocksIndexes[i][1] + 1 - allSelectedMeasureBlocksIndexes[i][0]);
     }
     scannedResult.setDimensionChunks(dimensionColumnDataChunk);
     scannedResult.setIndexes(indexes);

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCacheTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCacheTest.java b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCacheTest.java
index c526f45..49b5a7b 100644
--- a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCacheTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCacheTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -39,7 +40,7 @@ import org.apache.carbondata.core.carbon.metadata.datatype.DataType;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
 import org.apache.carbondata.core.reader.CarbonDictionaryColumnMetaChunk;
 import org.apache.carbondata.core.util.CarbonProperties;
-import org.apache.carbondata.core.util.CarbonUtilException;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -182,7 +183,7 @@ public class ReverseDictionaryCacheTest extends AbstractDictionaryCacheTest {
       reverseDictionary = (Dictionary) reverseDictionaryCache.get(dictionaryColumnUniqueIdentifier);
       fail("not throwing exception");
     } catch (Exception e) {
-      assertTrue(e instanceof CarbonUtilException);
+      assertTrue(e instanceof IOException);
     }
     assertEquals(null, reverseDictionary);
   }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileHolderImplUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileHolderImplUnitTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileHolderImplUnitTest.java
index 38d9f44..3b3ab9f 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileHolderImplUnitTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileHolderImplUnitTest.java
@@ -76,68 +76,70 @@ public class DFSFileHolderImplUnitTest {
     fileNameWithEmptyContent = fileWithEmptyContent.getAbsolutePath();
   }
 
-  @AfterClass public static void tearDown() {
+  @AfterClass public static void tearDown() throws IOException  {
     file.delete();
     fileWithEmptyContent.delete();
     dfsFileHolder.finish();
   }
 
-  @Test public void testReadByteArray() {
+  @Test public void testReadByteArray() throws IOException  {
     byte[] result = dfsFileHolder.readByteArray(fileName, 1);
     byte[] expected_result = new byte[] { 72 };
     assertThat(result, is(equalTo(expected_result)));
   }
 
-  @Test public void testReadByteArrayWithFilePath() {
+  @Test public void testReadByteArrayWithFilePath() throws IOException  {
     byte[] result = dfsFileHolder.readByteArray(fileName, 2L, 2);
     byte[] expected_result = { 108, 108 };
     assertThat(result, is(equalTo(expected_result)));
   }
 
-  @Test public void testReadLong() {
+  @Test public void testReadLong() throws IOException  {
     long actualResult = dfsFileHolder.readLong(fileName, 1L);
     long expectedResult = 7308335519855243122L;
     assertThat(actualResult, is(equalTo(expectedResult)));
   }
 
-  @Test public void testReadLongForIoException() throws IOException {
+  @Test(expected = IOException.class)
+  public void testReadLongForIoException() throws IOException {
     dfsFileHolder.readLong(fileNameWithEmptyContent, 1L);
-
   }
 
-  @Test public void testReadIntForIoException() throws IOException {
+  @Test(expected = IOException.class)
+  public void testReadIntForIoException() throws IOException{
     dfsFileHolder.readInt(fileNameWithEmptyContent, 1L);
   }
 
-  @Test public void testReadInt() {
+  @Test public void testReadInt() throws IOException  {
     int actualResult = dfsFileHolder.readInt(fileName, 1L);
     int expectedResult = 1701604463;
     assertThat(actualResult, is(equalTo(expectedResult)));
   }
 
-  @Test public void testReadIntWithFileName() {
+  @Test public void testReadIntWithFileName() throws IOException {
     int actualResult = dfsFileHolder.readInt(fileName);
     int expectedResult = 1701604463;
     assertThat(actualResult, is(equalTo(expectedResult)));
   }
 
-  @Test public void testReadIntWithFileNameForIOException() {
+  @Test(expected = IOException.class)
+  public void testReadIntWithFileNameForIOException() throws IOException {
     dfsFileHolder.readInt(fileNameWithEmptyContent);
-
   }
 
-  @Test public void testDouble() {
+  @Test public void testDouble() throws IOException  {
     double actualResult = dfsFileHolder.readDouble(fileName, 1L);
     double expectedResult = 7.3083355198552433E18;
     assertThat(actualResult, is(equalTo(expectedResult)));
   }
 
-  @Test public void testDoubleForIoException() throws IOException {
+  @Test(expected = IOException.class)
+  public void testDoubleForIoException() throws IOException {
     dfsFileHolder.readDouble(fileNameWithEmptyContent, 1L);
-
   }
 
-  @Test public void testDoubleForIoExceptionwithUpdateCache() throws Exception {
+  @Test
+  public void testDoubleForIoExceptionwithUpdateCache() throws IOException {
     new MockUp<FileSystem>() {
       @SuppressWarnings("unused") @Mock public FSDataInputStream open(Path file)
           throws IOException {
@@ -145,13 +147,7 @@ public class DFSFileHolderImplUnitTest {
       }
 
     };
-    String expected = null;
-    try {
-      dfsFileHolder.readDouble(fileName, 1L);
-    } catch (Exception e) {
-      assertNull(e.getMessage());
-    }
-
+    dfsFileHolder.readDouble(fileName, 1L);
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/FileHolderImplUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/FileHolderImplUnitTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/FileHolderImplUnitTest.java
index 127f2e0..c14dff9 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/FileHolderImplUnitTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/FileHolderImplUnitTest.java
@@ -78,25 +78,25 @@ public class FileHolderImplUnitTest {
     fileNameWithEmptyContent = fileWithEmptyContent.getAbsolutePath();
   }
 
-  @AfterClass public static void tearDown() {
+  @AfterClass public static void tearDown() throws IOException {
     file.delete();
     fileWithEmptyContent.delete();
     fileHolder.finish();
   }
 
-  @Test public void testReadByteArray() {
+  @Test public void testReadByteArray() throws IOException  {
     byte[] result = fileHolder.readByteArray(fileName, 1);
     byte[] expected_result = new byte[] { 72 };
     assertThat(result, is(equalTo(expected_result)));
   }
 
-  @Test public void testReadByteArrayWithFilePath() {
+  @Test public void testReadByteArrayWithFilePath() throws IOException  {
     byte[] result = fileHolder.readByteArray(fileName, 2L, 2);
     byte[] expected_result = { 108, 108 };
     assertThat(result, is(equalTo(expected_result)));
   }
 
-  @Test public void testReadLong() {
+  @Test public void testReadLong() throws IOException  {
     long actualResult = fileHolder.readLong(fileName, 1L);
     long expectedResult = 7308335519855243122L;
     assertThat(actualResult, is(equalTo(expectedResult)));
@@ -104,31 +104,30 @@ public class FileHolderImplUnitTest {
 
   @Test public void testReadLongForIoException() throws IOException {
     fileHolder.readLong(fileNameWithEmptyContent, 1L);
-
   }
 
   @Test public void testReadIntForIoException() throws IOException {
     fileHolder.readInt(fileNameWithEmptyContent, 1L);
   }
 
-  @Test public void testReadInt() {
+  @Test public void testReadInt() throws IOException  {
     int actualResult = fileHolder.readInt(fileName, 1L);
     int expectedResult = 1701604463;
     assertThat(actualResult, is(equalTo(expectedResult)));
   }
 
-  @Test public void testReadIntWithFileName() {
+  @Test public void testReadIntWithFileName() throws IOException  {
     int actualResult = fileHolder.readInt(fileName);
     int expectedResult = 1701604463;
     assertThat(actualResult, is(equalTo(expectedResult)));
   }
 
-  @Test public void testReadIntWithFileNameForIOException() {
+  @Test public void testReadIntWithFileNameForIOException() throws IOException  {
     fileHolder.readInt(fileNameWithEmptyContent);
 
   }
 
-  @Test public void testDouble() {
+  @Test public void testDouble() throws IOException  {
     double actualResult = fileHolder.readDouble(fileName, 1L);
     double expectedResult = 7.3083355198552433E18;
     assertThat(actualResult, is(equalTo(expectedResult)));

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/MemoryMappedFileHolderImplUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/MemoryMappedFileHolderImplUnitTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/MemoryMappedFileHolderImplUnitTest.java
deleted file mode 100644
index 29ca475..0000000
--- a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/MemoryMappedFileHolderImplUnitTest.java
+++ /dev/null
@@ -1,137 +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.carbondata.core.carbon.datastorage.filesystem.store.impl;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-
-import org.apache.carbondata.core.datastorage.store.impl.MemoryMappedFileHolderImpl;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-public class MemoryMappedFileHolderImplUnitTest {
-
-  private static MemoryMappedFileHolderImpl memoryMappedFileHolder = null;
-  private static MemoryMappedFileHolderImpl memoryMappedFileHolderWithCapacity = null;
-  private static String fileName = null;
-  private static String fileWithEmptyContentName = null;
-  private static File file = null;
-  private static File fileWithEmptyContent = null;
-
-  @BeforeClass public static void setup() {
-    memoryMappedFileHolder = new MemoryMappedFileHolderImpl();
-    memoryMappedFileHolderWithCapacity = new MemoryMappedFileHolderImpl(50);
-    file = new File("Test.carbondata");
-    fileWithEmptyContent = new File("TestEXception.carbondata");
-
-    if (!file.exists()) try {
-      file.createNewFile();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-    if (!fileWithEmptyContent.exists()) try {
-      fileWithEmptyContent.createNewFile();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-    try {
-      FileOutputStream of = new FileOutputStream(file, true);
-      BufferedWriter br = new BufferedWriter(new OutputStreamWriter(of, "UTF-8"));
-      br.write("Hello World");
-      br.close();
-    } catch (Exception e) {
-      e.getMessage();
-    }
-    fileName = file.getAbsolutePath();
-    fileWithEmptyContentName = fileWithEmptyContent.getAbsolutePath();
-
-  }
-
-  @AfterClass public static void tearDown() {
-    file.delete();
-    fileWithEmptyContent.delete();
-    memoryMappedFileHolder.finish();
-  }
-
-  @Test public void testReadByteArray() {
-    byte[] result = memoryMappedFileHolder.readByteArray(fileName, 1);
-    byte[] expected_result = new byte[] { 72 };
-    assertThat(result, is(equalTo(expected_result)));
-  }
-
-  @Test public void testReadByteArrayWithFilePath() {
-
-    final byte[] result = memoryMappedFileHolder.readByteArray(fileName, 0L, 6);
-    final byte[] expected_result = { 32, 87, 111, 114, 108, 100 };
-
-    assertThat(result, is(equalTo(expected_result)));
-  }
-
-  @Test public void testReadLong() {
-
-    long actualResult = memoryMappedFileHolderWithCapacity.readLong(fileName, 0L);
-    long expectedResult = 5216694956355245935L;
-    assertThat(actualResult, is(equalTo(expectedResult)));
-  }
-
-  @Test public void testReadInt() {
-    memoryMappedFileHolder = new MemoryMappedFileHolderImpl();
-
-    int actualResult = memoryMappedFileHolder.readInt(fileName, 0L);
-    int expectedResult = 1214606444;
-    assertThat(actualResult, is(equalTo(expectedResult)));
-  }
-
-  @Test public void testReadIntWithFileName() {
-
-    int actualResult = memoryMappedFileHolder.readInt(fileName);
-    int expectedResult = 1701604463;
-    assertThat(actualResult, is(equalTo(expectedResult)));
-  }
-
-  @Test public void testDouble() {
-    memoryMappedFileHolder = new MemoryMappedFileHolderImpl();
-
-    double actualResult = memoryMappedFileHolder.readDouble(fileName, 0L);
-    double expectedResult = 5.2166949563552461E18;
-    assertThat(actualResult, is(equalTo(expectedResult)));
-  }
-
-  @Test public void testDoubleForIoExceptionwithUpdateCache() throws Exception {
-
-    String expected = null;
-    try {
-      memoryMappedFileHolder.readDouble(fileName, 0L);
-    } catch (Exception e) {
-      assertEquals(e.getMessage(), expected);
-    }
-
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/SegmentTaskIndexStoreTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/SegmentTaskIndexStoreTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/datastore/SegmentTaskIndexStoreTest.java
index 8adb8bb..17e39f3 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/SegmentTaskIndexStoreTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/datastore/SegmentTaskIndexStoreTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.carbondata.core.carbon.datastore;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -39,7 +40,6 @@ import org.apache.carbondata.core.carbon.metadata.blocklet.SegmentInfo;
 import org.apache.carbondata.core.carbon.metadata.schema.table.column.ColumnSchema;
 import org.apache.carbondata.core.carbon.path.CarbonTablePath;
 import org.apache.carbondata.core.util.CarbonUtil;
-import org.apache.carbondata.core.util.CarbonUtilException;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -87,7 +87,7 @@ public class SegmentTaskIndexStoreTest {
     return footerList;
   }
 
-  @Test public void loadAndGetTaskIdToSegmentsMap() throws CarbonUtilException {
+  @Test public void loadAndGetTaskIdToSegmentsMap() throws IOException {
     new MockUp<CarbonTablePath.DataFileUtil>() {
       @Mock String getTaskNo(String carbonDataFileName) {
         return "100";

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/block/SegmentPropertiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/block/SegmentPropertiesTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/datastore/block/SegmentPropertiesTest.java
index 52e84ee..72d47df 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/block/SegmentPropertiesTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/datastore/block/SegmentPropertiesTest.java
@@ -325,7 +325,6 @@ public class SegmentPropertiesTest extends TestCase {
 
   private ColumnSchema getMeasureColumn() {
     ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setAggregateFunction("SUM");
     dimColumn.setColumnName("IMEI_COUNT");
     dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
     dimColumn.setDataType(DataType.STRING);
@@ -338,7 +337,6 @@ public class SegmentPropertiesTest extends TestCase {
 
   private ColumnSchema getMeasureColumn1() {
     ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setAggregateFunction("SUM");
     dimColumn.setColumnName("IMEI_COUNT1");
     dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
     dimColumn.setDataType(DataType.STRING);

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/block/SegmentPropertiesTestUtil.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/block/SegmentPropertiesTestUtil.java b/core/src/test/java/org/apache/carbondata/core/carbon/datastore/block/SegmentPropertiesTestUtil.java
index 807b11b..ed1068a 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/block/SegmentPropertiesTestUtil.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/datastore/block/SegmentPropertiesTestUtil.java
@@ -208,7 +208,6 @@ public class SegmentPropertiesTestUtil {
 
   public static ColumnSchema getMeasureColumn() {
     ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setAggregateFunction("SUM");
     dimColumn.setColumnName("IMEI_COUNT");
     dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
     dimColumn.setDataType(DataType.STRING);
@@ -221,7 +220,6 @@ public class SegmentPropertiesTestUtil {
 
   public static ColumnSchema getMeasureColumn1() {
     ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setAggregateFunction("SUM");
     dimColumn.setColumnName("IMEI_COUNT1");
     dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
     dimColumn.setDataType(DataType.STRING);

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/chunk/reader/dimension/CompressedDimensionChunkFileBasedReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/chunk/reader/dimension/CompressedDimensionChunkFileBasedReaderTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/datastore/chunk/reader/dimension/CompressedDimensionChunkFileBasedReaderTest.java
index 57379c1..5a043b0 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/chunk/reader/dimension/CompressedDimensionChunkFileBasedReaderTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/datastore/chunk/reader/dimension/CompressedDimensionChunkFileBasedReaderTest.java
@@ -19,6 +19,7 @@
 
 package org.apache.carbondata.core.carbon.datastore.chunk.reader.dimension;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -57,7 +58,7 @@ public class CompressedDimensionChunkFileBasedReaderTest {
         new CompressedDimensionChunkFileBasedReaderV1(info, eachColumnBlockSize, "filePath");
   }
 
-  @Test public void readDimensionChunksTest() {
+  @Test public void readDimensionChunksTest() throws IOException {
     FileHolder fileHolder = new MockUp<FileHolder>() {
       @Mock public byte[] readByteArray(String filePath, long offset, int length) {
         byte mockedValue[] = { 1, 5, 4, 8, 7 };
@@ -101,7 +102,7 @@ public class CompressedDimensionChunkFileBasedReaderTest {
     }
   }
 
-  @Test public void readDimensionChunksTestForIfStatement() {
+  @Test public void readDimensionChunksTestForIfStatement() throws IOException {
     FileHolder fileHolder = new MockUp<FileHolder>() {
       @Mock public byte[] readByteArray(String filePath, long offset, int length) {
         byte mockedValue[] = { 1, 5, 4, 8, 7 };

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/chunk/reader/measure/CompressedMeasureChunkFileBasedReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/chunk/reader/measure/CompressedMeasureChunkFileBasedReaderTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/datastore/chunk/reader/measure/CompressedMeasureChunkFileBasedReaderTest.java
index c2a5d5d..0080690 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/datastore/chunk/reader/measure/CompressedMeasureChunkFileBasedReaderTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/datastore/chunk/reader/measure/CompressedMeasureChunkFileBasedReaderTest.java
@@ -2,6 +2,7 @@ package org.apache.carbondata.core.carbon.datastore.chunk.reader.measure;
 
 import static junit.framework.TestCase.assertEquals;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -58,7 +59,7 @@ public class CompressedMeasureChunkFileBasedReaderTest {
         new CompressedMeasureChunkFileBasedReaderV1(info, "filePath");
   }
 
-  @Test public void readMeasureChunkTest() {
+  @Test public void readMeasureChunkTest() throws IOException {
     FileHolder fileHolder = new MockUp<FileHolder>() {
       @Mock public byte[] readByteArray(String filePath, long offset, int length) {
         dataHolder[0] = new CarbonWriteDataHolder();
@@ -80,7 +81,7 @@ public class CompressedMeasureChunkFileBasedReaderTest {
       
   }
 
-  @Test public void readMeasureChunksTest() {
+  @Test public void readMeasureChunksTest() throws IOException {
     FileHolder fileHolder = new MockUp<FileHolder>() {
       @Mock public byte[] readByteArray(String filePath, long offset, int length) {
         dataHolder[0] = new CarbonWriteDataHolder();

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/CarbonMetadataTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/CarbonMetadataTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/metadata/CarbonMetadataTest.java
index 85ae9b4..9c74a4a 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/CarbonMetadataTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/metadata/CarbonMetadataTest.java
@@ -134,7 +134,6 @@ public class CarbonMetadataTest {
 
   private static ColumnSchema getColumnarMeasureColumn() {
     ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setAggregateFunction("SUM");
     dimColumn.setColumnName("IMEI_COUNT");
     dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
     dimColumn.setDataType(DataType.STRING);

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/converter/ThriftWrapperSchemaConverterImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/converter/ThriftWrapperSchemaConverterImplTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/metadata/converter/ThriftWrapperSchemaConverterImplTest.java
index 4022ff4..4af55c0 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/converter/ThriftWrapperSchemaConverterImplTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/metadata/converter/ThriftWrapperSchemaConverterImplTest.java
@@ -1555,7 +1555,6 @@ long time =1112745600000L;
     wrapperColumnSchema.setColumnGroup(1);
     wrapperColumnSchema.setScale(1);
     wrapperColumnSchema.setDefaultValue(new byte[] { 1, 2 });
-    wrapperColumnSchema.setAggregateFunction("");
     wrapperColumnSchema.setColumnProperties(columnPropertyMap);
     wrapperColumnSchema.setInvisible(true);
     wrapperColumnSchema.setColumnReferenceId("1");

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableTest.java
index ff74e14..ca5def5 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableTest.java
@@ -88,7 +88,6 @@ public class CarbonTableTest extends TestCase {
 
   private ColumnSchema getColumnarMeasureColumn() {
     ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setAggregateFunction("SUM");
     dimColumn.setColumnName("IMEI_COUNT");
     dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
     dimColumn.setDataType(DataType.STRING);

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableWithComplexTypesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableWithComplexTypesTest.java b/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableWithComplexTypesTest.java
index 8a5d9d7..4cf8725 100644
--- a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableWithComplexTypesTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableWithComplexTypesTest.java
@@ -127,7 +127,6 @@ public class CarbonTableWithComplexTypesTest extends TestCase {
 
   private ColumnSchema getColumnarMeasureColumn() {
     ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setAggregateFunction("SUM");
     dimColumn.setColumnName("IMEI_COUNT");
     dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
     dimColumn.setDataType(DataType.STRING);

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/eaadc88a/core/src/test/java/org/apache/carbondata/core/datastorage/store/columnar/ColumnarKeyStoreDataHolderUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/datastorage/store/columnar/ColumnarKeyStoreDataHolderUnitTest.java b/core/src/test/java/org/apache/carbondata/core/datastorage/store/columnar/ColumnarKeyStoreDataHolderUnitTest.java
index 0ce6c1e..9ff0677 100644
--- a/core/src/test/java/org/apache/carbondata/core/datastorage/store/columnar/ColumnarKeyStoreDataHolderUnitTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/datastorage/store/columnar/ColumnarKeyStoreDataHolderUnitTest.java
@@ -83,7 +83,7 @@ public class ColumnarKeyStoreDataHolderUnitTest {
     byte[] keyBlockData = new byte[] { 32, 64, 32, 40, 64, 8, 8 };
     List<byte[]> noDictionaryValBasedKeyBlockData = new java.util.ArrayList<>();
     noDictionaryValBasedKeyBlockData.add(keyBlockData);
-    new ColumnarKeyStoreDataHolder(noDictionaryValBasedKeyBlockData, columnarKeyStoreMetadata);
+    new ColumnarKeyStoreDataHolder(columnarKeyStoreMetadata);
     int columnIndex = 0;
     int expected_result = 8232;
     int result = columnarKeyStoreDataHolder.getSurrogateKey(columnIndex);


Mime
View raw message