http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/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
deleted file mode 100644
index 4af55c0..0000000
--- 
a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/converter/ThriftWrapperSchemaConverterImplTest.java
+++ /dev/null
@@ -1,1846 +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.metadata.converter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.carbondata.core.carbon.metadata.datatype.DataType;
-import org.apache.carbondata.core.carbon.metadata.encoder.Encoding;
-import org.apache.carbondata.core.carbon.metadata.schema.SchemaEvolution;
-import org.apache.carbondata.core.carbon.metadata.schema.SchemaEvolutionEntry;
-import org.apache.carbondata.core.carbon.metadata.schema.table.TableInfo;
-import org.apache.carbondata.core.carbon.metadata.schema.table.TableSchema;
-import 
org.apache.carbondata.core.carbon.metadata.schema.table.column.ColumnSchema;
-
-import mockit.Mock;
-import mockit.MockUp;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class ThriftWrapperSchemaConverterImplTest {
-
-  private static ThriftWrapperSchemaConverterImpl thriftWrapperSchemaConverter 
= null;
-  private static org.apache.carbondata.format.SchemaEvolutionEntry 
schemaEvolEntry = null;
-  private static org.apache.carbondata.format.ColumnSchema thriftColumnSchema 
= null;
-  private static List<ColumnSchema> columnSchemas = null;
-  private static List<SchemaEvolutionEntry> schemaEvolutionEntries = null;
-  private static List<org.apache.carbondata.format.ColumnSchema> 
thriftColumnSchemas = null;
-  private static List<org.apache.carbondata.format.SchemaEvolutionEntry>
-      thriftSchemaEvolutionEntries = null;
-  private static org.apache.carbondata.format.SchemaEvolution schemaEvol = 
null;
-  private static List<org.apache.carbondata.format.Encoding> encoders = null;
-  private static List<Encoding> encodings = null;
-  private static Map columnPropertyMap = null;
-  private static org.apache.carbondata.format.TableSchema tabSchema = null;
-
-  @BeforeClass public static void setUp() {
-
-    thriftWrapperSchemaConverter = new ThriftWrapperSchemaConverterImpl();
-    schemaEvolEntry = new org.apache.carbondata.format.SchemaEvolutionEntry();
-    schemaEvolutionEntries = new ArrayList();
-    schemaEvolutionEntries.add(new SchemaEvolutionEntry());
-    columnSchemas = new ArrayList();
-    columnSchemas.add(new ColumnSchema());
-    encodings = new ArrayList<>();
-    encodings.add(Encoding.INVERTED_INDEX);
-    encodings.add(Encoding.DELTA);
-    encodings.add(Encoding.BIT_PACKED);
-    encodings.add(Encoding.DICTIONARY);
-    encodings.add(Encoding.RLE);
-    encodings.add(Encoding.DIRECT_DICTIONARY);
-    encoders = new ArrayList<org.apache.carbondata.format.Encoding>();
-    encoders.add(org.apache.carbondata.format.Encoding.INVERTED_INDEX);
-    encoders.add(org.apache.carbondata.format.Encoding.DELTA);
-    encoders.add(org.apache.carbondata.format.Encoding.BIT_PACKED);
-    encoders.add(org.apache.carbondata.format.Encoding.DICTIONARY);
-    encoders.add(org.apache.carbondata.format.Encoding.RLE);
-    encoders.add(org.apache.carbondata.format.Encoding.DIRECT_DICTIONARY);
-
-    columnPropertyMap = new HashMap<String, String>();
-    columnPropertyMap.put("property", "value");
-    thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.STRING,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-    thriftColumnSchemas = new 
ArrayList<org.apache.carbondata.format.ColumnSchema>();
-    thriftColumnSchemas.add(thriftColumnSchema);
-    thriftSchemaEvolutionEntries = new ArrayList<>();
-    thriftSchemaEvolutionEntries.add(schemaEvolEntry);
-    schemaEvol = new 
org.apache.carbondata.format.SchemaEvolution(thriftSchemaEvolutionEntries);
-
-    new MockUp<SchemaEvolution>() {
-      @Mock public List<SchemaEvolutionEntry> getSchemaEvolutionEntryList() {
-        return schemaEvolutionEntries;
-      }
-    };
-
-    new MockUp<org.apache.carbondata.format.SchemaEvolutionEntry>() {
-      @Mock public org.apache.carbondata.format.SchemaEvolutionEntry setAdded(
-          List<org.apache.carbondata.format.ColumnSchema> added) {
-        return schemaEvolEntry;
-      }
-
-      @Mock public org.apache.carbondata.format.SchemaEvolutionEntry 
setRemoved(
-          List<org.apache.carbondata.format.ColumnSchema> removed) {
-        return schemaEvolEntry;
-      }
-
-      @Mock public long getTime_stamp() {
-        long time = 1112745600000L;
-        return time;
-      }
-
-      @Mock public List<org.apache.carbondata.format.ColumnSchema> getAdded() {
-        return thriftColumnSchemas;
-      }
-
-      @Mock public List<org.apache.carbondata.format.ColumnSchema> 
getRemoved() {
-        return thriftColumnSchemas;
-      }
-
-    };
-
-    new MockUp<org.apache.carbondata.format.ColumnSchema>() {
-      @Mock
-      public org.apache.carbondata.format.ColumnSchema setColumn_group_id(int 
column_group_id) {
-        return thriftColumnSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema setScale(int 
scale) {
-        return thriftColumnSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema setPrecision(int 
precision) {
-        return thriftColumnSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema setNum_child(int 
num_child) {
-        return thriftColumnSchema;
-      }
-
-      @Mock
-      public org.apache.carbondata.format.ColumnSchema setDefault_value(byte[] 
default_value) {
-        return thriftColumnSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema 
setColumnProperties(
-          Map<String, String> columnProperties) {
-        return thriftColumnSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema 
setInvisible(boolean invisible) {
-        return thriftColumnSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema 
setColumnReferenceId(
-          String columnReferenceId) {
-        return thriftColumnSchema;
-      }
-
-      @Mock public String getColumn_id() {
-        return "1";
-      }
-
-      @Mock public String getColumn_name() {
-        return "columnName";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimension() {
-        return true;
-      }
-
-      @Mock public List<org.apache.carbondata.format.Encoding> getEncoders() {
-        return encoders;
-      }
-
-      @Mock public int getNum_child() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getColumn_group_id() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefault_value() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public String getAggregate_function() {
-        return "";
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-
-    };
-
-    final Map mapTableProperties = new HashMap<String, String>();
-    tabSchema = new org.apache.carbondata.format.TableSchema();
-
-    new MockUp<org.apache.carbondata.format.TableSchema>() {
-      @Mock public org.apache.carbondata.format.TableSchema setTableProperties(
-          Map<String, String> tableProperties) {
-        return tabSchema;
-      }
-
-      @Mock public String getTable_id() {
-        return "1";
-      }
-
-      @Mock public Map<String, String> getTableProperties() {
-        return mapTableProperties;
-      }
-
-      @Mock public List<org.apache.carbondata.format.ColumnSchema> 
getTable_columns() {
-        return thriftColumnSchemas;
-      }
-
-      @Mock public org.apache.carbondata.format.SchemaEvolution 
getSchema_evolution() {
-        return schemaEvol;
-      }
-    };
-    new MockUp<org.apache.carbondata.format.SchemaEvolution>() {
-      @Mock
-      public List<org.apache.carbondata.format.SchemaEvolutionEntry> 
getSchema_evolution_history() {
-        return thriftSchemaEvolutionEntries;
-      }
-    };
-  }
-
-  @Test public void testFromWrapperToExternalSchemaEvolutionEntry() {
-    final SchemaEvolutionEntry schemaEvolutionEntry = new 
SchemaEvolutionEntry();
-
-    new MockUp<SchemaEvolutionEntry>() {
-      @Mock public List<ColumnSchema> getAdded() {
-        return columnSchemas;
-      }
-
-      @Mock public List<ColumnSchema> getRemoved() {
-        return columnSchemas;
-      }
-    };
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.BOOLEAN;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-    };
-
-    org.apache.carbondata.format.SchemaEvolutionEntry actualResult = 
thriftWrapperSchemaConverter
-        .fromWrapperToExternalSchemaEvolutionEntry(schemaEvolutionEntry);
-    assertEquals(schemaEvolEntry, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalSchemaEvolution() {
-    SchemaEvolution schemaEvolution = new SchemaEvolution();
-
-    new MockUp<SchemaEvolutionEntry>() {
-      @Mock public List<ColumnSchema> getAdded() {
-        return columnSchemas;
-      }
-
-      @Mock public List<ColumnSchema> getRemoved() {
-        return columnSchemas;
-      }
-    };
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.BOOLEAN;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    List<org.apache.carbondata.format.SchemaEvolutionEntry> 
thriftSchemaEvolutionEntries =
-        new ArrayList<>();
-    thriftSchemaEvolutionEntries.add(schemaEvolEntry);
-
-    org.apache.carbondata.format.SchemaEvolution actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalSchemaEvolution(schemaEvolution);
-
-    org.apache.carbondata.format.SchemaEvolution expectedResult =
-        new 
org.apache.carbondata.format.SchemaEvolution(thriftSchemaEvolutionEntries);
-    assertEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchema() {
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.BOOLEAN;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchemaForStringDatatype() {
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.STRING,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.STRING;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchemaForIntDatatype() {
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.INT,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.INT;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchemaForShortDatatype() {
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.SHORT,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.SHORT;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchemaForLongDatatype() {
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.LONG,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.LONG;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchemaForDoubleDatatype() {
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.DOUBLE,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.DOUBLE;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchemaForDecimalDatatype() {
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.DECIMAL,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.DECIMAL;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void 
testFromWrapperToExternalColumnSchemaForTimestampDatatype() {
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new org.apache.carbondata.format.ColumnSchema(
-            org.apache.carbondata.format.DataType.TIMESTAMP, "columnName", 
"1", true, encoders,
-            true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.TIMESTAMP;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchemaForArrayDatatype() {
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.ARRAY,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.ARRAY;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchemaForStructDatatype() {
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.STRUCT,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.STRUCT;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchemaForDatatypeNullCase() 
{
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new org.apache.carbondata.format.ColumnSchema(null, "columnName", "1", 
true, encoders,
-            true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return null;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalColumnSchemaWhenEncoderIsNull() {
-
-    final List<Encoding> encoding = new ArrayList<>();
-    encoding.add(Encoding.INVERTED_INDEX);
-    encoding.add(null);
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encoding;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.BOOLEAN;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    List<Encoding> encodings = null;
-    encodings = new ArrayList<>();
-    encodings.add(Encoding.INVERTED_INDEX);
-    encodings.add(null);
-    List<org.apache.carbondata.format.Encoding> encoders = null;
-    encoders = new ArrayList<org.apache.carbondata.format.Encoding>();
-    encoders.add(org.apache.carbondata.format.Encoding.INVERTED_INDEX);
-    encoders.add(null);
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema = null;
-    thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.STRING,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    org.apache.carbondata.format.ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalColumnSchema(wrapperColumnSchema);
-    assertEquals(thriftColumnSchema, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalTableSchema() {
-    TableSchema wrapperTableSchema = new TableSchema();
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.BOOLEAN;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    new MockUp<SchemaEvolutionEntry>() {
-      @Mock public List<ColumnSchema> getAdded() {
-        return columnSchemas;
-      }
-
-      @Mock public List<ColumnSchema> getRemoved() {
-        return columnSchemas;
-      }
-    };
-
-    final SchemaEvolution schemaEvolution = new SchemaEvolution();
-    final Map mapTableProperties = new HashMap<String, String>();
-
-    new MockUp<TableSchema>() {
-      @Mock public List<ColumnSchema> getListOfColumns() {
-        return columnSchemas;
-      }
-
-      @Mock public SchemaEvolution getSchemaEvalution() {
-        return schemaEvolution;
-      }
-
-      @Mock public String getTableId() {
-        return "tableId";
-      }
-
-      @Mock public Map<String, String> getTableProperties() {
-        return mapTableProperties;
-      }
-
-    };
-    org.apache.carbondata.format.TableSchema expectedResult =
-        new org.apache.carbondata.format.TableSchema("tableId", 
thriftColumnSchemas, schemaEvol);
-    org.apache.carbondata.format.TableSchema actualResult =
-        
thriftWrapperSchemaConverter.fromWrapperToExternalTableSchema(wrapperTableSchema);
-    assertEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testFromWrapperToExternalTableInfo() {
-    TableInfo wrapperTableInfo = new TableInfo();
-    String dbName = "dbName";
-    String tableName = "TableName";
-    final TableSchema wrapperTableSchema = new TableSchema();
-    final List<TableSchema> tableSchemas = new ArrayList<>();
-    tableSchemas.add(wrapperTableSchema);
-
-    new MockUp<SchemaEvolutionEntry>() {
-      @Mock public List<ColumnSchema> getAdded() {
-        return columnSchemas;
-      }
-
-      @Mock public List<ColumnSchema> getRemoved() {
-        return columnSchemas;
-      }
-    };
-
-    new MockUp<ColumnSchema>() {
-      @Mock public List<Encoding> getEncodingList() {
-        return encodings;
-      }
-
-      @Mock public int getSchemaOrdinal() {
-        return 1;
-      }
-
-      @Mock public DataType getDataType() {
-        return DataType.BOOLEAN;
-      }
-
-      @Mock public String getColumnName() {
-        return "columnName";
-      }
-
-      @Mock public String getColumnUniqueId() {
-        return "1";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimensionColumn() {
-        return true;
-      }
-
-      @Mock public int getColumnGroupId() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getNumberOfChild() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefaultValue() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-    };
-
-    new MockUp<TableInfo>() {
-      @Mock public TableSchema getFactTable() {
-        return wrapperTableSchema;
-      }
-
-      @Mock public List<TableSchema> getAggregateTableList() {
-        return tableSchemas;
-      }
-    };
-
-    new MockUp<TableSchema>() {
-      @Mock public List<ColumnSchema> getListOfColumns() {
-        return columnSchemas;
-      }
-
-      final SchemaEvolution schemaEvolution = new SchemaEvolution();
-      final Map mapTableProperties = new HashMap<String, String>();
-
-      @Mock public SchemaEvolution getSchemaEvalution() {
-        return schemaEvolution;
-      }
-
-      @Mock public String getTableId() {
-        return "tableId";
-      }
-
-      @Mock public Map<String, String> getTableProperties() {
-        return mapTableProperties;
-      }
-
-    };
-    org.apache.carbondata.format.TableSchema thriftFactTable =
-        new org.apache.carbondata.format.TableSchema("tableId", 
thriftColumnSchemas, schemaEvol);
-    List<org.apache.carbondata.format.TableSchema> thriftAggTables = new 
ArrayList<>();
-    thriftAggTables.add(thriftFactTable);
-    org.apache.carbondata.format.TableInfo actualResult = 
thriftWrapperSchemaConverter
-        .fromWrapperToExternalTableInfo(wrapperTableInfo, dbName, tableName);
-    org.apache.carbondata.format.TableInfo expectedResult =
-        new org.apache.carbondata.format.TableInfo(thriftFactTable, 
thriftAggTables);
-    assertEquals(expectedResult, actualResult);
-  }
-
-  @Test public void testFromExternalToWrapperSchemaEvolutionEntry() {
-long time =1112745600000L;
-    ColumnSchema wrapperColumnSchema = new ColumnSchema();
-    wrapperColumnSchema.setColumnUniqueId("1");
-    wrapperColumnSchema.setColumnName("columnName");
-    wrapperColumnSchema.setColumnar(true);
-    wrapperColumnSchema.setDataType(DataType.STRING);
-    wrapperColumnSchema.setDimensionColumn(true);
-    wrapperColumnSchema.setEncodingList(encodings);
-    wrapperColumnSchema.setNumberOfChild(1);
-    wrapperColumnSchema.setPrecision(1);
-    wrapperColumnSchema.setColumnGroup(1);
-    wrapperColumnSchema.setScale(1);
-    wrapperColumnSchema.setDefaultValue(new byte[] { 1, 2 });
-    wrapperColumnSchema.setColumnProperties(columnPropertyMap);
-    wrapperColumnSchema.setInvisible(true);
-    wrapperColumnSchema.setColumnReferenceId("1");
-    List<ColumnSchema> wrapperAddedColumns = new ArrayList<ColumnSchema>();
-    wrapperAddedColumns.add(wrapperColumnSchema);
-    SchemaEvolutionEntry wrapperSchemaEvolutionEntry = new 
SchemaEvolutionEntry();
-
-    List<ColumnSchema> wrapperRemovedColumns = new ArrayList<ColumnSchema>();
-    wrapperRemovedColumns.add(wrapperColumnSchema);
-
-    wrapperSchemaEvolutionEntry.setTimeStamp(time);
-    wrapperSchemaEvolutionEntry.setAdded(wrapperAddedColumns);
-    wrapperSchemaEvolutionEntry.setRemoved(wrapperRemovedColumns);
-    SchemaEvolutionEntry actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperSchemaEvolutionEntry(schemaEvolEntry);
-    assertEquals(wrapperSchemaEvolutionEntry.getAdded().get(0), 
actualResult.getAdded().get(0));
-  }
-
-  @Test public void testFromExternalToWrapperSchemaEvolution() {
-
-    new MockUp<SchemaEvolutionEntry>() {
-      @Mock public List<ColumnSchema> getAdded() {
-        return columnSchemas;
-      }
-
-      @Mock public List<ColumnSchema> getRemoved() {
-        return columnSchemas;
-      }
-    };
-
-    SchemaEvolution actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperSchemaEvolution(schemaEvol);
-    assertEquals(columnSchemas, 
actualResult.getSchemaEvolutionEntryList().get(0).getAdded());
-  }
-
-  @Test public void testFromExternalToWrapperColumnSchema() {
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColumnSchema);
-    Boolean expectedResult = true;
-    assertEquals(expectedResult, actualResult.hasEncoding(encodings.get(0)));
-  }
-
-  @Test public void testFromExternalToWrapperColumnSchemaForIntDatatype() {
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.INT,
-            "columnName", "1", true, encoders, true);
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColumnSchema);
-    Boolean expectedResult = true;
-    assertEquals(expectedResult, actualResult.hasEncoding(encodings.get(0)));
-  }
-
-  @Test public void testFromExternalToWrapperColumnSchemaForShortDatatype() {
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.SHORT,
-            "columnName", "1", true, encoders, true);
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColumnSchema);
-    Boolean expectedResult = true;
-    assertEquals(expectedResult, actualResult.hasEncoding(encodings.get(0)));
-  }
-
-  @Test public void testFromExternalToWrapperColumnSchemaForLongDatatype() {
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.LONG,
-            "columnName", "1", true, encoders, true);
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColumnSchema);
-    Boolean expectedResult = true;
-    assertEquals(expectedResult, actualResult.hasEncoding(encodings.get(0)));
-  }
-
-  @Test public void testFromExternalToWrapperColumnSchemaForDoubleDatatype() {
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.DOUBLE,
-            "columnName", "1", true, encoders, true);
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColumnSchema);
-    Boolean expectedResult = true;
-    assertEquals(expectedResult, actualResult.hasEncoding(encodings.get(0)));
-  }
-
-  @Test public void testFromExternalToWrapperColumnSchemaForDecimalDatatype() {
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.DECIMAL,
-            "columnName", "1", true, encoders, true);
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColumnSchema);
-    Boolean expectedResult = true;
-    assertEquals(expectedResult, actualResult.hasEncoding(encodings.get(0)));
-  }
-
-  @Test public void 
testFromExternalToWrapperColumnSchemaForTimestampDatatype() {
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new org.apache.carbondata.format.ColumnSchema(
-            org.apache.carbondata.format.DataType.TIMESTAMP, "columnName", 
"1", true, encoders,
-            true);
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColumnSchema);
-    Boolean expectedResult = true;
-    assertEquals(expectedResult, actualResult.hasEncoding(encodings.get(0)));
-  }
-
-  @Test public void testFromExternalToWrapperColumnSchemaForArrayDatatype() {
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.ARRAY,
-            "columnName", "1", true, encoders, true);
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColumnSchema);
-    Boolean expectedResult = true;
-    assertEquals(expectedResult, actualResult.hasEncoding(encodings.get(0)));
-  }
-
-  @Test public void testFromExternalToWrapperColumnSchemaForStructDatatype() {
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.STRUCT,
-            "columnName", "1", true, encoders, true);
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColumnSchema);
-    Boolean expectedResult = true;
-    assertEquals(expectedResult, actualResult.hasEncoding(encodings.get(0)));
-  }
-
-  @Test public void testFromExternalToWrapperColumnSchemaForDatatypeNullCase() 
{
-
-    org.apache.carbondata.format.ColumnSchema thriftColumnSchema =
-        new org.apache.carbondata.format.ColumnSchema(null, "columnName", "1", 
true, encoders,
-            true);
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColumnSchema);
-    Boolean expectedResult = true;
-    assertEquals(expectedResult, actualResult.hasEncoding(encodings.get(0)));
-  }
-
-  @Test public void testFromExternalToWrapperColumnSchemaEncodingNullCase() {
-
-    final List<org.apache.carbondata.format.Encoding> encoders =
-        new ArrayList<org.apache.carbondata.format.Encoding>();
-    encoders.add(org.apache.carbondata.format.Encoding.INVERTED_INDEX);
-    encoders.add(null);
-
-    List<Encoding> encodings = new ArrayList<>();
-    encodings.add(Encoding.INVERTED_INDEX);
-    encodings.add(null);
-
-    final org.apache.carbondata.format.ColumnSchema thriftColSchema =
-        new 
org.apache.carbondata.format.ColumnSchema(org.apache.carbondata.format.DataType.STRING,
-            "columnName", "1", true, encoders, true);
-    thriftColumnSchema.setSchemaOrdinal(1);
-
-    new MockUp<org.apache.carbondata.format.ColumnSchema>() {
-      @Mock
-      public org.apache.carbondata.format.ColumnSchema setColumn_group_id(int 
column_group_id) {
-        return thriftColSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema setScale(int 
scale) {
-        return thriftColSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema setPrecision(int 
precision) {
-        return thriftColSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema setNum_child(int 
num_child) {
-        return thriftColSchema;
-      }
-
-      @Mock
-      public org.apache.carbondata.format.ColumnSchema setDefault_value(byte[] 
default_value) {
-        return thriftColSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema 
setColumnProperties(
-          Map<String, String> columnProperties) {
-        return thriftColSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema 
setInvisible(boolean invisible) {
-        return thriftColSchema;
-      }
-
-      @Mock public org.apache.carbondata.format.ColumnSchema 
setColumnReferenceId(
-          String columnReferenceId) {
-        return thriftColSchema;
-      }
-
-      @Mock public String getColumn_id() {
-        return "1";
-      }
-
-      @Mock public String getColumn_name() {
-        return "columnName";
-      }
-
-      @Mock public boolean isColumnar() {
-        return true;
-      }
-
-      @Mock public boolean isDimension() {
-        return true;
-      }
-
-      @Mock public List<org.apache.carbondata.format.Encoding> getEncoders() {
-        return encoders;
-      }
-
-      @Mock public int getNum_child() {
-        return 1;
-      }
-
-      @Mock public int getPrecision() {
-        return 1;
-      }
-
-      @Mock public int getColumn_group_id() {
-        return 1;
-      }
-
-      @Mock public int getScale() {
-        return 1;
-      }
-
-      @Mock public byte[] getDefault_value() {
-        return new byte[] { 1, 2 };
-      }
-
-      @Mock public String getAggregate_function() {
-        return "";
-      }
-
-      @Mock public Map<String, String> getColumnProperties() {
-        return columnPropertyMap;
-      }
-
-      @Mock public boolean isInvisible() {
-        return true;
-      }
-
-      @Mock public String getColumnReferenceId() {
-        return "1";
-      }
-
-    };
-
-    ColumnSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperColumnSchema(thriftColSchema);
-    assertEquals("columnName", actualResult.getColumnName());
-  }
-
-  @Test public void testFromExternalToWrapperTableSchema() {
-    String tableId = "1";
-    String tableName = "tableName";
-    TableSchema actualResult =
-        
thriftWrapperSchemaConverter.fromExternalToWrapperTableSchema(tabSchema, 
"tableName");
-    assertEquals(tableId, actualResult.getTableId());
-    assertEquals(tableName, actualResult.getTableName());
-  }
-
-  @Test public void testFromExternalToWrapperTableInfo() {
-    final List<org.apache.carbondata.format.TableSchema> tableSchemas = new 
ArrayList();
-    long time = 1112745600000L;
-    tableSchemas.add(tabSchema);
-    new MockUp<org.apache.carbondata.format.TableInfo>() {
-      @Mock public org.apache.carbondata.format.TableSchema getFact_table() {
-        return tabSchema;
-      }
-
-      @Mock public List<org.apache.carbondata.format.TableSchema> 
getAggregate_table_list() {
-        return tableSchemas;
-      }
-    };
-    org.apache.carbondata.format.TableInfo externalTableInfo =
-        new org.apache.carbondata.format.TableInfo();
-    TableInfo actualResult = thriftWrapperSchemaConverter
-        .fromExternalToWrapperTableInfo(externalTableInfo, "dbName", 
"tableName", "/path");
-    assertEquals(time, actualResult.getLastUpdatedTime());
-    assertEquals("dbName_tableName", actualResult.getTableUniqueName());
-  }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/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
deleted file mode 100644
index ca5def5..0000000
--- 
a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableTest.java
+++ /dev/null
@@ -1,118 +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.metadata.schema.table;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.carbondata.core.carbon.metadata.datatype.DataType;
-import org.apache.carbondata.core.carbon.metadata.encoder.Encoding;
-import 
org.apache.carbondata.core.carbon.metadata.schema.table.column.CarbonDimension;
-import 
org.apache.carbondata.core.carbon.metadata.schema.table.column.ColumnSchema;
-import org.apache.carbondata.core.constants.CarbonCommonConstants;
-
-import junit.framework.TestCase;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CarbonTableTest extends TestCase {
-
-  private CarbonTable carbonTable;
-
-  @BeforeClass public void setUp() {
-    carbonTable = new CarbonTable();
-    carbonTable.loadCarbonTable(getTableInfo(1000L));
-  }
-
-  @AfterClass public void tearDown() {
-    carbonTable = null;
-  }
-
-  @Test public void testNumberOfDimensionReturnsProperCount() {
-    assertEquals(1, carbonTable.getNumberOfDimensions("carbonTestTable"));
-  }
-
-  @Test public void testNumberOfMeasureReturnsProperCount() {
-    assertEquals(1, carbonTable.getNumberOfMeasures("carbonTestTable"));
-  }
-
-  @Test public void testGetDatabaseNameResturnsDatabaseName() {
-    assertEquals("carbonTestDatabase", carbonTable.getDatabaseName());
-  }
-
-  @Test public void testFactTableNameReturnsProperFactTableName() {
-    assertEquals("carbonTestTable", carbonTable.getFactTableName());
-  }
-
-  @Test public void testTableUniqueNameIsProper() {
-    assertEquals("carbonTestDatabase_carbonTestTable", 
carbonTable.getTableUniqueName());
-  }
-
-  @Test public void testDimensionPresentInTableIsProper() {
-    CarbonDimension dimension = new 
CarbonDimension(getColumnarDimensionColumn(), 0, -1, -1,-1);
-    assertTrue(carbonTable.getDimensionByName("carbonTestTable", 
"IMEI").equals(dimension));
-  }
-
-  private ColumnSchema getColumnarDimensionColumn() {
-    ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setColumnar(true);
-    dimColumn.setColumnName("IMEI");
-    dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
-    dimColumn.setDataType(DataType.STRING);
-    dimColumn.setDimensionColumn(true);
-    List<Encoding> encodeList =
-        new ArrayList<Encoding>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE);
-    encodeList.add(Encoding.DICTIONARY);
-    dimColumn.setEncodingList(encodeList);
-    dimColumn.setNumberOfChild(0);
-    return dimColumn;
-  }
-
-  private ColumnSchema getColumnarMeasureColumn() {
-    ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setColumnName("IMEI_COUNT");
-    dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
-    dimColumn.setDataType(DataType.STRING);
-    return dimColumn;
-  }
-
-  private TableSchema getTableSchema() {
-    TableSchema tableSchema = new TableSchema();
-    List<ColumnSchema> columnSchemaList = new ArrayList<ColumnSchema>();
-    columnSchemaList.add(getColumnarDimensionColumn());
-    columnSchemaList.add(getColumnarMeasureColumn());
-    tableSchema.setListOfColumns(columnSchemaList);
-    tableSchema.setTableId(UUID.randomUUID().toString());
-    tableSchema.setTableName("carbonTestTable");
-    return tableSchema;
-  }
-
-  private TableInfo getTableInfo(long timeStamp) {
-    TableInfo info = new TableInfo();
-    info.setDatabaseName("carbonTestDatabase");
-    info.setLastUpdatedTime(timeStamp);
-    info.setTableUniqueName("carbonTestDatabase_carbonTestTable");
-    info.setFactTable(getTableSchema());
-    info.setStorePath("testore");
-    return info;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/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
deleted file mode 100644
index 4cf8725..0000000
--- 
a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/CarbonTableWithComplexTypesTest.java
+++ /dev/null
@@ -1,158 +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.metadata.schema.table;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.carbondata.core.carbon.metadata.datatype.DataType;
-import org.apache.carbondata.core.carbon.metadata.encoder.Encoding;
-import 
org.apache.carbondata.core.carbon.metadata.schema.table.column.ColumnSchema;
-import org.apache.carbondata.core.constants.CarbonCommonConstants;
-
-import junit.framework.TestCase;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CarbonTableWithComplexTypesTest extends TestCase {
-
-  private CarbonTable carbonTable;
-
-  @BeforeClass public void setUp() {
-    carbonTable = new CarbonTable();
-    carbonTable.loadCarbonTable(getTableInfo(1000L));
-  }
-
-  @AfterClass public void tearDown() {
-    carbonTable = null;
-  }
-
-  @Test public void testNumberOfDimensionReturnsProperCount() {
-    assertEquals(2, carbonTable.getNumberOfDimensions("carbonTestTable"));
-  }
-
-  @Test public void testNumberOfMeasureReturnsProperCount() {
-    assertEquals(1, carbonTable.getNumberOfMeasures("carbonTestTable"));
-  }
-
-  @Test public void testGetDatabaseNameResturnsDatabaseName() {
-    assertEquals("carbonTestDatabase", carbonTable.getDatabaseName());
-  }
-
-  @Test public void testFactTableNameReturnsProperFactTableName() {
-    assertEquals("carbonTestTable", carbonTable.getFactTableName());
-  }
-
-  @Test public void testTableUniqueNameIsProper() {
-    assertEquals("carbonTestDatabase_carbonTestTable", 
carbonTable.getTableUniqueName());
-  }
-
-  private List<ColumnSchema> getColumnarDimensionColumn() {
-
-    List<ColumnSchema> cols = new ArrayList<ColumnSchema>();
-
-    ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setColumnar(true);
-    dimColumn.setColumnName("IMEI");
-    dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
-    dimColumn.setDataType(DataType.STRING);
-    dimColumn.setDimensionColumn(true);
-    List<Encoding> encodeList =
-        new ArrayList<Encoding>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE);
-    encodeList.add(Encoding.DICTIONARY);
-    dimColumn.setEncodingList(encodeList);
-    dimColumn.setNumberOfChild(0);
-    cols.add(dimColumn);
-
-    ColumnSchema structColumn = new ColumnSchema();
-    structColumn.setColumnar(true);
-    structColumn.setColumnName("mobile");
-    structColumn.setColumnUniqueId(UUID.randomUUID().toString());
-    structColumn.setDataType(DataType.STRUCT);
-    structColumn.setDimensionColumn(true);
-    structColumn.setEncodingList(encodeList);
-    structColumn.setNumberOfChild(2);
-    cols.add(structColumn);
-
-    ColumnSchema primitiveColumn = new ColumnSchema();
-    primitiveColumn.setColumnar(true);
-    primitiveColumn.setColumnName("mobile.stdcode");
-    primitiveColumn.setColumnUniqueId(UUID.randomUUID().toString());
-    primitiveColumn.setDataType(DataType.STRING);
-    primitiveColumn.setDimensionColumn(true);
-    primitiveColumn.setEncodingList(encodeList);
-    primitiveColumn.setNumberOfChild(0);
-    cols.add(primitiveColumn);
-
-    ColumnSchema arrayColumn = new ColumnSchema();
-    arrayColumn.setColumnar(true);
-    arrayColumn.setColumnName("mobile.val");
-    arrayColumn.setColumnUniqueId(UUID.randomUUID().toString());
-    arrayColumn.setDataType(DataType.ARRAY);
-    arrayColumn.setDimensionColumn(true);
-    arrayColumn.setEncodingList(encodeList);
-    arrayColumn.setNumberOfChild(1);
-    cols.add(arrayColumn);
-
-    ColumnSchema primitiveColumn1 = new ColumnSchema();
-    primitiveColumn1.setColumnar(true);
-    primitiveColumn1.setColumnName("mobile.val.phoneno");
-    primitiveColumn1.setColumnUniqueId(UUID.randomUUID().toString());
-    primitiveColumn1.setDataType(DataType.STRING);
-    primitiveColumn1.setDimensionColumn(true);
-    primitiveColumn1.setEncodingList(encodeList);
-    primitiveColumn1.setNumberOfChild(0);
-    cols.add(primitiveColumn1);
-
-    return cols;
-  }
-
-  private ColumnSchema getColumnarMeasureColumn() {
-    ColumnSchema dimColumn = new ColumnSchema();
-    dimColumn.setColumnName("IMEI_COUNT");
-    dimColumn.setColumnUniqueId(UUID.randomUUID().toString());
-    dimColumn.setDataType(DataType.STRING);
-    dimColumn.setDimensionColumn(false);
-    return dimColumn;
-  }
-
-  private TableSchema getTableSchema() {
-    TableSchema tableSchema = new TableSchema();
-    List<ColumnSchema> columnSchemaList = new ArrayList<ColumnSchema>();
-    columnSchemaList.addAll(getColumnarDimensionColumn());
-    columnSchemaList.add(getColumnarMeasureColumn());
-    tableSchema.setListOfColumns(columnSchemaList);
-    tableSchema.setTableId(UUID.randomUUID().toString());
-    tableSchema.setTableName("carbonTestTable");
-    return tableSchema;
-  }
-
-  private TableInfo getTableInfo(long timeStamp) {
-    TableInfo info = new TableInfo();
-    info.setDatabaseName("carbonTestDatabase");
-    info.setLastUpdatedTime(timeStamp);
-    info.setTableUniqueName("carbonTestDatabase_carbonTestTable");
-    info.setFactTable(getTableSchema());
-    info.setStorePath("testStore");
-    return info;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/TableInfoTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/TableInfoTest.java
 
b/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/TableInfoTest.java
deleted file mode 100644
index d59dd23..0000000
--- 
a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/TableInfoTest.java
+++ /dev/null
@@ -1,52 +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.metadata.schema.table;
-
-import junit.framework.TestCase;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class TableInfoTest extends TestCase {
-
-    private TableInfo tableInfo;
-
-    @BeforeClass public void setUp() {
-        tableInfo = 
getTableInfo("tableInfoTestDatabase_equalsTableInfoTestTable");
-    }
-
-    @AfterClass public void tearDown() {
-        tableInfo = null;
-    }
-
-    @Test public void testTableInfoEquals() {
-        TableInfo cmpEqualsTableInfo = 
getTableInfo("tableInfoTestDatabase_equalsTableInfoTestTable");
-        TableInfo cmpNotEqualsTableInfo = 
getTableInfo("tableInfoTestDatabase_notEqualsTableInfoTestTable");
-        assertTrue(tableInfo.equals(cmpEqualsTableInfo));
-        assertTrue(!(tableInfo.equals(cmpNotEqualsTableInfo)));
-    }
-
-    private TableInfo getTableInfo(String tableUniqueName) {
-        TableInfo info = new TableInfo();
-        info.setDatabaseName("tableInfoTestDatabase");
-        info.setLastUpdatedTime(1000L);
-        info.setTableUniqueName(tableUniqueName);
-        return info;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/TableSchemaTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/TableSchemaTest.java
 
b/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/TableSchemaTest.java
deleted file mode 100644
index 2389481..0000000
--- 
a/core/src/test/java/org/apache/carbondata/core/carbon/metadata/schema/table/TableSchemaTest.java
+++ /dev/null
@@ -1,51 +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.metadata.schema.table;
-
-import junit.framework.TestCase;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class TableSchemaTest extends TestCase {
-
-    private TableSchema tableSchema;
-
-    @BeforeClass public void setUp() {
-        tableSchema = getTableSchema("1000", "tableSchemaTestTable");
-    }
-
-    @AfterClass public void tearDown() {
-        tableSchema = null;
-    }
-
-    @Test public void testTableInfoEquals() {
-        TableSchema cmpEqualsTableSchema = getTableSchema("1000", 
"tableSchemaTestTable");
-        TableSchema cmpNotEqualsTableSchema = getTableSchema("1000", 
"tableSchemaTestTable2");
-        assertTrue(tableSchema.equals(cmpEqualsTableSchema));
-        assertTrue(!(tableSchema.equals(cmpNotEqualsTableSchema)));
-    }
-
-    private TableSchema getTableSchema(String tableId, String tableName) {
-        TableSchema tableSchema = new TableSchema();
-        tableSchema.setTableId(tableId);
-        tableSchema.setTableName(tableName);
-        return tableSchema;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/test/java/org/apache/carbondata/core/carbon/querystatistics/DriverQueryStatisticsRecorderImplTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/apache/carbondata/core/carbon/querystatistics/DriverQueryStatisticsRecorderImplTest.java
 
b/core/src/test/java/org/apache/carbondata/core/carbon/querystatistics/DriverQueryStatisticsRecorderImplTest.java
deleted file mode 100644
index ead1d54..0000000
--- 
a/core/src/test/java/org/apache/carbondata/core/carbon/querystatistics/DriverQueryStatisticsRecorderImplTest.java
+++ /dev/null
@@ -1,120 +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.querystatistics;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertNotNull;
-import static org.pentaho.di.core.util.Assert.assertNull;
-
-public class DriverQueryStatisticsRecorderImplTest {
-  private static DriverQueryStatisticsRecorderImpl 
driverQueryStatisticsRecorderImpl = null;
-  private static QueryStatistic queryStasticsWithSQL_PARSE = null;
-  private static QueryStatistic queryStasticsWithLoadMetaData = null;
-  private static QueryStatistic queryStasticsWithLOAD_BLOCKS_DRIVER = null;
-  private static QueryStatistic queryStasticsWithBLOCK_ALLOCATION = null;
-  private static QueryStatistic queryStasticsWithBLOCK_IDENTIFICATION = null;
-
-  private static List<QueryStatistic> queryStatisticList;
-
-  @BeforeClass public static void setUp() {
-    driverQueryStatisticsRecorderImpl = 
DriverQueryStatisticsRecorderImpl.getInstance();
-    queryStasticsWithSQL_PARSE = new QueryStatistic();
-    queryStasticsWithLoadMetaData = new QueryStatistic();
-    queryStasticsWithLOAD_BLOCKS_DRIVER = new QueryStatistic();
-    queryStasticsWithBLOCK_ALLOCATION = new QueryStatistic();
-    queryStasticsWithBLOCK_IDENTIFICATION = new QueryStatistic();
-    queryStatisticList = new ArrayList<>();
-
-  }
-
-  @Test public void testCollectDriverStatistics() {
-    queryStasticsWithLOAD_BLOCKS_DRIVER
-        .addCountStatistic(QueryStatisticsConstants.LOAD_BLOCKS_DRIVER, 3);
-    queryStasticsWithLOAD_BLOCKS_DRIVER
-        .addStatistics(QueryStatisticsConstants.LOAD_BLOCKS_DRIVER, 5);
-    queryStasticsWithLOAD_BLOCKS_DRIVER
-        .addFixedTimeStatistic(QueryStatisticsConstants.LOAD_BLOCKS_DRIVER, 5);
-    queryStatisticList.add(queryStasticsWithLOAD_BLOCKS_DRIVER);
-    queryStasticsWithBLOCK_ALLOCATION
-        .addCountStatistic(QueryStatisticsConstants.BLOCK_ALLOCATION, 3);
-    
queryStasticsWithBLOCK_ALLOCATION.addStatistics(QueryStatisticsConstants.BLOCK_ALLOCATION,
 5);
-    queryStasticsWithLOAD_BLOCKS_DRIVER
-        .addFixedTimeStatistic(QueryStatisticsConstants.LOAD_BLOCKS_DRIVER, 5);
-    queryStatisticList.add(queryStasticsWithBLOCK_ALLOCATION);
-    queryStasticsWithBLOCK_IDENTIFICATION
-        .addCountStatistic(QueryStatisticsConstants.BLOCK_IDENTIFICATION, 3);
-    queryStasticsWithBLOCK_IDENTIFICATION
-        .addStatistics(QueryStatisticsConstants.BLOCK_IDENTIFICATION, 5);
-    queryStatisticList.add(queryStasticsWithBLOCK_IDENTIFICATION);
-    
queryStasticsWithLoadMetaData.addCountStatistic(QueryStatisticsConstants.LOAD_META,
 3);
-    
queryStasticsWithLoadMetaData.addStatistics(QueryStatisticsConstants.LOAD_META, 
5);
-    queryStatisticList.add(queryStasticsWithLoadMetaData);
-    
queryStasticsWithSQL_PARSE.addCountStatistic(QueryStatisticsConstants.SQL_PARSE,
 3);
-    
queryStasticsWithSQL_PARSE.addStatistics(QueryStatisticsConstants.SQL_PARSE, 5);
-    queryStatisticList.add(queryStasticsWithSQL_PARSE);
-
-    String result =
-        
driverQueryStatisticsRecorderImpl.collectDriverStatistics(queryStatisticList, 
"query1");
-    assertNotNull(result);
-  }
-
-  @Test public void testCollectDriverStatisticsWithBlock_Allocation() {
-    queryStatisticList.clear();
-    queryStasticsWithBLOCK_ALLOCATION
-        .addCountStatistic(QueryStatisticsConstants.BLOCK_ALLOCATION, 3);
-    
queryStasticsWithBLOCK_ALLOCATION.addStatistics(QueryStatisticsConstants.BLOCK_ALLOCATION,
 5);
-    queryStatisticList.add(queryStasticsWithBLOCK_ALLOCATION);
-    String result =
-        
driverQueryStatisticsRecorderImpl.collectDriverStatistics(queryStatisticList, 
"query1");
-    assertNull(result);
-  }
-
-  @Test public void 
testCollectDriverStatisticsWithBlock_AllocationAndBlock_Identification() {
-    queryStatisticList.clear();
-    queryStasticsWithBLOCK_ALLOCATION
-        .addCountStatistic(QueryStatisticsConstants.BLOCK_ALLOCATION, 3);
-    
queryStasticsWithBLOCK_ALLOCATION.addStatistics(QueryStatisticsConstants.BLOCK_ALLOCATION,
 5);
-    queryStatisticList.add(queryStasticsWithBLOCK_ALLOCATION);
-    queryStasticsWithBLOCK_IDENTIFICATION
-        .addCountStatistic(QueryStatisticsConstants.BLOCK_IDENTIFICATION, 3);
-    queryStasticsWithBLOCK_IDENTIFICATION
-        .addStatistics(QueryStatisticsConstants.BLOCK_IDENTIFICATION, 5);
-    queryStatisticList.add(queryStasticsWithBLOCK_IDENTIFICATION);
-    String result =
-        
driverQueryStatisticsRecorderImpl.collectDriverStatistics(queryStatisticList, 
"query1");
-    assertNotNull(result);
-  }
-
-  @Test
-  public void 
testCollectDriverStatisticsWithBlock_AllocationAndBlock_IdentificationForException()
 {
-    queryStatisticList.clear();
-
-    driverQueryStatisticsRecorderImpl = 
DriverQueryStatisticsRecorderImpl.getInstance();
-
-    String result =
-        
driverQueryStatisticsRecorderImpl.collectDriverStatistics(queryStatisticList, 
"query1");
-    assertNull(result);
-  }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/test/java/org/apache/carbondata/core/carbon/querystatistics/QueryStasticsRecorderImplTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/apache/carbondata/core/carbon/querystatistics/QueryStasticsRecorderImplTest.java
 
b/core/src/test/java/org/apache/carbondata/core/carbon/querystatistics/QueryStasticsRecorderImplTest.java
deleted file mode 100644
index 90ed930..0000000
--- 
a/core/src/test/java/org/apache/carbondata/core/carbon/querystatistics/QueryStasticsRecorderImplTest.java
+++ /dev/null
@@ -1,110 +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.querystatistics;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertNotNull;
-
-public class QueryStasticsRecorderImplTest {
-
-  private static QueryStatisticsRecorderImpl queryStasticsRecorderImpl = null;
-  private static QueryStatistic queryStatistic = null;
-  private static QueryStatistic queryStatisticWithLOAD_BLOCKS_EXECUTOR = null;
-  private static QueryStatistic queryStatisticWithSCAN_BLOCKS_TIME = null;
-  private static QueryStatistic queryStatisticWithSCAN_BLOCKS_NUM = null;
-  private static QueryStatistic queryStatisticWithLOAD_DICTIONARY = null;
-  private static QueryStatistic queryStatisticWithRESULT_SIZE = null;
-  private static QueryStatistic queryStatisticWithEXECUTOR_PART = null;
-  private static QueryStatistic queryStatisticWithTOTAL_BLOCKLET_NUM = null;
-  private static QueryStatistic queryStatisticWithVALID_SCAN_BLOCKLET_NUM = 
null;
-
-  @BeforeClass public static void setUp() {
-    queryStatisticWithLOAD_BLOCKS_EXECUTOR = new QueryStatistic();
-    queryStasticsRecorderImpl = new 
QueryStatisticsRecorderImpl(System.nanoTime() + "");
-    queryStasticsRecorderImpl.logStatisticsAsTableDriver();
-    queryStatisticWithLOAD_BLOCKS_EXECUTOR
-        .addStatistics(QueryStatisticsConstants.LOAD_BLOCKS_EXECUTOR, 5L);
-    queryStatisticWithLOAD_BLOCKS_EXECUTOR
-        .addCountStatistic(QueryStatisticsConstants.LOAD_BLOCKS_EXECUTOR, 5L);
-    queryStatisticWithLOAD_BLOCKS_EXECUTOR
-        .addStatistics(QueryStatisticsConstants.LOAD_BLOCKS_EXECUTOR, 5L);
-    queryStasticsRecorderImpl.logStatistics();
-    
queryStasticsRecorderImpl.recordStatistics(queryStatisticWithLOAD_BLOCKS_EXECUTOR);
-    queryStatisticWithSCAN_BLOCKS_TIME = new QueryStatistic();
-    
queryStatisticWithSCAN_BLOCKS_TIME.addStatistics(QueryStatisticsConstants.SCAN_BLOCKS_TIME,
 5L);
-    queryStatisticWithSCAN_BLOCKS_TIME
-        .addCountStatistic(QueryStatisticsConstants.SCAN_BLOCKS_TIME, 5L);
-    
queryStatisticWithSCAN_BLOCKS_TIME.addStatistics(QueryStatisticsConstants.SCAN_BLOCKS_TIME,
 5L);
-    queryStasticsRecorderImpl.logStatistics();
-    
queryStasticsRecorderImpl.recordStatistics(queryStatisticWithSCAN_BLOCKS_TIME);
-    queryStatisticWithSCAN_BLOCKS_NUM = new QueryStatistic();
-    
queryStatisticWithSCAN_BLOCKS_NUM.addStatistics(QueryStatisticsConstants.SCAN_BLOCKS_NUM,
 5L);
-    queryStatisticWithSCAN_BLOCKS_NUM
-        .addCountStatistic(QueryStatisticsConstants.SCAN_BLOCKS_NUM, 5L);
-    
queryStatisticWithSCAN_BLOCKS_NUM.addStatistics(QueryStatisticsConstants.SCAN_BLOCKS_NUM,
 5L);
-    queryStasticsRecorderImpl.logStatistics();
-    
queryStasticsRecorderImpl.recordStatistics(queryStatisticWithSCAN_BLOCKS_NUM);
-    queryStatisticWithLOAD_DICTIONARY = new QueryStatistic();
-    
queryStatisticWithLOAD_DICTIONARY.addStatistics(QueryStatisticsConstants.LOAD_DICTIONARY,
 5L);
-    queryStatisticWithLOAD_DICTIONARY
-        .addCountStatistic(QueryStatisticsConstants.LOAD_DICTIONARY, 5L);
-    
queryStatisticWithLOAD_DICTIONARY.addStatistics(QueryStatisticsConstants.LOAD_DICTIONARY,
 5L);
-    queryStasticsRecorderImpl.logStatistics();
-    
queryStasticsRecorderImpl.recordStatistics(queryStatisticWithLOAD_DICTIONARY);
-    queryStatisticWithRESULT_SIZE = new QueryStatistic();
-    
queryStatisticWithRESULT_SIZE.addStatistics(QueryStatisticsConstants.RESULT_SIZE,
 5L);
-    
queryStatisticWithRESULT_SIZE.addCountStatistic(QueryStatisticsConstants.RESULT_SIZE,
 5L);
-    
queryStatisticWithRESULT_SIZE.addStatistics(QueryStatisticsConstants.RESULT_SIZE,
 5L);
-    queryStasticsRecorderImpl.logStatistics();
-    queryStasticsRecorderImpl.recordStatistics(queryStatisticWithRESULT_SIZE);
-    queryStatisticWithEXECUTOR_PART = new QueryStatistic();
-    
queryStatisticWithEXECUTOR_PART.addStatistics(QueryStatisticsConstants.EXECUTOR_PART,
 5L);
-    
queryStatisticWithEXECUTOR_PART.addCountStatistic(QueryStatisticsConstants.EXECUTOR_PART,
 5L);
-    
queryStatisticWithEXECUTOR_PART.addStatistics(QueryStatisticsConstants.EXECUTOR_PART,
 5L);
-    queryStasticsRecorderImpl.logStatistics();
-    
queryStasticsRecorderImpl.recordStatistics(queryStatisticWithEXECUTOR_PART);
-    queryStatisticWithTOTAL_BLOCKLET_NUM = new QueryStatistic();
-    queryStatisticWithTOTAL_BLOCKLET_NUM
-        .addStatistics(QueryStatisticsConstants.TOTAL_BLOCKLET_NUM, 5L);
-    queryStatisticWithTOTAL_BLOCKLET_NUM
-        .addCountStatistic(QueryStatisticsConstants.TOTAL_BLOCKLET_NUM, 5L);
-    queryStatisticWithTOTAL_BLOCKLET_NUM
-        .addStatistics(QueryStatisticsConstants.TOTAL_BLOCKLET_NUM, 5L);
-    queryStasticsRecorderImpl.logStatistics();
-    
queryStasticsRecorderImpl.recordStatistics(queryStatisticWithTOTAL_BLOCKLET_NUM);
-    queryStatisticWithVALID_SCAN_BLOCKLET_NUM = new QueryStatistic();
-    queryStatisticWithVALID_SCAN_BLOCKLET_NUM
-        .addStatistics(QueryStatisticsConstants.VALID_SCAN_BLOCKLET_NUM, 5L);
-    queryStatisticWithVALID_SCAN_BLOCKLET_NUM
-        .addCountStatistic(QueryStatisticsConstants.VALID_SCAN_BLOCKLET_NUM, 
5L);
-    queryStatisticWithVALID_SCAN_BLOCKLET_NUM
-        .addStatistics(QueryStatisticsConstants.VALID_SCAN_BLOCKLET_NUM, 5L);
-    queryStasticsRecorderImpl.logStatistics();
-    
queryStasticsRecorderImpl.recordStatistics(queryStatisticWithVALID_SCAN_BLOCKLET_NUM);
-    queryStasticsRecorderImpl.logStatisticsAsTableExecutor();
-  }
-
-  @Test public void testcollectExecutorStatistics() {
-    assertNotNull(queryStasticsRecorderImpl.collectExecutorStatistics());
-  }
-
-}

Reply via email to