carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jack...@apache.org
Subject [03/57] [abbrv] incubator-carbondata git commit: move org.apache.carbon.common in core
Date Sat, 14 Jan 2017 07:57:12 GMT
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/core/src/test/java/org/apache/carbondata/scan/filter/FilterUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/scan/filter/FilterUtilTest.java b/core/src/test/java/org/apache/carbondata/scan/filter/FilterUtilTest.java
deleted file mode 100644
index cdd530d..0000000
--- a/core/src/test/java/org/apache/carbondata/scan/filter/FilterUtilTest.java
+++ /dev/null
@@ -1,392 +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;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.carbondata.core.cache.dictionary.AbstractDictionaryCacheTest;
-import org.apache.carbondata.core.AbsoluteTableIdentifier;
-import org.apache.carbondata.core.CarbonTableIdentifier;
-import org.apache.carbondata.core.datastore.IndexKey;
-import org.apache.carbondata.core.datastore.block.SegmentProperties;
-import org.apache.carbondata.core.metadata.DataType;
-import org.apache.carbondata.core.metadata.Encoding;
-import org.apache.carbondata.core.metadata.schema.table.column.CarbonColumn;
-import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension;
-import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema;
-import org.apache.carbondata.core.constants.CarbonCommonConstants;
-import org.apache.carbondata.core.keygenerator.KeyGenException;
-import org.apache.carbondata.core.keygenerator.mdkey.MultiDimKeyVarLengthGenerator;
-import org.apache.carbondata.scan.expression.ColumnExpression;
-import org.apache.carbondata.scan.expression.Expression;
-import org.apache.carbondata.scan.expression.LiteralExpression;
-import org.apache.carbondata.scan.expression.conditional.ListExpression;
-import org.apache.carbondata.scan.filter.intf.RowImpl;
-
-import mockit.Mock;
-import mockit.MockUp;
-import org.junit.Before;
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-public class FilterUtilTest extends AbstractDictionaryCacheTest {
-
-  private ColumnSchema columnSchema;
-
-  @Before public void setUp() throws Exception {
-    init();
-    this.databaseName = props.getProperty("database", "testSchema");
-    this.tableName = props.getProperty("tableName", "carbon");
-    this.carbonStorePath = props.getProperty("storePath", "carbonStore");
-    carbonTableIdentifier =
-        new CarbonTableIdentifier(databaseName, tableName, UUID.randomUUID().toString());
-    this.carbonStorePath = props.getProperty("storePath", "carbonStore");
-    columnSchema = new ColumnSchema();
-    columnSchema.setColumnar(true);
-    columnSchema.setColumnName("IMEI");
-    columnSchema.setColumnUniqueId(UUID.randomUUID().toString());
-    columnSchema.setDataType(DataType.STRING);
-    columnSchema.setDimensionColumn(true);
-  }
-
-  @Test public void testCheckIfLeftExpressionRequireEvaluation() {
-    List<Expression> children = new ArrayList<>();
-    ListExpression expression = new ListExpression(children);
-    boolean result = FilterUtil.checkIfLeftExpressionRequireEvaluation(expression);
-    assertTrue(result);
-  }
-
-  @Test
-  public void testCheckIfLeftExpressionRequireEvaluationWithExpressionNotInstanceOfColumnExpression() {
-    ColumnExpression expression = new ColumnExpression("test", DataType.STRING);
-    boolean result = FilterUtil.checkIfLeftExpressionRequireEvaluation(expression);
-    assertFalse(result);
-  }
-
-  @Test public void testNanSafeEqualsDoublesWithUnEqualValues() {
-    Double d1 = new Double(60.67);
-    Double d2 = new Double(60.69);
-    boolean result = FilterUtil.nanSafeEqualsDoubles(d1, d2);
-    assertFalse(result);
-  }
-
-  @Test public void testNanSafeEqualsDoublesWithEqualValues() {
-    Double d1 = new Double(60.67);
-    Double d2 = new Double(60.67);
-    boolean result = FilterUtil.nanSafeEqualsDoubles(d1, d2);
-    assertTrue(result);
-  }
-
-  @Test public void testCompareFilterKeyBasedOnDataTypeForShortValue() {
-    String dictionaryVal = "1";
-    String memberVal = "1";
-    int actualResult =
-        FilterUtil.compareFilterKeyBasedOnDataType(dictionaryVal, memberVal, DataType.SHORT);
-    int expectedResult = 0;
-    assertEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testCompareFilterKeyBasedOnDataTypeForIntValue() {
-    String dictionaryVal = "1000";
-    String memberVal = "1001";
-    int actualResult =
-        FilterUtil.compareFilterKeyBasedOnDataType(dictionaryVal, memberVal, DataType.INT);
-    int expectedResult = -1;
-    assertEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testCompareFilterKeyBasedOnDataTypeForDoubleValue() {
-    String dictionaryVal = "1.90";
-    String memberVal = "1.89";
-    int actualResult =
-        FilterUtil.compareFilterKeyBasedOnDataType(dictionaryVal, memberVal, DataType.DOUBLE);
-    int expectedResult = 1;
-    assertEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testCompareFilterKeyBasedOnDataTypeForLongValue() {
-    String dictionaryVal = "111111111111111";
-    String memberVal = "1111111111111111";
-    int actualResult =
-        FilterUtil.compareFilterKeyBasedOnDataType(dictionaryVal, memberVal, DataType.LONG);
-    int expectedResult = -1;
-    assertEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testCompareFilterKeyBasedOnDataTypeForBooleanValue() {
-    String dictionaryVal = "true";
-    String memberVal = "false";
-    int actualResult =
-        FilterUtil.compareFilterKeyBasedOnDataType(dictionaryVal, memberVal, DataType.BOOLEAN);
-    int expectedResult = 1;
-    assertEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testCompareFilterKeyBasedOnDataTypeForDecimalValue() {
-    String dictionaryVal = "1111111";
-    String memberVal = "1111";
-    int actualResult =
-        FilterUtil.compareFilterKeyBasedOnDataType(dictionaryVal, memberVal, DataType.DECIMAL);
-    int expectedResult = 1;
-    assertEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testCompareFilterKeyBasedOnDataTypeForDefaultValue() {
-    String dictionaryVal = "11.78";
-    String memberVal = "1111.90";
-    int actualResult =
-        FilterUtil.compareFilterKeyBasedOnDataType(dictionaryVal, memberVal, DataType.FLOAT);
-    int expectedResult = -1;
-    assertEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testCompareFilterKeyBasedOnDataTypeForTimestamp() {
-    String dictionaryVal = "2008-01-01 00:00:01";
-    String memberVal = "2008-01-01 00:00:01";
-    int actualValue =
-        FilterUtil.compareFilterKeyBasedOnDataType(dictionaryVal, memberVal, DataType.TIMESTAMP);
-    int expectedValue = 0;
-    assertEquals(expectedValue, actualValue);
-  }
-
-  @Test public void testCompareFilterKeyBasedOnDataTypeForException() throws Exception {
-    String dictionaryVal = "test";
-    String memberVal = "1";
-    int actualValue =
-        FilterUtil.compareFilterKeyBasedOnDataType(dictionaryVal, memberVal, DataType.INT);
-    int expectedValue = -1;
-    assertEquals(expectedValue, actualValue);
-  }
-
-  @Test public void testCreateIndexKeyFromResolvedFilterVal() throws Exception {
-    long[] startOrEndKey = new long[] { 0, 10 };
-    byte[] startOrEndKeyForNoDictDimension = { 1, 2 };
-    int[] keys = new int[] { 1, 2 };
-    MultiDimKeyVarLengthGenerator multiDimKeyVarLengthGenerator =
-        new MultiDimKeyVarLengthGenerator(keys);
-    assertTrue(FilterUtil
-        .createIndexKeyFromResolvedFilterVal(startOrEndKey, multiDimKeyVarLengthGenerator,
-            startOrEndKeyForNoDictDimension) != null);
-
-  }
-
-  @Test public void testCheckIfExpressionContainsColumn() {
-    String columnName = "IMEI";
-    Expression expression = new ColumnExpression(columnName, DataType.STRING);
-    boolean result = FilterUtil.checkIfExpressionContainsColumn(expression);
-    assertTrue(result);
-  }
-
-  @Test
-  public void testCheckIfExpressionContainsColumnWithExpressionNotInstanceOfColumnExpression() {
-    String columnName = "IMEI";
-    Expression expression = new LiteralExpression(columnName, DataType.STRING);
-    boolean result = FilterUtil.checkIfExpressionContainsColumn(expression);
-    assertFalse(result);
-  }
-
-  @Test public void testIsExpressionNeedsToResolved() {
-    boolean isIncludeFilter = true;
-    Object obj = "test";
-    LiteralExpression literalExpression = new LiteralExpression(obj, DataType.STRING);
-    boolean result = FilterUtil.isExpressionNeedsToResolved(literalExpression, isIncludeFilter);
-    assertFalse(result);
-  }
-
-  @Test public void testIsExpressionNeedsToResolvedWithDataTypeNullAndIsIncludeFilterFalse() {
-    boolean isIncludeFilter = false;
-    Object obj = "test";
-    LiteralExpression literalExpression = new LiteralExpression(obj, DataType.NULL);
-    boolean result = FilterUtil.isExpressionNeedsToResolved(literalExpression, isIncludeFilter);
-    assertTrue(result);
-  }
-
-  @Test public void testGetMaskKey() {
-    int surrogate = 1;
-    int[] keys = new int[] { 1, 2 };
-    MultiDimKeyVarLengthGenerator multiDimKeyVarLengthGenerator =
-        new MultiDimKeyVarLengthGenerator(keys);
-    int ordinal = 1;
-    int keyOrdinal = 1;
-    int columnGroupOrdinal = 1;
-    int complexTypeOrdinal = 1;
-    ColumnSchema columnSchema = new ColumnSchema();
-    columnSchema.setColumnar(true);
-    columnSchema.setColumnName("IMEI");
-    columnSchema.setColumnUniqueId(UUID.randomUUID().toString());
-    columnSchema.setDataType(DataType.STRING);
-    columnSchema.setDimensionColumn(true);
-    CarbonDimension carbonDimension =
-        new CarbonDimension(columnSchema, ordinal, keyOrdinal, columnGroupOrdinal,
-            complexTypeOrdinal);
-    byte[] expectedResult = new byte[] { 1 };
-    byte[] actualResult =
-        FilterUtil.getMaskKey(surrogate, carbonDimension, multiDimKeyVarLengthGenerator);
-    assertArrayEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testGetFilterListForAllMembersRS() throws Exception {
-    Expression expression = new ColumnExpression("IMEI", DataType.STRING);
-    ColumnExpression columnExpression = new ColumnExpression("IMEI", DataType.STRING);
-    String defaultValues = "test";
-    int defaultSurrogate = 1;
-    boolean isIncludeFilter = true;
-    int ordinal = 1;
-    ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setColumnar(true);
-    dimColumn.setColumnName("IMEI");
-    dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
-    dimColumn.setDataType(DataType.STRING);
-    dimColumn.setDimensionColumn(true);
-    final CarbonColumn carbonColumn = new CarbonColumn(dimColumn, ordinal, -1);
-    new MockUp<ColumnExpression>() {
-      @Mock public CarbonColumn getCarbonColumn() {
-        return carbonColumn;
-      }
-    };
-
-    new MockUp<RowImpl>() {
-      @Mock public Object getVal(int index) {
-        return "test";
-      }
-    };
-    assertTrue(FilterUtil
-        .getFilterListForAllMembersRS(expression, columnExpression, defaultValues, defaultSurrogate,
-            isIncludeFilter) instanceof DimColumnFilterInfo);
-  }
-
-  @Test public void testGetFilterListForAllMembersRSWithDefaultValuesEqualsToNull()
-      throws Exception {
-    Expression expression = new ColumnExpression("IMEI", DataType.STRING);
-    ColumnExpression columnExpression = new ColumnExpression("IMEI", DataType.STRING);
-    String defaultValues = CarbonCommonConstants.MEMBER_DEFAULT_VAL;
-    int defaultSurrogate = 1;
-    boolean isIncludeFilter = true;
-    int ordinal = 1;
-    ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setColumnar(true);
-    dimColumn.setColumnName("IMEI");
-    dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
-    dimColumn.setDataType(DataType.STRING);
-    dimColumn.setDimensionColumn(true);
-    final CarbonColumn carbonColumn = new CarbonColumn(dimColumn, ordinal, -1);
-    new MockUp<ColumnExpression>() {
-      @Mock public CarbonColumn getCarbonColumn() {
-        return carbonColumn;
-      }
-    };
-
-    new MockUp<RowImpl>() {
-      @Mock public Object getVal(int index) {
-        return "test";
-      }
-    };
-    assertTrue(FilterUtil
-        .getFilterListForAllMembersRS(expression, columnExpression, defaultValues, defaultSurrogate,
-            isIncludeFilter) instanceof DimColumnFilterInfo);
-  }
-
-  @Test public void testgetFilterListForRS() throws Exception {
-    Expression expression = new ColumnExpression("IMEI", DataType.STRING);
-    ColumnExpression columnExpression = new ColumnExpression("IMEI", DataType.STRING);
-    String defaultValues = CarbonCommonConstants.MEMBER_DEFAULT_VAL;
-    int defaultSurrogate = 1;
-    int ordinal = 1;
-    final CarbonColumn carbonColumn = new CarbonColumn(columnSchema, ordinal, -1);
-    new MockUp<ColumnExpression>() {
-      @Mock public CarbonColumn getCarbonColumn() {
-        return carbonColumn;
-      }
-    };
-
-    new MockUp<RowImpl>() {
-      @Mock public Object getVal(int index) {
-        return "test";
-      }
-    };
-    assertTrue(FilterUtil.getFilterListForRS(expression, columnExpression, defaultValues,
-        defaultSurrogate) instanceof DimColumnFilterInfo);
-  }
-
-  @Test public void testCheckIfDataTypeNotTimeStamp() {
-    Expression expression = new ColumnExpression("test", DataType.STRING);
-    boolean result = FilterUtil.checkIfDataTypeNotTimeStamp(expression);
-    assertFalse(result);
-  }
-
-  @Test public void testPrepareDefaultEndIndexKey() throws Exception {
-    List<ColumnSchema> columnsInTable = new ArrayList<>();
-    columnsInTable.add(columnSchema);
-    int[] columnCardinality = new int[] { 1, 2 };
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        List<Encoding> encodingList = new ArrayList<>();
-        encodingList.add(Encoding.DICTIONARY);
-        return encodingList;
-      }
-    };
-    SegmentProperties segmentProperties = new SegmentProperties(columnsInTable, columnCardinality);
-    assertTrue(FilterUtil.prepareDefaultEndIndexKey(segmentProperties) instanceof IndexKey);
-  }
-
-  @Test public void testCheckIfRightExpressionRequireEvaluation() {
-    Expression expression = new ColumnExpression("test", DataType.STRING);
-    boolean result = FilterUtil.checkIfRightExpressionRequireEvaluation(expression);
-    assertTrue(result);
-  }
-
-  @Test
-  public void testCheckIfRightExpressionRequireEvaluationWithExpressionIsInstanceOfLiteralExpression() {
-    Expression expression = new LiteralExpression("test", DataType.STRING);
-    boolean result = FilterUtil.checkIfRightExpressionRequireEvaluation(expression);
-    assertFalse(result);
-  }
-
-  @Test public void testGetNoDictionaryValKeyMemberForFilter() {
-    boolean isIncludeFilter = true;
-    AbsoluteTableIdentifier absoluteTableIdentifier =
-        new AbsoluteTableIdentifier(this.carbonStorePath, carbonTableIdentifier);
-    ColumnExpression expression = new ColumnExpression("test", DataType.STRING);
-    List<String> evaluateResultListFinal = new ArrayList<>();
-    evaluateResultListFinal.add("test1");
-    evaluateResultListFinal.add("test2");
-    assertTrue(FilterUtil.getNoDictionaryValKeyMemberForFilter(evaluateResultListFinal, isIncludeFilter) instanceof DimColumnFilterInfo);
-  }
-
-  @Test public void testPrepareDefaultStartIndexKey() throws KeyGenException {
-    List<ColumnSchema> columnsInTable = new ArrayList<>();
-    columnsInTable.add(columnSchema);
-    int[] columnCardinality = new int[] { 1, 2 };
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        List<Encoding> encodingList = new ArrayList<>();
-        encodingList.add(Encoding.DICTIONARY);
-        return encodingList;
-      }
-    };
-    SegmentProperties segmentProperties = new SegmentProperties(columnsInTable, columnCardinality);
-    assertTrue(FilterUtil.prepareDefaultStartIndexKey(segmentProperties) instanceof IndexKey);
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/core/src/test/java/org/apache/carbondata/scan/result/BatchResultTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/scan/result/BatchResultTest.java b/core/src/test/java/org/apache/carbondata/scan/result/BatchResultTest.java
deleted file mode 100644
index 5a6225e..0000000
--- a/core/src/test/java/org/apache/carbondata/scan/result/BatchResultTest.java
+++ /dev/null
@@ -1,95 +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 java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import mockit.Mock;
-import mockit.MockUp;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-public class BatchResultTest {
-  private static BatchResult batchResult;
-  private static List<Object[]> rowsList = new ArrayList(2);
-
-  @BeforeClass public static void setUp() {
-    batchResult = new BatchResult();
-    rowsList.add(0, new Integer[] { 1, 2 });
-    rowsList.add(1, new Integer[] { 3 });
-  }
-
-  @Test public void testNext() throws NoSuchElementException {
-    BatchResult rows = new BatchResult();
-    rows.setRows(rowsList);
-    Object[] result = rows.next();
-    assert (result.equals(rowsList.get(0)));
-  }
-
-  @Test(expected = NoSuchElementException.class) public void testNextWithNoSuchElementException() {
-    BatchResult rows = new BatchResult();
-    List emptyList = new ArrayList(2);
-    rows.setRows(emptyList);
-    rows.next();
-  }
-
-  @Test public void testGetRows() {
-    new MockUp<BatchResult>() {
-      @Mock public void $init() {
-        //to be left blank
-      }
-    };
-    BatchResult batchResult = new BatchResult();
-    List<Object[]> list = batchResult.getRows();
-    assertNull("Number of rows is null", list);
-  }
-
-  @Test public void testHasNext() {
-    List<Object[]> list = new ArrayList<>();
-    list.add(0, new Integer[] { 1, 2 });
-    list.add(1, new Integer[] { 1, 2 });
-    batchResult.setRows(list);
-    boolean result = batchResult.hasNext();
-    assert (result);
-  }
-
-  @Test public void testGetRawRow() {
-    List<Object[]> list = new ArrayList<>();
-    list.add(0, new Integer[] { 1, 2 });
-    batchResult.setRows(list);
-    Object[] actualValue = batchResult.getRawRow(0);
-    assert (list.get(0) == actualValue);
-  }
-
-  @Test public void testGetSize() {
-    List<Object[]> list = new ArrayList<>();
-    list.add(0, new Integer[] { 1, 2 });
-    list.add(1, new Integer[] { 1, 2 });
-    batchResult.setRows(list);
-    int actualValue = batchResult.getSize();
-    int expectedValue = 2;
-    assertEquals(expectedValue, actualValue);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/core/src/test/java/org/apache/carbondata/scan/result/impl/FilterQueryScannedResultTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/scan/result/impl/FilterQueryScannedResultTest.java b/core/src/test/java/org/apache/carbondata/scan/result/impl/FilterQueryScannedResultTest.java
deleted file mode 100644
index 9aabaeb..0000000
--- a/core/src/test/java/org/apache/carbondata/scan/result/impl/FilterQueryScannedResultTest.java
+++ /dev/null
@@ -1,210 +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.impl;
-
-
-public class FilterQueryScannedResultTest {
-
-//  private static FilterQueryScannedResult filterQueryScannedResult;
-//
-//  @BeforeClass public static void setUp() {
-//    BlockExecutionInfo blockExecutionInfo = new BlockExecutionInfo();
-//    blockExecutionInfo.setFixedLengthKeySize(2);
-//    blockExecutionInfo.setNoDictionaryBlockIndexes(new int[] { 0, 1 });
-//    blockExecutionInfo.setDictionaryColumnBlockIndex(new int[] { 0, 1 });
-//    Map<Integer, KeyStructureInfo> columnGourpToKeyInfo = new HashMap<>();
-//    columnGourpToKeyInfo.put(1, new KeyStructureInfo());
-//    blockExecutionInfo.setColumnGroupToKeyStructureInfo(columnGourpToKeyInfo);
-//    Map<Integer, GenericQueryType> genericQueryType = new HashMap<>();
-//    genericQueryType.put(1, new ArrayQueryType("Query1", "Parent", 1));
-//    blockExecutionInfo.setComplexDimensionInfoMap(genericQueryType);
-//    blockExecutionInfo.setComplexColumnParentBlockIndexes(new int[] { 1 });
-//    QueryDimension[] queryDimensions = { new QueryDimension("Col1"), new QueryDimension("Col2") };
-//    blockExecutionInfo.setQueryDimensions(queryDimensions);
-//    filterQueryScannedResult = new FilterQueryScannedResult(blockExecutionInfo);
-//    filterQueryScannedResult.setIndexes(new int[] { 1, 2, 3, 4 });
-//    DimensionChunkAttributes dimensionChunkAttributes = new DimensionChunkAttributes();
-//    dimensionChunkAttributes.setEachRowSize(0);
-//    ColumnGroupDimensionDataChunk[] columnGroupDimensionDataChunks =
-//        { new ColumnGroupDimensionDataChunk(new byte[] { 1, 2 }, dimensionChunkAttributes),
-//            new ColumnGroupDimensionDataChunk(new byte[] { 2, 3 }, dimensionChunkAttributes) };
-//    filterQueryScannedResult.setDimensionChunks(columnGroupDimensionDataChunks);
-//    MeasureColumnDataChunk measureColumnDataChunk = new MeasureColumnDataChunk();
-//    filterQueryScannedResult
-//        .setMeasureChunks(new MeasureColumnDataChunk[] { measureColumnDataChunk });
-//  }
-//
-//  @Test public void testToGetDictionaryKeyArray() {
-//    new MockUp<ColumnGroupDimensionDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public int fillChunkData(byte[] data, int offset, int rowId,
-//          KeyStructureInfo restructuringInfo) {
-//        return 1;
-//      }
-//    };
-//    byte[] keyArray = filterQueryScannedResult.getDictionaryKeyArray();
-//    byte[] expectedResult = { 0, 0 };
-//    assertThat(expectedResult, is(equalTo(keyArray)));
-//  }
-//
-//  @Test public void testToGetDictionaryKeyIntegerArray() {
-//    new MockUp<ColumnGroupDimensionDataChunk>() {
-//      @Mock @SuppressWarnings("unused")
-//      public int fillConvertedChunkData(int rowId, int columnIndex, int[] row,
-//          KeyStructureInfo info) {
-//        return 1;
-//      }
-//    };
-//    int[] keyArray = filterQueryScannedResult.getDictionaryKeyIntegerArray();
-//    int[] expectedResult = { 0, 0 };
-//    assertThat(expectedResult, is(equalTo(keyArray)));
-//  }
-//
-//  @Test public void testToGetComplexTypeKeyArray() {
-//    new MockUp<ByteArrayOutputStream>() {
-//      @Mock @SuppressWarnings("unused") public synchronized byte toByteArray()[] {
-//        return new byte[] { 1, 2, 3 };
-//      }
-//    };
-//    new MockUp<ArrayQueryType>() {
-//      @Mock @SuppressWarnings("unused") public void parseBlocksAndReturnComplexColumnByteArray(
-//          DimensionColumnDataChunk[] dimensionColumnDataChunks, int rowNumber,
-//          DataOutputStream dataOutputStream) throws IOException {
-//      }
-//    };
-//    filterQueryScannedResult.incrementCounter();
-//    byte[][] keyArray = filterQueryScannedResult.getComplexTypeKeyArray();
-//    byte[][] expectedResult = { { 1, 2, 3 } };
-//    assertThat(expectedResult, is(equalTo(keyArray)));
-//  }
-//
-//  @Test public void testToGetNoDictionaryKeyArray() {
-//    new MockUp<ColumnGroupDimensionDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public byte[] getChunkData(int rowId) {
-//        return new byte[] { 1, 2, 3 };
-//      }
-//    };
-//    byte[][] dictionaryKeyArray = filterQueryScannedResult.getNoDictionaryKeyArray();
-//    byte[][] expectedResult = { { 1, 2, 3 }, { 1, 2, 3 } };
-//    assertThat(expectedResult, is(equalTo(dictionaryKeyArray)));
-//  }
-//
-//  @Test public void testToGetNoDictionaryKeyStringArray() {
-//    new MockUp<ColumnGroupDimensionDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public byte[] getChunkData(int rowId) {
-//        return "1".getBytes();
-//      }
-//    };
-//    filterQueryScannedResult.incrementCounter();
-//    String[] dictionaryKeyStringArray = filterQueryScannedResult.getNoDictionaryKeyStringArray();
-//    String[] expectedResult = { "1", "1" };
-//    assertThat(expectedResult, is(equalTo(dictionaryKeyStringArray)));
-//  }
-//
-//  @Test public void testToGetCurrenrRowId() {
-//    int rowId = filterQueryScannedResult.getCurrenrRowId();
-//    int expectedResult = 3;
-//    assertThat(expectedResult, is(equalTo(rowId)));
-//  }
-//
-//  @Test public void testToGetDimensionKey() {
-//    new MockUp<ColumnGroupDimensionDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public byte[] getChunkData(int rowId) {
-//        return "1".getBytes();
-//      }
-//    };
-//    byte[] dictionaryKeyStringArray = filterQueryScannedResult.getDimensionKey(0);
-//    byte[] expectedResult = "1".getBytes();
-//    assertThat(expectedResult, is(equalTo(dictionaryKeyStringArray)));
-//  }
-//
-//  @Test public void testToGetIsNullMeasureValue() {
-//    new MockUp<MeasureColumnDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public PresenceMeta getNullValueIndexHolder() {
-//        return new PresenceMeta();
-//
-//      }
-//    };
-//    new MockUp<PresenceMeta>() {
-//      @Mock @SuppressWarnings("unused") public BitSet getBitSet() {
-//        return new BitSet();
-//      }
-//    };
-//    new MockUp<BitSet>() {
-//      @Mock @SuppressWarnings("unused") public boolean get(int bitIndex) {
-//        return false;
-//      }
-//    };
-//
-//    boolean nullMeasureValue = filterQueryScannedResult.isNullMeasureValue(0);
-//    assertThat(false, is(equalTo(nullMeasureValue)));
-//  }
-//
-//  @Test public void testToGetLongMeasureValue() {
-//    new MockUp<MeasureColumnDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public CarbonReadDataHolder getMeasureDataHolder() {
-//        return new CarbonReadDataHolder();
-//
-//      }
-//    };
-//    new MockUp<CarbonReadDataHolder>() {
-//      @Mock @SuppressWarnings("unused") public long getReadableLongValueByIndex(int index) {
-//        return 2L;
-//      }
-//    };
-//    long longMeasureValue = filterQueryScannedResult.getLongMeasureValue(0);
-//    long expectedResult = 2L;
-//    assertThat(expectedResult, is(equalTo(longMeasureValue)));
-//  }
-//
-//  @Test public void testToGetDoubleMeasureValue() {
-//    new MockUp<MeasureColumnDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public CarbonReadDataHolder getMeasureDataHolder() {
-//        return new CarbonReadDataHolder();
-//
-//      }
-//    };
-//    new MockUp<CarbonReadDataHolder>() {
-//      @Mock @SuppressWarnings("unused") public double getReadableDoubleValueByIndex(int index) {
-//        return 2.0;
-//      }
-//    };
-//    double longMeasureValue = filterQueryScannedResult.getDoubleMeasureValue(0);
-//    double expectedResult = 2.0;
-//    assertThat(expectedResult, is(equalTo(longMeasureValue)));
-//  }
-//
-//  @Test public void testToGetBigDecimalMeasureValue() {
-//    new MockUp<MeasureColumnDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public CarbonReadDataHolder getMeasureDataHolder() {
-//        return new CarbonReadDataHolder();
-//
-//      }
-//    };
-//    new MockUp<CarbonReadDataHolder>() {
-//      @Mock @SuppressWarnings("unused")
-//      public BigDecimal getReadableBigDecimalValueByIndex(int index) {
-//        return new BigDecimal(2);
-//      }
-//    };
-//    BigDecimal longMeasureValue = filterQueryScannedResult.getBigDecimalMeasureValue(0);
-//    BigDecimal expectedResult = new BigDecimal(2);
-//    assertThat(expectedResult, is(equalTo(longMeasureValue)));
-//  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/core/src/test/java/org/apache/carbondata/scan/result/impl/NonFilterQueryScannedResultTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/scan/result/impl/NonFilterQueryScannedResultTest.java b/core/src/test/java/org/apache/carbondata/scan/result/impl/NonFilterQueryScannedResultTest.java
deleted file mode 100644
index 09f0b75..0000000
--- a/core/src/test/java/org/apache/carbondata/scan/result/impl/NonFilterQueryScannedResultTest.java
+++ /dev/null
@@ -1,209 +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.impl;
-
-
-public class NonFilterQueryScannedResultTest {
-
-//  private static NonFilterQueryScannedResult filterQueryScannedResult;
-//
-//  @BeforeClass public static void setUp() {
-//    BlockExecutionInfo blockExecutionInfo = new BlockExecutionInfo();
-//    blockExecutionInfo.setFixedLengthKeySize(2);
-//    blockExecutionInfo.setNoDictionaryBlockIndexes(new int[] { 0, 1 });
-//    blockExecutionInfo.setDictionaryColumnBlockIndex(new int[] { 0, 1 });
-//    Map<Integer, KeyStructureInfo> columnGourpToKeyInfo = new HashMap<>();
-//    columnGourpToKeyInfo.put(1, new KeyStructureInfo());
-//    blockExecutionInfo.setColumnGroupToKeyStructureInfo(columnGourpToKeyInfo);
-//    Map<Integer, GenericQueryType> genericQueryType = new HashMap<>();
-//    genericQueryType.put(1, new ArrayQueryType("Query1", "Parent", 1));
-//    blockExecutionInfo.setComplexDimensionInfoMap(genericQueryType);
-//    blockExecutionInfo.setComplexColumnParentBlockIndexes(new int[] { 1 });
-//    QueryDimension[] queryDimensions = { new QueryDimension("Col1"), new QueryDimension("Col2") };
-//    blockExecutionInfo.setQueryDimensions(queryDimensions);
-//    filterQueryScannedResult = new NonFilterQueryScannedResult(blockExecutionInfo);
-//    DimensionChunkAttributes dimensionChunkAttributes = new DimensionChunkAttributes();
-//    dimensionChunkAttributes.setEachRowSize(0);
-//    ColumnGroupDimensionDataChunk[] columnGroupDimensionDataChunks =
-//        { new ColumnGroupDimensionDataChunk(new byte[] { 1, 2 }, dimensionChunkAttributes),
-//            new ColumnGroupDimensionDataChunk(new byte[] { 2, 3 }, dimensionChunkAttributes) };
-//    filterQueryScannedResult.setDimensionChunks(columnGroupDimensionDataChunks);
-//    MeasureColumnDataChunk measureColumnDataChunk = new MeasureColumnDataChunk();
-//    filterQueryScannedResult
-//        .setMeasureChunks(new MeasureColumnDataChunk[] { measureColumnDataChunk });
-//  }
-//
-//  @Test public void testToGetDictionaryKeyArray() {
-//    new MockUp<ColumnGroupDimensionDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public int fillChunkData(byte[] data, int offset, int rowId,
-//          KeyStructureInfo restructuringInfo) {
-//        return 1;
-//      }
-//    };
-//    byte[] keyArray = filterQueryScannedResult.getDictionaryKeyArray();
-//    byte[] expectedResult = { 0, 0 };
-//    assertThat(expectedResult, is(equalTo(keyArray)));
-//  }
-//
-//  @Test public void testToGetDictionaryKeyIntegerArray() {
-//    new MockUp<ColumnGroupDimensionDataChunk>() {
-//      @Mock @SuppressWarnings("unused")
-//      public int fillConvertedChunkData(int rowId, int columnIndex, int[] row,
-//          KeyStructureInfo info) {
-//        return 1;
-//      }
-//    };
-//    int[] keyArray = filterQueryScannedResult.getDictionaryKeyIntegerArray();
-//    int[] expectedResult = { 0, 0 };
-//    assertThat(expectedResult, is(equalTo(keyArray)));
-//  }
-//
-//  @Test public void testToGetComplexTypeKeyArray() {
-//    new MockUp<ByteArrayOutputStream>() {
-//      @Mock @SuppressWarnings("unused") public synchronized byte toByteArray()[] {
-//        return new byte[] { 1, 2, 3 };
-//      }
-//    };
-//    new MockUp<ArrayQueryType>() {
-//      @Mock @SuppressWarnings("unused") public void parseBlocksAndReturnComplexColumnByteArray(
-//          DimensionColumnDataChunk[] dimensionColumnDataChunks, int rowNumber,
-//          DataOutputStream dataOutputStream) throws IOException {
-//      }
-//    };
-//    filterQueryScannedResult.incrementCounter();
-//    byte[][] keyArray = filterQueryScannedResult.getComplexTypeKeyArray();
-//    byte[][] expectedResult = { { 1, 2, 3 } };
-//    assertThat(expectedResult, is(equalTo(keyArray)));
-//  }
-//
-//  @Test public void testToGetNoDictionaryKeyArray() {
-//    new MockUp<ColumnGroupDimensionDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public byte[] getChunkData(int rowId) {
-//        return new byte[] { 1, 2, 3 };
-//      }
-//    };
-//    byte[][] dictionaryKeyArray = filterQueryScannedResult.getNoDictionaryKeyArray();
-//    byte[][] expectedResult = { { 1, 2, 3 }, { 1, 2, 3 } };
-//    assertThat(expectedResult, is(equalTo(dictionaryKeyArray)));
-//  }
-//
-//  @Test public void testToGetNoDictionaryKeyStringArray() {
-//    new MockUp<ColumnGroupDimensionDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public byte[] getChunkData(int rowId) {
-//        return "1".getBytes();
-//      }
-//    };
-//    filterQueryScannedResult.incrementCounter();
-//    String[] dictionaryKeyStringArray = filterQueryScannedResult.getNoDictionaryKeyStringArray();
-//    String[] expectedResult = { "1", "1" };
-//    assertThat(expectedResult, is(equalTo(dictionaryKeyStringArray)));
-//  }
-//
-//  @Test public void testToGetCurrenrRowId() {
-//    int rowId = filterQueryScannedResult.getCurrenrRowId();
-//    int expectedResult = 2;
-//    assertThat(expectedResult, is(equalTo(rowId)));
-//  }
-//
-//  @Test public void testToGetDimensionKey() {
-//    new MockUp<ColumnGroupDimensionDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public byte[] getChunkData(int rowId) {
-//        return "1".getBytes();
-//      }
-//    };
-//    byte[] dictionaryKeyStringArray = filterQueryScannedResult.getDimensionKey(0);
-//    byte[] expectedResult = "1".getBytes();
-//    assertThat(expectedResult, is(equalTo(dictionaryKeyStringArray)));
-//  }
-//
-//  @Test public void testToGetIsNullMeasureValue() {
-//    new MockUp<MeasureColumnDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public PresenceMeta getNullValueIndexHolder() {
-//        return new PresenceMeta();
-//
-//      }
-//    };
-//    new MockUp<PresenceMeta>() {
-//      @Mock @SuppressWarnings("unused") public BitSet getBitSet() {
-//        return new BitSet();
-//      }
-//    };
-//    new MockUp<BitSet>() {
-//      @Mock @SuppressWarnings("unused") public boolean get(int bitIndex) {
-//        return false;
-//      }
-//    };
-//
-//    boolean nullMeasureValue = filterQueryScannedResult.isNullMeasureValue(0);
-//    assertThat(false, is(equalTo(nullMeasureValue)));
-//  }
-//
-//  @Test public void testToGetLongMeasureValue() {
-//    new MockUp<MeasureColumnDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public CarbonReadDataHolder getMeasureDataHolder() {
-//        return new CarbonReadDataHolder();
-//
-//      }
-//    };
-//    new MockUp<CarbonReadDataHolder>() {
-//      @Mock @SuppressWarnings("unused") public long getReadableLongValueByIndex(int index) {
-//        return 2L;
-//      }
-//    };
-//    long longMeasureValue = filterQueryScannedResult.getLongMeasureValue(0);
-//    long expectedResult = 2L;
-//    assertThat(expectedResult, is(equalTo(longMeasureValue)));
-//  }
-//
-//  @Test public void testToGetDoubleMeasureValue() {
-//    new MockUp<MeasureColumnDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public CarbonReadDataHolder getMeasureDataHolder() {
-//        return new CarbonReadDataHolder();
-//
-//      }
-//    };
-//    new MockUp<CarbonReadDataHolder>() {
-//      @Mock @SuppressWarnings("unused") public double getReadableDoubleValueByIndex(int index) {
-//        return 2.0;
-//      }
-//    };
-//    double longMeasureValue = filterQueryScannedResult.getDoubleMeasureValue(0);
-//    double expectedResult = 2.0;
-//    assertThat(expectedResult, is(equalTo(longMeasureValue)));
-//  }
-//
-//  @Test public void testToGetBigDecimalMeasureValue() {
-//    new MockUp<MeasureColumnDataChunk>() {
-//      @Mock @SuppressWarnings("unused") public CarbonReadDataHolder getMeasureDataHolder() {
-//        return new CarbonReadDataHolder();
-//
-//      }
-//    };
-//    new MockUp<CarbonReadDataHolder>() {
-//      @Mock @SuppressWarnings("unused")
-//      public BigDecimal getReadableBigDecimalValueByIndex(int index) {
-//        return new BigDecimal(2);
-//      }
-//    };
-//    BigDecimal longMeasureValue = filterQueryScannedResult.getBigDecimalMeasureValue(0);
-//    BigDecimal expectedResult = new BigDecimal(2);
-//    assertThat(expectedResult, is(equalTo(longMeasureValue)));
-//  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/core/src/test/java/org/apache/carbondata/scan/wrappers/ByteArrayWrapperTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/scan/wrappers/ByteArrayWrapperTest.java b/core/src/test/java/org/apache/carbondata/scan/wrappers/ByteArrayWrapperTest.java
deleted file mode 100644
index dfeb63d..0000000
--- a/core/src/test/java/org/apache/carbondata/scan/wrappers/ByteArrayWrapperTest.java
+++ /dev/null
@@ -1,107 +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.wrappers;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
-
-public class ByteArrayWrapperTest {
-  private static ByteArrayWrapper byteArrayWrapper;
-  byte[] dictionaryKey = new byte[] { 1 };
-  byte[][] complexTypesKeys = { { 1 }, { 1 } };
-  byte[][] noDictionaryKeys = new byte[][] { { 1 }, { 1 } };
-
-  @BeforeClass
-
-  public static void setUp() {
-    byteArrayWrapper = new ByteArrayWrapper();
-  }
-
-  @AfterClass public static void tearDown() {
-    byteArrayWrapper = null;
-  }
-
-  @Test public void testHashCodeValue() {
-    byteArrayWrapper.setDictionaryKey(dictionaryKey);
-    byteArrayWrapper.setComplexTypesKeys(complexTypesKeys);
-    byteArrayWrapper.setNoDictionaryKeys(noDictionaryKeys);
-
-    int result = byteArrayWrapper.hashCode();
-    assert (29583456 == result);
-  }
-
-  @Test public void testEqualsWithOtherAsInstanceOfByteArrayWrapper() {
-    ByteArrayWrapper other;
-    other = null;
-    boolean result = byteArrayWrapper.equals(other);
-    assertFalse(result);
-  }
-
-  @Test public void testEqualsWithNoDictionaryKeysOtherNotEqualNoDictionaryKeys() {
-    byte[][] noDictionaryKeysOther = { { 1 } };
-    byteArrayWrapper.setNoDictionaryKeys(noDictionaryKeys);
-    ByteArrayWrapper other = new ByteArrayWrapper();
-    other.setNoDictionaryKeys(noDictionaryKeysOther);
-    boolean result = byteArrayWrapper.equals(other);
-    assertFalse(result);
-  }
-
-  @Test public void testEqualsWithComplexTypesKeysOtherNotEqualComplexTypesKeys() {
-    byte[][] complexTypesKeysOther = { { 1 } };
-    byteArrayWrapper.setComplexTypesKeys(complexTypesKeys);
-    byteArrayWrapper.setNoDictionaryKeys(noDictionaryKeys);
-    ByteArrayWrapper other = new ByteArrayWrapper();
-    other.setComplexTypesKeys(complexTypesKeysOther);
-    other.setNoDictionaryKeys(noDictionaryKeys);
-    boolean result = byteArrayWrapper.equals(other);
-    assertFalse(result);
-  }
-
-  @Test
-
-  public void testEqualsForFirstElementComplexTypesKeysAndOther() {
-    ByteArrayWrapper other = new ByteArrayWrapper();
-    other.setComplexTypesKeys(complexTypesKeys);
-    other.setDictionaryKey(dictionaryKey);
-    other.setNoDictionaryKeys(noDictionaryKeys);
-    byteArrayWrapper.setComplexTypesKeys(complexTypesKeys);
-    byteArrayWrapper.setDictionaryKey(dictionaryKey);
-    byteArrayWrapper.setNoDictionaryKeys(noDictionaryKeys);
-    boolean result = byteArrayWrapper.equals(other);
-    assertTrue(result);
-  }
-
-  @Test public void testCompareTo() {
-    byteArrayWrapper.setDictionaryKey(dictionaryKey);
-    ByteArrayWrapper other = new ByteArrayWrapper();
-    other.setDictionaryKey(dictionaryKey);
-    other.setNoDictionaryKeys(noDictionaryKeys);
-    other.setComplexTypesKeys(complexTypesKeys);
-    byteArrayWrapper.setNoDictionaryKeys(noDictionaryKeys);
-    byteArrayWrapper.setComplexTypesKeys(complexTypesKeys);
-    int actualResult = byteArrayWrapper.compareTo(other);
-    int expectedResult = 0;
-    assertEquals(expectedResult, actualResult);
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/core/src/test/java/org/apache/carbondata/scanner/impl/FilterScannerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/scanner/impl/FilterScannerTest.java b/core/src/test/java/org/apache/carbondata/scanner/impl/FilterScannerTest.java
deleted file mode 100644
index 6e8534a..0000000
--- a/core/src/test/java/org/apache/carbondata/scanner/impl/FilterScannerTest.java
+++ /dev/null
@@ -1,162 +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.scanner.impl;
-
-import static junit.framework.TestCase.assertEquals;
-
-public class FilterScannerTest {
-//
-//  private static FilterScanner filterScanner;
-//  private static BlockletIndex blockletIndex;
-//  private static BlockletMinMaxIndex blockletMinMaxIndex;
-//  private static BTreeBuilderInfo bTreeBuilderInfo;
-//  private static DataFileFooter dataFileFooter;
-//
-//  @BeforeClass public static void setUp() {
-//    BlockExecutionInfo blockExecutionInfo = new BlockExecutionInfo();
-//    FilterExecuter filterExecutor = new AndFilterExecuterImpl(null, null);
-//    blockExecutionInfo.setFilterExecuterTree(filterExecutor);
-//    blockExecutionInfo.setFixedLengthKeySize(1);
-//    blockExecutionInfo.setNoDictionaryBlockIndexes(new int[] { 1, 2 });
-//    blockExecutionInfo.setDictionaryColumnBlockIndex(new int[] { 1 });
-//    blockExecutionInfo.setColumnGroupToKeyStructureInfo(new HashMap<Integer, KeyStructureInfo>());
-//    blockExecutionInfo.setComplexDimensionInfoMap(new HashMap<Integer, GenericQueryType>());
-//    blockExecutionInfo.setComplexColumnParentBlockIndexes(new int[] { 1 });
-//    blockExecutionInfo.setQueryDimensions(new QueryDimension[] { new QueryDimension("Col1") });
-//    blockExecutionInfo.setAllSelectedDimensionBlocksIndexes(new int[][] { { 0, 0 } });
-//    blockExecutionInfo.setAllSelectedMeasureBlocksIndexes(new int[][] { { 0, 0 } });
-//    blockExecutionInfo.setTotalNumberOfMeasureBlock(1);
-//    blockExecutionInfo.setTotalNumberDimensionBlock(1);
-//    QueryStatisticsModel queryStatisticsModel = new QueryStatisticsModel();
-//    QueryStatistic queryStatistic = new QueryStatistic();
-//    queryStatistic.addCountStatistic(QueryStatisticsConstants.TOTAL_BLOCKLET_NUM, 1);
-//    Map<String, QueryStatistic> statisticsTypeAndObjMap = new HashMap<>();
-//    statisticsTypeAndObjMap.put(QueryStatisticsConstants.TOTAL_BLOCKLET_NUM, queryStatistic);
-//    statisticsTypeAndObjMap.put(QueryStatisticsConstants.VALID_SCAN_BLOCKLET_NUM, queryStatistic);
-//    queryStatisticsModel.setStatisticsTypeAndObjMap(statisticsTypeAndObjMap);
-//    QueryStatisticsRecorder queryStatisticsRecorder = new QueryStatisticsRecorderImpl("1");
-//    queryStatisticsModel.setRecorder(queryStatisticsRecorder);
-//    filterScanner = new FilterScanner(blockExecutionInfo, queryStatisticsModel);
-//    blockletIndex = new BlockletIndex();
-//    blockletMinMaxIndex = new BlockletMinMaxIndex();
-//    blockletMinMaxIndex.setMinValues(new byte[][] { { 1, 2 } });
-//    blockletMinMaxIndex.setMaxValues(new byte[][] { { 10, 12 } });
-//    blockletIndex.setMinMaxIndex(blockletMinMaxIndex);
-//    dataFileFooter = new DataFileFooter();
-//    dataFileFooter.setBlockletIndex(blockletIndex);
-//    bTreeBuilderInfo = new BTreeBuilderInfo(Arrays.asList(dataFileFooter), new int[] { 1 });
-//  }
-//
-//  @Test public void testToScanBlockletWithEmptyBitSet() throws QueryExecutionException {
-//    new MockUp<AndFilterExecuterImpl>() {
-//      @SuppressWarnings("unused") @Mock
-//      public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue) {
-//        return new BitSet();
-//      }
-//    };
-//    BlocksChunkHolder blocksChunkHolder = new BlocksChunkHolder(1, 1);
-//    DataRefNode dataRefNode = new BlockBTreeLeafNode(bTreeBuilderInfo, 0, 1);
-//    blocksChunkHolder.setDataBlock(dataRefNode);
-//    AbstractScannedResult abstractScannedResult = filterScanner.scanBlocklet(blocksChunkHolder);
-//    assertEquals(0, abstractScannedResult.numberOfOutputRows());
-//  }
-//
-//  @Test public void testToScanBlockletWithNonEmptyBitSet() throws QueryExecutionException {
-//    new MockUp<AndFilterExecuterImpl>() {
-//      @SuppressWarnings("unused") @Mock
-//      public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue) {
-//        BitSet bitSet = new BitSet();
-//        bitSet.set(1);
-//        bitSet.set(2);
-//        bitSet.set(1);
-//        return bitSet;
-//      }
-//
-//      @SuppressWarnings("unused") @Mock
-//      public BitSet applyFilter(BlocksChunkHolder blockChunkHolder)
-//          throws FilterUnsupportedException {
-//        BitSet bitSet = new BitSet();
-//        bitSet.set(1);
-//        bitSet.set(2);
-//        bitSet.set(1);
-//        return bitSet;
-//      }
-//    };
-//    DataRefNode dataRefNode = new MockUp<DataRefNode>() {
-//      @Mock @SuppressWarnings("unused") DimensionColumnDataChunk[] getDimensionChunks(
-//          FileHolder fileReader, int[][] blockIndexes) {
-//        DimensionColumnDataChunk[] dimensionChunkAttributes =
-//            { new ColumnGroupDimensionDataChunk(null, null) };
-//        return dimensionChunkAttributes;
-//      }
-//
-//      @Mock @SuppressWarnings("unused") MeasureColumnDataChunk[] getMeasureChunks(
-//          FileHolder fileReader, int[][] blockIndexes) {
-//
-//        MeasureColumnDataChunk[] measureColumnDataChunks = { new MeasureColumnDataChunk() };
-//        return measureColumnDataChunks;
-//      }
-//    }.getMockInstance();
-//
-//    BlocksChunkHolder blocksChunkHolder = new BlocksChunkHolder(1, 1);
-//    blocksChunkHolder.setDataBlock(dataRefNode);
-//    DimensionChunkAttributes dimensionChunkAttributes = new DimensionChunkAttributes();
-//    DimensionColumnDataChunk dimensionColumnDataChunk =
-//        new FixedLengthDimensionDataChunk(new byte[] { 0, 1 }, dimensionChunkAttributes);
-//    blocksChunkHolder.setDimensionDataChunk(new DimensionColumnDataChunk[]
-//
-//        { dimensionColumnDataChunk });
-//    MeasureColumnDataChunk measureColumnDataChunk = new MeasureColumnDataChunk();
-//    blocksChunkHolder.setMeasureDataChunk(new MeasureColumnDataChunk[]
-//
-//        { measureColumnDataChunk });
-//    FileHolder fileHolder = new DFSFileHolderImpl();
-//    blocksChunkHolder.setFileReader(fileHolder);
-//    AbstractScannedResult abstractScannedResult = filterScanner.scanBlocklet(blocksChunkHolder);
-//
-//    assertEquals(2, abstractScannedResult.numberOfOutputRows());
-//  }
-//
-//  @Test(expected = QueryExecutionException.class) public void testToScanBlockletWithException()
-//      throws QueryExecutionException {
-//    new MockUp<AndFilterExecuterImpl>() {
-//      @SuppressWarnings("unused") @Mock
-//      public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue) {
-//        BitSet bitSet = new BitSet();
-//        bitSet.set(1);
-//        bitSet.set(2);
-//        bitSet.set(1);
-//        return bitSet;
-//      }
-//
-//      @SuppressWarnings("unused") @Mock
-//      public BitSet applyFilter(BlocksChunkHolder blockChunkHolder)
-//          throws FilterUnsupportedException {
-//        throw new FilterUnsupportedException("Filter unsupported");
-//      }
-//    };
-//    BlocksChunkHolder blocksChunkHolder = new BlocksChunkHolder(1, 1);
-//    BTreeBuilderInfo bTreeBuilderInfo =
-//        new BTreeBuilderInfo(Arrays.asList(dataFileFooter), new int[] { 1 });
-//    DataRefNode dataRefNode = new BlockBTreeLeafNode(bTreeBuilderInfo, 0, 1);
-//    blocksChunkHolder.setDataBlock(dataRefNode);
-//    filterScanner.scanBlocklet(blocksChunkHolder);
-//  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/dev/findbugs-exclude.xml
----------------------------------------------------------------------
diff --git a/dev/findbugs-exclude.xml b/dev/findbugs-exclude.xml
index be54b56..90239ad 100644
--- a/dev/findbugs-exclude.xml
+++ b/dev/findbugs-exclude.xml
@@ -34,12 +34,12 @@
   </Match>
 
   <Match>
-    <Class name="org.apache.carbondata.scan.aggregator.impl.BitSet"/>
+    <Class name="org.apache.carbondata.core.scan.aggregator.impl.BitSet"/>
     <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
   </Match>
 
   <Match>
-    <Class name="org.apache.carbondata.scan.expression.ExpressionResult"/>
+    <Class name="org.apache.carbondata.core.scan.expression.ExpressionResult"/>
     <Or>
       <Method name="getBoolean"/>
     </Or>

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/examples/spark/src/main/scala/org/apache/carbondata/examples/AlluxioExample.scala
----------------------------------------------------------------------
diff --git a/examples/spark/src/main/scala/org/apache/carbondata/examples/AlluxioExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/AlluxioExample.scala
index 17fe960..963552e 100644
--- a/examples/spark/src/main/scala/org/apache/carbondata/examples/AlluxioExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/AlluxioExample.scala
@@ -18,7 +18,7 @@
 package org.apache.carbondata.examples
 
 import org.apache.carbondata.core.constants.CarbonCommonConstants
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory
+import org.apache.carbondata.core.datastorage.impl.FileFactory
 import org.apache.carbondata.core.util.CarbonProperties
 import org.apache.carbondata.examples.util.ExampleUtils
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/examples/spark/src/main/scala/org/apache/carbondata/examples/util/AllDictionaryUtil.scala
----------------------------------------------------------------------
diff --git a/examples/spark/src/main/scala/org/apache/carbondata/examples/util/AllDictionaryUtil.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/util/AllDictionaryUtil.scala
index 6011bcb..e16e084 100644
--- a/examples/spark/src/main/scala/org/apache/carbondata/examples/util/AllDictionaryUtil.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/util/AllDictionaryUtil.scala
@@ -24,7 +24,7 @@ import scala.collection.mutable.{ArrayBuffer, HashSet}
 import org.apache.spark.SparkContext
 
 import org.apache.carbondata.common.logging.LogServiceFactory
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory
+import org.apache.carbondata.core.datastorage.impl.FileFactory
 
 object AllDictionaryUtil {
   private val LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName)

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
index 615629d..23429c4 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.util.*;
 
-import org.apache.carbondata.common.iudprocessor.iuddata.BlockMappingVO;
+import org.apache.carbondata.core.update.data.BlockMappingVO;
 import org.apache.carbondata.core.AbsoluteTableIdentifier;
 import org.apache.carbondata.core.ColumnarFormatVersion;
 import org.apache.carbondata.core.datastore.DataRefNode;
@@ -41,7 +41,7 @@ import org.apache.carbondata.core.keygenerator.KeyGenException;
 import org.apache.carbondata.core.stats.QueryStatistic;
 import org.apache.carbondata.core.stats.QueryStatisticsConstants;
 import org.apache.carbondata.core.stats.QueryStatisticsRecorder;
-import org.apache.carbondata.core.update.UpdateVO;
+import org.apache.carbondata.core.update.data.UpdateVO;
 import org.apache.carbondata.core.updatestatus.SegmentStatusManager;
 import org.apache.carbondata.core.updatestatus.SegmentUpdateStatusManager;
 import org.apache.carbondata.core.util.CarbonTimeStatisticsFactory;
@@ -52,12 +52,12 @@ import org.apache.carbondata.hadoop.util.BlockLevelTraverser;
 import org.apache.carbondata.hadoop.util.CarbonInputFormatUtil;
 import org.apache.carbondata.hadoop.util.ObjectSerializationUtil;
 import org.apache.carbondata.hadoop.util.SchemaReader;
-import org.apache.carbondata.scan.expression.Expression;
-import org.apache.carbondata.scan.filter.FilterExpressionProcessor;
-import org.apache.carbondata.scan.filter.FilterUtil;
-import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
-import org.apache.carbondata.scan.model.CarbonQueryPlan;
-import org.apache.carbondata.scan.model.QueryModel;
+import org.apache.carbondata.core.scan.expression.Expression;
+import org.apache.carbondata.core.scan.filter.FilterExpressionProcessor;
+import org.apache.carbondata.core.scan.filter.FilterUtil;
+import org.apache.carbondata.core.scan.filter.resolver.FilterResolverIntf;
+import org.apache.carbondata.core.scan.model.CarbonQueryPlan;
+import org.apache.carbondata.core.scan.model.QueryModel;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java
index 36bf3a1..a42995f 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java
@@ -33,7 +33,7 @@ import org.apache.carbondata.core.datastore.block.Distributable;
 import org.apache.carbondata.core.datastore.block.TableBlockInfo;
 import org.apache.carbondata.core.path.CarbonTablePath;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
-import org.apache.carbondata.core.update.UpdateVO;
+import org.apache.carbondata.core.update.data.UpdateVO;
 import org.apache.carbondata.core.util.CarbonProperties;
 import org.apache.carbondata.hadoop.internal.index.Block;
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java
index 9c17f5e..af6611f 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java
@@ -28,11 +28,11 @@ import org.apache.carbondata.core.cache.dictionary.Dictionary;
 import org.apache.carbondata.core.datastore.block.TableBlockInfo;
 import org.apache.carbondata.core.util.CarbonUtil;
 import org.apache.carbondata.hadoop.readsupport.CarbonReadSupport;
-import org.apache.carbondata.scan.executor.QueryExecutor;
-import org.apache.carbondata.scan.executor.QueryExecutorFactory;
-import org.apache.carbondata.scan.executor.exception.QueryExecutionException;
-import org.apache.carbondata.scan.model.QueryModel;
-import org.apache.carbondata.scan.result.iterator.ChunkRowIterator;
+import org.apache.carbondata.core.scan.executor.QueryExecutor;
+import org.apache.carbondata.core.scan.executor.QueryExecutorFactory;
+import org.apache.carbondata.core.scan.executor.exception.QueryExecutionException;
+import org.apache.carbondata.core.scan.model.QueryModel;
+import org.apache.carbondata.core.scan.result.iterator.ChunkRowIterator;
 
 import org.apache.hadoop.mapreduce.InputSplit;
 import org.apache.hadoop.mapreduce.RecordReader;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java
index f353b55..0eca474 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java
@@ -30,8 +30,8 @@ import org.apache.carbondata.hadoop.internal.segment.SegmentManager;
 import org.apache.carbondata.hadoop.internal.segment.SegmentManagerFactory;
 import org.apache.carbondata.hadoop.util.CarbonInputFormatUtil;
 import org.apache.carbondata.hadoop.util.ObjectSerializationUtil;
-import org.apache.carbondata.scan.expression.Expression;
-import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
+import org.apache.carbondata.core.scan.expression.Expression;
+import org.apache.carbondata.core.scan.filter.resolver.FilterResolverIntf;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.InputSplit;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/Index.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/Index.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/Index.java
index 49404f7..0e2f3f6 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/Index.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/Index.java
@@ -22,7 +22,7 @@ package org.apache.carbondata.hadoop.internal.index;
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
+import org.apache.carbondata.core.scan.filter.resolver.FilterResolverIntf;
 
 import org.apache.hadoop.mapreduce.JobContext;
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndex.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndex.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndex.java
index 8a2ce37..a036b2a 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndex.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/index/impl/InMemoryBTreeIndex.java
@@ -49,9 +49,9 @@ import org.apache.carbondata.hadoop.CarbonInputSplit;
 import org.apache.carbondata.hadoop.internal.index.Block;
 import org.apache.carbondata.hadoop.internal.index.Index;
 import org.apache.carbondata.hadoop.internal.segment.Segment;
-import org.apache.carbondata.scan.filter.FilterExpressionProcessor;
-import org.apache.carbondata.scan.filter.FilterUtil;
-import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
+import org.apache.carbondata.core.scan.filter.FilterExpressionProcessor;
+import org.apache.carbondata.core.scan.filter.FilterUtil;
+import org.apache.carbondata.core.scan.filter.resolver.FilterResolverIntf;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/Segment.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/Segment.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/Segment.java
index 067b23f..6a99bd7 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/Segment.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/Segment.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
+import org.apache.carbondata.core.scan.filter.resolver.FilterResolverIntf;
 
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/impl/IndexedSegment.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/impl/IndexedSegment.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/impl/IndexedSegment.java
index 76c1415..0215e26 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/impl/IndexedSegment.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/internal/segment/impl/IndexedSegment.java
@@ -27,7 +27,7 @@ import org.apache.carbondata.hadoop.internal.index.Block;
 import org.apache.carbondata.hadoop.internal.index.Index;
 import org.apache.carbondata.hadoop.internal.index.IndexLoader;
 import org.apache.carbondata.hadoop.internal.segment.Segment;
-import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
+import org.apache.carbondata.core.scan.filter.resolver.FilterResolverIntf;
 
 import org.apache.hadoop.mapreduce.InputSplit;
 import org.apache.hadoop.mapreduce.JobContext;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/util/BlockLevelTraverser.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/util/BlockLevelTraverser.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/util/BlockLevelTraverser.java
index 5df0b83..1800fc3 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/util/BlockLevelTraverser.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/util/BlockLevelTraverser.java
@@ -30,7 +30,7 @@ import org.apache.carbondata.core.keygenerator.KeyGenException;
 import org.apache.carbondata.core.update.CarbonUpdateUtil;
 import org.apache.carbondata.core.update.SegmentUpdateDetails;
 import org.apache.carbondata.core.updatestatus.SegmentUpdateStatusManager;
-import org.apache.carbondata.scan.filter.FilterUtil;
+import org.apache.carbondata.core.scan.filter.FilterUtil;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/util/CarbonInputFormatUtil.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/util/CarbonInputFormatUtil.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/util/CarbonInputFormatUtil.java
index cdfe7a4..7585032 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/util/CarbonInputFormatUtil.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/util/CarbonInputFormatUtil.java
@@ -27,13 +27,13 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable;
 import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension;
 import org.apache.carbondata.core.metadata.schema.table.column.CarbonMeasure;
 import org.apache.carbondata.hadoop.CarbonInputFormat;
-import org.apache.carbondata.scan.expression.Expression;
-import org.apache.carbondata.scan.filter.FilterExpressionProcessor;
-import org.apache.carbondata.scan.filter.resolver.FilterResolverIntf;
-import org.apache.carbondata.scan.model.CarbonQueryPlan;
-import org.apache.carbondata.scan.model.QueryDimension;
-import org.apache.carbondata.scan.model.QueryMeasure;
-import org.apache.carbondata.scan.model.QueryModel;
+import org.apache.carbondata.core.scan.expression.Expression;
+import org.apache.carbondata.core.scan.filter.FilterExpressionProcessor;
+import org.apache.carbondata.core.scan.filter.resolver.FilterResolverIntf;
+import org.apache.carbondata.core.scan.model.CarbonQueryPlan;
+import org.apache.carbondata.core.scan.model.QueryDimension;
+import org.apache.carbondata.core.scan.model.QueryMeasure;
+import org.apache.carbondata.core.scan.model.QueryModel;
 
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapreduce.Job;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/main/java/org/apache/carbondata/hadoop/util/SchemaReader.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/util/SchemaReader.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/util/SchemaReader.java
index a24a303..9b95f0a 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/util/SchemaReader.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/util/SchemaReader.java
@@ -28,7 +28,7 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable;
 import org.apache.carbondata.core.metadata.schema.table.TableInfo;
 import org.apache.carbondata.core.path.CarbonStorePath;
 import org.apache.carbondata.core.path.CarbonTablePath;
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory;
+import org.apache.carbondata.core.datastorage.impl.FileFactory;
 import org.apache.carbondata.core.reader.ThriftReader;
 
 import org.apache.thrift.TBase;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/test/java/org/apache/carbondata/hadoop/ft/CarbonInputFormat_FT.java
----------------------------------------------------------------------
diff --git a/hadoop/src/test/java/org/apache/carbondata/hadoop/ft/CarbonInputFormat_FT.java b/hadoop/src/test/java/org/apache/carbondata/hadoop/ft/CarbonInputFormat_FT.java
index 158af7d..5383646 100644
--- a/hadoop/src/test/java/org/apache/carbondata/hadoop/ft/CarbonInputFormat_FT.java
+++ b/hadoop/src/test/java/org/apache/carbondata/hadoop/ft/CarbonInputFormat_FT.java
@@ -23,10 +23,10 @@ import java.util.List;
 
 import org.apache.carbondata.core.metadata.DataType;
 import org.apache.carbondata.hadoop.CarbonInputFormat;
-import org.apache.carbondata.scan.expression.ColumnExpression;
-import org.apache.carbondata.scan.expression.Expression;
-import org.apache.carbondata.scan.expression.LiteralExpression;
-import org.apache.carbondata.scan.expression.conditional.EqualToExpression;
+import org.apache.carbondata.core.scan.expression.ColumnExpression;
+import org.apache.carbondata.core.scan.expression.Expression;
+import org.apache.carbondata.core.scan.expression.LiteralExpression;
+import org.apache.carbondata.core.scan.expression.conditional.EqualToExpression;
 
 import junit.framework.TestCase;
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/test/java/org/apache/carbondata/hadoop/ft/CarbonInputMapperTest.java
----------------------------------------------------------------------
diff --git a/hadoop/src/test/java/org/apache/carbondata/hadoop/ft/CarbonInputMapperTest.java b/hadoop/src/test/java/org/apache/carbondata/hadoop/ft/CarbonInputMapperTest.java
index 359d4a7..def162c 100644
--- a/hadoop/src/test/java/org/apache/carbondata/hadoop/ft/CarbonInputMapperTest.java
+++ b/hadoop/src/test/java/org/apache/carbondata/hadoop/ft/CarbonInputMapperTest.java
@@ -31,10 +31,10 @@ import org.apache.carbondata.core.util.CarbonUtil;
 import org.apache.carbondata.hadoop.CarbonInputFormat;
 import org.apache.carbondata.hadoop.CarbonProjection;
 import org.apache.carbondata.hadoop.test.util.StoreCreator;
-import org.apache.carbondata.scan.expression.ColumnExpression;
-import org.apache.carbondata.scan.expression.Expression;
-import org.apache.carbondata.scan.expression.LiteralExpression;
-import org.apache.carbondata.scan.expression.conditional.EqualToExpression;
+import org.apache.carbondata.core.scan.expression.ColumnExpression;
+import org.apache.carbondata.core.scan.expression.Expression;
+import org.apache.carbondata.core.scan.expression.LiteralExpression;
+import org.apache.carbondata.core.scan.expression.conditional.EqualToExpression;
 
 import junit.framework.TestCase;
 import org.apache.hadoop.conf.Configuration;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/ObjectSerializationUtilTest.java
----------------------------------------------------------------------
diff --git a/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/ObjectSerializationUtilTest.java b/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/ObjectSerializationUtilTest.java
index e52d8d2..3b5c56b 100644
--- a/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/ObjectSerializationUtilTest.java
+++ b/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/ObjectSerializationUtilTest.java
@@ -21,10 +21,10 @@ package org.apache.carbondata.hadoop.test.util;
 
 import org.apache.carbondata.core.metadata.DataType;
 import org.apache.carbondata.hadoop.util.ObjectSerializationUtil;
-import org.apache.carbondata.scan.expression.ColumnExpression;
-import org.apache.carbondata.scan.expression.Expression;
-import org.apache.carbondata.scan.expression.LiteralExpression;
-import org.apache.carbondata.scan.expression.conditional.EqualToExpression;
+import org.apache.carbondata.core.scan.expression.ColumnExpression;
+import org.apache.carbondata.core.scan.expression.Expression;
+import org.apache.carbondata.core.scan.expression.LiteralExpression;
+import org.apache.carbondata.core.scan.expression.conditional.EqualToExpression;
 
 import junit.framework.TestCase;
 import org.junit.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
----------------------------------------------------------------------
diff --git a/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java b/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
index f4c0d72..fa3710f 100644
--- a/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
+++ b/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
@@ -47,7 +47,7 @@ import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema;
 import org.apache.carbondata.core.path.CarbonStorePath;
 import org.apache.carbondata.core.path.CarbonTablePath;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory;
+import org.apache.carbondata.core.datastorage.impl.FileFactory;
 import org.apache.carbondata.core.load.BlockDetails;
 import org.apache.carbondata.core.load.LoadMetadataDetails;
 import org.apache.carbondata.core.util.CarbonProperties;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala
index f25e723..3555477 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala
@@ -27,8 +27,8 @@ import org.apache.spark.sql.Row
 import org.apache.spark.sql.common.util.QueryTest
 import org.scalatest.BeforeAndAfterAll
 
+import org.apache.carbondata.core.datastorage.impl.FileFactory
 import org.apache.carbondata.core.path.{CarbonStorePath, CarbonTablePath}
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory
 
 class TestLoadDataGeneral extends QueryTest with BeforeAndAfterAll {
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/BlockPruneQueryTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/BlockPruneQueryTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/BlockPruneQueryTestCase.scala
index 3eccc70..18efde8 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/BlockPruneQueryTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/BlockPruneQueryTestCase.scala
@@ -24,7 +24,7 @@ import org.apache.spark.sql.Row
 import org.apache.spark.sql.common.util.QueryTest
 import org.scalatest.BeforeAndAfterAll
 
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory
+import org.apache.carbondata.core.datastorage.impl.FileFactory
 
 /**
   * This class contains test cases for block prune query

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/SubqueryWithFilterAndSortTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/SubqueryWithFilterAndSortTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/SubqueryWithFilterAndSortTestCase.scala
index 18cdf2a..9b4ac04 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/SubqueryWithFilterAndSortTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/SubqueryWithFilterAndSortTestCase.scala
@@ -22,7 +22,7 @@ package org.apache.carbondata.spark.testsuite.detailquery
 import org.apache.spark.sql.common.util.QueryTest
 import org.scalatest.BeforeAndAfterAll
 
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory
+import org.apache.carbondata.core.datastorage.impl.FileFactory
 import org.apache.carbondata.core.datastorage.store.impl.FileFactory.FileType
 
 class SubqueryWithFilterAndSortTestCase extends QueryTest with BeforeAndAfterAll {

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/ValueCompressionDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/ValueCompressionDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/ValueCompressionDataTypeTestCase.scala
index 0baf230..81a2b00 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/ValueCompressionDataTypeTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/ValueCompressionDataTypeTestCase.scala
@@ -21,7 +21,7 @@ package org.apache.carbondata.spark.testsuite.detailquery
 import org.apache.spark.sql.common.util.QueryTest
 import org.scalatest.BeforeAndAfterAll
 
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory
+import org.apache.carbondata.core.datastorage.impl.FileFactory
 import org.apache.carbondata.core.datastorage.store.impl.FileFactory.FileType
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
index ddbef8d..fbcccda 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
@@ -42,10 +42,10 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable;
 import org.apache.carbondata.core.path.CarbonStorePath;
 import org.apache.carbondata.core.path.CarbonTablePath;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
-import org.apache.carbondata.core.datastorage.store.filesystem.CarbonFile;
-import org.apache.carbondata.core.datastorage.store.filesystem.CarbonFileFilter;
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory;
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory.FileType;
+import org.apache.carbondata.core.datastorage.filesystem.CarbonFile;
+import org.apache.carbondata.core.datastorage.filesystem.CarbonFileFilter;
+import org.apache.carbondata.core.datastorage.impl.FileFactory;
+import org.apache.carbondata.core.datastorage.impl.FileFactory.FileType;
 import org.apache.carbondata.core.load.LoadMetadataDetails;
 import org.apache.carbondata.core.update.CarbonUpdateUtil;
 import org.apache.carbondata.core.updatestatus.SegmentStatusManager;

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
index 62afa0f..16dfcba 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
@@ -39,9 +39,9 @@ import org.apache.carbondata.core.CarbonTableIdentifier;
 import org.apache.carbondata.core.path.CarbonStorePath;
 import org.apache.carbondata.core.path.CarbonTablePath;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
-import org.apache.carbondata.core.datastorage.store.filesystem.CarbonFile;
-import org.apache.carbondata.core.datastorage.store.filesystem.CarbonFileFilter;
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory;
+import org.apache.carbondata.core.datastorage.filesystem.CarbonFile;
+import org.apache.carbondata.core.datastorage.filesystem.CarbonFileFilter;
+import org.apache.carbondata.core.datastorage.impl.FileFactory;
 import org.apache.carbondata.core.load.LoadMetadataDetails;
 import org.apache.carbondata.core.update.CarbonUpdateUtil;
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionExecutor.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionExecutor.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionExecutor.java
index e932eaa..1314499 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionExecutor.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionExecutor.java
@@ -38,14 +38,14 @@ import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension;
 import org.apache.carbondata.core.metadata.schema.table.column.CarbonMeasure;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
 import org.apache.carbondata.core.util.CarbonUtil;
-import org.apache.carbondata.scan.executor.QueryExecutor;
-import org.apache.carbondata.scan.executor.QueryExecutorFactory;
-import org.apache.carbondata.scan.executor.exception.QueryExecutionException;
-import org.apache.carbondata.scan.model.QueryDimension;
-import org.apache.carbondata.scan.model.QueryMeasure;
-import org.apache.carbondata.scan.model.QueryModel;
-import org.apache.carbondata.scan.result.BatchResult;
-import org.apache.carbondata.scan.result.iterator.RawResultIterator;
+import org.apache.carbondata.core.scan.executor.QueryExecutor;
+import org.apache.carbondata.core.scan.executor.QueryExecutorFactory;
+import org.apache.carbondata.core.scan.executor.exception.QueryExecutionException;
+import org.apache.carbondata.core.scan.model.QueryDimension;
+import org.apache.carbondata.core.scan.model.QueryMeasure;
+import org.apache.carbondata.core.scan.model.QueryModel;
+import org.apache.carbondata.core.scan.result.BatchResult;
+import org.apache.carbondata.core.scan.result.iterator.RawResultIterator;
 
 /**
  * Executor class for executing the query on the selected segments to be merged.

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionUtil.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionUtil.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionUtil.java
index 1cb2978..e9bd4ae 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionUtil.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionUtil.java
@@ -33,7 +33,7 @@ import org.apache.carbondata.core.metadata.blocklet.DataFileFooter;
 import org.apache.carbondata.core.metadata.schema.table.CarbonTable;
 import org.apache.carbondata.core.path.CarbonTablePath;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory;
+import org.apache.carbondata.core.datastorage.impl.FileFactory;
 import org.apache.carbondata.core.util.CarbonUtil;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/952cf517/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java
index ea38d1a..5523dcf 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java
@@ -33,9 +33,9 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable;
 import org.apache.carbondata.core.path.CarbonStorePath;
 import org.apache.carbondata.core.path.CarbonTablePath;
 import org.apache.carbondata.core.constants.CarbonCommonConstants;
-import org.apache.carbondata.core.datastorage.store.filesystem.CarbonFile;
-import org.apache.carbondata.core.datastorage.store.filesystem.CarbonFileFilter;
-import org.apache.carbondata.core.datastorage.store.impl.FileFactory;
+import org.apache.carbondata.core.datastorage.filesystem.CarbonFile;
+import org.apache.carbondata.core.datastorage.filesystem.CarbonFileFilter;
+import org.apache.carbondata.core.datastorage.impl.FileFactory;
 import org.apache.carbondata.core.load.LoadMetadataDetails;
 import org.apache.carbondata.core.reader.CarbonDeleteFilesDataReader;
 import org.apache.carbondata.core.update.CarbonUpdateUtil;



Mime
View raw message