You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2019/11/12 11:25:33 UTC

[carbondata] branch master updated: [CARBONDATA-3568] optimize java code checkstyle for @Override rule

This is an automated email from the ASF dual-hosted git repository.

jackylk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git


The following commit(s) were added to refs/heads/master by this push:
     new 2cec58b  [CARBONDATA-3568] optimize java code checkstyle for @Override rule
2cec58b is described below

commit 2cec58b31e4d96f94801dda6c47b3b691596c08e
Author: lamber-ken <22...@qq.com>
AuthorDate: Tue Nov 5 11:47:23 2019 +0800

    [CARBONDATA-3568] optimize java code checkstyle for @Override rule
    
    This closes #3434
---
 .../apache/carbondata/common/CarbonIterator.java   |   9 +-
 .../carbondata/common/constants/LoggerAction.java  |   3 +-
 .../dictionary/AbstractColumnDictionaryInfo.java   |  57 ++++++---
 .../dictionary/ColumnDictionaryChunkIterator.java  |   6 +-
 .../cache/dictionary/ColumnDictionaryInfo.java     |  21 ++--
 .../dictionary/ColumnReverseDictionaryInfo.java    |  12 +-
 .../dictionary/DictionaryByteArrayWrapper.java     |   6 +-
 .../cache/dictionary/DictionaryChunksWrapper.java  |   9 +-
 .../DictionaryColumnUniqueIdentifier.java          |   6 +-
 .../core/cache/dictionary/ForwardDictionary.java   |  27 +++--
 .../cache/dictionary/ForwardDictionaryCache.java   |  21 ++--
 .../cache/dictionary/ManageDictionaryAndBTree.java |   3 +-
 .../core/cache/dictionary/ReverseDictionary.java   |  27 +++--
 .../cache/dictionary/ReverseDictionaryCache.java   |  21 ++--
 .../core/datamap/AbstractDataMapJob.java           |   3 +-
 .../carbondata/core/datamap/DataMapChooser.java    |   9 +-
 .../carbondata/core/datamap/DataMapMeta.java       |   6 +-
 .../apache/carbondata/core/datamap/Segment.java    |  15 ++-
 .../carbondata/core/datamap/TableDataMap.java      |   6 +-
 .../datamap/dev/cgdatamap/CoarseGrainDataMap.java  |   3 +-
 .../datamap/dev/expr/AndDataMapExprWrapper.java    |  12 +-
 .../dev/expr/DataMapDistributableWrapper.java      |   6 +-
 .../datamap/dev/expr/DataMapExprWrapperImpl.java   |  12 +-
 .../datamap/dev/expr/OrDataMapExprWrapper.java     |  15 ++-
 .../datamap/dev/fgdatamap/FineGrainBlocklet.java   |  18 ++-
 .../datamap/dev/fgdatamap/FineGrainDataMap.java    |   3 +-
 .../datastore/TableSegmentUniqueIdentifier.java    |   6 +-
 .../core/datastore/block/AbstractIndex.java        |  12 +-
 .../carbondata/core/datastore/block/BlockInfo.java |   6 +-
 .../block/SegmentPropertiesAndSchemaHolder.java    |   9 +-
 .../core/datastore/block/TableBlockInfo.java       |  15 ++-
 .../block/TableBlockUniqueIdentifier.java          |   6 +-
 .../core/datastore/block/TableTaskInfo.java        |  12 +-
 .../chunk/impl/AbstractDimensionColumnPage.java    |  27 +++--
 .../chunk/impl/DimensionRawColumnChunk.java        |   3 +-
 .../chunk/impl/FixedLengthDimensionColumnPage.java |  12 +-
 .../chunk/impl/MeasureRawColumnChunk.java          |   3 +-
 .../impl/VariableLengthDimensionColumnPage.java    |  15 ++-
 .../dimension/AbstractChunkReaderV2V3Format.java   |   3 +-
 .../CompressedDimensionChunkFileBasedReaderV1.java |   6 +-
 ...mpressedDimChunkFileBasedPageLevelReaderV3.java |   3 +-
 .../CompressedDimensionChunkFileBasedReaderV3.java |   3 +-
 .../reader/measure/AbstractMeasureChunkReader.java |   3 +-
 .../CompressedMeasureChunkFileBasedReaderV1.java   |   6 +-
 .../CompressedMeasureChunkFileBasedReaderV3.java   |   9 +-
 ...mpressedMsrChunkFileBasedPageLevelReaderV3.java |   6 +-
 .../datastore/chunk/store/ColumnPageWrapper.java   |   9 +-
 .../impl/LocalDictDimensionDataChunkStore.java     |  30 +++--
 .../safe/AbstractNonDictionaryVectorFiller.java    |   3 +-
 .../safe/SafeAbsractDimensionDataChunkStore.java   |  27 +++--
 .../SafeFixedLengthDimensionDataChunkStore.java    |  15 ++-
 ...VariableShortLengthDimensionDataChunkStore.java |   6 +-
 .../UnsafeAbstractDimensionDataChunkStore.java     |  30 +++--
 .../UnsafeFixedLengthDimensionDataChunkStore.java  |  15 ++-
 .../BlockIndexerStorageForNoDictionary.java        |   9 +-
 .../core/datastore/columnar/ColumnWithRowId.java   |   9 +-
 .../columnar/ColumnWithRowIdForHighCard.java       |   9 +-
 .../columnar/ColumnWithRowIdForNoDictionary.java   |   9 +-
 .../datastore/compression/AbstractCompressor.java  |   6 +-
 .../core/datastore/compression/GzipCompressor.java |  27 +++--
 .../datastore/compression/SnappyCompressor.java    |  51 +++++---
 .../core/datastore/compression/ZstdCompressor.java |   6 +-
 .../exception/CarbonDataWriterException.java       |   3 +-
 .../datastore/exception/IndexBuilderException.java |   3 +-
 .../filesystem/AbstractDFSCarbonFile.java          |  66 +++++++----
 .../core/datastore/filesystem/LocalCarbonFile.java |  93 ++++++++++-----
 .../core/datastore/filesystem/S3CarbonFile.java    |   3 +-
 .../datastore/filesystem/ViewFSCarbonFile.java     |   3 +-
 .../core/datastore/impl/DFSFileReaderImpl.java     |  30 +++--
 .../datastore/impl/DefaultFileTypeProvider.java    |   3 +-
 .../core/datastore/impl/FileReaderImpl.java        |  30 +++--
 .../page/ActualDataBasedFallbackEncoder.java       |   3 +-
 .../core/datastore/page/DecimalColumnPage.java     |   3 +-
 .../page/DecoderBasedFallbackEncoder.java          |   3 +-
 .../core/datastore/page/LocalDictColumnPage.java   | 129 ++++++++++++++-------
 .../core/datastore/page/SafeDecimalColumnPage.java |  15 ++-
 .../datastore/page/SafeFixLengthColumnPage.java    |   9 +-
 .../datastore/page/SafeVarLengthColumnPage.java    |   3 +-
 .../datastore/page/UnsafeFixLengthColumnPage.java  |  12 +-
 .../datastore/page/UnsafeVarLengthColumnPage.java  |   3 +-
 .../datastore/page/VarLengthColumnPageBase.java    |   3 +-
 .../adaptive/AdaptiveDeltaFloatingCodec.java       |   9 +-
 .../adaptive/AdaptiveDeltaIntegralCodec.java       |   9 +-
 .../encoding/adaptive/AdaptiveFloatingCodec.java   |   9 +-
 .../encoding/adaptive/AdaptiveIntegralCodec.java   |   9 +-
 .../encoding/compress/DirectCompressCodec.java     |   6 +-
 .../core/datastore/page/encoding/rle/RLECodec.java |   9 +-
 .../page/statistics/DummyStatsCollector.java       |  45 ++++---
 .../page/statistics/KeyPageStatsCollector.java     |  18 ++-
 .../page/statistics/LVStringStatsCollector.java    |  18 ++-
 .../statistics/PrimitivePageStatsCollector.java    |   3 +-
 .../carbondata/core/datastore/row/CarbonRow.java   |   3 +-
 .../client/NonSecureDictionaryClient.java          |   9 +-
 .../IncrementalColumnDictionaryGenerator.java      |  18 ++-
 .../generator/TableDictionaryGenerator.java        |   6 +-
 .../server/NonSecureDictionaryServer.java          |  24 ++--
 .../server/NonSecureDictionaryServerHandler.java   |   6 +-
 .../NonSecureDictionaryServiceProvider.java        |   4 +-
 .../fileoperations/AtomicFileOperationS3Impl.java  |  12 +-
 .../fileoperations/AtomicFileOperationsImpl.java   |  12 +-
 .../core/indexstore/BlockletDataMapIndexStore.java |  12 +-
 .../indexstore/BlockletDataMapIndexWrapper.java    |  12 +-
 .../core/indexstore/BlockletDetailInfo.java        |   6 +-
 .../core/indexstore/ExtendedBlocklet.java          |   6 +-
 .../core/indexstore/ExtendedBlockletWrapper.java   |   6 +-
 .../ExtendedBlockletWrapperContainer.java          |   9 +-
 .../carbondata/core/indexstore/PartitionSpec.java  |  15 ++-
 .../TableBlockIndexUniqueIdentifier.java           |   6 +-
 .../indexstore/blockletindex/BlockDataMap.java     |  15 ++-
 .../indexstore/blockletindex/BlockletDataMap.java  |   3 +-
 .../blockletindex/BlockletDataMapFactory.java      |  21 ++--
 .../blockletindex/BlockletDataRefNode.java         |  15 ++-
 .../indexstore/blockletindex/IndexWrapper.java     |   6 +-
 .../blockletindex/SegmentIndexFileStore.java       |  12 +-
 .../core/indexstore/row/DataMapRowImpl.java        |  60 ++++++----
 .../core/indexstore/row/UnsafeDataMapRow.java      |  57 ++++++---
 .../core/indexstore/schema/CarbonRowSchema.java    |  18 ++-
 .../MultiDimKeyVarLengthEquiSplitGenerator.java    |  24 ++--
 ...MultiDimKeyVarLengthVariableSplitGenerator.java |  24 ++--
 .../timestamp/DateDirectDictionaryGenerator.java   |   9 +-
 .../TimeStampDirectDictionaryGenerator.java        |   9 +-
 .../keygenerator/mdkey/AbstractKeyGenerator.java   |   3 +-
 .../carbondata/core/keygenerator/mdkey/Bits.java   |   6 +-
 .../mdkey/MultiDimKeyVarLengthGenerator.java       |  30 +++--
 .../dictionaryholder/MapBasedDictionaryStore.java  |   9 +-
 .../DictionaryThresholdReachedException.java       |   3 +-
 .../generator/ColumnLocalDictionaryGenerator.java  |   9 +-
 .../carbondata/core/locks/AlluxioFileLock.java     |   6 +-
 .../carbondata/core/locks/CarbonLockUtil.java      |   3 +-
 .../apache/carbondata/core/locks/HdfsFileLock.java |   3 +-
 .../carbondata/core/locks/LocalFileLock.java       |   6 +-
 .../apache/carbondata/core/locks/S3FileLock.java   |   6 +-
 .../carbondata/core/locks/ZooKeeperLocking.java    |   6 +-
 .../core/memory/HeapMemoryAllocator.java           |   6 +-
 .../core/metadata/AbsoluteTableIdentifier.java     |   6 +-
 .../core/metadata/CarbonTableIdentifier.java       |   9 +-
 .../carbondata/core/metadata/ColumnIdentifier.java |   9 +-
 .../carbondata/core/metadata/SegmentFileStore.java |  18 ++-
 .../core/metadata/blocklet/BlockletInfo.java       |   6 +-
 .../ThriftWrapperSchemaConverterImpl.java          |  27 +++--
 .../core/metadata/datatype/DataTypeAdapter.java    |   6 +-
 .../metadata/datatype/DecimalConverterFactory.java |  57 ++++++---
 .../schema/table/AggregationDataMapSchema.java     |   6 +-
 .../core/metadata/schema/table/CarbonTable.java    |   9 +-
 .../core/metadata/schema/table/DataMapSchema.java  |   6 +-
 .../table/DiskBasedDMSchemaStorageProvider.java    |  18 ++-
 .../metadata/schema/table/RelationIdentifier.java  |  15 ++-
 .../core/metadata/schema/table/TableInfo.java      |   9 +-
 .../core/metadata/schema/table/TableSchema.java    |   6 +-
 .../schema/table/column/CarbonDimension.java       |   6 +-
 .../table/column/CarbonImplicitDimension.java      |  21 ++--
 .../schema/table/column/CarbonMeasure.java         |   6 +-
 .../metadata/schema/table/column/ColumnSchema.java |   6 +-
 .../table/column/ParentColumnTableRelation.java    |   6 +-
 .../carbondata/core/mutate/CarbonUpdateUtil.java   |   9 +-
 .../core/mutate/DeleteDeltaBlockDetails.java       |   6 +-
 .../core/mutate/DeleteDeltaBlockletDetails.java    |   6 +-
 .../core/mutate/SegmentUpdateDetails.java          |   6 +-
 .../apache/carbondata/core/mutate/UpdateVO.java    |   6 +-
 .../core/mutate/data/RowCountDetailsVO.java        |   6 +-
 .../apache/carbondata/core/preagg/QueryColumn.java |   6 +-
 .../LatestFilesReadCommittedScope.java             |  15 ++-
 .../TableStatusReadCommittedScope.java             |  18 ++-
 .../reader/CarbonDeleteDeltaFileReaderImpl.java    |   6 +-
 .../core/reader/CarbonDeleteFilesDataReader.java   |   3 +-
 .../reader/CarbonDictionaryMetadataReaderImpl.java |  15 ++-
 .../core/reader/CarbonDictionaryReaderImpl.java    |  15 ++-
 .../carbondata/core/reader/CarbonFooterReader.java |   3 +-
 .../core/reader/CarbonFooterReaderV3.java          |   3 +-
 .../carbondata/core/reader/CarbonHeaderReader.java |   3 +-
 .../core/reader/CarbonIndexFileReader.java         |   6 +-
 .../CarbonDictionarySortIndexReaderImpl.java       |  12 +-
 .../core/scan/complextypes/ArrayQueryType.java     |  30 +++--
 .../core/scan/complextypes/PrimitiveQueryType.java |  30 +++--
 .../core/scan/complextypes/StructQueryType.java    |  33 ++++--
 .../exception/QueryExecutionException.java         |   3 +-
 .../scan/executor/impl/AbstractQueryExecutor.java  |   3 +-
 .../core/scan/executor/infos/DeleteDeltaInfo.java  |   6 +-
 .../core/scan/expression/ExpressionResult.java     |   9 +-
 .../expression/conditional/ImplicitExpression.java |  15 ++-
 .../scan/expression/logical/FalseExpression.java   |   3 +-
 .../scan/expression/logical/RangeExpression.java   |   3 +-
 .../scan/expression/logical/TrueExpression.java    |   3 +-
 .../scan/filter/FilterExpressionProcessor.java     |   3 +-
 .../carbondata/core/scan/filter/FilterUtil.java    |   9 +-
 .../filter/executer/AndFilterExecuterImpl.java     |   6 +-
 .../scan/filter/executer/BitSetUpdaterFactory.java |   6 +-
 .../ImplicitIncludeFilterExecutorImpl.java         |   3 +-
 .../filter/executer/IncludeFilterExecuterImpl.java |   3 +-
 .../RowLevelRangeGrtThanFiterExecuterImpl.java     |   3 +-
 ...LevelRangeGrtrThanEquaToFilterExecuterImpl.java |   3 +-
 ...wLevelRangeLessThanEqualFilterExecuterImpl.java |   6 +-
 .../RowLevelRangeLessThanFilterExecuterImpl.java   |   3 +-
 .../carbondata/core/scan/filter/intf/RowImpl.java  |  12 +-
 .../scan/filter/optimizer/RangeFilterOptmizer.java |   3 +-
 .../core/scan/filter/partition/AndFilterImpl.java  |   3 +-
 .../scan/filter/partition/EqualToFilterImpl.java   |   3 +-
 .../core/scan/filter/partition/InFilterImpl.java   |   3 +-
 .../partition/KeepAllPartitionFilterImpl.java      |   3 +-
 .../core/scan/filter/partition/OrFilterImpl.java   |   3 +-
 .../partition/PruneAllPartitionFilterImpl.java     |   3 +-
 .../scan/filter/partition/RangeFilterImpl.java     |   3 +-
 .../resolver/ConditionalFilterResolverImpl.java    |  15 ++-
 .../filter/resolver/LogicalFilterResolverImpl.java |  21 ++--
 .../resolver/RowLevelFilterResolverImpl.java       |   3 +-
 .../resolver/RowLevelRangeFilterResolverImpl.java  |   6 +-
 .../resolverinfo/DimColumnResolvedFilterInfo.java  |   3 +-
 .../resolverinfo/FalseConditionalResolverImpl.java |   6 +-
 .../MeasureColumnResolvedFilterInfo.java           |   3 +-
 .../resolverinfo/TrueConditionalResolverImpl.java  |   6 +-
 .../visitor/ImplicitColumnVisitor.java             |   3 +-
 .../core/scan/partition/HashPartitioner.java       |   6 +-
 .../core/scan/partition/ListPartitioner.java       |   6 +-
 .../core/scan/partition/RangePartitioner.java      |   6 +-
 .../core/scan/processor/DataBlockIterator.java     |   6 +-
 .../carbondata/core/scan/result/RowBatch.java      |   6 +-
 .../scan/result/impl/FilterQueryScannedResult.java |  21 ++--
 .../result/impl/NonFilterQueryScannedResult.java   |  21 ++--
 .../AbstractDetailQueryResultIterator.java         |   3 +-
 .../scan/result/iterator/ChunkRowIterator.java     |   6 +-
 .../result/iterator/DetailQueryResultIterator.java |   3 +-
 .../PartitionSpliterRawResultIterator.java         |   6 +-
 .../core/scan/result/vector/ColumnVectorInfo.java  |   9 +-
 .../result/vector/impl/CarbonColumnVectorImpl.java | 114 ++++++++++++------
 .../result/vector/impl/CarbonDictionaryImpl.java   |  21 ++--
 .../directread/AbstractCarbonColumnarVector.java   |   3 +-
 ...ColumnarVectorWrapperDirectWithDeleteDelta.java |   3 +-
 ...apperDirectWithDeleteDeltaAndInvertedIndex.java |   3 +-
 ...lumnarVectorWrapperDirectWithInvertedIndex.java |   3 +-
 .../scan/scanner/impl/BlockletFullScanner.java     |   3 +-
 .../core/scan/wrappers/ByteArrayWrapper.java       |   9 +-
 .../core/scan/wrappers/IntArrayWrapper.java        |   6 +-
 .../core/service/impl/ColumnUniqueIdGenerator.java |   3 +-
 .../core/service/impl/DictionaryFactory.java       |  15 ++-
 .../carbondata/core/stats/TaskStatistics.java      |   3 +-
 .../carbondata/core/statusmanager/FileFormat.java  |   9 +-
 .../core/statusmanager/LoadMetadataDetails.java    |   9 +-
 .../core/statusmanager/SegmentRefreshInfo.java     |   3 +-
 .../statusmanager/SegmentUpdateStatusManager.java  |   9 +-
 .../carbondata/core/util/BlockletDataMapUtil.java  |   3 +-
 .../carbondata/core/util/CarbonThreadFactory.java  |   3 +-
 .../apache/carbondata/core/util/CarbonUtil.java    |  21 ++--
 .../core/util/DataFileFooterConverter.java         |   6 +-
 .../core/util/DataFileFooterConverter2.java        |   6 +-
 .../core/util/DataFileFooterConverterV3.java       |   6 +-
 .../core/util/DataTypeConverterImpl.java           |   3 +-
 .../apache/carbondata/core/util/DataTypeUtil.java  |   6 +-
 .../carbondata/core/util/DeleteLoadFolders.java    |   3 +-
 .../core/util/comparator/Comparator.java           |  21 ++--
 .../carbondata/core/util/path/CarbonTablePath.java |   9 +-
 .../core/writer/CarbonDeleteDeltaWriterImpl.java   |   3 +-
 .../core/writer/CarbonDictionaryWriterImpl.java    |  12 +-
 .../CarbonDictionarySortIndexWriterImpl.java       |  12 +-
 .../sortindex/CarbonDictionarySortModel.java       |   9 +-
 .../apache/carbondata/hadoop/CarbonInputSplit.java |  27 +++--
 .../core/CarbonPropertiesValidationTest.java       |   3 +-
 .../filesystem/store/impl/TestFileProvider.java    |   6 +-
 .../DiskBasedDMSchemaStoraheProviderSuite.java     |   3 +-
 .../carbondata/core/reader/ThriftReaderTest.java   |   9 +-
 .../executer/ExcludeFilterExecuterImplTest.java    |   6 +-
 .../datamap/bloom/BloomCacheKeyValue.java          |   3 +-
 .../datamap/bloom/BloomDataMapWriter.java          |   3 +-
 .../datamap/examples/MinMaxDataWriter.java         |  15 ++-
 .../datamap/examples/MinMaxIndexDataMap.java       |   6 +-
 .../examples/MinMaxIndexDataMapFactory.java        |  24 ++--
 .../datamap/lucene/LuceneDataMapFactoryBase.java   |   3 +-
 .../lucene/LuceneFineGrainDataMapFactory.java      |   6 +-
 dev/javastyle-config.xml                           |   2 +-
 .../carbondata/hadoop/CarbonMultiBlockSplit.java   |   3 +-
 .../carbondata/hadoop/CarbonRecordReader.java      |  15 ++-
 .../hadoop/api/CarbonFileInputFormat.java          |   6 +-
 .../carbondata/hadoop/api/CarbonInputFormat.java   |   9 +-
 .../hadoop/api/CarbonOutputCommitter.java          |  12 +-
 .../hadoop/api/CarbonTableOutputFormat.java        |  15 ++-
 .../impl/DictionaryDecodeReadSupport.java          |   9 +-
 .../hadoop/stream/StreamRecordReader.java          |  18 ++-
 .../hadoop/util/CarbonInputSplitTaskInfo.java      |  12 +-
 .../hadoop/util/CarbonVectorizedRecordReader.java  |  15 ++-
 .../hadoop/ft/CarbonTableInputFormatTest.java      |   3 +-
 .../hadoop/ft/CarbonTableOutputFormatTest.java     |   6 +-
 .../carbondata/hive/CarbonArrayInspector.java      |  33 ++++--
 .../hive/CarbonDictionaryDecodeReadSupport.java    |   9 +-
 .../carbondata/hive/CarbonHiveInputSplit.java      |  24 ++--
 .../carbondata/hive/CarbonHiveRecordReader.java    |  15 ++-
 .../apache/carbondata/hive/CarbonHiveSerDe.java    |  18 ++-
 .../apache/carbondata/hive/CarbonMapInspector.java |   9 +-
 .../carbondata/hive/CarbonObjectInspector.java     |  42 ++++---
 .../hive/CarbonStorageFormatDescriptor.java        |  12 +-
 .../carbondata/hive/MapredCarbonInputFormat.java   |   6 +-
 .../carbondata/hive/MapredCarbonOutputFormat.java  |   6 +-
 .../presto/CarbonColumnVectorWrapper.java          | 114 ++++++++++++------
 .../presto/CarbondataColumnConstraint.java         |   9 +-
 .../presto/CarbondataConnectorFactory.java         |   3 +-
 .../apache/carbondata/presto/CarbondataModule.java |   3 +-
 .../carbondata/presto/CarbondataPageSource.java    |  21 ++--
 .../apache/carbondata/presto/CarbondataPlugin.java |   3 +-
 .../presto/ColumnarVectorWrapperDirect.java        | 120 ++++++++++++-------
 .../presto/PrestoCarbonVectorizedRecordReader.java |  18 ++-
 .../carbondata/presto/impl/CarbonTableReader.java  |   3 +-
 .../presto/readers/BooleanStreamReader.java        |  30 +++--
 .../presto/readers/ByteStreamReader.java           |  27 +++--
 .../presto/readers/DecimalSliceStreamReader.java   |  27 +++--
 .../presto/readers/DoubleStreamReader.java         |  27 +++--
 .../presto/readers/FloatStreamReader.java          |  27 +++--
 .../presto/readers/IntegerStreamReader.java        |  24 ++--
 .../presto/readers/LongStreamReader.java           |  27 +++--
 .../presto/readers/ObjectStreamReader.java         |  18 ++-
 .../presto/readers/ShortStreamReader.java          |  27 +++--
 .../presto/readers/SliceStreamReader.java          |  33 ++++--
 .../presto/readers/TimestampStreamReader.java      |  27 +++--
 .../dictionary/client/SecureDictionaryClient.java  |   9 +-
 .../client/SecureDictionaryClientHandler.java      |   6 +-
 .../provider/SecureDictionaryServiceProvider.java  |   3 +-
 .../dictionary/server/SecureDictionaryServer.java  |   9 +-
 .../server/SecureDictionaryServerHandler.java      |   6 +-
 .../spark/partition/DropPartitionCallable.java     |   3 +-
 .../spark/partition/SplitPartitionCallable.java    |   3 +-
 .../spark/vectorreader/ColumnarVectorWrapper.java  | 111 ++++++++++++------
 .../vectorreader/ColumnarVectorWrapperDirect.java  | 117 ++++++++++++-------
 .../apache/spark/sql/CarbonDictionaryWrapper.java  |   6 +-
 .../org/apache/spark/sql/CarbonVectorProxy.java    | 108 +++++++++++------
 .../apache/spark/sql/CarbonDictionaryWrapper.java  |  15 ++-
 .../org/apache/spark/sql/CarbonVectorProxy.java    |  99 ++++++++++------
 .../carbondata/datamap/IndexDataMapProvider.java   |   3 +-
 .../datamap/PreAggregateDataMapProvider.java       |   3 +-
 .../spark/readsupport/SparkRowReadSupportImpl.java |   6 +-
 .../stream/CarbonStreamRecordReader.java           |   9 +-
 .../stream/CarbonStreamRecordReaderTest.java       |   6 +-
 .../processing/datatypes/ArrayDataType.java        |   6 +-
 .../processing/datatypes/PrimitiveDataType.java    |  15 ++-
 .../processing/datatypes/StructDataType.java       |   9 +-
 .../processing/exception/SliceMergerException.java |   3 +-
 .../loading/AbstractDataLoadProcessorStep.java     |   3 +-
 .../loading/TableProcessingOperations.java         |   6 +-
 .../converter/impl/ComplexFieldConverterImpl.java  |   6 +-
 .../impl/DictionaryFieldConverterImpl.java         |   6 +-
 .../impl/DirectDictionaryFieldConverterImpl.java   |   3 +-
 .../converter/impl/MeasureFieldConverterImpl.java  |   3 +-
 .../impl/NonDictionaryFieldConverterImpl.java      |   6 +-
 .../loading/converter/impl/RowConverterImpl.java   |   6 +-
 .../DictionaryServerClientDictionary.java          |  12 +-
 .../loading/dictionary/DirectDictionary.java       |   3 +-
 .../exception/CarbonDataLoadingException.java      |   3 +-
 .../loading/jsoninput/JsonInputFormat.java         |  39 ++++---
 .../loading/parser/impl/JsonRowParser.java         |   3 +-
 .../loading/parser/impl/MapParserImpl.java         |   3 +-
 .../partition/impl/HashPartitionerImpl.java        |   3 +-
 .../processing/loading/row/CarbonRowBatch.java     |   6 +-
 .../processing/loading/row/CarbonSortBatch.java    |   9 +-
 .../sort/impl/ParallelReadMergeSorterImpl.java     |   3 +-
 ...ParallelReadMergeSorterWithColumnRangeImpl.java |  12 +-
 .../UnsafeBatchParallelReadMergeSorterImpl.java    |  18 ++-
 .../impl/UnsafeParallelReadMergeSorterImpl.java    |  15 ++-
 ...ParallelReadMergeSorterWithColumnRangeImpl.java |  15 ++-
 .../loading/sort/unsafe/UnsafeSortDataRows.java    |   3 +-
 .../unsafe/holder/UnsafeFinalMergePageHolder.java  |   9 +-
 .../sort/unsafe/holder/UnsafeInmemoryHolder.java   |   9 +-
 .../unsafe/holder/UnsafeInmemoryMergeHolder.java   |   9 +-
 .../holder/UnsafeSortTempFileChunkHolder.java      |  12 +-
 .../merger/UnsafeIntermediateFileMerger.java       |   3 +-
 .../sort/unsafe/sort/UnsafeIntSortDataFormat.java  |  12 +-
 .../CarbonRowDataWriterProcessorStepImpl.java      |  15 ++-
 .../steps/DataConverterProcessorStepImpl.java      |  12 +-
 .../steps/DataWriterBatchProcessorStepImpl.java    |  12 +-
 .../loading/steps/DataWriterProcessorStepImpl.java |  15 ++-
 .../loading/steps/InputProcessorStepImpl.java      |  18 ++-
 .../InputProcessorStepWithNoConverterImpl.java     |  21 ++--
 .../loading/steps/JsonInputProcessorStepImpl.java  |  15 ++-
 .../loading/steps/SortProcessorStepImpl.java       |   3 +-
 .../merger/CarbonDataMergerUtilResult.java         |   6 +-
 .../processing/merger/NodeBlockRelation.java       |   9 +-
 .../processing/merger/NodeMultiBlockRelation.java  |   9 +-
 .../merger/RowResultMergerProcessor.java           |   3 +-
 .../processing/sort/DummyRowUpdater.java           |   6 +-
 .../processing/sort/SchemaBasedRowUpdater.java     |   6 +-
 .../CarbonSortKeyAndGroupByException.java          |   3 +-
 .../sort/sortdata/FileMergeSortComparator.java     |   3 +-
 .../sort/sortdata/InMemorySortTempChunkHolder.java |   6 +-
 .../sort/sortdata/IntermediateFileMerger.java      |   3 +-
 .../sortdata/SingleThreadFinalSortFilesMerger.java |   3 +-
 .../processing/sort/sortdata/SortDataRows.java     |   3 +-
 .../sort/sortdata/SortTempFileChunkHolder.java     |  12 +-
 .../processing/sort/sortdata/TableFieldStat.java   |   6 +-
 .../store/CarbonFactDataHandlerColumnar.java       |   6 +-
 .../writer/v3/CarbonFactDataWriterImplV3.java      |   3 +-
 .../processing/util/CarbonBadRecordUtil.java       |   3 +-
 .../processing/util/CarbonLoaderUtil.java          |   3 +-
 .../carbondata/sdk/file/AvroCarbonWriter.java      |   3 +-
 .../carbondata/sdk/file/JsonCarbonWriter.java      |   6 +-
 .../org/apache/carbondata/sdk/file/TestUtil.java   |   3 +-
 .../sdk/file/arrow/ArrowFieldWriter.java           |  84 +++++++++-----
 .../carbondata/store/CarbonRowReadSupport.java     |   9 +-
 .../carbondata/sdk/file/AvroCarbonWriterTest.java  |  15 ++-
 .../carbondata/sdk/file/CSVCarbonWriterTest.java   |   9 +-
 .../carbondata/sdk/file/CarbonReaderTest.java      |   3 +-
 .../sdk/file/ConcurrentAvroSdkWriterTest.java      |   3 +-
 .../sdk/file/ConcurrentSdkReaderTest.java          |   3 +-
 .../sdk/file/ConcurrentSdkWriterTest.java          |   3 +-
 .../org/apache/carbondata/sdk/file/MinMaxTest.java |   6 +-
 .../sdk/file/MultithreadSDKBlockletReaderTest.java |   3 +-
 .../streaming/CarbonStreamOutputFormat.java        |   3 +-
 .../streaming/CarbonStreamRecordWriter.java        |   3 +-
 .../streaming/parser/CSVStreamParserImp.java       |   9 +-
 .../streaming/segment/StreamSegment.java           |   3 +-
 .../streaming/CarbonStreamOutputFormatTest.java    |   6 +-
 .../org/apache/carbondata/tool/FileCollector.java  |   3 +-
 .../org/apache/carbondata/tool/ScanBenchmark.java  |  18 ++-
 .../org/apache/carbondata/tool/CarbonCliTest.java  |   3 +-
 408 files changed, 3444 insertions(+), 1722 deletions(-)

diff --git a/common/src/main/java/org/apache/carbondata/common/CarbonIterator.java b/common/src/main/java/org/apache/carbondata/common/CarbonIterator.java
index 16f428b..8835f04 100644
--- a/common/src/main/java/org/apache/carbondata/common/CarbonIterator.java
+++ b/common/src/main/java/org/apache/carbondata/common/CarbonIterator.java
@@ -25,11 +25,14 @@ import java.util.Iterator;
  */
 public abstract class CarbonIterator<E> implements Iterator<E> {
 
-  @Override public abstract boolean hasNext();
+  @Override
+  public abstract boolean hasNext();
 
-  @Override public abstract E next();
+  @Override
+  public abstract E next();
 
-  @Override public void remove() {
+  @Override
+  public void remove() {
     throw new UnsupportedOperationException("remove");
   }
 
diff --git a/common/src/main/java/org/apache/carbondata/common/constants/LoggerAction.java b/common/src/main/java/org/apache/carbondata/common/constants/LoggerAction.java
index 9c027fe..ca2e2e7 100644
--- a/common/src/main/java/org/apache/carbondata/common/constants/LoggerAction.java
+++ b/common/src/main/java/org/apache/carbondata/common/constants/LoggerAction.java
@@ -32,7 +32,8 @@ public enum LoggerAction {
     this.name = name;
   }
 
-  @Override public String toString() {
+  @Override
+  public String toString() {
     return this.name;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/AbstractColumnDictionaryInfo.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/AbstractColumnDictionaryInfo.java
index f5971a5..8010d1c 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/AbstractColumnDictionaryInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/AbstractColumnDictionaryInfo.java
@@ -76,7 +76,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    *
    * @return
    */
-  @Override public long getFileTimeStamp() {
+  @Override
+  public long getFileTimeStamp() {
     return fileTimeStamp;
   }
 
@@ -86,7 +87,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    *
    * @return
    */
-  @Override public int getAccessCount() {
+  @Override
+  public int getAccessCount() {
     return accessCount.get();
   }
 
@@ -95,11 +97,13 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    *
    * @return
    */
-  @Override public long getMemorySize() {
+  @Override
+  public long getMemorySize() {
     return memorySize;
   }
 
-  @Override public void setMemorySize(long memorySize) {
+  @Override
+  public void setMemorySize(long memorySize) {
     this.memorySize = memorySize;
   }
 
@@ -107,7 +111,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    * This method will increment the access count for a column by 1
    * whenever a column is getting used in query or incremental data load
    */
-  @Override public void incrementAccessCount() {
+  @Override
+  public void incrementAccessCount() {
     accessCount.incrementAndGet();
   }
 
@@ -117,7 +122,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    *
    * @return size of last dictionary chunk
    */
-  @Override public int getSizeOfLastDictionaryChunk() {
+  @Override
+  public int getSizeOfLastDictionaryChunk() {
     return 0;
   }
 
@@ -136,11 +142,13 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    *
    * @param offsetTillFileIsRead
    */
-  @Override public void setOffsetTillFileIsRead(long offsetTillFileIsRead) {
+  @Override
+  public void setOffsetTillFileIsRead(long offsetTillFileIsRead) {
     this.offsetTillFileIsRead = offsetTillFileIsRead;
   }
 
-  @Override public long getOffsetTillFileIsRead() {
+  @Override
+  public long getOffsetTillFileIsRead() {
     return offsetTillFileIsRead;
   }
 
@@ -150,7 +158,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    *
    * @param fileTimeStamp
    */
-  @Override public void setFileTimeStamp(long fileTimeStamp) {
+  @Override
+  public void setFileTimeStamp(long fileTimeStamp) {
     this.fileTimeStamp = fileTimeStamp;
   }
 
@@ -161,14 +170,16 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    *
    * @return
    */
-  @Override public DictionaryChunksWrapper getDictionaryChunks() {
+  @Override
+  public DictionaryChunksWrapper getDictionaryChunks() {
     return new DictionaryChunksWrapper(dictionaryChunks);
   }
 
   /**
    * This method will release the objects and set default value for primitive types
    */
-  @Override public void clear() {
+  @Override
+  public void clear() {
     decrementAccessCount();
   }
 
@@ -180,7 +191,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    * @param surrogateKey a unique ID for a dictionary value
    * @return if found returns key else 0
    */
-  @Override public int getSortedIndex(int surrogateKey) {
+  @Override
+  public int getSortedIndex(int surrogateKey) {
     return 0;
   }
 
@@ -190,7 +202,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    *
    * @param dictionaryMetaFileLength length of dictionary metadata file
    */
-  @Override public void setDictionaryMetaFileLength(long dictionaryMetaFileLength) {
+  @Override
+  public void setDictionaryMetaFileLength(long dictionaryMetaFileLength) {
     this.dictionaryMetaFileLength = dictionaryMetaFileLength;
   }
 
@@ -200,7 +213,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    *
    * @return
    */
-  @Override public long getDictionaryMetaFileLength() {
+  @Override
+  public long getDictionaryMetaFileLength() {
     return dictionaryMetaFileLength;
   }
 
@@ -214,7 +228,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    * @param sortedIndex sort index of dictionary value
    * @return value if found else null
    */
-  @Override public String getDictionaryValueFromSortedIndex(int sortedIndex) {
+  @Override
+  public String getDictionaryValueFromSortedIndex(int sortedIndex) {
     return null;
   }
 
@@ -227,7 +242,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    * @param surrogateKey a unique ID for a dictionary value
    * @return value if found else null
    */
-  @Override public String getDictionaryValueForKey(int surrogateKey) {
+  @Override
+  public String getDictionaryValueForKey(int surrogateKey) {
     String dictionaryValue = null;
     if (surrogateKey < MINIMUM_SURROGATE_KEY) {
       return dictionaryValue;
@@ -249,7 +265,8 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    * @param surrogateKey a unique ID for a dictionary value
    * @return value if found else null
    */
-  @Override public byte[] getDictionaryValueForKeyInBytes(int surrogateKey) {
+  @Override
+  public byte[] getDictionaryValueForKeyInBytes(int surrogateKey) {
     if (surrogateKey < MINIMUM_SURROGATE_KEY) {
       return null;
     }
@@ -292,12 +309,14 @@ public abstract class AbstractColumnDictionaryInfo implements DictionaryInfo {
    * @param value dictionary value
    * @return if found returns key else INVALID_SURROGATE_KEY
    */
-  @Override public int getSurrogateKey(String value) {
+  @Override
+  public int getSurrogateKey(String value) {
     byte[] keyData = value.getBytes(Charset.forName(CarbonCommonConstants.DEFAULT_CHARSET));
     return getSurrogateKey(keyData);
   }
 
-  @Override public void invalidate() {
+  @Override
+  public void invalidate() {
 
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryChunkIterator.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryChunkIterator.java
index dc8eb24..e118816 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryChunkIterator.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryChunkIterator.java
@@ -74,7 +74,8 @@ public class ColumnDictionaryChunkIterator extends CarbonIterator {
    *
    * @return {@code true} if the iteration has more elements
    */
-  @Override public boolean hasNext() {
+  @Override
+  public boolean hasNext() {
     return (currentSize < size);
   }
 
@@ -85,7 +86,8 @@ public class ColumnDictionaryChunkIterator extends CarbonIterator {
    *
    * @return the next element in the iteration
    */
-  @Override public byte[] next() {
+  @Override
+  public byte[] next() {
     if (iteratorIndex >= columnDictionaryChunks.get(outerIndex).getValues().size()) {
       iteratorIndex = 0;
       outerIndex++;
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java
index e7c68a5..1bbc388 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java
@@ -61,7 +61,8 @@ public class ColumnDictionaryInfo extends AbstractColumnDictionaryInfo {
    * @param value dictionary value as byte array
    * @return if found returns key else 0
    */
-  @Override public int getSurrogateKey(byte[] value) {
+  @Override
+  public int getSurrogateKey(byte[] value) {
     return getSurrogateKeyFromDictionaryValue(value);
   }
 
@@ -73,7 +74,8 @@ public class ColumnDictionaryInfo extends AbstractColumnDictionaryInfo {
    * @param surrogateKey a unique ID for a dictionary value
    * @return if found returns key else 0
    */
-  @Override public int getSortedIndex(int surrogateKey) {
+  @Override
+  public int getSortedIndex(int surrogateKey) {
     if (surrogateKey > sortReverseOrderReference.get().size()
         || surrogateKey < MINIMUM_SURROGATE_KEY) {
       return -1;
@@ -94,7 +96,8 @@ public class ColumnDictionaryInfo extends AbstractColumnDictionaryInfo {
    * @param sortedIndex sort index of dictionary value
    * @return value if found else null
    */
-  @Override public String getDictionaryValueFromSortedIndex(int sortedIndex) {
+  @Override
+  public String getDictionaryValueFromSortedIndex(int sortedIndex) {
     if (sortedIndex > sortReverseOrderReference.get().size()
         || sortedIndex < MINIMUM_SURROGATE_KEY) {
       return null;
@@ -111,7 +114,8 @@ public class ColumnDictionaryInfo extends AbstractColumnDictionaryInfo {
    *
    * @param newDictionaryChunk
    */
-  @Override public void addDictionaryChunk(List<byte[]> newDictionaryChunk) {
+  @Override
+  public void addDictionaryChunk(List<byte[]> newDictionaryChunk) {
     if (dictionaryChunks.size() > 0) {
       // Ensure that each time a new dictionary chunk is getting added to the
       // dictionary chunks list, equal distribution of dictionary values should
@@ -147,7 +151,8 @@ public class ColumnDictionaryInfo extends AbstractColumnDictionaryInfo {
    *
    * @return size of last dictionary chunk
    */
-  @Override public int getSizeOfLastDictionaryChunk() {
+  @Override
+  public int getSizeOfLastDictionaryChunk() {
     int lastDictionaryChunkSize = 0;
     if (dictionaryChunks.size() > 0) {
       lastDictionaryChunkSize = dictionaryChunks.get(dictionaryChunks.size() - 1).size();
@@ -161,7 +166,8 @@ public class ColumnDictionaryInfo extends AbstractColumnDictionaryInfo {
    *
    * @param sortOrderIndex
    */
-  @Override public void setSortOrderIndex(List<Integer> sortOrderIndex) {
+  @Override
+  public void setSortOrderIndex(List<Integer> sortOrderIndex) {
     sortOrderReference.set(sortOrderIndex);
   }
 
@@ -171,7 +177,8 @@ public class ColumnDictionaryInfo extends AbstractColumnDictionaryInfo {
    *
    * @param sortReverseOrderIndex
    */
-  @Override public void setSortReverseOrderIndex(List<Integer> sortReverseOrderIndex) {
+  @Override
+  public void setSortReverseOrderIndex(List<Integer> sortReverseOrderIndex) {
     sortReverseOrderReference.set(sortReverseOrderIndex);
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnReverseDictionaryInfo.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnReverseDictionaryInfo.java
index 42d5b2e..84c1953 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnReverseDictionaryInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnReverseDictionaryInfo.java
@@ -64,7 +64,8 @@ public class ColumnReverseDictionaryInfo extends AbstractColumnDictionaryInfo {
    * @param value dictionary value as byte array. It will be treated as key here
    * @return if found returns key else INVALID_SURROGATE_KEY
    */
-  @Override public int getSurrogateKey(byte[] value) {
+  @Override
+  public int getSurrogateKey(byte[] value) {
     DictionaryByteArrayWrapper dictionaryByteArrayWrapper =
         new DictionaryByteArrayWrapper(value, xxHash32);
     Integer surrogateKeyInMap =
@@ -80,7 +81,8 @@ public class ColumnReverseDictionaryInfo extends AbstractColumnDictionaryInfo {
    *
    * @param dictionaryChunk
    */
-  @Override public void addDictionaryChunk(List<byte[]> dictionaryChunk) {
+  @Override
+  public void addDictionaryChunk(List<byte[]> dictionaryChunk) {
     dictionaryChunks.add(dictionaryChunk);
     if (null == dictionaryByteArrayToSurrogateKeyMap) {
       createDictionaryByteArrayToSurrogateKeyMap(dictionaryChunk.size());
@@ -118,7 +120,8 @@ public class ColumnReverseDictionaryInfo extends AbstractColumnDictionaryInfo {
    *
    * @param sortOrderIndex
    */
-  @Override public void setSortOrderIndex(List<Integer> sortOrderIndex) {
+  @Override
+  public void setSortOrderIndex(List<Integer> sortOrderIndex) {
   }
 
   /**
@@ -127,6 +130,7 @@ public class ColumnReverseDictionaryInfo extends AbstractColumnDictionaryInfo {
    *
    * @param sortReverseOrderIndex
    */
-  @Override public void setSortReverseOrderIndex(List<Integer> sortReverseOrderIndex) {
+  @Override
+  public void setSortReverseOrderIndex(List<Integer> sortReverseOrderIndex) {
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryByteArrayWrapper.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryByteArrayWrapper.java
index f812f86..aaf965f 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryByteArrayWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryByteArrayWrapper.java
@@ -61,7 +61,8 @@ public class DictionaryByteArrayWrapper {
    * @param other
    * @return
    */
-  @Override public boolean equals(Object other) {
+  @Override
+  public boolean equals(Object other) {
     if (this == other) {
       return true;
     }
@@ -81,7 +82,8 @@ public class DictionaryByteArrayWrapper {
    *
    * @return
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     if (null != xxHash32) {
       return xxHash32.hash(data, 0, data.length, 0);
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryChunksWrapper.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryChunksWrapper.java
index 61ff51c..ddc4e50 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryChunksWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryChunksWrapper.java
@@ -71,7 +71,8 @@ public class DictionaryChunksWrapper implements Iterator<byte[]> {
    *
    * @return {@code true} if the iteration has more elements
    */
-  @Override public boolean hasNext() {
+  @Override
+  public boolean hasNext() {
     return (currentIndex < size);
   }
 
@@ -82,7 +83,8 @@ public class DictionaryChunksWrapper implements Iterator<byte[]> {
    *
    * @return the next element in the iteration
    */
-  @Override public byte[] next() {
+  @Override
+  public byte[] next() {
     if (iteratorIndex >= dictionaryChunks.get(outerIndex).size()) {
       iteratorIndex = 0;
       outerIndex++;
@@ -110,7 +112,8 @@ public class DictionaryChunksWrapper implements Iterator<byte[]> {
    * @implSpec The default implementation throws an instance of
    * {@link UnsupportedOperationException} and performs no other action.
    */
-  @Override public void remove() {
+  @Override
+  public void remove() {
     throw new UnsupportedOperationException("Remove operation not supported");
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryColumnUniqueIdentifier.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryColumnUniqueIdentifier.java
index a7b47c9..d525a53 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryColumnUniqueIdentifier.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryColumnUniqueIdentifier.java
@@ -142,7 +142,8 @@ public class DictionaryColumnUniqueIdentifier implements Serializable {
    * @param other
    * @return
    */
-  @Override public boolean equals(Object other) {
+  @Override
+  public boolean equals(Object other) {
     if (this == other) {
       return true;
     }
@@ -162,7 +163,8 @@ public class DictionaryColumnUniqueIdentifier implements Serializable {
    *
    * @return
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = dictionarySourceAbsoluteTableIdentifier.hashCode();
     result = 31 * result + columnIdentifier.hashCode();
     return result;
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionary.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionary.java
index bb5bb57..5e690fa 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionary.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionary.java
@@ -50,7 +50,8 @@ public class ForwardDictionary implements Dictionary {
    * @param value dictionary value
    * @return if found returns key else INVALID_SURROGATE_KEY
    */
-  @Override public int getSurrogateKey(String value) {
+  @Override
+  public int getSurrogateKey(String value) {
     return columnDictionaryInfo.getSurrogateKey(value);
   }
 
@@ -64,7 +65,8 @@ public class ForwardDictionary implements Dictionary {
    * @param value dictionary value as byte array
    * @return if found returns key else INVALID_SURROGATE_KEY
    */
-  @Override public int getSurrogateKey(byte[] value) {
+  @Override
+  public int getSurrogateKey(byte[] value) {
     return columnDictionaryInfo.getSurrogateKey(value);
   }
 
@@ -77,7 +79,8 @@ public class ForwardDictionary implements Dictionary {
    * @param surrogateKey a unique ID for a dictionary value
    * @return value if found else null
    */
-  @Override public String getDictionaryValueForKey(int surrogateKey) {
+  @Override
+  public String getDictionaryValueForKey(int surrogateKey) {
     return columnDictionaryInfo.getDictionaryValueForKey(surrogateKey);
   }
 
@@ -90,7 +93,8 @@ public class ForwardDictionary implements Dictionary {
    * @param surrogateKey a unique ID for a dictionary value
    * @return value if found else null
    */
-  @Override public byte[] getDictionaryValueForKeyInBytes(int surrogateKey) {
+  @Override
+  public byte[] getDictionaryValueForKeyInBytes(int surrogateKey) {
     return columnDictionaryInfo.getDictionaryValueForKeyInBytes(surrogateKey);
   }
 
@@ -102,7 +106,8 @@ public class ForwardDictionary implements Dictionary {
    * @param surrogateKey a unique ID for a dictionary value
    * @return if found returns key else 0
    */
-  @Override public int getSortedIndex(int surrogateKey) {
+  @Override
+  public int getSortedIndex(int surrogateKey) {
     return columnDictionaryInfo.getSortedIndex(surrogateKey);
   }
 
@@ -116,7 +121,8 @@ public class ForwardDictionary implements Dictionary {
    * @param sortedIndex sort index of dictionary value
    * @return value if found else null
    */
-  @Override public String getDictionaryValueFromSortedIndex(int sortedIndex) {
+  @Override
+  public String getDictionaryValueFromSortedIndex(int sortedIndex) {
     return columnDictionaryInfo.getDictionaryValueFromSortedIndex(sortedIndex);
   }
 
@@ -129,14 +135,16 @@ public class ForwardDictionary implements Dictionary {
    *
    * @return
    */
-  @Override public DictionaryChunksWrapper getDictionaryChunks() {
+  @Override
+  public DictionaryChunksWrapper getDictionaryChunks() {
     return columnDictionaryInfo.getDictionaryChunks();
   }
 
   /**
    * This method will release the objects and set default value for primitive types
    */
-  @Override public void clear() {
+  @Override
+  public void clear() {
     if (null != columnDictionaryInfo) {
       columnDictionaryInfo.clear();
       columnDictionaryInfo = null;
@@ -166,7 +174,8 @@ public class ForwardDictionary implements Dictionary {
    * This method return the access count associated with the dictionary.
    * @return
    */
-  @Override public int getAccessCount() {
+  @Override
+  public int getAccessCount() {
     if (null != columnDictionaryInfo) {
       return columnDictionaryInfo.getAccessCount();
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCache.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCache.java
index 8b3d649..9698e6c 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCache.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCache.java
@@ -75,7 +75,8 @@ public class ForwardDictionaryCache<K extends
    * @return dictionary
    * @throws IOException in case memory is not sufficient to load dictionary into memory
    */
-  @Override public Dictionary get(DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier)
+  @Override
+  public Dictionary get(DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier)
       throws IOException {
     return getDictionary(dictionaryColumnUniqueIdentifier);
   }
@@ -89,7 +90,8 @@ public class ForwardDictionaryCache<K extends
    * @return list of dictionary
    * @throws IOException in case memory is not sufficient to load dictionary into memory
    */
-  @Override public List<Dictionary> getAll(
+  @Override
+  public List<Dictionary> getAll(
       List<DictionaryColumnUniqueIdentifier> dictionaryColumnUniqueIdentifiers) throws IOException {
     boolean exceptionOccurredInDictionaryLoading = false;
     String exceptionMessage = "";
@@ -100,7 +102,8 @@ public class ForwardDictionaryCache<K extends
     ExecutorService executorService = Executors.newFixedThreadPool(threadPoolSize);
     for (final DictionaryColumnUniqueIdentifier uniqueIdent : dictionaryColumnUniqueIdentifiers) {
       taskSubmitList.add(executorService.submit(new Callable<Dictionary>() {
-        @Override public Dictionary call() throws IOException {
+        @Override
+        public Dictionary call() throws IOException {
           try {
             // Register thread callback for calculating metrics
             TaskMetricsMap.getInstance().registerThreadCallback();
@@ -165,7 +168,8 @@ public class ForwardDictionaryCache<K extends
    *                                         tableName and columnIdentifier
    * @return
    */
-  @Override public Dictionary getIfPresent(
+  @Override
+  public Dictionary getIfPresent(
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier) {
     Dictionary forwardDictionary = null;
     ColumnDictionaryInfo columnDictionaryInfo = (ColumnDictionaryInfo) carbonLRUCache.get(
@@ -184,7 +188,8 @@ public class ForwardDictionaryCache<K extends
    * @param dictionaryColumnUniqueIdentifier unique identifier which contains dbName,
    *                                         tableName and columnIdentifier
    */
-  @Override public void invalidate(
+  @Override
+  public void invalidate(
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier) {
     carbonLRUCache.remove(
         getLruCacheKey(dictionaryColumnUniqueIdentifier.getColumnIdentifier().getColumnId(),
@@ -240,7 +245,8 @@ public class ForwardDictionaryCache<K extends
     return columnDictionaryInfo;
   }
 
-  @Override public void clearAccessCount(List<DictionaryColumnUniqueIdentifier> keys) {
+  @Override
+  public void clearAccessCount(List<DictionaryColumnUniqueIdentifier> keys) {
     for (DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier : keys) {
       Dictionary cacheable = (Dictionary) carbonLRUCache.get(
           getLruCacheKey(dictionaryColumnUniqueIdentifier.getColumnIdentifier().getColumnId(),
@@ -249,7 +255,8 @@ public class ForwardDictionaryCache<K extends
     }
   }
 
-  @Override protected long getEstimatedDictionarySize(DictionaryInfo dictionaryInfo,
+  @Override
+  protected long getEstimatedDictionarySize(DictionaryInfo dictionaryInfo,
       CarbonDictionaryColumnMetaChunk carbonDictionaryColumnMetaChunk,
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier, boolean
       readSortIndexSize) throws IOException {
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ManageDictionaryAndBTree.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ManageDictionaryAndBTree.java
index 038b356..88c3ddb 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ManageDictionaryAndBTree.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ManageDictionaryAndBTree.java
@@ -64,7 +64,8 @@ public class ManageDictionaryAndBTree {
       // sort index file is created with dictionary size appended to it. So all the files
       // with a given column ID need to be listed
       CarbonFile[] listFiles = metadataDir.listFiles(new CarbonFileFilter() {
-        @Override public boolean accept(CarbonFile path) {
+        @Override
+        public boolean accept(CarbonFile path) {
           if (path.getName().startsWith(columnSchema.getColumnUniqueId())) {
             return true;
           }
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionary.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionary.java
index 4672011..c1587d6 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionary.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionary.java
@@ -44,7 +44,8 @@ public class ReverseDictionary implements Dictionary {
    * @param value dictionary value
    * @return if found returns key else INVALID_SURROGATE_KEY
    */
-  @Override public int getSurrogateKey(String value) {
+  @Override
+  public int getSurrogateKey(String value) {
     return columnReverseDictionaryInfo.getSurrogateKey(value);
   }
 
@@ -58,7 +59,8 @@ public class ReverseDictionary implements Dictionary {
    * @param value dictionary value as byte array
    * @return if found returns key else INVALID_SURROGATE_KEY
    */
-  @Override public int getSurrogateKey(byte[] value) {
+  @Override
+  public int getSurrogateKey(byte[] value) {
     return columnReverseDictionaryInfo.getSurrogateKey(value);
   }
 
@@ -71,7 +73,8 @@ public class ReverseDictionary implements Dictionary {
    * @param surrogateKey a unique ID for a dictionary value
    * @return value if found else null
    */
-  @Override public String getDictionaryValueForKey(int surrogateKey) {
+  @Override
+  public String getDictionaryValueForKey(int surrogateKey) {
     return columnReverseDictionaryInfo.getDictionaryValueForKey(surrogateKey);
   }
 
@@ -84,7 +87,8 @@ public class ReverseDictionary implements Dictionary {
    * @param surrogateKey a unique ID for a dictionary value
    * @return value if found else null
    */
-  @Override public byte[] getDictionaryValueForKeyInBytes(int surrogateKey) {
+  @Override
+  public byte[] getDictionaryValueForKeyInBytes(int surrogateKey) {
     return columnReverseDictionaryInfo.getDictionaryValueForKeyInBytes(surrogateKey);
   }
 
@@ -96,7 +100,8 @@ public class ReverseDictionary implements Dictionary {
    * @param surrogateKey a unique ID for a dictionary value
    * @return if found returns key else 0
    */
-  @Override public int getSortedIndex(int surrogateKey) {
+  @Override
+  public int getSortedIndex(int surrogateKey) {
     return columnReverseDictionaryInfo.getSortedIndex(surrogateKey);
   }
 
@@ -110,7 +115,8 @@ public class ReverseDictionary implements Dictionary {
    * @param sortedIndex sort index of dictionary value
    * @return value if found else null
    */
-  @Override public String getDictionaryValueFromSortedIndex(int sortedIndex) {
+  @Override
+  public String getDictionaryValueFromSortedIndex(int sortedIndex) {
     return columnReverseDictionaryInfo.getDictionaryValueFromSortedIndex(sortedIndex);
   }
 
@@ -123,14 +129,16 @@ public class ReverseDictionary implements Dictionary {
    *
    * @return
    */
-  @Override public DictionaryChunksWrapper getDictionaryChunks() {
+  @Override
+  public DictionaryChunksWrapper getDictionaryChunks() {
     return columnReverseDictionaryInfo.getDictionaryChunks();
   }
 
   /**
    * This method will release the objects and set default value for primitive types
    */
-  @Override public void clear() {
+  @Override
+  public void clear() {
     if (null != columnReverseDictionaryInfo) {
       columnReverseDictionaryInfo.clear();
       columnReverseDictionaryInfo = null;
@@ -141,7 +149,8 @@ public class ReverseDictionary implements Dictionary {
    * This method return the access count associated with the dictionary.
    * @return
    */
-  @Override public int getAccessCount() {
+  @Override
+  public int getAccessCount() {
     if (null != columnReverseDictionaryInfo) {
       return columnReverseDictionaryInfo.getAccessCount();
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCache.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCache.java
index fc4bbe5..d4e617d 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCache.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCache.java
@@ -80,7 +80,8 @@ public class ReverseDictionaryCache<K extends DictionaryColumnUniqueIdentifier,
    * @return dictionary
    * @throws IOException in case memory is not sufficient to load dictionary into memory
    */
-  @Override public Dictionary get(DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier)
+  @Override
+  public Dictionary get(DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier)
       throws IOException {
     return getDictionary(dictionaryColumnUniqueIdentifier);
   }
@@ -94,7 +95,8 @@ public class ReverseDictionaryCache<K extends DictionaryColumnUniqueIdentifier,
    * @return list of dictionary
    * @throws IOException in case memory is not sufficient to load dictionary into memory
    */
-  @Override public List<Dictionary> getAll(
+  @Override
+  public List<Dictionary> getAll(
       List<DictionaryColumnUniqueIdentifier> dictionaryColumnUniqueIdentifiers)
       throws IOException {
     boolean exceptionOccurredInDictionaryLoading = false;
@@ -106,7 +108,8 @@ public class ReverseDictionaryCache<K extends DictionaryColumnUniqueIdentifier,
     ExecutorService executorService = Executors.newFixedThreadPool(threadPoolSize);
     for (final DictionaryColumnUniqueIdentifier uniqueIdent : dictionaryColumnUniqueIdentifiers) {
       taskSubmitList.add(executorService.submit(new Callable<Dictionary>() {
-        @Override public Dictionary call() throws IOException {
+        @Override
+        public Dictionary call() throws IOException {
           return getDictionary(uniqueIdent);
         }
       }));
@@ -142,7 +145,8 @@ public class ReverseDictionaryCache<K extends DictionaryColumnUniqueIdentifier,
    *                                         tableName and columnIdentifier
    * @return
    */
-  @Override public Dictionary getIfPresent(
+  @Override
+  public Dictionary getIfPresent(
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier) {
     Dictionary reverseDictionary = null;
     ColumnReverseDictionaryInfo columnReverseDictionaryInfo =
@@ -162,7 +166,8 @@ public class ReverseDictionaryCache<K extends DictionaryColumnUniqueIdentifier,
    * @param dictionaryColumnUniqueIdentifier unique identifier which contains dbName,
    *                                         tableName and columnIdentifier
    */
-  @Override public void invalidate(
+  @Override
+  public void invalidate(
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier) {
     carbonLRUCache.remove(
         getLruCacheKey(dictionaryColumnUniqueIdentifier.getColumnIdentifier().getColumnId(),
@@ -219,7 +224,8 @@ public class ReverseDictionaryCache<K extends DictionaryColumnUniqueIdentifier,
     return columnReverseDictionaryInfo;
   }
 
-  @Override public void clearAccessCount(List<DictionaryColumnUniqueIdentifier> keys) {
+  @Override
+  public void clearAccessCount(List<DictionaryColumnUniqueIdentifier> keys) {
     for (DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier : keys) {
       Dictionary cacheable = (Dictionary) carbonLRUCache.get(
           getLruCacheKey(dictionaryColumnUniqueIdentifier.getColumnIdentifier().getColumnId(),
@@ -228,7 +234,8 @@ public class ReverseDictionaryCache<K extends DictionaryColumnUniqueIdentifier,
     }
   }
 
-  @Override protected long getEstimatedDictionarySize(DictionaryInfo dictionaryInfo,
+  @Override
+  protected long getEstimatedDictionarySize(DictionaryInfo dictionaryInfo,
       CarbonDictionaryColumnMetaChunk carbonDictionaryColumnMetaChunk,
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier, boolean
       readSortIndexSize) throws IOException {
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/AbstractDataMapJob.java b/core/src/main/java/org/apache/carbondata/core/datamap/AbstractDataMapJob.java
index ed3ecc9..1415ada 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/AbstractDataMapJob.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/AbstractDataMapJob.java
@@ -27,7 +27,8 @@ import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
  */
 public abstract class AbstractDataMapJob implements DataMapJob {
 
-  @Override public void execute(CarbonTable carbonTable,
+  @Override
+  public void execute(CarbonTable carbonTable,
       FileInputFormat<Void, BlockletDataMapIndexWrapper> format) {
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapChooser.java b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapChooser.java
index 239401e..4410998 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapChooser.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapChooser.java
@@ -349,11 +349,13 @@ public class DataMapChooser {
       this.dataMap = dataMap;
     }
 
-    @Override public int compareTo(DataMapTuple o) {
+    @Override
+    public int compareTo(DataMapTuple o) {
       return order - o.order;
     }
 
-    @Override public boolean equals(Object o) {
+    @Override
+    public boolean equals(Object o) {
       if (this == o) return true;
       if (o == null || getClass() != o.getClass()) return false;
 
@@ -363,7 +365,8 @@ public class DataMapChooser {
       return dataMap != null ? dataMap.equals(that.dataMap) : that.dataMap == null;
     }
 
-    @Override public int hashCode() {
+    @Override
+    public int hashCode() {
       int result = order;
       result = 31 * result + (dataMap != null ? dataMap.hashCode() : 0);
       return result;
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapMeta.java b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapMeta.java
index 93a8012..fb6ba67 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapMeta.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapMeta.java
@@ -62,7 +62,8 @@ public class DataMapMeta {
 
   public List<String> getIndexedColumnNames() {
     return (List<String>) CollectionUtils.collect(indexedColumns, new Transformer() {
-      @Override public Object transform(Object input) {
+      @Override
+      public Object transform(Object input) {
         return ((CarbonColumn) input).getColName();
       }
     });
@@ -72,7 +73,8 @@ public class DataMapMeta {
     return optimizedOperation;
   }
 
-  @Override public String toString() {
+  @Override
+  public String toString() {
     return new StringBuilder("DataMapMeta{")
         .append("dataMapName='").append(dataMapName).append('\'')
         .append(", indexedColumns=[")
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/Segment.java b/core/src/main/java/org/apache/carbondata/core/datamap/Segment.java
index b684090..5279094 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/Segment.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/Segment.java
@@ -277,18 +277,21 @@ public class Segment implements Serializable, Writable {
     this.filteredIndexShardNames.add(filteredIndexShardName);
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     Segment segment = (Segment) o;
     return Objects.equals(segmentNo, segment.segmentNo);
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return Objects.hash(segmentNo);
   }
 
-  @Override public String toString() {
+  @Override
+  public String toString() {
     return segmentString;
   }
 
@@ -331,7 +334,8 @@ public class Segment implements Serializable, Writable {
     return true;
   }
 
-  @Override public void write(DataOutput out) throws IOException {
+  @Override
+  public void write(DataOutput out) throws IOException {
     out.writeUTF(segmentNo);
     boolean writeSegmentFileName = segmentFileName != null;
     out.writeBoolean(writeSegmentFileName);
@@ -351,7 +355,8 @@ public class Segment implements Serializable, Writable {
     out.writeLong(indexSize);
   }
 
-  @Override public void readFields(DataInput in) throws IOException {
+  @Override
+  public void readFields(DataInput in) throws IOException {
     this.segmentNo = in.readUTF();
     if (in.readBoolean()) {
       this.segmentFileName = in.readUTF();
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/TableDataMap.java b/core/src/main/java/org/apache/carbondata/core/datamap/TableDataMap.java
index 053f8fc..804e895 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/TableDataMap.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/TableDataMap.java
@@ -279,7 +279,8 @@ public final class TableDataMap extends OperationEventListener {
     for (int i = 0; i < numOfThreadsForPruning; i++) {
       final List<SegmentDataMapGroup> segmentDataMapGroups = datamapListForEachThread.get(i);
       results.add(executorService.submit(new Callable<Void>() {
-        @Override public Void call() throws IOException {
+        @Override
+        public Void call() throws IOException {
           Thread.currentThread().setName(threadName);
           for (SegmentDataMapGroup segmentDataMapGroup : segmentDataMapGroups) {
             List<ExtendedBlocklet> pruneBlocklets = new ArrayList<>();
@@ -463,7 +464,8 @@ public final class TableDataMap extends OperationEventListener {
     return dataMapFactory;
   }
 
-  @Override public void onEvent(Event event, OperationContext opContext) throws Exception {
+  @Override
+  public void onEvent(Event event, OperationContext opContext) throws Exception {
     dataMapFactory.fireEvent(event);
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/dev/cgdatamap/CoarseGrainDataMap.java b/core/src/main/java/org/apache/carbondata/core/datamap/dev/cgdatamap/CoarseGrainDataMap.java
index 3aba163..3de7a94 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/dev/cgdatamap/CoarseGrainDataMap.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/dev/cgdatamap/CoarseGrainDataMap.java
@@ -55,7 +55,8 @@ public abstract class CoarseGrainDataMap implements DataMap<Blocklet> {
   }
 
 
-  @Override public int getNumberOfEntries() {
+  @Override
+  public int getNumberOfEntries() {
     // keep default, one record in one datamap
     return 1;
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/AndDataMapExprWrapper.java b/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/AndDataMapExprWrapper.java
index c5099db..1abe84b 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/AndDataMapExprWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/AndDataMapExprWrapper.java
@@ -74,7 +74,8 @@ public class AndDataMapExprWrapper implements DataMapExprWrapper {
     return andBlocklets;
   }
 
-  @Override public List<ExtendedBlocklet> pruneBlocklets(List<ExtendedBlocklet> blocklets)
+  @Override
+  public List<ExtendedBlocklet> pruneBlocklets(List<ExtendedBlocklet> blocklets)
       throws IOException {
     List<ExtendedBlocklet> leftPrune = left.pruneBlocklets(blocklets);
     List<ExtendedBlocklet> rightPrune = right.pruneBlocklets(blocklets);
@@ -87,11 +88,13 @@ public class AndDataMapExprWrapper implements DataMapExprWrapper {
     return andBlocklets;
   }
 
-  @Override public FilterResolverIntf getFilterResolverIntf() {
+  @Override
+  public FilterResolverIntf getFilterResolverIntf() {
     return resolverIntf;
   }
 
-  @Override public FilterResolverIntf getFilterResolverIntf(String uniqueId) {
+  @Override
+  public FilterResolverIntf getFilterResolverIntf(String uniqueId) {
     FilterResolverIntf leftExp = left.getFilterResolverIntf(uniqueId);
     FilterResolverIntf rightExp = right.getFilterResolverIntf(uniqueId);
     if (leftExp != null) {
@@ -111,7 +114,8 @@ public class AndDataMapExprWrapper implements DataMapExprWrapper {
     return wrappers;
   }
 
-  @Override public DataMapLevel getDataMapLevel() {
+  @Override
+  public DataMapLevel getDataMapLevel() {
     return left.getDataMapLevel();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/DataMapDistributableWrapper.java b/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/DataMapDistributableWrapper.java
index 22d2b90..8a52974 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/DataMapDistributableWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/DataMapDistributableWrapper.java
@@ -42,11 +42,13 @@ public class DataMapDistributableWrapper extends InputSplit implements Serializa
     return distributable;
   }
 
-  @Override public long getLength() throws IOException, InterruptedException {
+  @Override
+  public long getLength() throws IOException, InterruptedException {
     return distributable.getLength();
   }
 
-  @Override public String[] getLocations() throws IOException, InterruptedException {
+  @Override
+  public String[] getLocations() throws IOException, InterruptedException {
     return distributable.getLocations();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/DataMapExprWrapperImpl.java b/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/DataMapExprWrapperImpl.java
index bb2662b..c60f1f4 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/DataMapExprWrapperImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/DataMapExprWrapperImpl.java
@@ -61,7 +61,8 @@ public class DataMapExprWrapperImpl implements DataMapExprWrapper {
     return dataMap.prune(dataMaps, distributable, expression, partitionsToPrune);
   }
 
-  @Override public List<ExtendedBlocklet> pruneBlocklets(List<ExtendedBlocklet> blocklets)
+  @Override
+  public List<ExtendedBlocklet> pruneBlocklets(List<ExtendedBlocklet> blocklets)
       throws IOException {
     List<ExtendedBlocklet> blockletList = new ArrayList<>();
     for (ExtendedBlocklet blocklet: blocklets) {
@@ -72,11 +73,13 @@ public class DataMapExprWrapperImpl implements DataMapExprWrapper {
     return blockletList;
   }
 
-  @Override public FilterResolverIntf getFilterResolverIntf() {
+  @Override
+  public FilterResolverIntf getFilterResolverIntf() {
     return expression;
   }
 
-  @Override public FilterResolverIntf getFilterResolverIntf(String uniqueId) {
+  @Override
+  public FilterResolverIntf getFilterResolverIntf(String uniqueId) {
     if (this.uniqueId.equals(uniqueId)) {
       return expression;
     }
@@ -94,7 +97,8 @@ public class DataMapExprWrapperImpl implements DataMapExprWrapper {
     return wrappers;
   }
 
-  @Override public DataMapLevel getDataMapLevel() {
+  @Override
+  public DataMapLevel getDataMapLevel() {
     return dataMap.getDataMapFactory().getDataMapLevel();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/OrDataMapExprWrapper.java b/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/OrDataMapExprWrapper.java
index 7812969..51b8994 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/OrDataMapExprWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/dev/expr/OrDataMapExprWrapper.java
@@ -70,7 +70,8 @@ public class OrDataMapExprWrapper implements DataMapExprWrapper {
     return new ArrayList<>(andBlocklets);
   }
 
-  @Override public List<ExtendedBlocklet> pruneBlocklets(List<ExtendedBlocklet> blocklets)
+  @Override
+  public List<ExtendedBlocklet> pruneBlocklets(List<ExtendedBlocklet> blocklets)
       throws IOException {
     List<ExtendedBlocklet> leftPrune = left.pruneBlocklets(blocklets);
     List<ExtendedBlocklet> rightPrune = right.pruneBlocklets(blocklets);
@@ -80,7 +81,8 @@ public class OrDataMapExprWrapper implements DataMapExprWrapper {
     return new ArrayList<>(andBlocklets);
   }
 
-  @Override public List<DataMapDistributableWrapper> toDistributable(List<Segment> segments)
+  @Override
+  public List<DataMapDistributableWrapper> toDistributable(List<Segment> segments)
       throws IOException {
     List<DataMapDistributableWrapper> wrappers = new ArrayList<>();
     wrappers.addAll(left.toDistributable(segments));
@@ -88,11 +90,13 @@ public class OrDataMapExprWrapper implements DataMapExprWrapper {
     return wrappers;
   }
 
-  @Override public FilterResolverIntf getFilterResolverIntf() {
+  @Override
+  public FilterResolverIntf getFilterResolverIntf() {
     return resolverIntf;
   }
 
-  @Override public FilterResolverIntf getFilterResolverIntf(String uniqueId) {
+  @Override
+  public FilterResolverIntf getFilterResolverIntf(String uniqueId) {
     FilterResolverIntf leftExp = left.getFilterResolverIntf(uniqueId);
     FilterResolverIntf rightExp = right.getFilterResolverIntf(uniqueId);
     if (leftExp != null) {
@@ -104,7 +108,8 @@ public class OrDataMapExprWrapper implements DataMapExprWrapper {
   }
 
 
-  @Override public DataMapLevel getDataMapLevel() {
+  @Override
+  public DataMapLevel getDataMapLevel() {
     return left.getDataMapLevel();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/dev/fgdatamap/FineGrainBlocklet.java b/core/src/main/java/org/apache/carbondata/core/datamap/dev/fgdatamap/FineGrainBlocklet.java
index 9d8f594..c395740 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/dev/fgdatamap/FineGrainBlocklet.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/dev/fgdatamap/FineGrainBlocklet.java
@@ -71,7 +71,8 @@ public class FineGrainBlocklet extends Blocklet implements Serializable {
       return bitSet;
     }
 
-    @Override public void write(DataOutput out) throws IOException {
+    @Override
+    public void write(DataOutput out) throws IOException {
       out.writeInt(pageId);
       out.writeInt(rowId.length);
       for (int i = 0; i < rowId.length; i++) {
@@ -79,7 +80,8 @@ public class FineGrainBlocklet extends Blocklet implements Serializable {
       }
     }
 
-    @Override public void readFields(DataInput in) throws IOException {
+    @Override
+    public void readFields(DataInput in) throws IOException {
       pageId = in.readInt();
       int length = in.readInt();
       rowId = new int[length];
@@ -105,7 +107,8 @@ public class FineGrainBlocklet extends Blocklet implements Serializable {
     return bitSetGroup;
   }
 
-  @Override public void write(DataOutput out) throws IOException {
+  @Override
+  public void write(DataOutput out) throws IOException {
     super.write(out);
     int size = pages.size();
     out.writeInt(size);
@@ -114,7 +117,8 @@ public class FineGrainBlocklet extends Blocklet implements Serializable {
     }
   }
 
-  @Override public void readFields(DataInput in) throws IOException {
+  @Override
+  public void readFields(DataInput in) throws IOException {
     super.readFields(in);
     int size = in.readInt();
     pages = new ArrayList<>(size);
@@ -125,11 +129,13 @@ public class FineGrainBlocklet extends Blocklet implements Serializable {
     }
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     return super.equals(o);
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return super.hashCode();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/dev/fgdatamap/FineGrainDataMap.java b/core/src/main/java/org/apache/carbondata/core/datamap/dev/fgdatamap/FineGrainDataMap.java
index 3a47df1..1e4c799 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/dev/fgdatamap/FineGrainDataMap.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/dev/fgdatamap/FineGrainDataMap.java
@@ -53,7 +53,8 @@ public abstract class FineGrainDataMap implements DataMap<FineGrainBlocklet> {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public int getNumberOfEntries() {
+  @Override
+  public int getNumberOfEntries() {
     // keep default, one record in one datamap
     return 1;
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java b/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java
index 18b856b..65b978b 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java
@@ -66,7 +66,8 @@ public class TableSegmentUniqueIdentifier {
    * @param o
    * @return
    */
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
 
@@ -81,7 +82,8 @@ public class TableSegmentUniqueIdentifier {
    * Returns hashcode for the TableSegmentIdentifier
    * @return
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = absoluteTableIdentifier.hashCode();
     result = 31 * result + segmentId.hashCode();
     return result;
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/AbstractIndex.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/AbstractIndex.java
index 1972e97..9bac098 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/block/AbstractIndex.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/AbstractIndex.java
@@ -71,7 +71,8 @@ public abstract class AbstractIndex implements Cacheable {
     return dataRefNode;
   }
 
-  @Override public long getFileTimeStamp() {
+  @Override
+  public long getFileTimeStamp() {
     return 0;
   }
 
@@ -87,7 +88,8 @@ public abstract class AbstractIndex implements Cacheable {
    *
    * @return
    */
-  @Override public int getAccessCount() {
+  @Override
+  public int getAccessCount() {
     return accessCount.get();
   }
 
@@ -96,11 +98,13 @@ public abstract class AbstractIndex implements Cacheable {
    *
    * @return
    */
-  @Override public long getMemorySize() {
+  @Override
+  public long getMemorySize() {
     return this.memorySize;
   }
 
-  @Override public void invalidate() {
+  @Override
+  public void invalidate() {
 
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockInfo.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockInfo.java
index d2eae8b..c832451 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockInfo.java
@@ -80,7 +80,8 @@ public class BlockInfo implements Serializable {
   /**
    * method to get the hash code
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = info.getFilePath().hashCode();
     result = 31 * result + (int) (info.getBlockOffset() ^ (info.getBlockOffset() >>> 32));
     result = 31 * result + (int) (info.getBlockLength() ^ (info.getBlockLength() >>> 32));
@@ -93,7 +94,8 @@ public class BlockInfo implements Serializable {
    *
    * @param obj
    */
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentPropertiesAndSchemaHolder.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentPropertiesAndSchemaHolder.java
index 00b624f..9d3d790 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentPropertiesAndSchemaHolder.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentPropertiesAndSchemaHolder.java
@@ -333,7 +333,8 @@ public class SegmentPropertiesAndSchemaHolder {
       fileFooterEntrySchemaForBlocklet = null;
     }
 
-    @Override public boolean equals(Object obj) {
+    @Override
+    public boolean equals(Object obj) {
       if (!(obj instanceof SegmentPropertiesAndSchemaHolder.SegmentPropertiesWrapper)) {
         return false;
       }
@@ -361,13 +362,15 @@ public class SegmentPropertiesAndSchemaHolder {
 
     private void sortList(List<ColumnSchema> columnSchemas) {
       Collections.sort(columnSchemas, new Comparator<ColumnSchema>() {
-        @Override public int compare(ColumnSchema o1, ColumnSchema o2) {
+        @Override
+        public int compare(ColumnSchema o1, ColumnSchema o2) {
           return o1.getColumnUniqueId().compareTo(o2.getColumnUniqueId());
         }
       });
     }
 
-    @Override public int hashCode() {
+    @Override
+    public int hashCode() {
       int allColumnsHashCode = 0;
       // check column order
       StringBuilder builder = new StringBuilder();
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java
index 4dd1403..142b4c2 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java
@@ -121,7 +121,8 @@ public class TableBlockInfo implements Distributable, Serializable {
    */
   public static final Comparator<Distributable> DATA_SIZE_DESC_COMPARATOR =
       new Comparator<Distributable>() {
-        @Override public int compare(Distributable o1, Distributable o2) {
+        @Override
+        public int compare(Distributable o1, Distributable o2) {
           long diff =
               ((TableBlockInfo) o1).getBlockLength() - ((TableBlockInfo) o2).getBlockLength();
           return diff < 0 ? 1 : (diff == 0 ? 0 : -1);
@@ -278,7 +279,8 @@ public class TableBlockInfo implements Distributable, Serializable {
    *
    * @see java.lang.Object#equals(java.lang.Object)
    */
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
@@ -319,7 +321,8 @@ public class TableBlockInfo implements Distributable, Serializable {
    * is same 2. compare task id if task id is same 3. compare offsets of the
    * block
    */
-  @Override public int compareTo(Distributable other) {
+  @Override
+  public int compareTo(Distributable other) {
 
     int compareResult = 0;
     // get the segment id
@@ -379,7 +382,8 @@ public class TableBlockInfo implements Distributable, Serializable {
     return 0;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = filePath.hashCode();
     result = 31 * result + (int) (blockOffset ^ (blockOffset >>> 32));
     result = 31 * result + (int) (blockLength ^ (blockLength >>> 32));
@@ -388,7 +392,8 @@ public class TableBlockInfo implements Distributable, Serializable {
     return result;
   }
 
-  @Override public String[] getLocations() {
+  @Override
+  public String[] getLocations() {
     return locations;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java
index 0434066..1f5ccf2 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java
@@ -57,11 +57,13 @@ public class TableBlockUniqueIdentifier {
     this.tableBlockInfo = tableBlockInfo;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return this.absoluteTableIdentifier.hashCode() + this.tableBlockInfo.hashCode();
   }
 
-  @Override public boolean equals(Object other) {
+  @Override
+  public boolean equals(Object other) {
     if (this == other) return true;
     if (other == null || getClass() != other.getClass()) return false;
     TableBlockUniqueIdentifier tableBlockUniqueIdentifier = (TableBlockUniqueIdentifier) other;
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableTaskInfo.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableTaskInfo.java
index 89a7551..adca63c 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableTaskInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableTaskInfo.java
@@ -46,7 +46,8 @@ public class TableTaskInfo implements Distributable {
     this.tableBlockInfoList = tableBlockInfoList;
   }
 
-  @Override public String[] getLocations() {
+  @Override
+  public String[] getLocations() {
     Set<String> locations = new HashSet<String>();
     for (TableBlockInfo tableBlockInfo : tableBlockInfoList) {
       locations.addAll(Arrays.asList(tableBlockInfo.getLocations()));
@@ -56,11 +57,13 @@ public class TableTaskInfo implements Distributable {
     return nodes.toArray(new String[nodes.size()]);
   }
 
-  @Override public int compareTo(Distributable o) {
+  @Override
+  public int compareTo(Distributable o) {
     return taskId.compareTo(((TableTaskInfo)o).getTaskId());
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
@@ -76,7 +79,8 @@ public class TableTaskInfo implements Distributable {
     return 0 == taskId.compareTo(((TableTaskInfo)obj).getTaskId());
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + ((taskId == null) ? 0 : taskId.hashCode());
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/AbstractDimensionColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/AbstractDimensionColumnPage.java
index fdf57a9..9ad5ab0 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/AbstractDimensionColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/AbstractDimensionColumnPage.java
@@ -42,15 +42,18 @@ public abstract class AbstractDimensionColumnPage implements DimensionColumnPage
   /**
    * @return whether columns where explicitly sorted or not
    */
-  @Override public boolean isExplicitSorted() {
+  @Override
+  public boolean isExplicitSorted() {
     return dataChunkStore.isExplicitSorted();
   }
 
-  @Override public boolean isAdaptiveEncoded() {
+  @Override
+  public boolean isAdaptiveEncoded() {
     return false;
   }
 
-  @Override public BitSet getNullBits() {
+  @Override
+  public BitSet getNullBits() {
     return null;
   }
 
@@ -60,14 +63,16 @@ public abstract class AbstractDimensionColumnPage implements DimensionColumnPage
    * @param rowId row id of the data
    * @return chunk
    */
-  @Override public byte[] getChunkData(int rowId) {
+  @Override
+  public byte[] getChunkData(int rowId) {
     return dataChunkStore.getRow(rowId);
   }
 
   /**
    * @return inverted index
    */
-  @Override public int getInvertedIndex(int rowId) {
+  @Override
+  public int getInvertedIndex(int rowId) {
     return dataChunkStore.getInvertedIndex(rowId);
   }
 
@@ -75,7 +80,8 @@ public abstract class AbstractDimensionColumnPage implements DimensionColumnPage
    * @param rowId
    * @return inverted index reverse
    */
-  @Override public int getInvertedReverseIndex(int rowId) {
+  @Override
+  public int getInvertedReverseIndex(int rowId) {
     return dataChunkStore.getInvertedReverseIndex(rowId);
   }
 
@@ -86,7 +92,8 @@ public abstract class AbstractDimensionColumnPage implements DimensionColumnPage
    * @param compareValue value to compare
    * @return compare result
    */
-  @Override public int compareTo(int rowId, byte[] compareValue) {
+  @Override
+  public int compareTo(int rowId, byte[] compareValue) {
     // TODO Auto-generated method stub
     return dataChunkStore.compareTo(rowId, compareValue);
   }
@@ -94,7 +101,8 @@ public abstract class AbstractDimensionColumnPage implements DimensionColumnPage
   /**
    * below method will be used to free the allocated memory
    */
-  @Override public void freeMemory() {
+  @Override
+  public void freeMemory() {
     if (dataChunkStore != null) {
       dataChunkStore.freeMemory();
       dataChunkStore = null;
@@ -104,7 +112,8 @@ public abstract class AbstractDimensionColumnPage implements DimensionColumnPage
   /**
    * @return column is dictionary column or not
    */
-  @Override public boolean isNoDicitionaryColumn() {
+  @Override
+  public boolean isNoDicitionaryColumn() {
     return false;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/DimensionRawColumnChunk.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/DimensionRawColumnChunk.java
index ccf0a0e..cf8102e 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/DimensionRawColumnChunk.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/DimensionRawColumnChunk.java
@@ -141,7 +141,8 @@ public class DimensionRawColumnChunk extends AbstractRawColumnChunk {
     }
   }
 
-  @Override public void freeMemory() {
+  @Override
+  public void freeMemory() {
     super.freeMemory();
     if (null != dataChunks) {
       for (int i = 0; i < dataChunks.length; i++) {
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionColumnPage.java
index 9639e9b..287369a 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionColumnPage.java
@@ -85,7 +85,8 @@ public class FixedLengthDimensionColumnPage extends AbstractDimensionColumnPage
    * @param data             data to filed
    * @return how many bytes was copied
    */
-  @Override public int fillRawData(int rowId, int offset, byte[] data) {
+  @Override
+  public int fillRawData(int rowId, int offset, byte[] data) {
     dataChunkStore.fillRow(rowId, data, offset);
     return dataChunkStore.getColumnValueSize();
   }
@@ -98,7 +99,8 @@ public class FixedLengthDimensionColumnPage extends AbstractDimensionColumnPage
    * @param outputSurrogateKey
    * @return
    */
-  @Override public int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey) {
+  @Override
+  public int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey) {
     outputSurrogateKey[chunkIndex] = dataChunkStore.getSurrogate(rowId);
     return chunkIndex + 1;
   }
@@ -110,7 +112,8 @@ public class FixedLengthDimensionColumnPage extends AbstractDimensionColumnPage
    * @param chunkIndex
    * @return next column index
    */
-  @Override public int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex) {
+  @Override
+  public int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex) {
     ColumnVectorInfo columnVectorInfo = vectorInfo[chunkIndex];
     int offset = columnVectorInfo.offset;
     int vectorOffset = columnVectorInfo.vectorOffset;
@@ -149,7 +152,8 @@ public class FixedLengthDimensionColumnPage extends AbstractDimensionColumnPage
    * @param chunkIndex
    * @return next column index
    */
-  @Override public int fillVector(int[] filteredRowId, ColumnVectorInfo[] vectorInfo,
+  @Override
+  public int fillVector(int[] filteredRowId, ColumnVectorInfo[] vectorInfo,
       int chunkIndex) {
     ColumnVectorInfo columnVectorInfo = vectorInfo[chunkIndex];
     int offset = columnVectorInfo.offset;
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/MeasureRawColumnChunk.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/MeasureRawColumnChunk.java
index 86b5535..90d6e7f 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/MeasureRawColumnChunk.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/MeasureRawColumnChunk.java
@@ -125,7 +125,8 @@ public class MeasureRawColumnChunk extends AbstractRawColumnChunk {
     }
   }
 
-  @Override public void freeMemory() {
+  @Override
+  public void freeMemory() {
     super.freeMemory();
     if (null != columnPages) {
       for (int i = 0; i < columnPages.length; i++) {
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionColumnPage.java
index 8e6e83f..9a4ca02 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionColumnPage.java
@@ -91,7 +91,8 @@ public class VariableLengthDimensionColumnPage extends AbstractDimensionColumnPa
    * @param data              data to filed
    * @return how many bytes was copied
    */
-  @Override public int fillRawData(int rowId, int offset, byte[] data) {
+  @Override
+  public int fillRawData(int rowId, int offset, byte[] data) {
     // no required in this case because this column chunk is not the part if
     // mdkey
     return 0;
@@ -105,14 +106,16 @@ public class VariableLengthDimensionColumnPage extends AbstractDimensionColumnPa
    * @param outputSurrogateKey
    * @return
    */
-  @Override public int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey) {
+  @Override
+  public int fillSurrogateKey(int rowId, int chunkIndex, int[] outputSurrogateKey) {
     return chunkIndex + 1;
   }
 
   /**
    * @return whether column is dictionary column or not
    */
-  @Override public boolean isNoDicitionaryColumn() {
+  @Override
+  public boolean isNoDicitionaryColumn() {
     return true;
   }
 
@@ -123,7 +126,8 @@ public class VariableLengthDimensionColumnPage extends AbstractDimensionColumnPa
    * @param chunkIndex
    * @return next column index
    */
-  @Override public int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex) {
+  @Override
+  public int fillVector(ColumnVectorInfo[] vectorInfo, int chunkIndex) {
     ColumnVectorInfo columnVectorInfo = vectorInfo[chunkIndex];
     CarbonColumnVector vector = columnVectorInfo.vector;
     int offset = columnVectorInfo.offset;
@@ -145,7 +149,8 @@ public class VariableLengthDimensionColumnPage extends AbstractDimensionColumnPa
    * @param chunkIndex
    * @return next column index
    */
-  @Override public int fillVector(int[] filteredRowId, ColumnVectorInfo[] vectorInfo,
+  @Override
+  public int fillVector(int[] filteredRowId, ColumnVectorInfo[] vectorInfo,
       int chunkIndex) {
     ColumnVectorInfo columnVectorInfo = vectorInfo[chunkIndex];
     CarbonColumnVector vector = columnVectorInfo.vector;
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/AbstractChunkReaderV2V3Format.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/AbstractChunkReaderV2V3Format.java
index 1c85020..da0e2fc 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/AbstractChunkReaderV2V3Format.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/AbstractChunkReaderV2V3Format.java
@@ -57,7 +57,8 @@ public abstract class AbstractChunkReaderV2V3Format extends AbstractChunkReader
    * @param columnIndexRange column index range to be read
    * @return dimension column chunks
    */
-  @Override public DimensionRawColumnChunk[] readRawDimensionChunks(final FileReader fileReader,
+  @Override
+  public DimensionRawColumnChunk[] readRawDimensionChunks(final FileReader fileReader,
       final int[][] columnIndexRange) throws IOException {
     // read the column chunk based on block index and add
     DimensionRawColumnChunk[] dataChunks =
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v1/CompressedDimensionChunkFileBasedReaderV1.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v1/CompressedDimensionChunkFileBasedReaderV1.java
index d681b54..92b85a0 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v1/CompressedDimensionChunkFileBasedReaderV1.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v1/CompressedDimensionChunkFileBasedReaderV1.java
@@ -68,7 +68,8 @@ public class CompressedDimensionChunkFileBasedReaderV1 extends AbstractChunkRead
    * @param columnIndexRange blocks to be read
    * @return dimension column chunks
    */
-  @Override public DimensionRawColumnChunk[] readRawDimensionChunks(FileReader fileReader,
+  @Override
+  public DimensionRawColumnChunk[] readRawDimensionChunks(FileReader fileReader,
       int[][] columnIndexRange) throws IOException {
     DimensionRawColumnChunk[] dataChunks = new DimensionRawColumnChunk[dimensionColumnChunk.size()];
     for (int i = 0; i < columnIndexRange.length; i++) {
@@ -86,7 +87,8 @@ public class CompressedDimensionChunkFileBasedReaderV1 extends AbstractChunkRead
    * @param columnIndex column to be read
    * @return dimension column chunk
    */
-  @Override public DimensionRawColumnChunk readRawDimensionChunk(FileReader fileReader,
+  @Override
+  public DimensionRawColumnChunk readRawDimensionChunk(FileReader fileReader,
       int columnIndex) throws IOException {
     DataChunk dataChunk = dimensionColumnChunk.get(columnIndex);
     ByteBuffer buffer = null;
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimChunkFileBasedPageLevelReaderV3.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimChunkFileBasedPageLevelReaderV3.java
index d5ca9ae..71f1f60 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimChunkFileBasedPageLevelReaderV3.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimChunkFileBasedPageLevelReaderV3.java
@@ -140,7 +140,8 @@ public class CompressedDimChunkFileBasedPageLevelReaderV3
    * @param pageNumber              number
    * @return DimensionColumnDataChunk
    */
-  @Override public DimensionColumnPage decodeColumnPage(
+  @Override
+  public DimensionColumnPage decodeColumnPage(
       DimensionRawColumnChunk dimensionRawColumnChunk, int pageNumber,
       ReusableDataBuffer reusableDataBuffer)
       throws IOException, MemoryException {
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimensionChunkFileBasedReaderV3.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimensionChunkFileBasedReaderV3.java
index 5a673fb..78286ce 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimensionChunkFileBasedReaderV3.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimensionChunkFileBasedReaderV3.java
@@ -208,7 +208,8 @@ public class CompressedDimensionChunkFileBasedReaderV3 extends AbstractChunkRead
    * @param pageNumber              number
    * @return DimensionColumnPage
    */
-  @Override public DimensionColumnPage decodeColumnPage(DimensionRawColumnChunk rawColumnPage,
+  @Override
+  public DimensionColumnPage decodeColumnPage(DimensionRawColumnChunk rawColumnPage,
       int pageNumber, ReusableDataBuffer reusableDataBuffer) throws IOException, MemoryException {
     return decodeColumnPage(rawColumnPage, pageNumber, null, reusableDataBuffer);
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/AbstractMeasureChunkReader.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/AbstractMeasureChunkReader.java
index 91a779e..5e2e209 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/AbstractMeasureChunkReader.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/AbstractMeasureChunkReader.java
@@ -55,7 +55,8 @@ public abstract class AbstractMeasureChunkReader implements MeasureColumnChunkRe
     this.numberOfRows = numberOfRows;
   }
 
-  @Override public void decodeColumnPageAndFillVector(MeasureRawColumnChunk measureRawColumnChunk,
+  @Override
+  public void decodeColumnPageAndFillVector(MeasureRawColumnChunk measureRawColumnChunk,
       int pageNumber, ColumnVectorInfo vectorInfo, ReusableDataBuffer reusableDataBuffer)
       throws IOException, MemoryException {
     throw new UnsupportedOperationException(
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java
index 429c797..6cb7591 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java
@@ -61,7 +61,8 @@ public class CompressedMeasureChunkFileBasedReaderV1 extends AbstractMeasureChun
    * @param columnIndexRange blocks to be read
    * @return measure data chunks
    */
-  @Override public MeasureRawColumnChunk[] readRawMeasureChunks(FileReader fileReader,
+  @Override
+  public MeasureRawColumnChunk[] readRawMeasureChunks(FileReader fileReader,
       int[][] columnIndexRange) throws IOException {
     MeasureRawColumnChunk[] datChunk = new MeasureRawColumnChunk[measureColumnChunks.size()];
     for (int i = 0; i < columnIndexRange.length; i++) {
@@ -79,7 +80,8 @@ public class CompressedMeasureChunkFileBasedReaderV1 extends AbstractMeasureChun
    * @param columnIndex column to be read
    * @return measure data chunk
    */
-  @Override public MeasureRawColumnChunk readRawMeasureChunk(FileReader fileReader, int columnIndex)
+  @Override
+  public MeasureRawColumnChunk readRawMeasureChunk(FileReader fileReader, int columnIndex)
       throws IOException {
     DataChunk dataChunk = measureColumnChunks.get(columnIndex);
     ByteBuffer buffer = fileReader
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMeasureChunkFileBasedReaderV3.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMeasureChunkFileBasedReaderV3.java
index f81c608..b6ea9b0 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMeasureChunkFileBasedReaderV3.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMeasureChunkFileBasedReaderV3.java
@@ -76,7 +76,8 @@ public class CompressedMeasureChunkFileBasedReaderV3 extends AbstractMeasureChun
    * @param columnIndex         column to be read
    * @return measure raw chunk
    */
-  @Override public MeasureRawColumnChunk readRawMeasureChunk(FileReader fileReader,
+  @Override
+  public MeasureRawColumnChunk readRawMeasureChunk(FileReader fileReader,
       int columnIndex) throws IOException {
     int dataLength = 0;
     // to calculate the length of the data to be read
@@ -189,13 +190,15 @@ public class CompressedMeasureChunkFileBasedReaderV3 extends AbstractMeasureChun
    * @param pageNumber            number
    * @return DimensionColumnPage
    */
-  @Override public ColumnPage decodeColumnPage(MeasureRawColumnChunk rawColumnChunk, int pageNumber,
+  @Override
+  public ColumnPage decodeColumnPage(MeasureRawColumnChunk rawColumnChunk, int pageNumber,
       ReusableDataBuffer reusableDataBuffer)
       throws IOException, MemoryException {
     return decodeColumnPage(rawColumnChunk, pageNumber, null, reusableDataBuffer);
   }
 
-  @Override public void decodeColumnPageAndFillVector(MeasureRawColumnChunk measureRawColumnChunk,
+  @Override
+  public void decodeColumnPageAndFillVector(MeasureRawColumnChunk measureRawColumnChunk,
       int pageNumber, ColumnVectorInfo vectorInfo, ReusableDataBuffer reusableDataBuffer)
       throws IOException, MemoryException {
     decodeColumnPage(measureRawColumnChunk, pageNumber, vectorInfo, reusableDataBuffer);
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMsrChunkFileBasedPageLevelReaderV3.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMsrChunkFileBasedPageLevelReaderV3.java
index b063024..2874488 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMsrChunkFileBasedPageLevelReaderV3.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMsrChunkFileBasedPageLevelReaderV3.java
@@ -71,7 +71,8 @@ public class CompressedMsrChunkFileBasedPageLevelReaderV3
    * @param blockletColumnIndex blocklet index of the column in carbon data file
    * @return measure raw chunk
    */
-  @Override public MeasureRawColumnChunk readRawMeasureChunk(FileReader fileReader,
+  @Override
+  public MeasureRawColumnChunk readRawMeasureChunk(FileReader fileReader,
       int blockletColumnIndex) throws IOException {
     int dataLength = 0;
     // to calculate the length of the data to be read
@@ -135,7 +136,8 @@ public class CompressedMsrChunkFileBasedPageLevelReaderV3
    * @param pageNumber            number
    * @return DimensionColumnDataChunk
    */
-  @Override public ColumnPage decodeColumnPage(
+  @Override
+  public ColumnPage decodeColumnPage(
       MeasureRawColumnChunk rawColumnPage, int pageNumber, ReusableDataBuffer reusableDataBuffer)
       throws IOException, MemoryException {
     // data chunk of blocklet column
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/ColumnPageWrapper.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/ColumnPageWrapper.java
index f4d3fe4..a195d87 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/ColumnPageWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/ColumnPageWrapper.java
@@ -95,7 +95,8 @@ public class ColumnPageWrapper implements DimensionColumnPage {
     return chunkIndex + 1;
   }
 
-  @Override public byte[] getChunkData(int rowId) {
+  @Override
+  public byte[] getChunkData(int rowId) {
     byte[] nullBitSet = getNullBitSet(rowId, columnPage.getColumnSpec().getColumnType());
     if (nullBitSet != null) {
       // if this row is null, return default null represent in byte array
@@ -279,11 +280,13 @@ public class ColumnPageWrapper implements DimensionColumnPage {
     }
   }
 
-  @Override public boolean isAdaptiveEncoded() {
+  @Override
+  public boolean isAdaptiveEncoded() {
     return isAdaptivePrimitivePage;
   }
 
-  @Override public BitSet getNullBits() {
+  @Override
+  public BitSet getNullBits() {
     return columnPage.getNullBits();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/LocalDictDimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/LocalDictDimensionDataChunkStore.java
index c116a24..fa67d6a 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/LocalDictDimensionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/LocalDictDimensionDataChunkStore.java
@@ -89,11 +89,13 @@ public class LocalDictDimensionDataChunkStore implements DimensionDataChunkStore
     }
   }
 
-  @Override public byte[] getRow(int rowId) {
+  @Override
+  public byte[] getRow(int rowId) {
     return dictionary.getDictionaryValue(dimensionDataChunkStore.getSurrogate(rowId));
   }
 
-  @Override public void fillRow(int rowId, CarbonColumnVector vector, int vectorRow) {
+  @Override
+  public void fillRow(int rowId, CarbonColumnVector vector, int vectorRow) {
     if (!dictionary.isDictionaryUsed()) {
       vector.setDictionary(dictionary);
       dictionary.setDictionaryUsed();
@@ -108,38 +110,46 @@ public class LocalDictDimensionDataChunkStore implements DimensionDataChunkStore
     vector.getDictionaryVector().putInt(vectorRow, dimensionDataChunkStore.getSurrogate(rowId));
   }
 
-  @Override public void fillRow(int rowId, byte[] buffer, int offset) {
+  @Override
+  public void fillRow(int rowId, byte[] buffer, int offset) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public int getInvertedIndex(int rowId) {
+  @Override
+  public int getInvertedIndex(int rowId) {
     return this.dimensionDataChunkStore.getInvertedIndex(rowId);
   }
 
-  @Override public int getInvertedReverseIndex(int rowId) {
+  @Override
+  public int getInvertedReverseIndex(int rowId) {
     return this.dimensionDataChunkStore.getInvertedReverseIndex(rowId);
   }
 
-  @Override public int getSurrogate(int rowId) {
+  @Override
+  public int getSurrogate(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public int getColumnValueSize() {
+  @Override
+  public int getColumnValueSize() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public boolean isExplicitSorted() {
+  @Override
+  public boolean isExplicitSorted() {
     return this.dimensionDataChunkStore.isExplicitSorted();
   }
 
-  @Override public int compareTo(int rowId, byte[] compareValue) {
+  @Override
+  public int compareTo(int rowId, byte[] compareValue) {
     return dimensionDataChunkStore.compareTo(rowId, compareValue);
   }
 
   /**
    * Below method will be used to free the memory occupied by the column chunk
    */
-  @Override public void freeMemory() {
+  @Override
+  public void freeMemory() {
     if (null != dimensionDataChunkStore) {
       this.dimensionDataChunkStore.freeMemory();
       this.dictionary = null;
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/AbstractNonDictionaryVectorFiller.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/AbstractNonDictionaryVectorFiller.java
index 298d165..b8dfae26 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/AbstractNonDictionaryVectorFiller.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/AbstractNonDictionaryVectorFiller.java
@@ -129,7 +129,8 @@ class LongStringVectorFiller extends AbstractNonDictionaryVectorFiller {
     this.actualDataLength = actualDataLength;
   }
 
-  @Override public void fillVector(byte[] data, CarbonColumnVector vector) {
+  @Override
+  public void fillVector(byte[] data, CarbonColumnVector vector) {
     // start position will be used to store the current data position
     boolean invertedIndex = vector instanceof ColumnarVectorWrapperDirectWithInvertedIndex
         || vector instanceof SequentialFill;
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeAbsractDimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeAbsractDimensionDataChunkStore.java
index e9bf24b..0a53ec6 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeAbsractDimensionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeAbsractDimensionDataChunkStore.java
@@ -61,7 +61,8 @@ public abstract class SafeAbsractDimensionDataChunkStore implements DimensionDat
    * @param invertedIndexReverse inverted index reverse to be stored
    * @param data                 data to be stored
    */
-  @Override public void putArray(final int[] invertedIndex, final int[] invertedIndexReverse,
+  @Override
+  public void putArray(final int[] invertedIndex, final int[] invertedIndexReverse,
       final byte[] data) {
     this.data = data;
     this.invertedIndex = invertedIndex;
@@ -71,7 +72,8 @@ public abstract class SafeAbsractDimensionDataChunkStore implements DimensionDat
   /**
    * Below method will be used to free the memory occupied by the column chunk
    */
-  @Override public void freeMemory() {
+  @Override
+  public void freeMemory() {
     data = null;
     invertedIndex = null;
     invertedIndexReverse = null;
@@ -83,7 +85,8 @@ public abstract class SafeAbsractDimensionDataChunkStore implements DimensionDat
    * @param rowId row id
    * @return inverted index based on row id passed
    */
-  @Override public int getInvertedIndex(int rowId) {
+  @Override
+  public int getInvertedIndex(int rowId) {
     return invertedIndex[rowId];
   }
 
@@ -93,7 +96,8 @@ public abstract class SafeAbsractDimensionDataChunkStore implements DimensionDat
    * @param rowId row id
    * @return inverted index based on row id passed
    */
-  @Override public int getInvertedReverseIndex(int rowId) {
+  @Override
+  public int getInvertedReverseIndex(int rowId) {
     return invertedIndexReverse[rowId];
   }
 
@@ -104,21 +108,24 @@ public abstract class SafeAbsractDimensionDataChunkStore implements DimensionDat
    * @param rowId row id
    * @return surrogate key
    */
-  @Override public int getSurrogate(int rowId) {
+  @Override
+  public int getSurrogate(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
   /**
    * @return size of each column value
    */
-  @Override public int getColumnValueSize() {
+  @Override
+  public int getColumnValueSize() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
   /**
    * @return whether column was explicitly sorted or not
    */
-  @Override public boolean isExplicitSorted() {
+  @Override
+  public boolean isExplicitSorted() {
     return isExplictSorted;
   }
 
@@ -129,11 +136,13 @@ public abstract class SafeAbsractDimensionDataChunkStore implements DimensionDat
    * @param data   buffer in which data will be filled
    * @param offset off the of the buffer
    */
-  @Override public void fillRow(int rowId, byte[] data, int offset) {
+  @Override
+  public void fillRow(int rowId, byte[] data, int offset) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void fillRow(int rowId, CarbonColumnVector vector, int vectorRow) {
+  @Override
+  public void fillRow(int rowId, CarbonColumnVector vector, int vectorRow) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeFixedLengthDimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeFixedLengthDimensionDataChunkStore.java
index ef63224..80640ab 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeFixedLengthDimensionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeFixedLengthDimensionDataChunkStore.java
@@ -100,7 +100,8 @@ public class SafeFixedLengthDimensionDataChunkStore extends SafeAbsractDimension
    *
    * @param rowId Inverted index
    */
-  @Override public byte[] getRow(int rowId) {
+  @Override
+  public byte[] getRow(int rowId) {
     // if column was explicitly sorted we need to get the rowid based inverted index reverse
     if (isExplictSorted) {
       rowId = invertedIndexReverse[rowId];
@@ -120,7 +121,8 @@ public class SafeFixedLengthDimensionDataChunkStore extends SafeAbsractDimension
    * @param index row id
    * @return surrogate key
    */
-  @Override public int getSurrogate(int index) {
+  @Override
+  public int getSurrogate(int index) {
     // if column was explicitly sorted we need to get the rowid based inverted index reverse
     if (isExplictSorted) {
       index = invertedIndexReverse[index];
@@ -137,7 +139,8 @@ public class SafeFixedLengthDimensionDataChunkStore extends SafeAbsractDimension
    * @param buffer   buffer in which data will be filled
    * @param offset off the of the buffer
    */
-  @Override public void fillRow(int rowId, byte[] buffer, int offset) {
+  @Override
+  public void fillRow(int rowId, byte[] buffer, int offset) {
     // if column was explicitly sorted we need to get the rowid based inverted index reverse
     if (isExplictSorted) {
       rowId = invertedIndexReverse[rowId];
@@ -150,7 +153,8 @@ public class SafeFixedLengthDimensionDataChunkStore extends SafeAbsractDimension
   /**
    * @return size of each column value
    */
-  @Override public int getColumnValueSize() {
+  @Override
+  public int getColumnValueSize() {
     return columnValueSize;
   }
 
@@ -161,7 +165,8 @@ public class SafeFixedLengthDimensionDataChunkStore extends SafeAbsractDimension
    * @param compareValue value of to be compared
    * @return compare result
    */
-  @Override public int compareTo(int rowId, byte[] compareValue) {
+  @Override
+  public int compareTo(int rowId, byte[] compareValue) {
     return ByteUtil.UnsafeComparer.INSTANCE
         .compareTo(data, rowId * columnValueSize, columnValueSize, compareValue, 0,
             columnValueSize);
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeVariableShortLengthDimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeVariableShortLengthDimensionDataChunkStore.java
index 639973a..daac725 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeVariableShortLengthDimensionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeVariableShortLengthDimensionDataChunkStore.java
@@ -32,11 +32,13 @@ public class SafeVariableShortLengthDimensionDataChunkStore
     super(isInvertedIndex, numberOfRows, dataLength);
   }
 
-  @Override protected int getLengthSize() {
+  @Override
+  protected int getLengthSize() {
     return CarbonCommonConstants.SHORT_SIZE_IN_BYTE;
   }
 
-  @Override protected int getLengthFromBuffer(ByteBuffer buffer) {
+  @Override
+  protected int getLengthFromBuffer(ByteBuffer buffer) {
     return buffer.getShort();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeAbstractDimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeAbstractDimensionDataChunkStore.java
index ca1bfa7..23376d3 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeAbstractDimensionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeAbstractDimensionDataChunkStore.java
@@ -87,7 +87,8 @@ public abstract class UnsafeAbstractDimensionDataChunkStore implements Dimension
    * @param invertedIndexReverse inverted index reverse to be stored
    * @param data                 data to be stored
    */
-  @Override public void putArray(final int[] invertedIndex, final int[] invertedIndexReverse,
+  @Override
+  public void putArray(final int[] invertedIndex, final int[] invertedIndexReverse,
       final byte[] data) {
     assert (!isMemoryOccupied);
     this.invertedIndexReverseOffset = dataLength;
@@ -112,7 +113,8 @@ public abstract class UnsafeAbstractDimensionDataChunkStore implements Dimension
     }
   }
 
-  @Override public void fillVector(int[] invertedIndex, int[] invertedIndexReverse, byte[] data,
+  @Override
+  public void fillVector(int[] invertedIndex, int[] invertedIndexReverse, byte[] data,
       ColumnVectorInfo vectorInfo) {
     throw new UnsupportedOperationException("This method not supposed to be called here");
   }
@@ -120,7 +122,8 @@ public abstract class UnsafeAbstractDimensionDataChunkStore implements Dimension
   /**
    * Below method will be used to free the memory occupied by the column chunk
    */
-  @Override public void freeMemory() {
+  @Override
+  public void freeMemory() {
     if (isMemoryReleased) {
       return;
     }
@@ -137,7 +140,8 @@ public abstract class UnsafeAbstractDimensionDataChunkStore implements Dimension
    * @param rowId row id
    * @return inverted index based on row id passed
    */
-  @Override public int getInvertedIndex(int rowId) {
+  @Override
+  public int getInvertedIndex(int rowId) {
     return CarbonUnsafe.getUnsafe().getInt(dataPageMemoryBlock.getBaseObject(),
         dataPageMemoryBlock.getBaseOffset() + dataLength + ((long)rowId
             * CarbonCommonConstants.INT_SIZE_IN_BYTE));
@@ -149,7 +153,8 @@ public abstract class UnsafeAbstractDimensionDataChunkStore implements Dimension
    * @param rowId row id
    * @return inverted index based on row id passed
    */
-  @Override public int getInvertedReverseIndex(int rowId) {
+  @Override
+  public int getInvertedReverseIndex(int rowId) {
     return CarbonUnsafe.getUnsafe().getInt(dataPageMemoryBlock.getBaseObject(),
         dataPageMemoryBlock.getBaseOffset() + this.invertedIndexReverseOffset + ((long)rowId
             * CarbonCommonConstants.INT_SIZE_IN_BYTE));
@@ -162,21 +167,24 @@ public abstract class UnsafeAbstractDimensionDataChunkStore implements Dimension
    * @param rowId row id
    * @return surrogate key
    */
-  @Override public int getSurrogate(int rowId) {
+  @Override
+  public int getSurrogate(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
   /**
    * @return size of each column value
    */
-  @Override public int getColumnValueSize() {
+  @Override
+  public int getColumnValueSize() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
   /**
    * @return whether column was explicitly sorted or not
    */
-  @Override public boolean isExplicitSorted() {
+  @Override
+  public boolean isExplicitSorted() {
     return isExplicitSorted;
   }
 
@@ -187,11 +195,13 @@ public abstract class UnsafeAbstractDimensionDataChunkStore implements Dimension
    * @param data   buffer in which data will be filled
    * @param offset off the of the buffer
    */
-  @Override public void fillRow(int rowId, byte[] data, int offset) {
+  @Override
+  public void fillRow(int rowId, byte[] data, int offset) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void fillRow(int rowId, CarbonColumnVector vector, int vectorRow) {
+  @Override
+  public void fillRow(int rowId, CarbonColumnVector vector, int vectorRow) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeFixedLengthDimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeFixedLengthDimensionDataChunkStore.java
index b0027bf..f2464eb 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeFixedLengthDimensionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeFixedLengthDimensionDataChunkStore.java
@@ -50,7 +50,8 @@ public class UnsafeFixedLengthDimensionDataChunkStore
    *
    * @param rowId Inverted index
    */
-  @Override public byte[] getRow(int rowId) {
+  @Override
+  public byte[] getRow(int rowId) {
     // if column was explicitly sorted we need to get the rowid based inverted index reverse
     if (isExplicitSorted) {
       rowId = CarbonUnsafe.getUnsafe().getInt(dataPageMemoryBlock.getBaseObject(),
@@ -74,7 +75,8 @@ public class UnsafeFixedLengthDimensionDataChunkStore
    * @param index row id
    * @return surrogate key
    */
-  @Override public int getSurrogate(int index) {
+  @Override
+  public int getSurrogate(int index) {
     // if column was explicitly sorted we need to get the rowid based inverted index reverse
     if (isExplicitSorted) {
       index = CarbonUnsafe.getUnsafe().getInt(dataPageMemoryBlock.getBaseObject(),
@@ -100,7 +102,8 @@ public class UnsafeFixedLengthDimensionDataChunkStore
    * @param buffer   buffer in which data will be filled
    * @param offset off the of the buffer
    */
-  @Override public void fillRow(int rowId, byte[] buffer, int offset) {
+  @Override
+  public void fillRow(int rowId, byte[] buffer, int offset) {
     // if column was explicitly sorted we need to get the rowid based inverted index reverse
     if (isExplicitSorted) {
       rowId = CarbonUnsafe.getUnsafe().getInt(dataPageMemoryBlock.getBaseObject(),
@@ -117,7 +120,8 @@ public class UnsafeFixedLengthDimensionDataChunkStore
   /**
    * @return size of each column value
    */
-  @Override public int getColumnValueSize() {
+  @Override
+  public int getColumnValueSize() {
     return columnValueSize;
   }
 
@@ -128,7 +132,8 @@ public class UnsafeFixedLengthDimensionDataChunkStore
    * @param compareValue value of to be compared
    * @return compare result
    */
-  @Override public int compareTo(int rowId, byte[] compareValue) {
+  @Override
+  public int compareTo(int rowId, byte[] compareValue) {
     // based on index we need to calculate the actual position in memory block
     rowId = rowId * columnValueSize;
     int compareResult = 0;
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/BlockIndexerStorageForNoDictionary.java b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/BlockIndexerStorageForNoDictionary.java
index bcf5432..0ea41af 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/BlockIndexerStorageForNoDictionary.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/BlockIndexerStorageForNoDictionary.java
@@ -100,15 +100,18 @@ public class BlockIndexerStorageForNoDictionary extends BlockIndexerStorage<Obje
     }
   }
 
-  @Override public Object[] getDataPage() {
+  @Override
+  public Object[] getDataPage() {
     return dataPage;
   }
 
-  @Override public short[] getDataRlePage() {
+  @Override
+  public short[] getDataRlePage() {
     return new short[0];
   }
 
-  @Override public int getDataRlePageLengthInBytes() {
+  @Override
+  public int getDataRlePageLengthInBytes() {
     return 0;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowId.java b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowId.java
index 5cd8f84..3756219 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowId.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowId.java
@@ -45,11 +45,13 @@ public class ColumnWithRowId<T> implements Comparable<ColumnWithRowId<T>> {
     return index;
   }
 
-  @Override public int compareTo(ColumnWithRowId o) {
+  @Override
+  public int compareTo(ColumnWithRowId o) {
     return ByteUtil.UnsafeComparer.INSTANCE.compareTo(column, o.column);
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (obj == null || getClass() != obj.getClass()) {
       return false;
     }
@@ -57,7 +59,8 @@ public class ColumnWithRowId<T> implements Comparable<ColumnWithRowId<T>> {
     return Arrays.equals(column, o.column) && index == o.index;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return Arrays.hashCode(column) + index.hashCode();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowIdForHighCard.java b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowIdForHighCard.java
index 6aef7fd..8697480 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowIdForHighCard.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowIdForHighCard.java
@@ -28,12 +28,14 @@ public class ColumnWithRowIdForHighCard<T> extends ColumnWithRowId<T>
     super(column, index);
   }
 
-  @Override public int compareTo(ColumnWithRowId o) {
+  @Override
+  public int compareTo(ColumnWithRowId o) {
     return UnsafeComparer.INSTANCE
         .compareTo(column, 2, column.length - 2, o.column, 2, o.column.length - 2);
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (obj == null || getClass() != obj.getClass()) {
       return false;
     }
@@ -41,7 +43,8 @@ public class ColumnWithRowIdForHighCard<T> extends ColumnWithRowId<T>
     return Arrays.equals(column, o.column) && getIndex() == o.getIndex();
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return Arrays.hashCode(column) + getIndex().hashCode();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowIdForNoDictionary.java b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowIdForNoDictionary.java
index affef97..5205c28 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowIdForNoDictionary.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithRowIdForNoDictionary.java
@@ -35,14 +35,16 @@ public class ColumnWithRowIdForNoDictionary<T>
     this.dataType = dataType;
   }
 
-  @Override public int compareTo(ColumnWithRowIdForNoDictionary o) {
+  @Override
+  public int compareTo(ColumnWithRowIdForNoDictionary o) {
     // use the data type based comparator for the no dictionary encoded columns
     SerializableComparator comparator =
         org.apache.carbondata.core.util.comparator.Comparator.getComparator(dataType);
     return comparator.compare(column, o.column);
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (obj == null || getClass() != obj.getClass()) {
       return false;
     }
@@ -50,7 +52,8 @@ public class ColumnWithRowIdForNoDictionary<T>
     return column.equals(o.column) && getIndex() == o.getIndex();
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return getColumn().hashCode() + getIndex().hashCode();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/AbstractCompressor.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/AbstractCompressor.java
index c554dc6..9978b68 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/AbstractCompressor.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/AbstractCompressor.java
@@ -119,9 +119,11 @@ public abstract class AbstractCompressor implements Compressor {
     throw new RuntimeException("Not implemented rawCompress for " + this.getName());
   }
 
-  @Override public boolean supportReusableBuffer() {
+  @Override
+  public boolean supportReusableBuffer() {
     return false;
   }
 
-  @Override public boolean supportUnsafe() { return false; }
+  @Override
+  public boolean supportUnsafe() { return false; }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/GzipCompressor.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/GzipCompressor.java
index b386913..a718f9c 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/GzipCompressor.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/GzipCompressor.java
@@ -29,7 +29,8 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
  */
 public class GzipCompressor extends AbstractCompressor {
 
-  @Override public String getName() {
+  @Override
+  public String getName() {
     return "gzip";
   }
 
@@ -92,28 +93,34 @@ public class GzipCompressor extends AbstractCompressor {
     return byteOutputStream.toByteArray();
   }
 
-  @Override public byte[] compressByte(byte[] unCompInput) {
+  @Override
+  public byte[] compressByte(byte[] unCompInput) {
     return compressData(unCompInput);
   }
 
-  @Override public byte[] compressByte(byte[] unCompInput, int byteSize) {
+  @Override
+  public byte[] compressByte(byte[] unCompInput, int byteSize) {
     return compressData(unCompInput);
   }
 
-  @Override public byte[] unCompressByte(byte[] compInput) {
+  @Override
+  public byte[] unCompressByte(byte[] compInput) {
     return decompressData(compInput, 0, compInput.length);
   }
 
-  @Override public byte[] unCompressByte(byte[] compInput, int offset, int length) {
+  @Override
+  public byte[] unCompressByte(byte[] compInput, int offset, int length) {
     return decompressData(compInput, offset, length);
   }
 
-  @Override public long rawUncompress(byte[] input, byte[] output) {
+  @Override
+  public long rawUncompress(byte[] input, byte[] output) {
     //gzip api doesnt have rawUncompress yet.
     throw new RuntimeException("Not implemented rawUcompress for gzip yet");
   }
 
-  @Override public long maxCompressedLength(long inputSize) {
+  @Override
+  public long maxCompressedLength(long inputSize) {
     // Check if input size is lower than the max possible size
     if (inputSize < Integer.MAX_VALUE) {
       return inputSize;
@@ -122,12 +129,14 @@ public class GzipCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public int unCompressedLength(byte[] data, int offset, int length) {
+  @Override
+  public int unCompressedLength(byte[] data, int offset, int length) {
     //gzip api doesnt have UncompressedLength
     throw new RuntimeException("Unsupported operation Exception");
   }
 
-  @Override public int rawUncompress(byte[] data, int offset, int length, byte[] output) {
+  @Override
+  public int rawUncompress(byte[] data, int offset, int length, byte[] output) {
     //gzip api doesnt have rawUncompress yet.
     throw new RuntimeException("Not implemented rawUcompress for gzip yet");
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/SnappyCompressor.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/SnappyCompressor.java
index 79e4f4f..ea3f72b 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/SnappyCompressor.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/SnappyCompressor.java
@@ -57,7 +57,8 @@ public class SnappyCompressor extends AbstractCompressor {
     return "snappy";
   }
 
-  @Override public byte[] compressByte(byte[] unCompInput) {
+  @Override
+  public byte[] compressByte(byte[] unCompInput) {
     try {
       return Snappy.rawCompress(unCompInput, unCompInput.length);
     } catch (IOException e) {
@@ -66,7 +67,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public byte[] compressByte(byte[] unCompInput, int byteSize) {
+  @Override
+  public byte[] compressByte(byte[] unCompInput, int byteSize) {
     try {
       return Snappy.rawCompress(unCompInput, byteSize);
     } catch (IOException e) {
@@ -75,7 +77,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public byte[] unCompressByte(byte[] compInput) {
+  @Override
+  public byte[] unCompressByte(byte[] compInput) {
     try {
       return Snappy.uncompress(compInput);
     } catch (IOException e) {
@@ -84,7 +87,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public byte[] unCompressByte(byte[] compInput, int offset, int length) {
+  @Override
+  public byte[] unCompressByte(byte[] compInput, int offset, int length) {
     int uncompressedLength = 0;
     byte[] data;
     try {
@@ -98,7 +102,8 @@ public class SnappyCompressor extends AbstractCompressor {
     return data;
   }
 
-  @Override public byte[] compressShort(short[] unCompInput) {
+  @Override
+  public byte[] compressShort(short[] unCompInput) {
     try {
       return Snappy.compress(unCompInput);
     } catch (IOException e) {
@@ -107,7 +112,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public short[] unCompressShort(byte[] compInput, int offset, int length) {
+  @Override
+  public short[] unCompressShort(byte[] compInput, int offset, int length) {
     try {
       return Snappy.uncompressShortArray(compInput, offset, length);
     } catch (IOException e) {
@@ -116,7 +122,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public byte[] compressInt(int[] unCompInput) {
+  @Override
+  public byte[] compressInt(int[] unCompInput) {
     try {
       return Snappy.compress(unCompInput);
     } catch (IOException e) {
@@ -125,7 +132,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public int[] unCompressInt(byte[] compInput, int offset, int length) {
+  @Override
+  public int[] unCompressInt(byte[] compInput, int offset, int length) {
     try {
       return Snappy.uncompressIntArray(compInput, offset, length);
     } catch (IOException e) {
@@ -134,7 +142,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public byte[] compressLong(long[] unCompInput) {
+  @Override
+  public byte[] compressLong(long[] unCompInput) {
     try {
       return Snappy.compress(unCompInput);
     } catch (IOException e) {
@@ -143,7 +152,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public long[] unCompressLong(byte[] compInput, int offset, int length) {
+  @Override
+  public long[] unCompressLong(byte[] compInput, int offset, int length) {
     try {
       return Snappy.uncompressLongArray(compInput, offset, length);
     } catch (IOException e) {
@@ -152,7 +162,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public byte[] compressFloat(float[] unCompInput) {
+  @Override
+  public byte[] compressFloat(float[] unCompInput) {
     try {
       return Snappy.compress(unCompInput);
     } catch (IOException e) {
@@ -161,7 +172,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public float[] unCompressFloat(byte[] compInput, int offset, int length) {
+  @Override
+  public float[] unCompressFloat(byte[] compInput, int offset, int length) {
     try {
       return Snappy.uncompressFloatArray(compInput, offset, length);
     } catch (IOException e) {
@@ -170,7 +182,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public byte[] compressDouble(double[] unCompInput) {
+  @Override
+  public byte[] compressDouble(double[] unCompInput) {
     try {
       return Snappy.compress(unCompInput);
     } catch (IOException e) {
@@ -179,7 +192,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public double[] unCompressDouble(byte[] compInput, int offset, int length) {
+  @Override
+  public double[] unCompressDouble(byte[] compInput, int offset, int length) {
     try {
       int uncompressedLength = Snappy.uncompressedLength(compInput, offset, length);
       double[] result = new double[uncompressedLength / 8];
@@ -211,7 +225,8 @@ public class SnappyCompressor extends AbstractCompressor {
     return true;
   }
 
-  @Override public int unCompressedLength(byte[] data, int offset, int length) {
+  @Override
+  public int unCompressedLength(byte[] data, int offset, int length) {
     try {
       return Snappy.uncompressedLength(data, offset, length);
     } catch (IOException e) {
@@ -219,7 +234,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public int rawUncompress(byte[] data, int offset, int length, byte[] output) {
+  @Override
+  public int rawUncompress(byte[] data, int offset, int length, byte[] output) {
     try {
       return Snappy.rawUncompress(data, offset, length, output, 0);
     } catch (IOException e) {
@@ -227,7 +243,8 @@ public class SnappyCompressor extends AbstractCompressor {
     }
   }
 
-  @Override public boolean supportReusableBuffer() {
+  @Override
+  public boolean supportReusableBuffer() {
     return true;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/ZstdCompressor.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/ZstdCompressor.java
index 56faa20..01486df 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/ZstdCompressor.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/ZstdCompressor.java
@@ -70,11 +70,13 @@ public class ZstdCompressor extends AbstractCompressor {
    * currently java version of zstd does not support this feature.
    * It may support it in upcoming release 1.3.5-3, then we can optimize this accordingly.
    */
-  @Override public int unCompressedLength(byte[] data, int offset, int length) {
+  @Override
+  public int unCompressedLength(byte[] data, int offset, int length) {
     throw new RuntimeException("Unsupported operation Exception");
   }
 
-  @Override public int rawUncompress(byte[] data, int offset, int length, byte[] output) {
+  @Override
+  public int rawUncompress(byte[] data, int offset, int length, byte[] output) {
     throw new RuntimeException("Unsupported operation Exception");
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/exception/CarbonDataWriterException.java b/core/src/main/java/org/apache/carbondata/core/datastore/exception/CarbonDataWriterException.java
index f9f44a4..6dc4f31 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/exception/CarbonDataWriterException.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/exception/CarbonDataWriterException.java
@@ -74,7 +74,8 @@ public class CarbonDataWriterException extends RuntimeException {
   /**
    * getLocalizedMessage
    */
-  @Override public String getLocalizedMessage() {
+  @Override
+  public String getLocalizedMessage() {
     return super.getLocalizedMessage();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/exception/IndexBuilderException.java b/core/src/main/java/org/apache/carbondata/core/datastore/exception/IndexBuilderException.java
index 9d69c3b..7296b8c 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/exception/IndexBuilderException.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/exception/IndexBuilderException.java
@@ -78,7 +78,8 @@ public class IndexBuilderException extends IOException {
   /**
    * getLocalizedMessage
    */
-  @Override public String getLocalizedMessage() {
+  @Override
+  public String getLocalizedMessage() {
     return super.getLocalizedMessage();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java
index 1470c05..f3362d3 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java
@@ -98,7 +98,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     this.fileStatus = fileStatus;
   }
 
-  @Override public boolean createNewFile() {
+  @Override
+  public boolean createNewFile() {
     Path path = fileStatus.getPath();
     FileSystem fs;
     try {
@@ -109,19 +110,23 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     }
   }
 
-  @Override public String getAbsolutePath() {
+  @Override
+  public String getAbsolutePath() {
     return fileStatus.getPath().toString();
   }
 
-  @Override public String getName() {
+  @Override
+  public String getName() {
     return fileStatus.getPath().getName();
   }
 
-  @Override public boolean isDirectory() {
+  @Override
+  public boolean isDirectory() {
     return fileStatus.isDirectory();
   }
 
-  @Override public boolean exists() {
+  @Override
+  public boolean exists() {
     FileSystem fs;
     try {
       if (null != fileStatus) {
@@ -134,15 +139,18 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     return false;
   }
 
-  @Override public String getCanonicalPath() {
+  @Override
+  public String getCanonicalPath() {
     return getAbsolutePath();
   }
 
-  @Override public String getPath() {
+  @Override
+  public String getPath() {
     return getAbsolutePath();
   }
 
-  @Override public long getSize() {
+  @Override
+  public long getSize() {
     return fileStatus.getLen();
   }
 
@@ -174,11 +182,13 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     return false;
   }
 
-  @Override public long getLastModifiedTime() {
+  @Override
+  public long getLastModifiedTime() {
     return fileStatus.getModificationTime();
   }
 
-  @Override public boolean setLastModifiedTime(long timestamp) {
+  @Override
+  public boolean setLastModifiedTime(long timestamp) {
     FileSystem fs;
     try {
       if (null != fileStatus) {
@@ -194,7 +204,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
   /**
    * This method will delete the data in file data from a given offset
    */
-  @Override public boolean truncate(String fileName, long validDataEndOffset) {
+  @Override
+  public boolean truncate(String fileName, long validDataEndOffset) {
     DataOutputStream dataOutputStream = null;
     DataInputStream dataInputStream = null;
     boolean fileTruncatedSuccessfully = false;
@@ -252,7 +263,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
    * @param endOffset     file length to be compared with current length of file
    * @return whether a file has been modified or not
    */
-  @Override public boolean isFileModified(long fileTimeStamp, long endOffset) {
+  @Override
+  public boolean isFileModified(long fileTimeStamp, long endOffset) {
     boolean isFileModified = false;
     if (getLastModifiedTime() > fileTimeStamp || getSize() > endOffset) {
       isFileModified = true;
@@ -260,7 +272,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     return isFileModified;
   }
 
-  @Override public DataOutputStream getDataOutputStream(String path, FileFactory.FileType fileType,
+  @Override
+  public DataOutputStream getDataOutputStream(String path, FileFactory.FileType fileType,
       int bufferSize, boolean append) throws IOException {
     Path pt = new Path(path);
     FileSystem fileSystem = pt.getFileSystem(FileFactory.getConfiguration());
@@ -279,13 +292,15 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     return stream;
   }
 
-  @Override public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
+  @Override
+  public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
       int bufferSize, Configuration hadoopConf) throws IOException {
     return getDataInputStream(path, fileType, bufferSize,
         CarbonUtil.inferCompressorFromFileName(path), hadoopConf);
   }
 
-  @Override public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
+  @Override
+  public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
       int bufferSize, String compressor) throws IOException {
     return getDataInputStream(path, fileType, bufferSize, FileFactory.getConfiguration());
   }
@@ -300,7 +315,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
    * @return DataInputStream
    * @throws IOException
    */
-  @Override public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
+  @Override
+  public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
       int bufferSize, long offset) throws IOException {
     path = path.replace("\\", "/");
     Path pt = new Path(path);
@@ -404,7 +420,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     return new DataOutputStream(new BufferedOutputStream(outputStream));
   }
 
-  @Override public boolean isFileExist(String filePath, boolean performFileCheck)
+  @Override
+  public boolean isFileExist(String filePath, boolean performFileCheck)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     Path path = new Path(filePath);
@@ -416,7 +433,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     }
   }
 
-  @Override public boolean isFileExist(String filePath)
+  @Override
+  public boolean isFileExist(String filePath)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     Path path = new Path(filePath);
@@ -424,7 +442,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     return fs.exists(path);
   }
 
-  @Override public boolean createNewFile(String filePath, FileFactory.FileType fileType)
+  @Override
+  public boolean createNewFile(String filePath, FileFactory.FileType fileType)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     Path path = new Path(filePath);
@@ -451,7 +470,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     }
   }
 
-  @Override public boolean deleteFile(String filePath, FileFactory.FileType fileType)
+  @Override
+  public boolean deleteFile(String filePath, FileFactory.FileType fileType)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     Path path = new Path(filePath);
@@ -459,7 +479,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     return fs.delete(path, true);
   }
 
-  @Override public boolean mkdirs(String filePath)
+  @Override
+  public boolean mkdirs(String filePath)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     Path path = new Path(filePath);
@@ -476,7 +497,8 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
     return fs.append(pt);
   }
 
-  @Override public boolean createNewLockFile(String filePath, FileFactory.FileType fileType)
+  @Override
+  public boolean createNewLockFile(String filePath, FileFactory.FileType fileType)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     Path path = new Path(filePath);
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java
index 3667069..3b82b3f 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java
@@ -70,18 +70,21 @@ public class LocalCarbonFile implements CarbonFile {
     this.file = file;
   }
 
-  @Override public String getAbsolutePath() {
+  @Override
+  public String getAbsolutePath() {
     return file.getAbsolutePath();
   }
 
-  @Override public CarbonFile[] listFiles(final CarbonFileFilter fileFilter) {
+  @Override
+  public CarbonFile[] listFiles(final CarbonFileFilter fileFilter) {
     if (!file.isDirectory()) {
       return new CarbonFile[0];
     }
 
     File[] files = file.listFiles(new FileFilter() {
 
-      @Override public boolean accept(File pathname) {
+      @Override
+      public boolean accept(File pathname) {
         return fileFilter.accept(new LocalCarbonFile(pathname));
       }
     });
@@ -99,22 +102,26 @@ public class LocalCarbonFile implements CarbonFile {
     return carbonFiles;
   }
 
-  @Override public String getName() {
+  @Override
+  public String getName() {
     return file.getName();
   }
 
-  @Override public boolean isDirectory() {
+  @Override
+  public boolean isDirectory() {
     return file.isDirectory();
   }
 
-  @Override public boolean exists() {
+  @Override
+  public boolean exists() {
     if (file != null) {
       return file.exists();
     }
     return false;
   }
 
-  @Override public String getCanonicalPath() {
+  @Override
+  public String getCanonicalPath() {
     try {
       return file.getCanonicalPath();
     } catch (IOException e) {
@@ -123,15 +130,18 @@ public class LocalCarbonFile implements CarbonFile {
     return null;
   }
 
-  @Override public CarbonFile getParentFile() {
+  @Override
+  public CarbonFile getParentFile() {
     return new LocalCarbonFile(file.getParentFile());
   }
 
-  @Override public String getPath() {
+  @Override
+  public String getPath() {
     return file.getPath();
   }
 
-  @Override public long getSize() {
+  @Override
+  public long getSize() {
     return file.length();
   }
 
@@ -149,7 +159,8 @@ public class LocalCarbonFile implements CarbonFile {
     }
   }
 
-  @Override public CarbonFile[] listFiles() {
+  @Override
+  public CarbonFile[] listFiles() {
 
     if (!file.isDirectory()) {
       return new CarbonFile[0];
@@ -183,7 +194,8 @@ public class LocalCarbonFile implements CarbonFile {
     return carbonFiles;
   }
 
-  @Override public List<CarbonFile> listFiles(boolean recursive, CarbonFileFilter fileFilter)
+  @Override
+  public List<CarbonFile> listFiles(boolean recursive, CarbonFileFilter fileFilter)
       throws IOException {
     if (!file.isDirectory()) {
       return new ArrayList<CarbonFile>();
@@ -202,7 +214,8 @@ public class LocalCarbonFile implements CarbonFile {
     return carbonFiles;
   }
 
-  @Override public boolean createNewFile() {
+  @Override
+  public boolean createNewFile() {
     try {
       return file.createNewFile();
     } catch (IOException e) {
@@ -210,18 +223,21 @@ public class LocalCarbonFile implements CarbonFile {
     }
   }
 
-  @Override public long getLastModifiedTime() {
+  @Override
+  public long getLastModifiedTime() {
     return file.lastModified();
   }
 
-  @Override public boolean setLastModifiedTime(long timestamp) {
+  @Override
+  public boolean setLastModifiedTime(long timestamp) {
     return file.setLastModified(timestamp);
   }
 
   /**
    * This method will delete the data in file data from a given offset
    */
-  @Override public boolean truncate(String fileName, long validDataEndOffset) {
+  @Override
+  public boolean truncate(String fileName, long validDataEndOffset) {
     FileChannel source = null;
     FileChannel destination = null;
     boolean fileTruncatedSuccessfully = false;
@@ -268,7 +284,8 @@ public class LocalCarbonFile implements CarbonFile {
    * @param endOffset     file length to be compared with current length of file
    * @return
    */
-  @Override public boolean isFileModified(long fileTimeStamp, long endOffset) {
+  @Override
+  public boolean isFileModified(long fileTimeStamp, long endOffset) {
     boolean isFileModified = false;
     if (getLastModifiedTime() > fileTimeStamp || getSize() > endOffset) {
       isFileModified = true;
@@ -277,7 +294,8 @@ public class LocalCarbonFile implements CarbonFile {
   }
 
 
-  @Override public boolean renameForce(String changeToName) {
+  @Override
+  public boolean renameForce(String changeToName) {
     File destFile = new File(changeToName);
     if (destFile.exists() && !file.getAbsolutePath().equals(destFile.getAbsolutePath())) {
       if (destFile.delete()) {
@@ -287,20 +305,23 @@ public class LocalCarbonFile implements CarbonFile {
     return file.renameTo(new File(changeToName));
   }
 
-  @Override public DataOutputStream getDataOutputStream(String path, FileFactory.FileType fileType,
+  @Override
+  public DataOutputStream getDataOutputStream(String path, FileFactory.FileType fileType,
       int bufferSize, boolean append) throws FileNotFoundException {
     path = FileFactory.getUpdatedFilePath(path, FileFactory.FileType.LOCAL);
     return new DataOutputStream(
         new BufferedOutputStream(new FileOutputStream(path, append), bufferSize));
   }
 
-  @Override public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
+  @Override
+  public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
       int bufferSize, Configuration configuration) throws IOException {
     return getDataInputStream(path, fileType, bufferSize,
         CarbonUtil.inferCompressorFromFileName(path));
   }
 
-  @Override public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
+  @Override
+  public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
       int bufferSize, String compressor) throws IOException {
     path = path.replace("\\", "/");
     path = FileFactory.getUpdatedFilePath(path, fileType);
@@ -338,7 +359,8 @@ public class LocalCarbonFile implements CarbonFile {
    * @return DataInputStream
    * @throws IOException
    */
-  @Override public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
+  @Override
+  public DataInputStream getDataInputStream(String path, FileFactory.FileType fileType,
       int bufferSize, long offset) throws IOException {
     path = path.replace("\\", "/");
     path = FileFactory.getUpdatedFilePath(path, fileType);
@@ -410,7 +432,8 @@ public class LocalCarbonFile implements CarbonFile {
     }
   }
 
-  @Override public boolean isFileExist(String filePath, boolean performFileCheck)
+  @Override
+  public boolean isFileExist(String filePath, boolean performFileCheck)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     filePath = FileFactory.getUpdatedFilePath(filePath);
@@ -423,7 +446,8 @@ public class LocalCarbonFile implements CarbonFile {
     }
   }
 
-  @Override public boolean isFileExist(String filePath)
+  @Override
+  public boolean isFileExist(String filePath)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     filePath = FileFactory.getUpdatedFilePath(filePath);
@@ -431,7 +455,8 @@ public class LocalCarbonFile implements CarbonFile {
     return defaultFile.exists();
   }
 
-  @Override public boolean createNewFile(String filePath, FileFactory.FileType fileType)
+  @Override
+  public boolean createNewFile(String filePath, FileFactory.FileType fileType)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     filePath = FileFactory.getUpdatedFilePath(filePath, fileType);
@@ -448,7 +473,8 @@ public class LocalCarbonFile implements CarbonFile {
     return file.createNewFile();
   }
 
-  @Override public boolean deleteFile(String filePath, FileFactory.FileType fileType)
+  @Override
+  public boolean deleteFile(String filePath, FileFactory.FileType fileType)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     filePath = FileFactory.getUpdatedFilePath(filePath, fileType);
@@ -456,7 +482,8 @@ public class LocalCarbonFile implements CarbonFile {
     return FileFactory.deleteAllFilesOfDir(file);
   }
 
-  @Override public boolean mkdirs(String filePath)
+  @Override
+  public boolean mkdirs(String filePath)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     filePath = FileFactory.getUpdatedFilePath(filePath);
@@ -472,7 +499,8 @@ public class LocalCarbonFile implements CarbonFile {
     return new DataOutputStream(new BufferedOutputStream(new FileOutputStream(path, true)));
   }
 
-  @Override public boolean createNewLockFile(String filePath, FileFactory.FileType fileType)
+  @Override
+  public boolean createNewLockFile(String filePath, FileFactory.FileType fileType)
       throws IOException {
     filePath = filePath.replace("\\", "/");
     filePath = FileFactory.getUpdatedFilePath(filePath, fileType);
@@ -480,11 +508,13 @@ public class LocalCarbonFile implements CarbonFile {
     return file.createNewFile();
   }
 
-  @Override public CarbonFile[] locationAwareListFiles(PathFilter pathFilter) throws IOException {
+  @Override
+  public CarbonFile[] locationAwareListFiles(PathFilter pathFilter) throws IOException {
     return listFiles();
   }
 
-  @Override public String[] getLocations() throws IOException {
+  @Override
+  public String[] getLocations() throws IOException {
     return new String[]{"localhost"};
   }
 
@@ -499,7 +529,8 @@ public class LocalCarbonFile implements CarbonFile {
     return 1;
   }
 
-  @Override public long getLength() {
+  @Override
+  public long getLength() {
     return file.length();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
index ffbe2d8..529cd66 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
@@ -93,7 +93,8 @@ public class S3CarbonFile extends HDFSCarbonFile {
     return getDataOutputStream(path, fileType, CarbonCommonConstants.BYTEBUFFER_SIZE, true);
   }
 
-  @Override public DataOutputStream getDataOutputStream(String path, FileFactory.FileType fileType,
+  @Override
+  public DataOutputStream getDataOutputStream(String path, FileFactory.FileType fileType,
       int bufferSize, boolean append) throws IOException {
     Path pt = new Path(path);
     FileSystem fileSystem = pt.getFileSystem(FileFactory.getConfiguration());
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java
index c55f85c..aa505a3 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java
@@ -83,7 +83,8 @@ public class ViewFSCarbonFile extends AbstractDFSCarbonFile {
     return files;
   }
 
-  @Override public CarbonFile getParentFile() {
+  @Override
+  public CarbonFile getParentFile() {
     Path parent = fileStatus.getPath().getParent();
     return null == parent ? null : new ViewFSCarbonFile(parent);
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileReaderImpl.java
index 0138dcf..e9b23f6 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileReaderImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileReaderImpl.java
@@ -46,7 +46,8 @@ public class DFSFileReaderImpl implements FileReader {
         new HashMap<String, FSDataInputStream>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE);
   }
 
-  @Override public byte[] readByteArray(String filePath, long offset, int length)
+  @Override
+  public byte[] readByteArray(String filePath, long offset, int length)
       throws IOException {
     FSDataInputStream fileChannel = updateCache(filePath);
     return read(fileChannel, length, offset);
@@ -99,19 +100,22 @@ public class DFSFileReaderImpl implements FileReader {
     return byteBuffer;
   }
 
-  @Override public int readInt(String filePath, long offset) throws IOException {
+  @Override
+  public int readInt(String filePath, long offset) throws IOException {
     FSDataInputStream fileChannel = updateCache(filePath);
     fileChannel.seek(offset);
     return fileChannel.readInt();
   }
 
-  @Override public long readDouble(String filePath, long offset) throws IOException {
+  @Override
+  public long readDouble(String filePath, long offset) throws IOException {
     FSDataInputStream fileChannel = updateCache(filePath);
     fileChannel.seek(offset);
     return fileChannel.readLong();
   }
 
-  @Override public void finish() throws IOException {
+  @Override
+  public void finish() throws IOException {
     for (Entry<String, FSDataInputStream> entry : fileNameAndStreamCache.entrySet()) {
       FSDataInputStream channel = entry.getValue();
       if (null != channel) {
@@ -120,23 +124,27 @@ public class DFSFileReaderImpl implements FileReader {
     }
   }
 
-  @Override public byte[] readByteArray(String filePath, int length) throws IOException {
+  @Override
+  public byte[] readByteArray(String filePath, int length) throws IOException {
     FSDataInputStream fileChannel = updateCache(filePath);
     return read(fileChannel, length);
   }
 
-  @Override public long readLong(String filePath, long offset) throws IOException {
+  @Override
+  public long readLong(String filePath, long offset) throws IOException {
     FSDataInputStream fileChannel = updateCache(filePath);
     fileChannel.seek(offset);
     return fileChannel.readLong();
   }
 
-  @Override public int readInt(String filePath) throws IOException {
+  @Override
+  public int readInt(String filePath) throws IOException {
     FSDataInputStream fileChannel = updateCache(filePath);
     return fileChannel.readInt();
   }
 
-  @Override public ByteBuffer readByteBuffer(String filePath, long offset, int length)
+  @Override
+  public ByteBuffer readByteBuffer(String filePath, long offset, int length)
       throws IOException {
     byte[] readByteArray = readByteArray(filePath, offset, length);
     ByteBuffer byteBuffer = ByteBuffer.wrap(readByteArray);
@@ -144,11 +152,13 @@ public class DFSFileReaderImpl implements FileReader {
     return byteBuffer;
   }
 
-  @Override public void setReadPageByPage(boolean isReadPageByPage) {
+  @Override
+  public void setReadPageByPage(boolean isReadPageByPage) {
     this.readPageByPage = isReadPageByPage;
   }
 
-  @Override public boolean isReadPageByPage() {
+  @Override
+  public boolean isReadPageByPage() {
     return readPageByPage;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/DefaultFileTypeProvider.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/DefaultFileTypeProvider.java
index 4572cc4..d2dd6a4 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/DefaultFileTypeProvider.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/DefaultFileTypeProvider.java
@@ -83,7 +83,8 @@ public class DefaultFileTypeProvider implements FileTypeInterface {
    * @param path path of the file
    * @return true if supported by the custom
    */
-  @Override public boolean isPathSupported(String path) {
+  @Override
+  public boolean isPathSupported(String path) {
     initializeCustomFileProvider();
     if (customFileTypeProvider != null) {
       return customFileTypeProvider.isPathSupported(path);
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileReaderImpl.java
index f513cb9..4b2c368 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileReaderImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileReaderImpl.java
@@ -59,7 +59,8 @@ public class FileReaderImpl implements FileReader {
    * @param length   number of bytes to be read
    * @return read byte array
    */
-  @Override public byte[] readByteArray(String filePath, long offset, int length)
+  @Override
+  public byte[] readByteArray(String filePath, long offset, int length)
       throws IOException {
     FileChannel fileChannel = updateCache(filePath);
     ByteBuffer byteBuffer = read(fileChannel, length, offset);
@@ -69,7 +70,8 @@ public class FileReaderImpl implements FileReader {
   /**
    * This method will be used to close all the streams currently present in the cache
    */
-  @Override public void finish() throws IOException {
+  @Override
+  public void finish() throws IOException {
     for (Entry<String, FileChannel> entry : fileNameAndStreamCache.entrySet()) {
       FileChannel channel = entry.getValue();
       if (null != channel) {
@@ -87,7 +89,8 @@ public class FileReaderImpl implements FileReader {
    * @param offset   reading start position,
    * @return read int
    */
-  @Override public int readInt(String filePath, long offset) throws IOException {
+  @Override
+  public int readInt(String filePath, long offset) throws IOException {
     FileChannel fileChannel = updateCache(filePath);
     ByteBuffer byteBuffer = read(fileChannel, CarbonCommonConstants.INT_SIZE_IN_BYTE, offset);
     return byteBuffer.getInt();
@@ -100,7 +103,8 @@ public class FileReaderImpl implements FileReader {
    * @param filePath fully qualified file path
    * @return read int
    */
-  @Override public int readInt(String filePath) throws IOException {
+  @Override
+  public int readInt(String filePath) throws IOException {
     FileChannel fileChannel = updateCache(filePath);
     ByteBuffer byteBuffer = read(fileChannel, CarbonCommonConstants.INT_SIZE_IN_BYTE);
     return byteBuffer.getInt();
@@ -114,7 +118,8 @@ public class FileReaderImpl implements FileReader {
    * @param offset   reading start position,
    * @return read int
    */
-  @Override public long readDouble(String filePath, long offset) throws IOException {
+  @Override
+  public long readDouble(String filePath, long offset) throws IOException {
     FileChannel fileChannel = updateCache(filePath);
     ByteBuffer byteBuffer = read(fileChannel, CarbonCommonConstants.LONG_SIZE_IN_BYTE, offset);
     return byteBuffer.getLong();
@@ -176,7 +181,8 @@ public class FileReaderImpl implements FileReader {
    * @param length   number of bytes to be read
    * @return read byte array
    */
-  @Override public byte[] readByteArray(String filePath, int length) throws IOException {
+  @Override
+  public byte[] readByteArray(String filePath, int length) throws IOException {
     FileChannel fileChannel = updateCache(filePath);
     ByteBuffer byteBuffer = read(fileChannel, length);
     return byteBuffer.array();
@@ -190,13 +196,15 @@ public class FileReaderImpl implements FileReader {
    * @param offset   reading start position,
    * @return read long
    */
-  @Override public long readLong(String filePath, long offset) throws IOException {
+  @Override
+  public long readLong(String filePath, long offset) throws IOException {
     FileChannel fileChannel = updateCache(filePath);
     ByteBuffer byteBuffer = read(fileChannel, CarbonCommonConstants.LONG_SIZE_IN_BYTE, offset);
     return byteBuffer.getLong();
   }
 
-  @Override public ByteBuffer readByteBuffer(String filePath, long offset, int length)
+  @Override
+  public ByteBuffer readByteBuffer(String filePath, long offset, int length)
       throws IOException {
     ByteBuffer byteBuffer = ByteBuffer.allocate(length);
     FileChannel fileChannel = updateCache(filePath);
@@ -206,11 +214,13 @@ public class FileReaderImpl implements FileReader {
     return byteBuffer;
   }
 
-  @Override public void setReadPageByPage(boolean isReadPageByPage) {
+  @Override
+  public void setReadPageByPage(boolean isReadPageByPage) {
     this.readPageByPage = isReadPageByPage;
   }
 
-  @Override public boolean isReadPageByPage() {
+  @Override
+  public boolean isReadPageByPage() {
     return readPageByPage;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/ActualDataBasedFallbackEncoder.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/ActualDataBasedFallbackEncoder.java
index 6efb1b8..0d29526 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/ActualDataBasedFallbackEncoder.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/ActualDataBasedFallbackEncoder.java
@@ -50,7 +50,8 @@ public class ActualDataBasedFallbackEncoder
     this.pageIndex = pageIndex;
   }
 
-  @Override public FallbackEncodedColumnPage call() throws Exception {
+  @Override
+  public FallbackEncodedColumnPage call() throws Exception {
     // disable encoding using local dictionary
     encodedColumnPage.getActualPage().disableLocalDictEncoding();
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/DecimalColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/DecimalColumnPage.java
index 50261e7..6c19f3f 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/DecimalColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/DecimalColumnPage.java
@@ -110,7 +110,8 @@ public abstract class DecimalColumnPage extends VarLengthColumnPageBase {
         "invalid data type: " + columnPageEncoderMeta.getStoreDataType());
   }
 
-  @Override public void putFloat(int rowId, float value) {
+  @Override
+  public void putFloat(int rowId, float value) {
     throw new UnsupportedOperationException(
         "invalid data type: " + columnPageEncoderMeta.getStoreDataType());
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/DecoderBasedFallbackEncoder.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/DecoderBasedFallbackEncoder.java
index 1de8201..a9ce735 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/DecoderBasedFallbackEncoder.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/DecoderBasedFallbackEncoder.java
@@ -53,7 +53,8 @@ public class DecoderBasedFallbackEncoder implements Callable<FallbackEncodedColu
     this.localDictionaryGenerator = localDictionaryGenerator;
   }
 
-  @Override public FallbackEncodedColumnPage call() throws Exception {
+  @Override
+  public FallbackEncodedColumnPage call() throws Exception {
     int pageSize =
         encodedColumnPage.getActualPage().getPageSize();
     int offset = 0;
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/LocalDictColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/LocalDictColumnPage.java
index 0e34d72..f428c60 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/LocalDictColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/LocalDictColumnPage.java
@@ -96,7 +96,8 @@ public class LocalDictColumnPage extends ColumnPage {
     this.actualDataColumnPage = actualDataColumnPage;
   }
 
-  @Override public byte[][] getByteArrayPage() {
+  @Override
+  public byte[][] getByteArrayPage() {
     if (null != pageLevelDictionary) {
       return encodedDataColumnPage.getByteArrayPage();
     } else {
@@ -120,7 +121,8 @@ public class LocalDictColumnPage extends ColumnPage {
    * @param rowId row number
    * @param bytes actual data
    */
-  @Override public void putBytes(int rowId, byte[] bytes) {
+  @Override
+  public void putBytes(int rowId, byte[] bytes) {
     if (null != pageLevelDictionary) {
       try {
         actualDataColumnPage.putBytes(rowId, bytes);
@@ -145,48 +147,59 @@ public class LocalDictColumnPage extends ColumnPage {
     }
   }
 
-  @Override public void disableLocalDictEncoding() {
+  @Override
+  public void disableLocalDictEncoding() {
     pageLevelDictionary = null;
     freeEncodedColumnPage();
   }
 
-  @Override public PageLevelDictionary getColumnPageDictionary() {
+  @Override
+  public PageLevelDictionary getColumnPageDictionary() {
     return pageLevelDictionary;
   }
 
-  @Override public void setBytePage(byte[] byteData) {
+  @Override
+  public void setBytePage(byte[] byteData) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void setShortPage(short[] shortData) {
+  @Override
+  public void setShortPage(short[] shortData) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void setShortIntPage(byte[] shortIntData) {
+  @Override
+  public void setShortIntPage(byte[] shortIntData) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void setIntPage(int[] intData) {
+  @Override
+  public void setIntPage(int[] intData) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void setLongPage(long[] longData) {
+  @Override
+  public void setLongPage(long[] longData) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void setFloatPage(float[] floatData) {
+  @Override
+  public void setFloatPage(float[] floatData) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void setDoublePage(double[] doubleData) {
+  @Override
+  public void setDoublePage(double[] doubleData) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void setByteArrayPage(byte[][] byteArray) {
+  @Override
+  public void setByteArrayPage(byte[][] byteArray) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void freeMemory() {
+  @Override
+  public void freeMemory() {
     // free the encoded column page as data is already encoded and it is of no use, during fallback
     // if goes to actual databased fallback, we need actual data and decoder based fallback we need
     // just the encoded data to form a new page
@@ -216,107 +229,133 @@ public class LocalDictColumnPage extends ColumnPage {
     }
   }
 
-  @Override public void putByte(int rowId, byte value) {
+  @Override
+  public void putByte(int rowId, byte value) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void putShort(int rowId, short value) {
+  @Override
+  public void putShort(int rowId, short value) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void putInt(int rowId, int value) {
+  @Override
+  public void putInt(int rowId, int value) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void putLong(int rowId, long value) {
+  @Override
+  public void putLong(int rowId, long value) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void putDouble(int rowId, double value) {
+  @Override
+  public void putDouble(int rowId, double value) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void putFloat(int rowId, float value) {
+  @Override
+  public void putFloat(int rowId, float value) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void putDecimal(int rowId, BigDecimal decimal) {
+  @Override
+  public void putDecimal(int rowId, BigDecimal decimal) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void putShortInt(int rowId, int value) {
+  @Override
+  public void putShortInt(int rowId, int value) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void putBytes(int rowId, byte[] bytes, int offset, int length) {
+  @Override
+  public void putBytes(int rowId, byte[] bytes, int offset, int length) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public byte getByte(int rowId) {
+  @Override
+  public byte getByte(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public short getShort(int rowId) {
+  @Override
+  public short getShort(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public int getShortInt(int rowId) {
+  @Override
+  public int getShortInt(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public int getInt(int rowId) {
+  @Override
+  public int getInt(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public long getLong(int rowId) {
+  @Override
+  public long getLong(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public float getFloat(int rowId) {
+  @Override
+  public float getFloat(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public double getDouble(int rowId) {
+  @Override
+  public double getDouble(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public BigDecimal getDecimal(int rowId) {
+  @Override
+  public BigDecimal getDecimal(int rowId) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public byte[] getBytes(int rowId) {
+  @Override
+  public byte[] getBytes(int rowId) {
     return actualDataColumnPage.getBytes(rowId);
   }
 
-  @Override public byte[] getBytePage() {
+  @Override
+  public byte[] getBytePage() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public short[] getShortPage() {
+  @Override
+  public short[] getShortPage() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public byte[] getShortIntPage() {
+  @Override
+  public byte[] getShortIntPage() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public int[] getIntPage() {
+  @Override
+  public int[] getIntPage() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public long[] getLongPage() {
+  @Override
+  public long[] getLongPage() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public float[] getFloatPage() {
+  @Override
+  public float[] getFloatPage() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public double[] getDoublePage() {
+  @Override
+  public double[] getDoublePage() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public byte[] getLVFlattenedBytePage() throws IOException {
+  @Override
+  public byte[] getLVFlattenedBytePage() throws IOException {
     if (null != encodedDataColumnPage) {
       return encodedDataColumnPage.getLVFlattenedBytePage();
     } else {
@@ -324,7 +363,8 @@ public class LocalDictColumnPage extends ColumnPage {
     }
   }
 
-  @Override public byte[] getComplexChildrenLVFlattenedBytePage() throws IOException {
+  @Override
+  public byte[] getComplexChildrenLVFlattenedBytePage() throws IOException {
     if (null != encodedDataColumnPage) {
       return encodedDataColumnPage.getComplexChildrenLVFlattenedBytePage();
     } else {
@@ -332,7 +372,8 @@ public class LocalDictColumnPage extends ColumnPage {
     }
   }
 
-  @Override public byte[] getComplexParentFlattenedBytePage() throws IOException {
+  @Override
+  public byte[] getComplexParentFlattenedBytePage() throws IOException {
     if (null != encodedDataColumnPage) {
       return encodedDataColumnPage.getComplexParentFlattenedBytePage();
     } else {
@@ -340,11 +381,13 @@ public class LocalDictColumnPage extends ColumnPage {
     }
   }
 
-  @Override public byte[] getDecimalPage() {
+  @Override
+  public byte[] getDecimalPage() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
-  @Override public void convertValue(ColumnPageValueConverter codec) {
+  @Override
+  public void convertValue(ColumnPageValueConverter codec) {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeDecimalColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeDecimalColumnPage.java
index 1867354..ba320e0 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeDecimalColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeDecimalColumnPage.java
@@ -198,23 +198,28 @@ public class SafeDecimalColumnPage extends DecimalColumnPage {
     return byteData;
   }
 
-  @Override public short[] getShortPage() {
+  @Override
+  public short[] getShortPage() {
     return shortData;
   }
 
-  @Override public byte[] getShortIntPage() {
+  @Override
+  public byte[] getShortIntPage() {
     return shortIntData;
   }
 
-  @Override public int[] getIntPage() {
+  @Override
+  public int[] getIntPage() {
     return intData;
   }
 
-  @Override public long[] getLongPage() {
+  @Override
+  public long[] getLongPage() {
     return longData;
   }
 
-  @Override public byte[][] getByteArrayPage() {
+  @Override
+  public byte[][] getByteArrayPage() {
     return byteArrayData;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeFixLengthColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeFixLengthColumnPage.java
index 9dd05a5..6bbdd35 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeFixLengthColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeFixLengthColumnPage.java
@@ -210,7 +210,8 @@ public class SafeFixLengthColumnPage extends ColumnPage {
     return doubleData[rowId];
   }
 
-  @Override public BigDecimal getDecimal(int rowId) {
+  @Override
+  public BigDecimal getDecimal(int rowId) {
     throw new UnsupportedOperationException(
         "invalid data type: " + columnPageEncoderMeta.getStoreDataType());
   }
@@ -279,7 +280,8 @@ public class SafeFixLengthColumnPage extends ColumnPage {
   /**
    * Get string page
    */
-  @Override public byte[][] getByteArrayPage() {
+  @Override
+  public byte[][] getByteArrayPage() {
     byte[][] data = new byte[arrayElementCount][];
     for (int i = 0; i < arrayElementCount; i++) {
       data[i] = fixedLengthdata[i];
@@ -335,7 +337,8 @@ public class SafeFixLengthColumnPage extends ColumnPage {
   /**
    * Set int values to page
    */
-  @Override public void setIntPage(int[] intData) {
+  @Override
+  public void setIntPage(int[] intData) {
     this.intData = intData;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeVarLengthColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeVarLengthColumnPage.java
index 9b47e86..b105239 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeVarLengthColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/SafeVarLengthColumnPage.java
@@ -52,7 +52,8 @@ public class SafeVarLengthColumnPage extends VarLengthColumnPageBase {
     byteArrayData.add(bytes);
   }
 
-  @Override public void putDecimal(int rowId, BigDecimal decimal) {
+  @Override
+  public void putDecimal(int rowId, BigDecimal decimal) {
     throw new UnsupportedOperationException(
         "invalid data type: " + columnPageEncoderMeta.getStoreDataType());
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeFixLengthColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeFixLengthColumnPage.java
index 2e576bc..3b7d7ee 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeFixLengthColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeFixLengthColumnPage.java
@@ -234,7 +234,8 @@ public class UnsafeFixLengthColumnPage extends ColumnPage {
         "invalid data type: " + columnPageEncoderMeta.getStoreDataType());
   }
 
-  @Override public void putDecimal(int rowId, BigDecimal decimal) {
+  @Override
+  public void putDecimal(int rowId, BigDecimal decimal) {
     throw new UnsupportedOperationException(
         "invalid data type: " + columnPageEncoderMeta.getStoreDataType());
   }
@@ -303,7 +304,8 @@ public class UnsafeFixLengthColumnPage extends ColumnPage {
     return data;
   }
 
-  @Override public byte[] getDecimalPage() {
+  @Override
+  public byte[] getDecimalPage() {
     throw new UnsupportedOperationException(
         "invalid data type: " + columnPageEncoderMeta.getStoreDataType());
   }
@@ -396,7 +398,8 @@ public class UnsafeFixLengthColumnPage extends ColumnPage {
         "invalid data type: " + columnPageEncoderMeta.getStoreDataType());
   }
 
-  @Override public byte[] getComplexChildrenLVFlattenedBytePage() {
+  @Override
+  public byte[] getComplexChildrenLVFlattenedBytePage() {
     byte[] data = new byte[totalLength];
     CarbonUnsafe.getUnsafe()
         .copyMemory(baseAddress, baseOffset, data, CarbonUnsafe.BYTE_ARRAY_OFFSET, totalLength);
@@ -472,7 +475,8 @@ public class UnsafeFixLengthColumnPage extends ColumnPage {
     }
   }
 
-  @Override public void convertValue(ColumnPageValueConverter codec) {
+  @Override
+  public void convertValue(ColumnPageValueConverter codec) {
     int endLoop = getEndLoop();
     if (columnPageEncoderMeta.getStoreDataType() == DataTypes.BYTE) {
       for (long i = 0; i < endLoop; i++) {
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
index c23c147..2fd4212 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
@@ -83,7 +83,8 @@ public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
     }
   }
 
-  @Override public void putDecimal(int rowId, BigDecimal decimal) {
+  @Override
+  public void putDecimal(int rowId, BigDecimal decimal) {
 
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java
index a941880..1b1f8f6 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java
@@ -464,7 +464,8 @@ public abstract class VarLengthColumnPageBase extends ColumnPage {
     return data;
   }
 
-  @Override public byte[] getComplexChildrenLVFlattenedBytePage() throws IOException {
+  @Override
+  public byte[] getComplexChildrenLVFlattenedBytePage() throws IOException {
     // output LV encoded byte array
     int offset = 0;
     byte[] data = new byte[totalLength + ((rowOffset.getActualRowCount() - 1) * 2)];
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveDeltaFloatingCodec.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveDeltaFloatingCodec.java
index 97c3bed..36f1e64 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveDeltaFloatingCodec.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveDeltaFloatingCodec.java
@@ -125,13 +125,15 @@ public class AdaptiveDeltaFloatingCodec extends AdaptiveCodec {
   @Override
   public ColumnPageDecoder createDecoder(final ColumnPageEncoderMeta meta) {
     return new ColumnPageDecoder() {
-      @Override public ColumnPage decode(byte[] input, int offset, int length)
+      @Override
+      public ColumnPage decode(byte[] input, int offset, int length)
           throws MemoryException, IOException {
         ColumnPage page = ColumnPage.decompress(meta, input, offset, length, false);
         return LazyColumnPage.newPage(page, converter);
       }
 
-      @Override public void decodeAndFillVector(byte[] input, int offset, int length,
+      @Override
+      public void decodeAndFillVector(byte[] input, int offset, int length,
           ColumnVectorInfo vectorInfo, BitSet nullBits, boolean isLVEncoded, int pageSize,
           ReusableDataBuffer reusableDataBuffer)
           throws MemoryException, IOException {
@@ -149,7 +151,8 @@ public class AdaptiveDeltaFloatingCodec extends AdaptiveCodec {
             pageSize);
       }
 
-      @Override public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
+      @Override
+      public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
           throws MemoryException, IOException {
         return decode(input, offset, length);
       }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveDeltaIntegralCodec.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveDeltaIntegralCodec.java
index 888ce87..d0bbedb 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveDeltaIntegralCodec.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveDeltaIntegralCodec.java
@@ -132,7 +132,8 @@ public class AdaptiveDeltaIntegralCodec extends AdaptiveCodec {
   @Override
   public ColumnPageDecoder createDecoder(final ColumnPageEncoderMeta meta) {
     return new ColumnPageDecoder() {
-      @Override public ColumnPage decode(byte[] input, int offset, int length)
+      @Override
+      public ColumnPage decode(byte[] input, int offset, int length)
           throws MemoryException, IOException {
         ColumnPage page = null;
         if (DataTypes.isDecimal(meta.getSchemaDataType())) {
@@ -143,7 +144,8 @@ public class AdaptiveDeltaIntegralCodec extends AdaptiveCodec {
         return LazyColumnPage.newPage(page, converter);
       }
 
-      @Override public void decodeAndFillVector(byte[] input, int offset, int length,
+      @Override
+      public void decodeAndFillVector(byte[] input, int offset, int length,
           ColumnVectorInfo vectorInfo, BitSet nullBits, boolean isLVEncoded, int pageSize,
           ReusableDataBuffer reusableDataBuffer)
           throws MemoryException, IOException {
@@ -168,7 +170,8 @@ public class AdaptiveDeltaIntegralCodec extends AdaptiveCodec {
             pageSize);
       }
 
-      @Override public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
+      @Override
+      public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
           throws MemoryException, IOException {
         return decode(input, offset, length);
       }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveFloatingCodec.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveFloatingCodec.java
index eb266d0..64a0ebf 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveFloatingCodec.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveFloatingCodec.java
@@ -113,13 +113,15 @@ public class AdaptiveFloatingCodec extends AdaptiveCodec {
   @Override
   public ColumnPageDecoder createDecoder(final ColumnPageEncoderMeta meta) {
     return new ColumnPageDecoder() {
-      @Override public ColumnPage decode(byte[] input, int offset, int length)
+      @Override
+      public ColumnPage decode(byte[] input, int offset, int length)
           throws MemoryException, IOException {
         ColumnPage page = ColumnPage.decompress(meta, input, offset, length, false);
         return LazyColumnPage.newPage(page, converter);
       }
 
-      @Override public void decodeAndFillVector(byte[] input, int offset, int length,
+      @Override
+      public void decodeAndFillVector(byte[] input, int offset, int length,
           ColumnVectorInfo vectorInfo, BitSet nullBits, boolean isLVEncoded, int pageSize,
           ReusableDataBuffer reusableDataBuffer)
           throws MemoryException, IOException {
@@ -137,7 +139,8 @@ public class AdaptiveFloatingCodec extends AdaptiveCodec {
             pageSize);
       }
 
-      @Override public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
+      @Override
+      public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
           throws MemoryException, IOException {
         return decode(input, offset, length);
       }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveIntegralCodec.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveIntegralCodec.java
index 37ff7c1..5651368 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveIntegralCodec.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveIntegralCodec.java
@@ -109,7 +109,8 @@ public class AdaptiveIntegralCodec extends AdaptiveCodec {
   @Override
   public ColumnPageDecoder createDecoder(final ColumnPageEncoderMeta meta) {
     return new ColumnPageDecoder() {
-      @Override public ColumnPage decode(byte[] input, int offset, int length)
+      @Override
+      public ColumnPage decode(byte[] input, int offset, int length)
           throws MemoryException, IOException {
         ColumnPage page = null;
         if (DataTypes.isDecimal(meta.getSchemaDataType())) {
@@ -120,7 +121,8 @@ public class AdaptiveIntegralCodec extends AdaptiveCodec {
         return LazyColumnPage.newPage(page, converter);
       }
 
-      @Override public void decodeAndFillVector(byte[] input, int offset, int length,
+      @Override
+      public void decodeAndFillVector(byte[] input, int offset, int length,
           ColumnVectorInfo vectorInfo, BitSet nullBits, boolean isLVEncoded, int pageSize,
           ReusableDataBuffer reusableDataBuffer) throws MemoryException, IOException {
         Compressor compressor =
@@ -144,7 +146,8 @@ public class AdaptiveIntegralCodec extends AdaptiveCodec {
             pageSize);
       }
 
-      @Override public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
+      @Override
+      public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
           throws MemoryException, IOException {
         return decode(input, offset, length);
       }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/compress/DirectCompressCodec.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/compress/DirectCompressCodec.java
index a33899f..a378988 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/compress/DirectCompressCodec.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/compress/DirectCompressCodec.java
@@ -95,7 +95,8 @@ public class DirectCompressCodec implements ColumnPageCodec {
   public ColumnPageDecoder createDecoder(final ColumnPageEncoderMeta meta) {
     return new ColumnPageDecoder() {
 
-      @Override public ColumnPage decode(byte[] input, int offset, int length)
+      @Override
+      public ColumnPage decode(byte[] input, int offset, int length)
           throws MemoryException {
         ColumnPage decodedPage;
         if (DataTypes.isDecimal(dataType)) {
@@ -146,7 +147,8 @@ public class DirectCompressCodec implements ColumnPageCodec {
         }
       }
 
-      @Override public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
+      @Override
+      public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
           throws MemoryException, IOException {
         return LazyColumnPage
             .newPage(ColumnPage.decompress(meta, input, offset, length, isLVEncoded), converter);
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/rle/RLECodec.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/rle/RLECodec.java
index 836a8b1..24d35ac 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/rle/RLECodec.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/rle/RLECodec.java
@@ -296,7 +296,8 @@ public class RLECodec implements ColumnPageCodec {
       this.compressorName = compressorName;
     }
 
-    @Override public ColumnPage decode(byte[] input, int offset, int length)
+    @Override
+    public ColumnPage decode(byte[] input, int offset, int length)
         throws MemoryException, IOException {
       DataType dataType = columnSpec.getSchemaDataType();
       DataInputStream in = new DataInputStream(new ByteArrayInputStream(input, offset, length));
@@ -316,14 +317,16 @@ public class RLECodec implements ColumnPageCodec {
       return resultPage;
     }
 
-    @Override public void decodeAndFillVector(byte[] input, int offset, int length,
+    @Override
+    public void decodeAndFillVector(byte[] input, int offset, int length,
         ColumnVectorInfo vectorInfo, BitSet nullBits, boolean isLVEncoded, int pageSize,
         ReusableDataBuffer reusableDataBuffer)
         throws MemoryException, IOException {
       throw new UnsupportedOperationException("Not supposed to be called here");
     }
 
-    @Override public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
+    @Override
+    public ColumnPage decode(byte[] input, int offset, int length, boolean isLVEncoded)
         throws MemoryException, IOException {
       return decode(input, offset, length);
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/DummyStatsCollector.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/DummyStatsCollector.java
index 86bd12f..86c1c62 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/DummyStatsCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/DummyStatsCollector.java
@@ -32,65 +32,80 @@ public class DummyStatsCollector implements ColumnPageStatsCollector {
    * dummy stats used to sync with encoder
    */
   protected static final SimpleStatsResult DUMMY_STATS = new SimpleStatsResult() {
-    @Override public Object getMin() {
+    @Override
+    public Object getMin() {
       return new byte[0];
     }
 
-    @Override public Object getMax() {
+    @Override
+    public Object getMax() {
       return new byte[0];
     }
 
-    @Override public int getDecimalCount() {
+    @Override
+    public int getDecimalCount() {
       return 0;
     }
 
-    @Override public DataType getDataType() {
+    @Override
+    public DataType getDataType() {
       return BYTE_ARRAY;
     }
 
-    @Override public boolean writeMinMax() {
+    @Override
+    public boolean writeMinMax() {
       return true;
     }
 
   };
 
-  @Override public void updateNull(int rowId) {
+  @Override
+  public void updateNull(int rowId) {
 
   }
 
-  @Override public void update(byte value) {
+  @Override
+  public void update(byte value) {
 
   }
 
-  @Override public void update(short value) {
+  @Override
+  public void update(short value) {
 
   }
 
-  @Override public void update(int value) {
+  @Override
+  public void update(int value) {
 
   }
 
-  @Override public void update(long value) {
+  @Override
+  public void update(long value) {
 
   }
 
-  @Override public void update(double value) {
+  @Override
+  public void update(double value) {
 
   }
 
-  @Override public void update(float value) {
+  @Override
+  public void update(float value) {
 
   }
 
-  @Override public void update(BigDecimal value) {
+  @Override
+  public void update(BigDecimal value) {
 
   }
 
-  @Override public void update(byte[] value) {
+  @Override
+  public void update(byte[] value) {
 
   }
 
-  @Override public SimpleStatsResult getPageStats() {
+  @Override
+  public SimpleStatsResult getPageStats() {
     return DUMMY_STATS;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/KeyPageStatsCollector.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/KeyPageStatsCollector.java
index e929c41..f76ceeb 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/KeyPageStatsCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/KeyPageStatsCollector.java
@@ -66,7 +66,8 @@ public class KeyPageStatsCollector implements ColumnPageStatsCollector {
 
   }
 
-  @Override public void update(float value) {
+  @Override
+  public void update(float value) {
 
   }
 
@@ -95,23 +96,28 @@ public class KeyPageStatsCollector implements ColumnPageStatsCollector {
   public SimpleStatsResult getPageStats() {
     return new SimpleStatsResult() {
 
-      @Override public Object getMin() {
+      @Override
+      public Object getMin() {
         return min;
       }
 
-      @Override public Object getMax() {
+      @Override
+      public Object getMax() {
         return max;
       }
 
-      @Override public int getDecimalCount() {
+      @Override
+      public int getDecimalCount() {
         return 0;
       }
 
-      @Override public DataType getDataType() {
+      @Override
+      public DataType getDataType() {
         return dataType;
       }
 
-      @Override public boolean writeMinMax() {
+      @Override
+      public boolean writeMinMax() {
         return true;
       }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/LVStringStatsCollector.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/LVStringStatsCollector.java
index c970111..8095bd5 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/LVStringStatsCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/LVStringStatsCollector.java
@@ -74,7 +74,8 @@ public abstract class LVStringStatsCollector implements ColumnPageStatsCollector
 
   }
 
-  @Override public void update(float value) {
+  @Override
+  public void update(float value) {
 
   }
 
@@ -120,29 +121,34 @@ public abstract class LVStringStatsCollector implements ColumnPageStatsCollector
   public SimpleStatsResult getPageStats() {
     return new SimpleStatsResult() {
 
-      @Override public Object getMin() {
+      @Override
+      public Object getMin() {
         if (null == min || ignoreWritingMinMax) {
           min = new byte[0];
         }
         return min;
       }
 
-      @Override public Object getMax() {
+      @Override
+      public Object getMax() {
         if (null == max || ignoreWritingMinMax) {
           max = new byte[0];
         }
         return max;
       }
 
-      @Override public int getDecimalCount() {
+      @Override
+      public int getDecimalCount() {
         return 0;
       }
 
-      @Override public DataType getDataType() {
+      @Override
+      public DataType getDataType() {
         return DataTypes.STRING;
       }
 
-      @Override public boolean writeMinMax() {
+      @Override
+      public boolean writeMinMax() {
         return !ignoreWritingMinMax;
       }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/PrimitivePageStatsCollector.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/PrimitivePageStatsCollector.java
index babf144..b420028 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/PrimitivePageStatsCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/statistics/PrimitivePageStatsCollector.java
@@ -401,7 +401,8 @@ public class PrimitivePageStatsCollector implements ColumnPageStatsCollector, Si
     return dataType;
   }
 
-  @Override public boolean writeMinMax() {
+  @Override
+  public boolean writeMinMax() {
     return true;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/row/CarbonRow.java b/core/src/main/java/org/apache/carbondata/core/datastore/row/CarbonRow.java
index c140017..3d4fc21 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/row/CarbonRow.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/row/CarbonRow.java
@@ -69,7 +69,8 @@ public class CarbonRow implements Serializable {
     data[ordinal] = value;
   }
 
-  @Override public String toString() {
+  @Override
+  public String toString() {
     return Arrays.toString(data);
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClient.java b/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClient.java
index 60872c1..03e10b3 100644
--- a/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClient.java
+++ b/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClient.java
@@ -49,7 +49,8 @@ public class NonSecureDictionaryClient implements DictionaryClient {
    * @param address
    * @param port
    */
-  @Override public void startClient(String secretKey, String address, int port,
+  @Override
+  public void startClient(String secretKey, String address, int port,
       boolean encryptSecureServer) {
     LOGGER.info("Starting client on " + address + " " + port);
     long start = System.currentTimeMillis();
@@ -58,7 +59,8 @@ public class NonSecureDictionaryClient implements DictionaryClient {
     Bootstrap clientBootstrap = new Bootstrap();
     clientBootstrap.group(workerGroup).channel(NioSocketChannel.class)
         .handler(new ChannelInitializer<SocketChannel>() {
-          @Override public void initChannel(SocketChannel ch) throws Exception {
+          @Override
+          public void initChannel(SocketChannel ch) throws Exception {
             ChannelPipeline pipeline = ch.pipeline();
             // Based on length provided at header, it collects all packets
             pipeline
@@ -86,7 +88,8 @@ public class NonSecureDictionaryClient implements DictionaryClient {
   /**
    * shutdown dictionary client
    */
-  @Override public void shutDown() {
+  @Override
+  public void shutDown() {
     workerGroup.shutdownGracefully();
     try {
       workerGroup.terminationFuture().sync();
diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java
index 7e4be5d..cad051f 100644
--- a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java
@@ -80,7 +80,8 @@ public class IncrementalColumnDictionaryGenerator implements BiDictionary<Intege
     this.dimension = dimension;
   }
 
-  @Override public Integer getOrGenerateKey(String value) throws DictionaryGenerationException {
+  @Override
+  public Integer getOrGenerateKey(String value) throws DictionaryGenerationException {
     Integer dict = getKey(value);
     if (dict == null) {
       dict = generateKey(value);
@@ -88,21 +89,25 @@ public class IncrementalColumnDictionaryGenerator implements BiDictionary<Intege
     return dict;
   }
 
-  @Override public Integer getKey(String value) {
+  @Override
+  public Integer getKey(String value) {
     return incrementalCache.get(value);
   }
 
-  @Override public String getValue(Integer key) {
+  @Override
+  public String getValue(Integer key) {
     return reverseIncrementalCache.get(key);
   }
 
-  @Override public int size() {
+  @Override
+  public int size() {
     synchronized (lock) {
       return currentDictionarySize;
     }
   }
 
-  @Override public Integer generateKey(String value) throws DictionaryGenerationException {
+  @Override
+  public Integer generateKey(String value) throws DictionaryGenerationException {
     synchronized (lock) {
       Integer dict = incrementalCache.get(value);
       if (dict == null) {
@@ -114,7 +119,8 @@ public class IncrementalColumnDictionaryGenerator implements BiDictionary<Intege
     }
   }
 
-  @Override public void writeDictionaryData() throws IOException {
+  @Override
+  public void writeDictionaryData() throws IOException {
     // initialize params
     AbsoluteTableIdentifier absoluteTableIdentifier = carbonTable.getAbsoluteTableIdentifier();
     ColumnIdentifier columnIdentifier = dimension.getColumnIdentifier();
diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java
index 461d34a..2cf9aa3 100644
--- a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java
@@ -77,7 +77,8 @@ public class TableDictionaryGenerator
     return ((BiDictionary) generator).size();
   }
 
-  @Override public void writeDictionaryData() {
+  @Override
+  public void writeDictionaryData() {
     int numOfCores = CarbonProperties.getInstance().getNumberOfLoadingCores();
     long start = System.currentTimeMillis();
     ExecutorService executorService = Executors.newFixedThreadPool(numOfCores);
@@ -115,7 +116,8 @@ public class TableDictionaryGenerator
       this.generator = generator;
     }
 
-    @Override public void run() {
+    @Override
+    public void run() {
       try {
         ((DictionaryWriter)generator).writeDictionaryData();
       } catch (IOException e) {
diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServer.java b/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServer.java
index 5d55416..8c282c1 100644
--- a/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServer.java
+++ b/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServer.java
@@ -73,7 +73,8 @@ public class NonSecureDictionaryServer extends AbstractDictionaryServer
    * start dictionary server
    *
    */
-  @Override public void startServer() {
+  @Override
+  public void startServer() {
     LOGGER.info("Starting Dictionary Server in Non Secure Mode");
     nonSecureDictionaryServerHandler = new NonSecureDictionaryServerHandler();
     String workerThreads = CarbonProperties.getInstance()
@@ -89,7 +90,8 @@ public class NonSecureDictionaryServer extends AbstractDictionaryServer
    * Binds dictionary server to an available port.
    *
    */
-  @Override public void bindToPort() {
+  @Override
+  public void bindToPort() {
     long start = System.currentTimeMillis();
     // Configure the server.
     int i = 0;
@@ -100,7 +102,8 @@ public class NonSecureDictionaryServer extends AbstractDictionaryServer
         bootstrap.group(boss, worker);
         bootstrap.channel(NioServerSocketChannel.class);
         bootstrap.childHandler(new ChannelInitializer<SocketChannel>() {
-          @Override public void initChannel(SocketChannel ch) throws Exception {
+          @Override
+          public void initChannel(SocketChannel ch) throws Exception {
             ChannelPipeline pipeline = ch.pipeline();
             pipeline
                 .addLast("LengthDecoder", new LengthFieldBasedFrameDecoder(1048576, 0, 2, 0, 2));
@@ -132,19 +135,23 @@ public class NonSecureDictionaryServer extends AbstractDictionaryServer
   /**
    * @return Port on which the NonSecureDictionaryServer has started.
    */
-  @Override public int getPort() {
+  @Override
+  public int getPort() {
     return port;
   }
 
-  @Override public String getSecretKey() {
+  @Override
+  public String getSecretKey() {
     return null;
   }
 
-  @Override public boolean isEncryptSecureServer() {
+  @Override
+  public boolean isEncryptSecureServer() {
     return false;
   }
 
-  @Override public String getHost() {
+  @Override
+  public String getHost() {
     return host;
   }
 
@@ -153,7 +160,8 @@ public class NonSecureDictionaryServer extends AbstractDictionaryServer
    *
    * @throws Exception
    */
-  @Override public void shutdown() throws Exception {
+  @Override
+  public void shutdown() throws Exception {
     LOGGER.info("Shutting down dictionary server");
     worker.shutdownGracefully();
     boss.shutdownGracefully();
diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServerHandler.java b/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServerHandler.java
index e261910..5722578 100644
--- a/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServerHandler.java
+++ b/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServerHandler.java
@@ -52,7 +52,8 @@ import org.apache.log4j.Logger;
     super.channelActive(ctx);
   }
 
-  @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+  @Override
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
     try {
       ByteBuf data = (ByteBuf) msg;
       DictionaryMessage key = new DictionaryMessage();
@@ -76,7 +77,8 @@ import org.apache.log4j.Logger;
    * @param ctx
    * @param cause
    */
-  @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+  @Override
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
     LOGGER.error("exceptionCaught", cause);
     ctx.close();
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/service/NonSecureDictionaryServiceProvider.java b/core/src/main/java/org/apache/carbondata/core/dictionary/service/NonSecureDictionaryServiceProvider.java
index 70354cb..9fb70ea 100644
--- a/core/src/main/java/org/apache/carbondata/core/dictionary/service/NonSecureDictionaryServiceProvider.java
+++ b/core/src/main/java/org/apache/carbondata/core/dictionary/service/NonSecureDictionaryServiceProvider.java
@@ -36,7 +36,9 @@ public class NonSecureDictionaryServiceProvider implements DictionaryServiceProv
   //    return NonSecureDictionaryServer.getInstance(port);
   //  }
 
-  @Override public DictionaryClient getDictionaryClient() {
+
+  @Override
+  public DictionaryClient getDictionaryClient() {
     return new NonSecureDictionaryClient();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationS3Impl.java b/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationS3Impl.java
index f5311cb..67f4ee9 100644
--- a/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationS3Impl.java
+++ b/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationS3Impl.java
@@ -44,24 +44,28 @@ class AtomicFileOperationS3Impl implements AtomicFileOperations {
   AtomicFileOperationS3Impl(String filePath) {
     this.filePath = filePath;
   }
-  @Override public DataInputStream openForRead() throws IOException {
+  @Override
+  public DataInputStream openForRead() throws IOException {
     return FileFactory.getDataInputStream(filePath, FileFactory.getFileType(filePath));
   }
 
-  @Override public void close() throws IOException {
+  @Override
+  public void close() throws IOException {
     if (null != dataOutStream) {
       CarbonUtil.closeStream(dataOutStream);
     }
   }
 
-  @Override public DataOutputStream openForWrite(FileWriteOperation operation) throws IOException {
+  @Override
+  public DataOutputStream openForWrite(FileWriteOperation operation) throws IOException {
     filePath = filePath.replace("\\", "/");
     FileFactory.FileType fileType = FileFactory.getFileType(filePath);
     dataOutStream = FileFactory.getDataOutputStream(filePath, fileType);
     return dataOutStream;
   }
 
-  @Override public void setFailed() {
+  @Override
+  public void setFailed() {
     // no implementation required
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java b/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java
index 13f10d7..16e4517 100644
--- a/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java
@@ -52,11 +52,13 @@ class AtomicFileOperationsImpl implements AtomicFileOperations {
     this.fileType = fileType;
   }
 
-  @Override public DataInputStream openForRead() throws IOException {
+  @Override
+  public DataInputStream openForRead() throws IOException {
     return FileFactory.getDataInputStream(filePath, fileType);
   }
 
-  @Override public DataOutputStream openForWrite(FileWriteOperation operation) throws IOException {
+  @Override
+  public DataOutputStream openForWrite(FileWriteOperation operation) throws IOException {
 
     filePath = filePath.replace("\\", "/");
 
@@ -74,7 +76,8 @@ class AtomicFileOperationsImpl implements AtomicFileOperations {
 
   }
 
-  @Override public void close() throws IOException {
+  @Override
+  public void close() throws IOException {
 
     if (null != dataOutStream) {
       CarbonUtil.closeStream(dataOutStream);
@@ -92,7 +95,8 @@ class AtomicFileOperationsImpl implements AtomicFileOperations {
     }
   }
 
-  @Override public void setFailed() {
+  @Override
+  public void setFailed() {
     this.setFailed = true;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java
index fd549e0..9df9f80 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java
@@ -158,7 +158,8 @@ public class BlockletDataMapIndexStore
     return blockletDataMapIndexWrapper;
   }
 
-  @Override public List<BlockletDataMapIndexWrapper> getAll(
+  @Override
+  public List<BlockletDataMapIndexWrapper> getAll(
       List<TableBlockIndexUniqueIdentifierWrapper> tableSegmentUniqueIdentifiers)
       throws IOException {
     Map<String, Map<String, BlockMetaInfo>> segInfoCache
@@ -205,7 +206,8 @@ public class BlockletDataMapIndexStore
    * @param tableSegmentUniqueIdentifierWrapper
    * @return
    */
-  @Override public BlockletDataMapIndexWrapper getIfPresent(
+  @Override
+  public BlockletDataMapIndexWrapper getIfPresent(
       TableBlockIndexUniqueIdentifierWrapper tableSegmentUniqueIdentifierWrapper) {
     return (BlockletDataMapIndexWrapper) lruCache.get(
         tableSegmentUniqueIdentifierWrapper.getTableBlockIndexUniqueIdentifier()
@@ -217,7 +219,8 @@ public class BlockletDataMapIndexStore
    *
    * @param tableSegmentUniqueIdentifierWrapper
    */
-  @Override public void invalidate(
+  @Override
+  public void invalidate(
       TableBlockIndexUniqueIdentifierWrapper tableSegmentUniqueIdentifierWrapper) {
     BlockletDataMapIndexWrapper blockletDataMapIndexWrapper =
         getIfPresent(tableSegmentUniqueIdentifierWrapper);
@@ -321,7 +324,8 @@ public class BlockletDataMapIndexStore
    *
    * @param tableSegmentUniqueIdentifiersWrapper
    */
-  @Override public void clearAccessCount(
+  @Override
+  public void clearAccessCount(
       List<TableBlockIndexUniqueIdentifierWrapper> tableSegmentUniqueIdentifiersWrapper) {
     for (TableBlockIndexUniqueIdentifierWrapper
              identifierWrapper : tableSegmentUniqueIdentifiersWrapper) {
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexWrapper.java b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexWrapper.java
index 65f45f2..b93a7bc 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexWrapper.java
@@ -48,19 +48,23 @@ public class BlockletDataMapIndexWrapper implements Cacheable, Serializable {
     }
   }
 
-  @Override public long getFileTimeStamp() {
+  @Override
+  public long getFileTimeStamp() {
     return 0;
   }
 
-  @Override public int getAccessCount() {
+  @Override
+  public int getAccessCount() {
     return 0;
   }
 
-  @Override public long getMemorySize() {
+  @Override
+  public long getMemorySize() {
     return wrapperSize;
   }
 
-  @Override public void invalidate() {
+  @Override
+  public void invalidate() {
     for (DataMap dataMap : dataMaps) {
       dataMap.clear();
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDetailInfo.java b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDetailInfo.java
index 31dcd24..6dc5987 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDetailInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDetailInfo.java
@@ -165,7 +165,8 @@ public class BlockletDetailInfo implements Serializable, Writable {
     this.blockSize = blockSize;
   }
 
-  @Override public void write(DataOutput out) throws IOException {
+  @Override
+  public void write(DataOutput out) throws IOException {
     out.writeInt(rowCount);
     out.writeShort(pagesCount);
     out.writeShort(versionNumber);
@@ -196,7 +197,8 @@ public class BlockletDetailInfo implements Serializable, Writable {
     out.writeBoolean(useMinMaxForPruning);
   }
 
-  @Override public void readFields(DataInput in) throws IOException {
+  @Override
+  public void readFields(DataInput in) throws IOException {
     rowCount = in.readInt();
     pagesCount = in.readShort();
     versionNumber = in.readShort();
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlocklet.java b/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlocklet.java
index 611e969..c31894c 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlocklet.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlocklet.java
@@ -119,7 +119,8 @@ public class ExtendedBlocklet extends Blocklet {
     this.dataMapUniqueId = dataMapUniqueId;
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     if (!super.equals(o)) {
@@ -132,7 +133,8 @@ public class ExtendedBlocklet extends Blocklet {
         that.inputSplit.getSegmentId() == null;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = super.hashCode();
     result = 31 * result + (inputSplit.getSegmentId() != null ?
         inputSplit.getSegmentId().hashCode() :
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlockletWrapper.java b/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlockletWrapper.java
index f722f32..6093e9a 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlockletWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlockletWrapper.java
@@ -228,7 +228,8 @@ public class ExtendedBlockletWrapper implements Writable, Serializable {
     }
   }
 
-  @Override public void write(DataOutput out) throws IOException {
+  @Override
+  public void write(DataOutput out) throws IOException {
     out.writeBoolean(isWrittenToFile);
     out.writeBoolean(bytes != null);
     if (bytes != null) {
@@ -238,7 +239,8 @@ public class ExtendedBlockletWrapper implements Writable, Serializable {
     out.writeInt(dataSize);
   }
 
-  @Override public void readFields(DataInput in) throws IOException {
+  @Override
+  public void readFields(DataInput in) throws IOException {
     this.isWrittenToFile = in.readBoolean();
     if (in.readBoolean()) {
       this.bytes = new byte[in.readInt()];
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlockletWrapperContainer.java b/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlockletWrapperContainer.java
index 40acf9e..19b0039 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlockletWrapperContainer.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/ExtendedBlockletWrapperContainer.java
@@ -137,7 +137,8 @@ public class ExtendedBlockletWrapperContainer implements Writable {
       this.isCountJob = isCountJob;
     }
 
-    @Override public List<ExtendedBlocklet> call() throws Exception {
+    @Override
+    public List<ExtendedBlocklet> call() throws Exception {
       List<ExtendedBlocklet> extendedBlocklets = new ArrayList<>();
       for (int i = start; i < end; i++) {
         extendedBlocklets.addAll(extendedBlockletWrappers[i].readBlocklet(tablePath, queryId,
@@ -147,14 +148,16 @@ public class ExtendedBlockletWrapperContainer implements Writable {
     }
   }
 
-  @Override public void write(DataOutput out) throws IOException {
+  @Override
+  public void write(DataOutput out) throws IOException {
     out.writeInt(extendedBlockletWrappers.length);
     for (int i = 0; i < extendedBlockletWrappers.length; i++) {
       extendedBlockletWrappers[i].write(out);
     }
   }
 
-  @Override public void readFields(DataInput in) throws IOException {
+  @Override
+  public void readFields(DataInput in) throws IOException {
     extendedBlockletWrappers = new ExtendedBlockletWrapper[in.readInt()];
     for (int i = 0; i < extendedBlockletWrappers.length; i++) {
       ExtendedBlockletWrapper extendedBlockletWrapper = new ExtendedBlockletWrapper();
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/PartitionSpec.java b/core/src/main/java/org/apache/carbondata/core/indexstore/PartitionSpec.java
index 0d989cc..50e8908 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/PartitionSpec.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/PartitionSpec.java
@@ -83,23 +83,27 @@ public class PartitionSpec implements Serializable, Writable {
     this.uuid = uuid;
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     PartitionSpec spec = (PartitionSpec) o;
     return Objects.equals(getLocation(), spec.getLocation());
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return Objects.hash(locationPath);
   }
 
-  @Override public String toString() {
+  @Override
+  public String toString() {
     return "PartitionSpec{" + "partitions=" + partitions + ", locationPath=" + locationPath
         + ", location='" + location + '\'' + '}';
   }
 
-  @Override public void write(DataOutput out) throws IOException {
+  @Override
+  public void write(DataOutput out) throws IOException {
     if (partitions == null) {
       out.writeBoolean(false);
     } else {
@@ -123,7 +127,8 @@ public class PartitionSpec implements Serializable, Writable {
     }
   }
 
-  @Override public void readFields(DataInput in) throws IOException {
+  @Override
+  public void readFields(DataInput in) throws IOException {
     if (in.readBoolean()) {
       int numPartitions = in.readInt();
       partitions = new ArrayList<>(numPartitions);
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/TableBlockIndexUniqueIdentifier.java b/core/src/main/java/org/apache/carbondata/core/indexstore/TableBlockIndexUniqueIdentifier.java
index 9f6a76e..041c070 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/TableBlockIndexUniqueIdentifier.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/TableBlockIndexUniqueIdentifier.java
@@ -73,7 +73,8 @@ public class TableBlockIndexUniqueIdentifier implements Serializable {
     return segmentId;
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     TableBlockIndexUniqueIdentifier that = (TableBlockIndexUniqueIdentifier) o;
@@ -82,7 +83,8 @@ public class TableBlockIndexUniqueIdentifier implements Serializable {
         .equals(mergeIndexFileName, that.mergeIndexFileName);
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return Objects.hash(indexFilePath, indexFileName, mergeIndexFileName);
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java
index 0169c12..90aed35 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java
@@ -111,7 +111,8 @@ public class BlockDataMap extends CoarseGrainDataMap
    */
   protected boolean isFilePathStored;
 
-  @Override public void init(DataMapModel dataMapModel)
+  @Override
+  public void init(DataMapModel dataMapModel)
       throws IOException, MemoryException {
     long startTime = System.currentTimeMillis();
     assert (dataMapModel instanceof BlockletDataMapModel);
@@ -607,7 +608,8 @@ public class BlockDataMap extends CoarseGrainDataMap
     taskSummaryDMStore = getMemoryDMStore(blockletDataMapModel.isAddToUnsafe());
   }
 
-  @Override public boolean isScanRequired(FilterResolverIntf filterExp) {
+  @Override
+  public boolean isScanRequired(FilterResolverIntf filterExp) {
     FilterExecuter filterExecuter = FilterUtil
         .getFilterExecuterTree(filterExp, getSegmentProperties(), null, getMinMaxCacheColumns());
     DataMapRow unsafeRow = taskSummaryDMStore
@@ -826,7 +828,8 @@ public class BlockDataMap extends CoarseGrainDataMap
     return found;
   }
 
-  @Override public void finish() {
+  @Override
+  public void finish() {
 
   }
 
@@ -999,7 +1002,8 @@ public class BlockDataMap extends CoarseGrainDataMap
     }
   }
 
-  @Override public void clear() {
+  @Override
+  public void clear() {
     if (memoryDMStore != null) {
       memoryDMStore.freeMemory();
     }
@@ -1079,7 +1083,8 @@ public class BlockDataMap extends CoarseGrainDataMap
     return segmentPropertiesWrapper;
   }
 
-  @Override public int getNumberOfEntries() {
+  @Override
+  public int getNumberOfEntries() {
     if (memoryDMStore != null) {
       if (memoryDMStore.getRowCount() == 0) {
         // so that one datamap considered as one record
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMap.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMap.java
index 11f24f5..195a288 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMap.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMap.java
@@ -278,7 +278,8 @@ public class BlockletDataMap extends BlockDataMap implements Serializable {
     }
   }
 
-  @Override public int getTotalBlocks() {
+  @Override
+  public int getTotalBlocks() {
     if (isLegacyStore) {
       return super.getTotalBlocklets();
     } else {
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java
index 8bac9a5..dc2baf2 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataMapFactory.java
@@ -148,7 +148,8 @@ public class BlockletDataMapFactory extends CoarseGrainDataMapFactory
     return dataMaps;
   }
 
-  @Override public List<CoarseGrainDataMap> getDataMaps(Segment segment) throws IOException {
+  @Override
+  public List<CoarseGrainDataMap> getDataMaps(Segment segment) throws IOException {
     List<CoarseGrainDataMap> dataMaps = new ArrayList<>();
     Set<TableBlockIndexUniqueIdentifier> identifiers =
         getTableBlockIndexUniqueIdentifiers(segment);
@@ -320,7 +321,8 @@ public class BlockletDataMapFactory extends CoarseGrainDataMapFactory
     return numOfIndexFiles + ":" + sum;
   }
 
-  @Override public List<CoarseGrainDataMap> getDataMaps(DataMapDistributable distributable)
+  @Override
+  public List<CoarseGrainDataMap> getDataMaps(DataMapDistributable distributable)
       throws IOException {
     BlockletDataMapDistributable mapDistributable = (BlockletDataMapDistributable) distributable;
     List<TableBlockIndexUniqueIdentifierWrapper> identifiersWrapper;
@@ -417,11 +419,13 @@ public class BlockletDataMapFactory extends CoarseGrainDataMapFactory
 
   }
 
-  @Override public void deleteDatamapData() {
+  @Override
+  public void deleteDatamapData() {
 
   }
 
-  @Override public SegmentProperties getSegmentProperties(Segment segment) throws IOException {
+  @Override
+  public SegmentProperties getSegmentProperties(Segment segment) throws IOException {
     List<CoarseGrainDataMap> dataMaps = getDataMaps(segment);
     assert (dataMaps.size() > 0);
     CoarseGrainDataMap coarseGrainDataMap = dataMaps.get(0);
@@ -430,14 +434,16 @@ public class BlockletDataMapFactory extends CoarseGrainDataMapFactory
     return dataMap.getSegmentProperties();
   }
 
-  @Override public SegmentProperties getSegmentPropertiesFromDataMap(DataMap coarseGrainDataMap)
+  @Override
+  public SegmentProperties getSegmentPropertiesFromDataMap(DataMap coarseGrainDataMap)
       throws IOException {
     assert (coarseGrainDataMap instanceof BlockDataMap);
     BlockDataMap dataMap = (BlockDataMap) coarseGrainDataMap;
     return dataMap.getSegmentProperties();
   }
 
-  @Override public List<Blocklet> getAllBlocklets(Segment segment, List<PartitionSpec> partitions)
+  @Override
+  public List<Blocklet> getAllBlocklets(Segment segment, List<PartitionSpec> partitions)
       throws IOException {
     List<Blocklet> blocklets = new ArrayList<>();
     List<CoarseGrainDataMap> dataMaps = getDataMaps(segment);
@@ -448,7 +454,8 @@ public class BlockletDataMapFactory extends CoarseGrainDataMapFactory
     return blocklets;
   }
 
-  @Override public boolean willBecomeStale(TableOperation operation) {
+  @Override
+  public boolean willBecomeStale(TableOperation operation) {
     return false;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataRefNode.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataRefNode.java
index fe372e7..9ace0d5 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataRefNode.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataRefNode.java
@@ -96,22 +96,26 @@ public class BlockletDataRefNode implements DataRefNode {
     this.blockletSerializer = new BlockletSerializer();
   }
 
-  @Override public DataRefNode getNextDataRefNode() {
+  @Override
+  public DataRefNode getNextDataRefNode() {
     if (index + 1 < blockInfos.size()) {
       return new BlockletDataRefNode(blockInfos, index + 1, dimensionLens);
     }
     return null;
   }
 
-  @Override public int numRows() {
+  @Override
+  public int numRows() {
     return blockInfos.get(index).getDetailInfo().getRowCount();
   }
 
-  @Override public long nodeIndex() {
+  @Override
+  public long nodeIndex() {
     return index;
   }
 
-  @Override public short blockletIndex() {
+  @Override
+  public short blockletIndex() {
     return blockInfos.get(index).getDetailInfo().getBlockletId();
   }
 
@@ -172,7 +176,8 @@ public class BlockletDataRefNode implements DataRefNode {
     return measureRawColumnChunks;
   }
 
-  @Override public MeasureRawColumnChunk readMeasureChunk(FileReader fileReader, int columnIndex)
+  @Override
+  public MeasureRawColumnChunk readMeasureChunk(FileReader fileReader, int columnIndex)
       throws IOException {
     MeasureColumnChunkReader measureColumnChunkReader = getMeasureColumnChunkReader(fileReader);
     MeasureRawColumnChunk measureRawColumnChunk =
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/IndexWrapper.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/IndexWrapper.java
index 9588f57..0f7c0db 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/IndexWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/IndexWrapper.java
@@ -40,10 +40,12 @@ public class IndexWrapper extends AbstractIndex {
         this.segmentProperties.getDimensionColumnsValueSize());
   }
 
-  @Override public void buildIndex(List<DataFileFooter> footerList) {
+  @Override
+  public void buildIndex(List<DataFileFooter> footerList) {
   }
 
-  @Override public void clear() {
+  @Override
+  public void clear() {
     super.clear();
     if (blockInfos != null) {
       for (TableBlockInfo blockInfo : blockInfos) {
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java
index fc30861..17e5dc5 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java
@@ -315,7 +315,8 @@ public class SegmentIndexFileStore {
   private MergedBlockIndexHeader readMergeBlockIndexHeader(ThriftReader thriftReader)
       throws IOException {
     return (MergedBlockIndexHeader) thriftReader.read(new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new MergedBlockIndexHeader();
       }
     });
@@ -323,7 +324,8 @@ public class SegmentIndexFileStore {
 
   private MergedBlockIndex readMergeBlockIndex(ThriftReader thriftReader) throws IOException {
     return (MergedBlockIndex) thriftReader.read(new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new MergedBlockIndex();
       }
     });
@@ -347,7 +349,8 @@ public class SegmentIndexFileStore {
    */
   public static CarbonFile[] getCarbonIndexFiles(CarbonFile carbonFile) {
     return carbonFile.listFiles(new CarbonFileFilter() {
-      @Override public boolean accept(CarbonFile file) {
+      @Override
+      public boolean accept(CarbonFile file) {
         return ((file.getName().endsWith(CarbonTablePath.INDEX_FILE_EXT) || file.getName()
             .endsWith(CarbonTablePath.MERGE_INDEX_FILE_EXT)) && file.getSize() > 0);
       }
@@ -381,7 +384,8 @@ public class SegmentIndexFileStore {
   public static CarbonFile[] getCarbonIndexFiles(String segmentPath, Configuration configuration) {
     CarbonFile carbonFile = FileFactory.getCarbonFile(segmentPath, configuration);
     return carbonFile.listFiles(new CarbonFileFilter() {
-      @Override public boolean accept(CarbonFile file) {
+      @Override
+      public boolean accept(CarbonFile file) {
         return ((file.getName().endsWith(CarbonTablePath.INDEX_FILE_EXT) || file.getName()
             .endsWith(CarbonTablePath.MERGE_INDEX_FILE_EXT)) && file.getSize() > 0);
       }
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/row/DataMapRowImpl.java b/core/src/main/java/org/apache/carbondata/core/indexstore/row/DataMapRowImpl.java
index 5068fa9..42bfb55 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/row/DataMapRowImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/row/DataMapRowImpl.java
@@ -33,88 +33,107 @@ public class DataMapRowImpl extends DataMapRow {
     this.data = new Object[schemas.length];
   }
 
-  @Override public byte[] getByteArray(int ordinal) {
+  @Override
+  public byte[] getByteArray(int ordinal) {
     return (byte[]) data[ordinal];
   }
 
-  @Override public int getLengthInBytes(int ordinal) {
+  @Override
+  public int getLengthInBytes(int ordinal) {
     return ((byte[]) data[ordinal]).length;
   }
 
-  @Override public void setBoolean(boolean value, int ordinal) {
+  @Override
+  public void setBoolean(boolean value, int ordinal) {
     assert (schemas[ordinal].getDataType() == DataTypes.BOOLEAN);
     data[ordinal] = value;
   }
 
-  @Override public boolean getBoolean(int ordinal) {
+  @Override
+  public boolean getBoolean(int ordinal) {
     return (boolean) data[ordinal];
   }
 
-  @Override public DataMapRow getRow(int ordinal) {
+  @Override
+  public DataMapRow getRow(int ordinal) {
     return (DataMapRow) data[ordinal];
   }
 
-  @Override public void setByteArray(byte[] byteArray, int ordinal) {
+  @Override
+  public void setByteArray(byte[] byteArray, int ordinal) {
     assert (schemas[ordinal].getDataType() == DataTypes.BYTE_ARRAY);
     data[ordinal] = byteArray;
   }
 
-  @Override public int getInt(int ordinal) {
+  @Override
+  public int getInt(int ordinal) {
     return (Integer) data[ordinal];
   }
 
-  @Override public void setInt(int value, int ordinal) {
+  @Override
+  public void setInt(int value, int ordinal) {
     assert (schemas[ordinal].getDataType() == DataTypes.INT);
     data[ordinal] = value;
   }
 
-  @Override public void setByte(byte value, int ordinal) {
+  @Override
+  public void setByte(byte value, int ordinal) {
     assert (schemas[ordinal].getDataType() == DataTypes.BYTE);
     data[ordinal] = value;
   }
 
-  @Override public byte getByte(int ordinal) {
+  @Override
+  public byte getByte(int ordinal) {
     return (Byte) data[ordinal];
   }
 
-  @Override public void setShort(short value, int ordinal) {
+  @Override
+  public void setShort(short value, int ordinal) {
     assert (schemas[ordinal].getDataType() == DataTypes.SHORT);
     data[ordinal] = value;
   }
 
-  @Override public short getShort(int ordinal) {
+  @Override
+  public short getShort(int ordinal) {
     return (Short) data[ordinal];
   }
 
-  @Override public void setLong(long value, int ordinal) {
+  @Override
+  public void setLong(long value, int ordinal) {
     assert (schemas[ordinal].getDataType() == DataTypes.LONG);
     data[ordinal] = value;
   }
 
-  @Override public long getLong(int ordinal) {
+  @Override
+  public long getLong(int ordinal) {
     return (Long) data[ordinal];
   }
 
-  @Override public void setFloat(float value, int ordinal) {
+  @Override
+  public void setFloat(float value, int ordinal) {
     assert (schemas[ordinal].getDataType() == DataTypes.FLOAT);
     data[ordinal] = value;
   }
 
-  @Override public float getFloat(int ordinal) {
+  @Override
+  public float getFloat(int ordinal) {
     return (Float) data[ordinal];
   }
 
-  @Override public void setDouble(double value, int ordinal) {
+  @Override
+  public void setDouble(double value, int ordinal) {
     assert (schemas[ordinal].getDataType() == DataTypes.DOUBLE);
     data[ordinal] = value;
   }
 
-  @Override public void setRow(DataMapRow row, int ordinal) {
+  @Override
+  public void setRow(DataMapRow row, int ordinal) {
     assert (DataTypes.isStructType(schemas[ordinal].getDataType()));
     data[ordinal] = row;
   }
 
-  @Override public double getDouble(int ordinal) {
+  @Override
+  public double getDouble(int ordinal) {
     return (Double) data[ordinal];
   }
 
@@ -122,7 +141,8 @@ public class DataMapRowImpl extends DataMapRow {
     this.totalLengthInBytes = totalLengthInBytes;
   }
 
-  @Override public int getTotalSizeInBytes() {
+  @Override
+  public int getTotalSizeInBytes() {
     if (totalLengthInBytes > 0) {
       return totalLengthInBytes;
     } else {
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/row/UnsafeDataMapRow.java b/core/src/main/java/org/apache/carbondata/core/indexstore/row/UnsafeDataMapRow.java
index 5f6c4dc..eca20aa 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/row/UnsafeDataMapRow.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/row/UnsafeDataMapRow.java
@@ -43,7 +43,8 @@ public class UnsafeDataMapRow extends DataMapRow {
     this.pointer = pointer;
   }
 
-  @Override public byte[] getByteArray(int ordinal) {
+  @Override
+  public byte[] getByteArray(int ordinal) {
     int length;
     int currentOffset;
     switch (schemas[ordinal].getSchemaType()) {
@@ -67,7 +68,8 @@ public class UnsafeDataMapRow extends DataMapRow {
     return data;
   }
 
-  @Override public int getLengthInBytes(int ordinal) {
+  @Override
+  public int getLengthInBytes(int ordinal) {
     int length;
     int schemaOrdinal = schemas[ordinal].getBytePosition();
     switch (schemas[ordinal].getSchemaType()) {
@@ -85,80 +87,97 @@ public class UnsafeDataMapRow extends DataMapRow {
     return length;
   }
 
-  @Override public void setBoolean(boolean value, int ordinal) {
+  @Override
+  public void setBoolean(boolean value, int ordinal) {
     throw new UnsupportedOperationException("Not supported to set on unsafe row");
   }
 
-  @Override public boolean getBoolean(int ordinal) {
+  @Override
+  public boolean getBoolean(int ordinal) {
     return getUnsafe().getBoolean(block.getBaseObject(),
         block.getBaseOffset() + pointer + schemas[ordinal].getBytePosition());
   }
 
-  @Override public DataMapRow getRow(int ordinal) {
+  @Override
+  public DataMapRow getRow(int ordinal) {
     CarbonRowSchema[] childSchemas =
         ((CarbonRowSchema.StructCarbonRowSchema) schemas[ordinal]).getChildSchemas();
     return new UnsafeDataMapRow(childSchemas, block, pointer);
   }
 
-  @Override public void setByteArray(byte[] byteArray, int ordinal) {
+  @Override
+  public void setByteArray(byte[] byteArray, int ordinal) {
     throw new UnsupportedOperationException("Not supported to set on unsafe row");
   }
 
-  @Override public int getInt(int ordinal) {
+  @Override
+  public int getInt(int ordinal) {
     return getUnsafe().getInt(block.getBaseObject(),
         block.getBaseOffset() + pointer + schemas[ordinal].getBytePosition());
   }
 
-  @Override public void setInt(int value, int ordinal) {
+  @Override
+  public void setInt(int value, int ordinal) {
     throw new UnsupportedOperationException("Not supported to set on unsafe row");
   }
 
-  @Override public void setByte(byte value, int ordinal) {
+  @Override
+  public void setByte(byte value, int ordinal) {
     throw new UnsupportedOperationException("Not supported to set on unsafe row");
   }
 
-  @Override public byte getByte(int ordinal) {
+  @Override
+  public byte getByte(int ordinal) {
     return getUnsafe().getByte(block.getBaseObject(),
         block.getBaseOffset() + pointer + schemas[ordinal].getBytePosition());
   }
 
-  @Override public void setShort(short value, int ordinal) {
+  @Override
+  public void setShort(short value, int ordinal) {
     throw new UnsupportedOperationException("Not supported to set on unsafe row");
   }
 
-  @Override public short getShort(int ordinal) {
+  @Override
+  public short getShort(int ordinal) {
     return getUnsafe().getShort(block.getBaseObject(),
         block.getBaseOffset() + pointer + schemas[ordinal].getBytePosition());
   }
 
-  @Override public void setLong(long value, int ordinal) {
+  @Override
+  public void setLong(long value, int ordinal) {
     throw new UnsupportedOperationException("Not supported to set on unsafe row");
   }
 
-  @Override public long getLong(int ordinal) {
+  @Override
+  public long getLong(int ordinal) {
     return getUnsafe().getLong(block.getBaseObject(),
         block.getBaseOffset() + pointer + schemas[ordinal].getBytePosition());
   }
 
-  @Override public void setFloat(float value, int ordinal) {
+  @Override
+  public void setFloat(float value, int ordinal) {
     throw new UnsupportedOperationException("Not supported to set on unsafe row");
   }
 
-  @Override public float getFloat(int ordinal) {
+  @Override
+  public float getFloat(int ordinal) {
     return getUnsafe().getFloat(block.getBaseObject(),
         block.getBaseOffset() + pointer + schemas[ordinal].getBytePosition());
   }
 
-  @Override public void setDouble(double value, int ordinal) {
+  @Override
+  public void setDouble(double value, int ordinal) {
     throw new UnsupportedOperationException("Not supported to set on unsafe row");
   }
 
-  @Override public double getDouble(int ordinal) {
+  @Override
+  public double getDouble(int ordinal) {
     return getUnsafe().getDouble(block.getBaseObject(),
         block.getBaseOffset() + pointer + schemas[ordinal].getBytePosition());
   }
 
-  @Override public void setRow(DataMapRow row, int ordinal) {
+  @Override
+  public void setRow(DataMapRow row, int ordinal) {
     throw new UnsupportedOperationException("Not supported to set on unsafe row");
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/schema/CarbonRowSchema.java b/core/src/main/java/org/apache/carbondata/core/indexstore/schema/CarbonRowSchema.java
index 30a7a9c..9c2ed97 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/schema/CarbonRowSchema.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/schema/CarbonRowSchema.java
@@ -86,7 +86,8 @@ public abstract class CarbonRowSchema implements Serializable {
       this.length = length;
     }
 
-    @Override public int getLength() {
+    @Override
+    public int getLength() {
       if (length == 0) {
         return dataType.getSizeInBytes();
       } else {
@@ -94,7 +95,8 @@ public abstract class CarbonRowSchema implements Serializable {
       }
     }
 
-    @Override public DataMapSchemaType getSchemaType() {
+    @Override
+    public DataMapSchemaType getSchemaType() {
       return DataMapSchemaType.FIXED;
     }
   }
@@ -111,11 +113,13 @@ public abstract class CarbonRowSchema implements Serializable {
       this.isVarcharType = isVarcharType;
     }
 
-    @Override public int getLength() {
+    @Override
+    public int getLength() {
       return dataType.getSizeInBytes();
     }
 
-    @Override public DataMapSchemaType getSchemaType() {
+    @Override
+    public DataMapSchemaType getSchemaType() {
       return isVarcharType ? DataMapSchemaType.VARIABLE_INT : DataMapSchemaType.VARIABLE_SHORT;
     }
   }
@@ -129,7 +133,8 @@ public abstract class CarbonRowSchema implements Serializable {
       this.childSchemas = childSchemas;
     }
 
-    @Override public int getLength() {
+    @Override
+    public int getLength() {
       return dataType.getSizeInBytes();
     }
 
@@ -137,7 +142,8 @@ public abstract class CarbonRowSchema implements Serializable {
       return childSchemas;
     }
 
-    @Override public DataMapSchemaType getSchemaType() {
+    @Override
+    public DataMapSchemaType getSchemaType() {
       return DataMapSchemaType.STRUCT;
     }
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/columnar/impl/MultiDimKeyVarLengthEquiSplitGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/columnar/impl/MultiDimKeyVarLengthEquiSplitGenerator.java
index 53f68d6..c034ac7 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/columnar/impl/MultiDimKeyVarLengthEquiSplitGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/columnar/impl/MultiDimKeyVarLengthEquiSplitGenerator.java
@@ -132,7 +132,8 @@ public class MultiDimKeyVarLengthEquiSplitGenerator extends MultiDimKeyVarLength
     return ints;
   }
 
-  @Override public byte[][] splitKey(byte[] key) {
+  @Override
+  public byte[][] splitKey(byte[] key) {
     byte[][] split = new byte[blockKeySize.length][];
     int copyIndex = 0;
     for (int i = 0; i < split.length; i++) {
@@ -143,15 +144,18 @@ public class MultiDimKeyVarLengthEquiSplitGenerator extends MultiDimKeyVarLength
     return split;
   }
 
-  @Override public byte[][] generateAndSplitKey(long[] keys) throws KeyGenException {
+  @Override
+  public byte[][] generateAndSplitKey(long[] keys) throws KeyGenException {
     return splitKey(generateKey(keys));
   }
 
-  @Override public byte[][] generateAndSplitKey(int[] keys) throws KeyGenException {
+  @Override
+  public byte[][] generateAndSplitKey(int[] keys) throws KeyGenException {
     return splitKey(generateKey(keys));
   }
 
-  @Override public long[] getKeyArray(byte[][] key) {
+  @Override
+  public long[] getKeyArray(byte[][] key) {
     byte[] fullKey = new byte[getKeySizeInBytes()];
     int copyIndex = 0;
     for (int i = 0; i < key.length; i++) {
@@ -161,7 +165,8 @@ public class MultiDimKeyVarLengthEquiSplitGenerator extends MultiDimKeyVarLength
     return getKeyArray(fullKey);
   }
 
-  @Override public byte[] getKeyByteArray(byte[][] key) {
+  @Override
+  public byte[] getKeyByteArray(byte[][] key) {
     byte[] fullKey = new byte[getKeySizeInBytes()];
     int copyIndex = 0;
     for (int i = 0; i < key.length; i++) {
@@ -175,7 +180,8 @@ public class MultiDimKeyVarLengthEquiSplitGenerator extends MultiDimKeyVarLength
     return blockKeySize;
   }
 
-  @Override public int getKeySizeByBlock(int[] blockIndexes) {
+  @Override
+  public int getKeySizeByBlock(int[] blockIndexes) {
     int size = 0;
 
     for (int i = 0; i < blockIndexes.length; i++) {
@@ -186,7 +192,8 @@ public class MultiDimKeyVarLengthEquiSplitGenerator extends MultiDimKeyVarLength
     return size;
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (!(obj instanceof MultiDimKeyVarLengthEquiSplitGenerator)) {
       return false;
     }
@@ -194,7 +201,8 @@ public class MultiDimKeyVarLengthEquiSplitGenerator extends MultiDimKeyVarLength
     return o.dimensionsToSplit == dimensionsToSplit && super.equals(obj);
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return super.hashCode() + dimensionsToSplit;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/columnar/impl/MultiDimKeyVarLengthVariableSplitGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/columnar/impl/MultiDimKeyVarLengthVariableSplitGenerator.java
index 3f53994..e83ba52 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/columnar/impl/MultiDimKeyVarLengthVariableSplitGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/columnar/impl/MultiDimKeyVarLengthVariableSplitGenerator.java
@@ -133,7 +133,8 @@ public class MultiDimKeyVarLengthVariableSplitGenerator extends MultiDimKeyVarLe
     return ints;
   }
 
-  @Override public byte[][] splitKey(byte[] key) {
+  @Override
+  public byte[][] splitKey(byte[] key) {
     byte[][] split = new byte[blockKeySize.length][];
     int copyIndex = 0;
     for (int i = 0; i < split.length; i++) {
@@ -144,15 +145,18 @@ public class MultiDimKeyVarLengthVariableSplitGenerator extends MultiDimKeyVarLe
     return split;
   }
 
-  @Override public byte[][] generateAndSplitKey(long[] keys) throws KeyGenException {
+  @Override
+  public byte[][] generateAndSplitKey(long[] keys) throws KeyGenException {
     return splitKey(generateKey(keys));
   }
 
-  @Override public byte[][] generateAndSplitKey(int[] keys) throws KeyGenException {
+  @Override
+  public byte[][] generateAndSplitKey(int[] keys) throws KeyGenException {
     return splitKey(generateKey(keys));
   }
 
-  @Override public long[] getKeyArray(byte[][] key) {
+  @Override
+  public long[] getKeyArray(byte[][] key) {
     byte[] fullKey = new byte[getKeySizeInBytes()];
     int copyIndex = 0;
     for (int i = 0; i < key.length; i++) {
@@ -162,7 +166,8 @@ public class MultiDimKeyVarLengthVariableSplitGenerator extends MultiDimKeyVarLe
     return getKeyArray(fullKey);
   }
 
-  @Override public byte[] getKeyByteArray(byte[][] key) {
+  @Override
+  public byte[] getKeyByteArray(byte[][] key) {
     byte[] fullKey = new byte[getKeySizeInBytes()];
     int copyIndex = 0;
     for (int i = 0; i < key.length; i++) {
@@ -176,7 +181,8 @@ public class MultiDimKeyVarLengthVariableSplitGenerator extends MultiDimKeyVarLe
     return blockKeySize;
   }
 
-  @Override public int getKeySizeByBlock(int[] blockIndexes) {
+  @Override
+  public int getKeySizeByBlock(int[] blockIndexes) {
     Set<Integer> selectedRanges = new HashSet<>();
     for (int i = 0; i < blockIndexes.length; i++) {
       int[] byteRange = byteRangesForKeys[blockIndexes[i]];
@@ -187,7 +193,8 @@ public class MultiDimKeyVarLengthVariableSplitGenerator extends MultiDimKeyVarLe
     return selectedRanges.size();
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (!(obj instanceof MultiDimKeyVarLengthVariableSplitGenerator)) {
       return false;
     }
@@ -195,7 +202,8 @@ public class MultiDimKeyVarLengthVariableSplitGenerator extends MultiDimKeyVarLe
     return Arrays.equals(o.dimensionsToSplit, dimensionsToSplit) && super.equals(obj);
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return super.hashCode() + Arrays.hashCode(dimensionsToSplit);
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
index 3a134c3..9f915fb 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
@@ -83,7 +83,8 @@ public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator
    * @param memberStr date format string
    * @return dictionary value
    */
-  @Override public int generateDirectSurrogateKey(String memberStr) {
+  @Override
+  public int generateDirectSurrogateKey(String memberStr) {
     if (null == memberStr || memberStr.trim().isEmpty() || memberStr
         .equals(CarbonCommonConstants.MEMBER_DEFAULT_VAL)) {
       return CarbonCommonConstants.DIRECT_DICT_VALUE_NULL;
@@ -140,7 +141,8 @@ public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator
    * @param key
    * @return member value/actual value Date
    */
-  @Override public Object getValueFromSurrogate(int key) {
+  @Override
+  public Object getValueFromSurrogate(int key) {
     if (key == CarbonCommonConstants.DIRECT_DICT_VALUE_NULL) {
       return null;
     }
@@ -182,7 +184,8 @@ public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator
     }
   }
 
-  @Override public DataType getReturnType() {
+  @Override
+  public DataType getReturnType() {
     return DataTypes.INT;
   }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java
index 1e5a1f1..ddf48f1 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java
@@ -124,7 +124,8 @@ public class TimeStampDirectDictionaryGenerator implements DirectDictionaryGener
    * @param memberStr date format string
    * @return dictionary value
    */
-  @Override public int generateDirectSurrogateKey(String memberStr) {
+  @Override
+  public int generateDirectSurrogateKey(String memberStr) {
     if (null == memberStr || memberStr.trim().isEmpty() || memberStr
         .equals(CarbonCommonConstants.MEMBER_DEFAULT_VAL)) {
       return CarbonCommonConstants.DIRECT_DICT_VALUE_NULL;
@@ -181,7 +182,8 @@ public class TimeStampDirectDictionaryGenerator implements DirectDictionaryGener
    * @param key
    * @return member value/actual value Date
    */
-  @Override public Object getValueFromSurrogate(int key) {
+  @Override
+  public Object getValueFromSurrogate(int key) {
     if (key == CarbonCommonConstants.DIRECT_DICT_VALUE_NULL) {
       return null;
     }
@@ -223,7 +225,8 @@ public class TimeStampDirectDictionaryGenerator implements DirectDictionaryGener
     }
   }
 
-  @Override public DataType getReturnType() {
+  @Override
+  public DataType getReturnType() {
     return DataTypes.LONG;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/AbstractKeyGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/AbstractKeyGenerator.java
index 86eb4e4..f960d5f 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/AbstractKeyGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/AbstractKeyGenerator.java
@@ -23,7 +23,8 @@ public abstract class AbstractKeyGenerator implements KeyGenerator {
 
   private static final long serialVersionUID = -6675293078575359769L;
 
-  @Override public int compare(byte[] byte1, byte[] byte2) {
+  @Override
+  public int compare(byte[] byte1, byte[] byte2) {
     // Short circuit equal case
     if (byte1 == byte2) {
       return 0;
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/Bits.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/Bits.java
index 822b343..868c5ad 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/Bits.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/Bits.java
@@ -312,7 +312,8 @@ public class Bits implements Serializable {
 
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (obj instanceof Bits) {
       Bits other = (Bits) obj;
       return Arrays.equals(lens, other.lens);
@@ -320,7 +321,8 @@ public class Bits implements Serializable {
     return false;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return Arrays.hashCode(lens);
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/MultiDimKeyVarLengthGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/MultiDimKeyVarLengthGenerator.java
index 1aa91f9..703b49c 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/MultiDimKeyVarLengthGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/MultiDimKeyVarLengthGenerator.java
@@ -37,27 +37,32 @@ public class MultiDimKeyVarLengthGenerator extends AbstractKeyGenerator {
     }
   }
 
-  @Override public byte[] generateKey(long[] keys) throws KeyGenException {
+  @Override
+  public byte[] generateKey(long[] keys) throws KeyGenException {
 
     return bits.getBytes(keys);
   }
 
-  @Override public byte[] generateKey(int[] keys) throws KeyGenException {
+  @Override
+  public byte[] generateKey(int[] keys) throws KeyGenException {
 
     return bits.getBytes(keys);
   }
 
-  @Override public long[] getKeyArray(byte[] key) {
+  @Override
+  public long[] getKeyArray(byte[] key) {
 
     return bits.getKeyArray(key, 0);
   }
 
-  @Override public long[] getKeyArray(byte[] key, int offset) {
+  @Override
+  public long[] getKeyArray(byte[] key, int offset) {
 
     return bits.getKeyArray(key, offset);
   }
 
-  @Override public long getKey(byte[] key, int index) {
+  @Override
+  public long getKey(byte[] key, int index) {
 
     return bits.getKeyArray(key, 0)[index];
   }
@@ -66,16 +71,19 @@ public class MultiDimKeyVarLengthGenerator extends AbstractKeyGenerator {
     return bits.getByteSize();
   }
 
-  @Override public int[] getKeyByteOffsets(int index) {
+  @Override
+  public int[] getKeyByteOffsets(int index) {
     return byteRangesForKeys[index];
   }
 
-  @Override public int getDimCount() {
+  @Override
+  public int getDimCount() {
 
     return bits.getDimCount();
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (obj instanceof MultiDimKeyVarLengthGenerator) {
       MultiDimKeyVarLengthGenerator other = (MultiDimKeyVarLengthGenerator) obj;
       return bits.equals(other.bits);
@@ -84,11 +92,13 @@ public class MultiDimKeyVarLengthGenerator extends AbstractKeyGenerator {
     return false;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return bits.hashCode();
   }
 
-  @Override public long[] getKeyArray(byte[] key, int[] maskedByteRanges) {
+  @Override
+  public long[] getKeyArray(byte[] key, int[] maskedByteRanges) {
     return bits.getKeyArray(key, maskedByteRanges);
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/localdictionary/dictionaryholder/MapBasedDictionaryStore.java b/core/src/main/java/org/apache/carbondata/core/localdictionary/dictionaryholder/MapBasedDictionaryStore.java
index 0a50451..b03843a 100644
--- a/core/src/main/java/org/apache/carbondata/core/localdictionary/dictionaryholder/MapBasedDictionaryStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/localdictionary/dictionaryholder/MapBasedDictionaryStore.java
@@ -82,7 +82,8 @@ public class MapBasedDictionaryStore implements DictionaryStore {
    * @param data dictionary key
    * @return dictionary value
    */
-  @Override public int putIfAbsent(byte[] data) throws DictionaryThresholdReachedException {
+  @Override
+  public int putIfAbsent(byte[] data) throws DictionaryThresholdReachedException {
     // check if threshold has already reached
     checkIfThresholdReached();
     DictionaryByteArrayWrapper key = new DictionaryByteArrayWrapper(data);
@@ -136,7 +137,8 @@ public class MapBasedDictionaryStore implements DictionaryStore {
    *
    * @return
    */
-  @Override public boolean isThresholdReached() {
+  @Override
+  public boolean isThresholdReached() {
     return isThresholdReached;
   }
 
@@ -147,7 +149,8 @@ public class MapBasedDictionaryStore implements DictionaryStore {
    *              Caller will take of passing proper value
    * @return dictionary key based on value
    */
-  @Override public byte[] getDictionaryKeyBasedOnValue(int value) {
+  @Override
+  public byte[] getDictionaryKeyBasedOnValue(int value) {
     assert referenceDictionaryArray != null;
     // reference array index will be -1 of the value as dictionary value starts from 1
     return referenceDictionaryArray[value - 1].getData();
diff --git a/core/src/main/java/org/apache/carbondata/core/localdictionary/exception/DictionaryThresholdReachedException.java b/core/src/main/java/org/apache/carbondata/core/localdictionary/exception/DictionaryThresholdReachedException.java
index 7d648e0..09fc1e9 100644
--- a/core/src/main/java/org/apache/carbondata/core/localdictionary/exception/DictionaryThresholdReachedException.java
+++ b/core/src/main/java/org/apache/carbondata/core/localdictionary/exception/DictionaryThresholdReachedException.java
@@ -73,7 +73,8 @@ public class DictionaryThresholdReachedException extends Exception {
   /**
    * getLocalizedMessage
    */
-  @Override public String getLocalizedMessage() {
+  @Override
+  public String getLocalizedMessage() {
     return super.getLocalizedMessage();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/localdictionary/generator/ColumnLocalDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/localdictionary/generator/ColumnLocalDictionaryGenerator.java
index c55a289..38d17e9 100644
--- a/core/src/main/java/org/apache/carbondata/core/localdictionary/generator/ColumnLocalDictionaryGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/localdictionary/generator/ColumnLocalDictionaryGenerator.java
@@ -60,7 +60,8 @@ public class ColumnLocalDictionaryGenerator implements LocalDictionaryGenerator
    * data for which dictionary needs to be generated
    * @return dictionary value
    */
-  @Override public int generateDictionary(byte[] data) throws DictionaryThresholdReachedException {
+  @Override
+  public int generateDictionary(byte[] data) throws DictionaryThresholdReachedException {
     return this.dictionaryHolder.putIfAbsent(data);
   }
 
@@ -69,7 +70,8 @@ public class ColumnLocalDictionaryGenerator implements LocalDictionaryGenerator
    * for dictionary for particular column
    * @return true if dictionary threshold reached for column
    */
-  @Override public boolean isThresholdReached() {
+  @Override
+  public boolean isThresholdReached() {
     return this.dictionaryHolder.isThresholdReached();
   }
 
@@ -79,7 +81,8 @@ public class ColumnLocalDictionaryGenerator implements LocalDictionaryGenerator
    * dictionary value
    * @return dictionary key based on value
    */
-  @Override public byte[] getDictionaryKeyBasedOnValue(int value) {
+  @Override
+  public byte[] getDictionaryKeyBasedOnValue(int value) {
     return this.dictionaryHolder.getDictionaryKeyBasedOnValue(value);
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/locks/AlluxioFileLock.java b/core/src/main/java/org/apache/carbondata/core/locks/AlluxioFileLock.java
index 0297983..e871f53 100644
--- a/core/src/main/java/org/apache/carbondata/core/locks/AlluxioFileLock.java
+++ b/core/src/main/java/org/apache/carbondata/core/locks/AlluxioFileLock.java
@@ -66,14 +66,16 @@ public class AlluxioFileLock extends HdfsFileLock {
   /* (non-Javadoc)
    * @see org.apache.carbondata.core.locks.ICarbonLock#unlock()
    */
-  @Override public boolean unlock() {
+  @Override
+  public boolean unlock() {
     return super.unlock();
   }
 
   /* (non-Javadoc)
    * @see org.apache.carbondata.core.locks.ICarbonLock#lock()
    */
-  @Override public boolean lock() {
+  @Override
+  public boolean lock() {
     return super.lock();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java b/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java
index fbbf0c6..bcf15ee 100644
--- a/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java
@@ -135,7 +135,8 @@ public class CarbonLockUtil {
     CarbonFile[] files = FileFactory.getCarbonFile(lockFilesDir)
         .listFiles(new CarbonFileFilter() {
 
-            @Override public boolean accept(CarbonFile pathName) {
+            @Override
+            public boolean accept(CarbonFile pathName) {
               if (CarbonTablePath.isSegmentLockFilePath(pathName.getName())) {
                 return (currTime - pathName.getLastModifiedTime()) > segmentLockFilesPreserveTime;
               }
diff --git a/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java b/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java
index b7b2c97..65cfa0f 100644
--- a/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java
+++ b/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java
@@ -56,7 +56,8 @@ public class HdfsFileLock extends AbstractCarbonLock {
   /* (non-Javadoc)
    * @see org.apache.carbondata.core.locks.ICarbonLock#lock()
    */
-  @Override public boolean lock() {
+  @Override
+  public boolean lock() {
     try {
       if (null != this.lockFileDir &&
           !FileFactory.isFileExist(lockFileDir)) {
diff --git a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java b/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
index 35b4a1d..1a5c713 100644
--- a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
+++ b/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
@@ -72,7 +72,8 @@ public class LocalFileLock extends AbstractCarbonLock {
    *
    * @return
    */
-  @Override public boolean lock() {
+  @Override
+  public boolean lock() {
     try {
       if (!FileFactory.isFileExist(lockFileDir)) {
         FileFactory.mkdirs(lockFileDir, FileFactory.getFileType(lockFileDir));
@@ -104,7 +105,8 @@ public class LocalFileLock extends AbstractCarbonLock {
    *
    * @return
    */
-  @Override public boolean unlock() {
+  @Override
+  public boolean unlock() {
     boolean status = false;
     try {
       if (null != fileLock) {
diff --git a/core/src/main/java/org/apache/carbondata/core/locks/S3FileLock.java b/core/src/main/java/org/apache/carbondata/core/locks/S3FileLock.java
index e9d9aed..eab34ad 100644
--- a/core/src/main/java/org/apache/carbondata/core/locks/S3FileLock.java
+++ b/core/src/main/java/org/apache/carbondata/core/locks/S3FileLock.java
@@ -65,7 +65,8 @@ public class S3FileLock extends AbstractCarbonLock {
   /* (non-Javadoc)
    * @see org.apache.carbondata.core.locks.ICarbonLock#unlock()
    */
-  @Override public boolean unlock() {
+  @Override
+  public boolean unlock() {
     boolean status = false;
     if (null != dataOutputStream) {
       try {
@@ -81,7 +82,8 @@ public class S3FileLock extends AbstractCarbonLock {
   /* (non-Javadoc)
    * @see org.apache.carbondata.core.locks.ICarbonLock#lock()
    */
-  @Override public boolean lock() {
+  @Override
+  public boolean lock() {
     try {
       if (!FileFactory.isFileExist(lockFileDir)) {
         FileFactory.mkdirs(lockFileDir, FileFactory.getFileType(lockFileDir));
diff --git a/core/src/main/java/org/apache/carbondata/core/locks/ZooKeeperLocking.java b/core/src/main/java/org/apache/carbondata/core/locks/ZooKeeperLocking.java
index de8d6a6..7b12f77 100644
--- a/core/src/main/java/org/apache/carbondata/core/locks/ZooKeeperLocking.java
+++ b/core/src/main/java/org/apache/carbondata/core/locks/ZooKeeperLocking.java
@@ -137,7 +137,8 @@ public class ZooKeeperLocking extends AbstractCarbonLock {
   /**
    * Handling of the locking mechanism using zoo keeper.
    */
-  @Override public boolean lock() {
+  @Override
+  public boolean lock() {
     try {
       // create the lock file with lockName.
       lockPath =
@@ -175,7 +176,8 @@ public class ZooKeeperLocking extends AbstractCarbonLock {
   /**
    * @return status where lock file is unlocked or not.
    */
-  @Override public boolean unlock() {
+  @Override
+  public boolean unlock() {
     try {
       // exists will return null if the path doesn't exists.
       if (null != zk.exists(lockPath, true)) {
diff --git a/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java b/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java
index d5c4833..55d973e 100644
--- a/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java
+++ b/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java
@@ -59,7 +59,8 @@ public class HeapMemoryAllocator implements MemoryAllocator {
     return shouldPooling && (size >= poolingThresholdBytes);
   }
 
-  @Override public MemoryBlock allocate(long size) throws OutOfMemoryError {
+  @Override
+  public MemoryBlock allocate(long size) throws OutOfMemoryError {
     int numWords = (int) ((size + 7) / 8);
     long alignedSize = numWords * 8L;
     assert (alignedSize >= size);
@@ -87,7 +88,8 @@ public class HeapMemoryAllocator implements MemoryAllocator {
     return new MemoryBlock(array, CarbonUnsafe.LONG_ARRAY_OFFSET, size, MemoryType.ONHEAP);
   }
 
-  @Override public void free(MemoryBlock memory) {
+  @Override
+  public void free(MemoryBlock memory) {
     final long size = memory.size();
 
     // As an additional layer of defense against use-after-free bugs, we mutate the
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java b/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
index 931d2d3..5d08c4f 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
@@ -96,7 +96,8 @@ public class AbsoluteTableIdentifier implements Serializable {
   /**
    * to get the hash code
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result =
@@ -111,7 +112,8 @@ public class AbsoluteTableIdentifier implements Serializable {
    *
    * @param obj other object
    */
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/CarbonTableIdentifier.java b/core/src/main/java/org/apache/carbondata/core/metadata/CarbonTableIdentifier.java
index 7d93e27..6e6c6b6 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/CarbonTableIdentifier.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/CarbonTableIdentifier.java
@@ -91,7 +91,8 @@ public class CarbonTableIdentifier implements Serializable {
     return databaseName + File.separator + tableName + '_' + tableId;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + ((databaseName == null) ? 0 : databaseName.hashCode());
@@ -100,7 +101,8 @@ public class CarbonTableIdentifier implements Serializable {
     return result;
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
@@ -138,7 +140,8 @@ public class CarbonTableIdentifier implements Serializable {
   /**
    * return unique table name
    */
-  @Override public String toString() {
+  @Override
+  public String toString() {
     return tableUniqueName;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/ColumnIdentifier.java b/core/src/main/java/org/apache/carbondata/core/metadata/ColumnIdentifier.java
index 2246cb2..fa9c49e 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/ColumnIdentifier.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/ColumnIdentifier.java
@@ -77,14 +77,16 @@ public class ColumnIdentifier implements Serializable {
     return this.dataType;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + ((columnId == null) ? 0 : columnId.hashCode());
     return result;
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
@@ -105,7 +107,8 @@ public class ColumnIdentifier implements Serializable {
     return true;
   }
 
-  @Override public String toString() {
+  @Override
+  public String toString() {
     return "ColumnIdentifier [columnId=" + columnId + "]";
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/SegmentFileStore.java b/core/src/main/java/org/apache/carbondata/core/metadata/SegmentFileStore.java
index b03dbf4..57eb46d 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/SegmentFileStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/SegmentFileStore.java
@@ -106,7 +106,8 @@ public class SegmentFileStore {
     if ((tempFolder.exists() && partionNames.size() > 0) || (isMergeIndexFlow
         && partionNames.size() > 0)) {
       CarbonFile[] carbonFiles = tempFolder.listFiles(new CarbonFileFilter() {
-        @Override public boolean accept(CarbonFile file) {
+        @Override
+        public boolean accept(CarbonFile file) {
           return file.getName().startsWith(taskNo) && (
               file.getName().endsWith(CarbonTablePath.INDEX_FILE_EXT) || file.getName()
                   .endsWith(CarbonTablePath.MERGE_INDEX_FILE_EXT));
@@ -193,7 +194,8 @@ public class SegmentFileStore {
   public static CarbonFile[] getListOfCarbonIndexFiles(String segmentPath) {
     CarbonFile segmentFolder = FileFactory.getCarbonFile(segmentPath);
     CarbonFile[] indexFiles = segmentFolder.listFiles(new CarbonFileFilter() {
-      @Override public boolean accept(CarbonFile file) {
+      @Override
+      public boolean accept(CarbonFile file) {
         return (file.getName().endsWith(CarbonTablePath.INDEX_FILE_EXT) ||
             file.getName().endsWith(CarbonTablePath.MERGE_INDEX_FILE_EXT));
       }
@@ -245,7 +247,8 @@ public class SegmentFileStore {
     String tablePath = carbonTable.getTablePath();
     CarbonFile segmentFolder = FileFactory.getCarbonFile(segment.getSegmentPath());
     CarbonFile[] otherFiles = segmentFolder.listFiles(new CarbonFileFilter() {
-      @Override public boolean accept(CarbonFile file) {
+      @Override
+      public boolean accept(CarbonFile file) {
         return (!file.getName().equals("_SUCCESS") && !file.getName().endsWith(".crc"));
       }
     });
@@ -293,7 +296,8 @@ public class SegmentFileStore {
     }
     CarbonFile segmentFolder = FileFactory.getCarbonFile(segmentPath);
     CarbonFile[] indexFiles = segmentFolder.listFiles(new CarbonFileFilter() {
-      @Override public boolean accept(CarbonFile file) {
+      @Override
+      public boolean accept(CarbonFile file) {
         if (null != currentLoadTimeStamp) {
           return file.getName().contains(currentLoadTimeStamp) && (
               file.getName().endsWith(CarbonTablePath.INDEX_FILE_EXT) || file.getName()
@@ -534,7 +538,8 @@ public class SegmentFileStore {
     CarbonFile carbonFile = FileFactory.getCarbonFile(segmentPath);
     if (carbonFile.exists()) {
       return carbonFile.listFiles(new CarbonFileFilter() {
-        @Override public boolean accept(CarbonFile file) {
+        @Override
+        public boolean accept(CarbonFile file) {
           return file.getName().endsWith(CarbonTablePath.SEGMENT_EXT);
         }
       });
@@ -555,7 +560,8 @@ public class SegmentFileStore {
       CarbonFile carbonFile = FileFactory.getCarbonFile(location);
 
       CarbonFile[] listFiles = carbonFile.listFiles(new CarbonFileFilter() {
-        @Override public boolean accept(CarbonFile file) {
+        @Override
+        public boolean accept(CarbonFile file) {
           return CarbonTablePath.isCarbonIndexFile(file.getAbsolutePath());
         }
       });
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/BlockletInfo.java b/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/BlockletInfo.java
index 24745e8..aebae47 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/BlockletInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/blocklet/BlockletInfo.java
@@ -204,7 +204,8 @@ public class BlockletInfo implements Serializable, Writable {
     this.numberOfPages = numberOfPages;
   }
 
-  @Override public void write(DataOutput output) throws IOException {
+  @Override
+  public void write(DataOutput output) throws IOException {
     output.writeLong(dimensionOffset);
     output.writeLong(measureOffsets);
     int dsize = dimensionChunkOffsets != null ? dimensionChunkOffsets.size() : 0;
@@ -283,7 +284,8 @@ public class BlockletInfo implements Serializable, Writable {
     return dataChunk;
   }
 
-  @Override public void readFields(DataInput input) throws IOException {
+  @Override
+  public void readFields(DataInput input) throws IOException {
     dimensionOffset = input.readLong();
     measureOffsets = input.readLong();
     int dimensionChunkOffsetsSize = input.readShort();
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImpl.java b/core/src/main/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImpl.java
index d9fa936..f914928 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/converter/ThriftWrapperSchemaConverterImpl.java
@@ -174,7 +174,8 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter {
   /* (non-Javadoc)
    * convert from wrapper to external column schema
    */
-  @Override public org.apache.carbondata.format.ColumnSchema fromWrapperToExternalColumnSchema(
+  @Override
+  public org.apache.carbondata.format.ColumnSchema fromWrapperToExternalColumnSchema(
       ColumnSchema wrapperColumnSchema) {
     List<org.apache.carbondata.format.Encoding> encoders =
         new ArrayList<org.apache.carbondata.format.Encoding>();
@@ -273,7 +274,8 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter {
   /* (non-Javadoc)
    * convert from wrapper to external tableschema
    */
-  @Override public org.apache.carbondata.format.TableSchema fromWrapperToExternalTableSchema(
+  @Override
+  public org.apache.carbondata.format.TableSchema fromWrapperToExternalTableSchema(
       TableSchema wrapperTableSchema) {
 
     List<org.apache.carbondata.format.ColumnSchema> thriftColumnSchema =
@@ -312,7 +314,8 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter {
   /* (non-Javadoc)
    * convert from wrapper to external tableinfo
    */
-  @Override public org.apache.carbondata.format.TableInfo fromWrapperToExternalTableInfo(
+  @Override
+  public org.apache.carbondata.format.TableInfo fromWrapperToExternalTableInfo(
       TableInfo wrapperTableInfo, String dbName, String tableName) {
     org.apache.carbondata.format.TableSchema thriftFactTable =
         fromWrapperToExternalTableSchema(wrapperTableInfo.getFactTable());
@@ -397,7 +400,8 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter {
   /* (non-Javadoc)
    * convert from external to wrapper schema evolution entry
    */
-  @Override public SchemaEvolutionEntry fromExternalToWrapperSchemaEvolutionEntry(
+  @Override
+  public SchemaEvolutionEntry fromExternalToWrapperSchemaEvolutionEntry(
       org.apache.carbondata.format.SchemaEvolutionEntry externalSchemaEvolutionEntry) {
 
     SchemaEvolutionEntry wrapperSchemaEvolutionEntry = new SchemaEvolutionEntry();
@@ -427,7 +431,8 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter {
   /* (non-Javadoc)
    * convert from external to wrapper schema evolution
    */
-  @Override public SchemaEvolution fromExternalToWrapperSchemaEvolution(
+  @Override
+  public SchemaEvolution fromExternalToWrapperSchemaEvolution(
       org.apache.carbondata.format.SchemaEvolution externalSchemaEvolution) {
     List<SchemaEvolutionEntry> wrapperSchemaEvolEntryList = new ArrayList<SchemaEvolutionEntry>();
     for (org.apache.carbondata.format.SchemaEvolutionEntry schemaEvolutionEntry :
@@ -522,7 +527,8 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter {
   /* (non-Javadoc)
    * convert from external to wrapper columnschema
    */
-  @Override public ColumnSchema fromExternalToWrapperColumnSchema(
+  @Override
+  public ColumnSchema fromExternalToWrapperColumnSchema(
       org.apache.carbondata.format.ColumnSchema externalColumnSchema) {
     ColumnSchema wrapperColumnSchema = new ColumnSchema();
     wrapperColumnSchema.setColumnUniqueId(externalColumnSchema.getColumn_id());
@@ -607,7 +613,8 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter {
   /* (non-Javadoc)
    * convert from external to wrapper tableschema
    */
-  @Override public TableSchema fromExternalToWrapperTableSchema(
+  @Override
+  public TableSchema fromExternalToWrapperTableSchema(
       org.apache.carbondata.format.TableSchema externalTableSchema, String tableName) {
     TableSchema wrapperTableSchema = new TableSchema();
     wrapperTableSchema.setTableId(externalTableSchema.getTable_id());
@@ -651,7 +658,8 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter {
   /* (non-Javadoc)
    * convert from external to wrapper tableinfo
    */
-  @Override public TableInfo fromExternalToWrapperTableInfo(
+  @Override
+  public TableInfo fromExternalToWrapperTableInfo(
       org.apache.carbondata.format.TableInfo externalTableInfo,
       String dbName,
       String tableName,
@@ -673,7 +681,8 @@ public class ThriftWrapperSchemaConverterImpl implements SchemaConverter {
     return wrapperTableInfo;
   }
 
-  @Override public DataMapSchema fromExternalToWrapperDataMapSchema(
+  @Override
+  public DataMapSchema fromExternalToWrapperDataMapSchema(
       org.apache.carbondata.format.DataMapSchema thriftDataMapSchema) {
     DataMapSchema childSchema = new DataMapSchema(thriftDataMapSchema.getDataMapName(),
         thriftDataMapSchema.getClassName());
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DataTypeAdapter.java b/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DataTypeAdapter.java
index 08fbcca..32c4763 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DataTypeAdapter.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DataTypeAdapter.java
@@ -35,10 +35,12 @@ public class DataTypeAdapter extends TypeAdapter<Object> {
 
   private Gson fallBack_original = new Gson();
 
-  @Override public void write(JsonWriter jsonWriter, Object o) throws IOException {
+  @Override
+  public void write(JsonWriter jsonWriter, Object o) throws IOException {
   }
 
-  @Override public Object read(JsonReader jsonReader) throws IOException {
+  @Override
+  public Object read(JsonReader jsonReader) throws IOException {
     JsonToken token = jsonReader.peek();
     if (token == JsonToken.STRING) {
       return DataTypeUtil.valueOf(jsonReader.nextString());
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DecimalConverterFactory.java b/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DecimalConverterFactory.java
index 2e155f4..fb50467 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DecimalConverterFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/datatype/DecimalConverterFactory.java
@@ -94,16 +94,19 @@ public final class DecimalConverterFactory {
       this.scale = scale;
     }
 
-    @Override public Object convert(BigDecimal decimal) {
+    @Override
+    public Object convert(BigDecimal decimal) {
       long longValue = decimal.unscaledValue().longValue();
       return (int) longValue;
     }
 
-    @Override public BigDecimal getDecimal(Object valueToBeConverted) {
+    @Override
+    public BigDecimal getDecimal(Object valueToBeConverted) {
       return BigDecimal.valueOf((Long) valueToBeConverted, scale);
     }
 
-    @Override public void fillVector(Object valuesToBeConverted, int size,
+    @Override
+    public void fillVector(Object valuesToBeConverted, int size,
         ColumnVectorInfo vectorInfo, BitSet nullBitSet, DataType pageType) {
       // TODO we need to find way to directly set to vector with out conversion. This way is very
       // inefficient.
@@ -186,11 +189,13 @@ public final class DecimalConverterFactory {
       }
     }
 
-    @Override public int getSize() {
+    @Override
+    public int getSize() {
       return 4;
     }
 
-    @Override public DecimalConverterType getDecimalConverterType() {
+    @Override
+    public DecimalConverterType getDecimalConverterType() {
       return DecimalConverterType.DECIMAL_INT;
     }
   }
@@ -201,19 +206,23 @@ public final class DecimalConverterFactory {
       super(scale);
     }
 
-    @Override public Object convert(BigDecimal decimal) {
+    @Override
+    public Object convert(BigDecimal decimal) {
       return decimal.unscaledValue().longValue();
     }
 
-    @Override public BigDecimal getDecimal(Object valueToBeConverted) {
+    @Override
+    public BigDecimal getDecimal(Object valueToBeConverted) {
       return BigDecimal.valueOf((Long) valueToBeConverted, scale);
     }
 
-    @Override public int getSize() {
+    @Override
+    public int getSize() {
       return 8;
     }
 
-    @Override public DecimalConverterType getDecimalConverterType() {
+    @Override
+    public DecimalConverterType getDecimalConverterType() {
       return DecimalConverterType.DECIMAL_LONG;
     }
   }
@@ -231,7 +240,8 @@ public final class DecimalConverterFactory {
       this.numBytes = minBytesForPrecision[precision];
     }
 
-    @Override public Object convert(BigDecimal decimal) {
+    @Override
+    public Object convert(BigDecimal decimal) {
       byte[] bytes = decimal.unscaledValue().toByteArray();
       byte[] fixedLengthBytes = null;
       if (bytes.length == numBytes) {
@@ -257,12 +267,14 @@ public final class DecimalConverterFactory {
       return value;
     }
 
-    @Override public BigDecimal getDecimal(Object valueToBeConverted) {
+    @Override
+    public BigDecimal getDecimal(Object valueToBeConverted) {
       BigInteger bigInteger = new BigInteger((byte[]) valueToBeConverted);
       return new BigDecimal(bigInteger, scale);
     }
 
-    @Override public void fillVector(Object valuesToBeConverted, int size,
+    @Override
+    public void fillVector(Object valuesToBeConverted, int size,
         ColumnVectorInfo vectorInfo, BitSet nullBitSet, DataType pageType) {
       CarbonColumnVector vector = getCarbonColumnVector(vectorInfo, nullBitSet);
       int precision = vectorInfo.measure.getMeasure().getPrecision();
@@ -287,11 +299,13 @@ public final class DecimalConverterFactory {
       }
     }
 
-    @Override public int getSize() {
+    @Override
+    public int getSize() {
       return numBytes;
     }
 
-    @Override public DecimalConverterType getDecimalConverterType() {
+    @Override
+    public DecimalConverterType getDecimalConverterType() {
       return DecimalConverterType.DECIMAL_UNSCALED;
     }
   }
@@ -300,15 +314,18 @@ public final class DecimalConverterFactory {
 
     public static LVBytesDecimalConverter INSTANCE = new LVBytesDecimalConverter();
 
-    @Override public Object convert(BigDecimal decimal) {
+    @Override
+    public Object convert(BigDecimal decimal) {
       return DataTypeUtil.bigDecimalToByte(decimal);
     }
 
-    @Override public BigDecimal getDecimal(Object valueToBeConverted) {
+    @Override
+    public BigDecimal getDecimal(Object valueToBeConverted) {
       return DataTypeUtil.byteToBigDecimal((byte[]) valueToBeConverted);
     }
 
-    @Override public void fillVector(Object valuesToBeConverted, int size,
+    @Override
+    public void fillVector(Object valuesToBeConverted, int size,
         ColumnVectorInfo vectorInfo, BitSet nullBitSet, DataType pageType) {
       CarbonColumnVector vector = getCarbonColumnVector(vectorInfo, nullBitSet);
       int precision = vectorInfo.measure.getMeasure().getPrecision();
@@ -329,11 +346,13 @@ public final class DecimalConverterFactory {
       }
     }
 
-    @Override public int getSize() {
+    @Override
+    public int getSize() {
       return -1;
     }
 
-    @Override public DecimalConverterType getDecimalConverterType() {
+    @Override
+    public DecimalConverterType getDecimalConverterType() {
       return DecimalConverterType.DECIMAL_LV;
     }
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/AggregationDataMapSchema.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/AggregationDataMapSchema.java
index dcc3336..20174c5 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/AggregationDataMapSchema.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/AggregationDataMapSchema.java
@@ -369,7 +369,8 @@ public class AggregationDataMapSchema extends DataMapSchema {
         DataMapClassProvider.TIMESERIES : DataMapClassProvider.PREAGGREGATE;
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     if (!super.equals(o)) return false;
@@ -377,7 +378,8 @@ public class AggregationDataMapSchema extends DataMapSchema {
     return that == this;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return super.hashCode();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java
index d0a6d1d..1ca2b89 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java
@@ -400,7 +400,8 @@ public class CarbonTable implements Serializable, Writable {
     columns.addAll(measures);
     Collections.sort(columns, new Comparator<CarbonColumn>() {
 
-      @Override public int compare(CarbonColumn o1, CarbonColumn o2) {
+      @Override
+      public int compare(CarbonColumn o1, CarbonColumn o2) {
         return Integer.compare(o1.getSchemaOrdinal(), o2.getSchemaOrdinal());
       }
 
@@ -1357,11 +1358,13 @@ public class CarbonTable implements Serializable, Writable {
     }
   }
 
-  @Override public void write(DataOutput out) throws IOException {
+  @Override
+  public void write(DataOutput out) throws IOException {
     tableInfo.write(out);
   }
 
-  @Override public void readFields(DataInput in) throws IOException {
+  @Override
+  public void readFields(DataInput in) throws IOException {
     tableInfo = new TableInfo();
     tableInfo.readFields(in);
     updateTableByTableInfo(this, tableInfo);
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DataMapSchema.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DataMapSchema.java
index 6ca3676..2a93f41 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DataMapSchema.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DataMapSchema.java
@@ -251,14 +251,16 @@ public class DataMapSchema implements Serializable, Writable {
     }
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     DataMapSchema that = (DataMapSchema) o;
     return Objects.equals(dataMapName, that.dataMapName);
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return Objects.hash(dataMapName);
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DiskBasedDMSchemaStorageProvider.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DiskBasedDMSchemaStorageProvider.java
index a430662..eb866aa 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DiskBasedDMSchemaStorageProvider.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DiskBasedDMSchemaStorageProvider.java
@@ -61,7 +61,8 @@ public class DiskBasedDMSchemaStorageProvider implements DataMapSchemaStoragePro
     this.mdtFilePath = storePath + CarbonCommonConstants.FILE_SEPARATOR + "datamap.mdtfile";
   }
 
-  @Override public void saveSchema(DataMapSchema dataMapSchema) throws IOException {
+  @Override
+  public void saveSchema(DataMapSchema dataMapSchema) throws IOException {
     BufferedWriter brWriter = null;
     DataOutputStream dataOutputStream = null;
     Gson gsonObjectToWrite = new Gson();
@@ -93,7 +94,8 @@ public class DiskBasedDMSchemaStorageProvider implements DataMapSchemaStoragePro
     }
   }
 
-  @Override public DataMapSchema retrieveSchema(String dataMapName)
+  @Override
+  public DataMapSchema retrieveSchema(String dataMapName)
       throws IOException, NoSuchDataMapException {
     checkAndReloadDataMapSchemas(true);
     for (DataMapSchema dataMapSchema : dataMapSchemas) {
@@ -104,7 +106,8 @@ public class DiskBasedDMSchemaStorageProvider implements DataMapSchemaStoragePro
     throw new NoSuchDataMapException(dataMapName);
   }
 
-  @Override public List<DataMapSchema> retrieveSchemas(CarbonTable carbonTable) throws IOException {
+  @Override
+  public List<DataMapSchema> retrieveSchemas(CarbonTable carbonTable) throws IOException {
     checkAndReloadDataMapSchemas(false);
     List<DataMapSchema> dataMapSchemas = new ArrayList<>();
     for (DataMapSchema dataMapSchema : this.dataMapSchemas) {
@@ -125,7 +128,8 @@ public class DiskBasedDMSchemaStorageProvider implements DataMapSchemaStoragePro
     return dataMapSchemas;
   }
 
-  @Override public List<DataMapSchema> retrieveAllSchemas() throws IOException {
+  @Override
+  public List<DataMapSchema> retrieveAllSchemas() throws IOException {
     checkAndReloadDataMapSchemas(true);
     return new ArrayList<>(dataMapSchemas);
   }
@@ -134,7 +138,8 @@ public class DiskBasedDMSchemaStorageProvider implements DataMapSchemaStoragePro
     Set<DataMapSchema> dataMapSchemas = new HashSet<>();
     CarbonFile carbonFile = FileFactory.getCarbonFile(storePath);
     CarbonFile[] carbonFiles = carbonFile.listFiles(new CarbonFileFilter() {
-      @Override public boolean accept(CarbonFile file) {
+      @Override
+      public boolean accept(CarbonFile file) {
         return file.getName().endsWith(".dmschema");
       }
     });
@@ -160,7 +165,8 @@ public class DiskBasedDMSchemaStorageProvider implements DataMapSchemaStoragePro
     return dataMapSchemas;
   }
 
-  @Override public void dropSchema(String dataMapName)
+  @Override
+  public void dropSchema(String dataMapName)
       throws IOException {
     String schemaPath = getSchemaPath(storePath, dataMapName);
     if (!FileFactory.isFileExist(schemaPath, FileFactory.getFileType(schemaPath))) {
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/RelationIdentifier.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/RelationIdentifier.java
index 0e8042d..922bf05 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/RelationIdentifier.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/RelationIdentifier.java
@@ -60,21 +60,24 @@ public class RelationIdentifier implements Serializable, Writable {
     this.tablePath = tablePath;
   }
 
-  @Override public void write(DataOutput out) throws IOException {
+  @Override
+  public void write(DataOutput out) throws IOException {
     out.writeUTF(databaseName);
     out.writeUTF(tableName);
     out.writeUTF(tableId);
     out.writeUTF(tablePath);
   }
 
-  @Override public void readFields(DataInput in) throws IOException {
+  @Override
+  public void readFields(DataInput in) throws IOException {
     this.databaseName = in.readUTF();
     this.tableName = in.readUTF();
     this.tableId = in.readUTF();
     this.tablePath = in.readUTF();
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
 
@@ -91,14 +94,16 @@ public class RelationIdentifier implements Serializable, Writable {
     return tableId != null ? tableId.equals(that.tableId) : that.tableId == null;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = databaseName != null ? databaseName.hashCode() : 0;
     result = 31 * result + (tableName != null ? tableName.hashCode() : 0);
     result = 31 * result + (tableId != null ? tableId.hashCode() : 0);
     return result;
   }
 
-  @Override public String toString() {
+  @Override
+  public String toString() {
     return databaseName + "." + tableName;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java
index ec9d311..4aeba9d 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java
@@ -211,7 +211,8 @@ public class TableInfo implements Serializable, Writable {
   /**
    * to generate the hash code
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + ((databaseName == null) ? 0 : databaseName.hashCode());
@@ -222,7 +223,8 @@ public class TableInfo implements Serializable, Writable {
   /**
    * Overridden equals method
    */
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
@@ -301,7 +303,8 @@ public class TableInfo implements Serializable, Writable {
     out.writeBoolean(isSchemaModified);
   }
 
-  @Override public void readFields(DataInput in) throws IOException {
+  @Override
+  public void readFields(DataInput in) throws IOException {
     this.databaseName = in.readUTF();
     this.tableUniqueName = in.readUTF();
     this.factTable = new TableSchema();
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchema.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchema.java
index 8e96aab..0d0001f 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchema.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchema.java
@@ -145,7 +145,8 @@ public class TableSchema implements Serializable, Writable, Cloneable {
     this.tableName = tableName;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + ((tableId == null) ? 0 : tableId.hashCode());
@@ -153,7 +154,8 @@ public class TableSchema implements Serializable, Writable, Cloneable {
     return result;
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonDimension.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonDimension.java
index f0ff1c8..fc2abf5 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonDimension.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonDimension.java
@@ -122,7 +122,8 @@ public class CarbonDimension extends CarbonColumn {
   /**
    * to generate the hash code for this class
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + ((columnSchema == null) ? 0 : columnSchema.hashCode());
@@ -132,7 +133,8 @@ public class CarbonDimension extends CarbonColumn {
   /**
    * to check whether to dimension are equal or not
    */
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonImplicitDimension.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonImplicitDimension.java
index fadbd02..01222c6 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonImplicitDimension.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonImplicitDimension.java
@@ -79,35 +79,40 @@ public class CarbonImplicitDimension extends CarbonDimension {
   /**
    * @return the list of encoder used in dimension
    */
-  @Override public List<Encoding> getEncoder() {
+  @Override
+  public List<Encoding> getEncoder() {
     return encodingList;
   }
 
   /**
    * @return return the number of child present in case of complex type
    */
-  @Override public int getNumberOfChild() {
+  @Override
+  public int getNumberOfChild() {
     return 0;
   }
 
   /**
    * @return the colName
    */
-  @Override public String getColName() {
+  @Override
+  public String getColName() {
     return implicitDimensionName;
   }
 
   /**
    * @return if column is dimension return true, else false.
    */
-  @Override public Boolean isDimension() {
+  @Override
+  public Boolean isDimension() {
     return true;
   }
 
   /**
    * @return the dataType
    */
-  @Override public DataType getDataType() {
+  @Override
+  public DataType getDataType() {
     return DataTypes.STRING;
   }
 
@@ -128,7 +133,8 @@ public class CarbonImplicitDimension extends CarbonDimension {
   /**
    * to generate the hash code for this class
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + ((implicitDimensionName == null) ?
@@ -140,7 +146,8 @@ public class CarbonImplicitDimension extends CarbonDimension {
   /**
    * to check whether to dimension are equal or not
    */
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonMeasure.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonMeasure.java
index d13dc6c..3310c8e 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonMeasure.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/CarbonMeasure.java
@@ -52,7 +52,8 @@ public class CarbonMeasure extends CarbonColumn {
   /**
    * to check whether to dimension are equal or not
    */
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
@@ -77,7 +78,8 @@ public class CarbonMeasure extends CarbonColumn {
    * hash code
    * @return
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return this.getColumnSchema().getColumnUniqueId().hashCode();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
index 0606cbd..6b4bd91 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
@@ -289,7 +289,8 @@ public class ColumnSchema implements Serializable, Writable {
    * hash code method to check get the hashcode based.
    * for generating the hash code only column name and column unique id will considered
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + ((columnName == null) ? 0 : columnName.hashCode()) +
@@ -304,7 +305,8 @@ public class ColumnSchema implements Serializable, Writable {
   /**
    * Overridden equals method for columnSchema
    */
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ParentColumnTableRelation.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ParentColumnTableRelation.java
index 28dc12c..659ba91 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ParentColumnTableRelation.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ParentColumnTableRelation.java
@@ -58,13 +58,15 @@ public class ParentColumnTableRelation implements Serializable, Writable {
     return columnName;
   }
 
-  @Override public void write(DataOutput out) throws IOException {
+  @Override
+  public void write(DataOutput out) throws IOException {
     relationIdentifier.write(out);
     out.writeUTF(columnId);
     out.writeUTF(columnName);
   }
 
-  @Override public void readFields(DataInput in) throws IOException {
+  @Override
+  public void readFields(DataInput in) throws IOException {
     this.relationIdentifier = new RelationIdentifier(null, null, null);
     relationIdentifier.readFields(in);
     this.columnId = in.readUTF();
diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java b/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java
index 340de3e..5bccdd6 100644
--- a/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java
@@ -324,7 +324,8 @@ public class CarbonUpdateUtil {
     for (CarbonFile eachDir : file.listFiles()) {
       // for each dir check if the file with the delta timestamp is present or not.
       CarbonFile[] toBeDeleted = eachDir.listFiles(new CarbonFileFilter() {
-        @Override public boolean accept(CarbonFile file) {
+        @Override
+        public boolean accept(CarbonFile file) {
           String fileName = file.getName();
           return (fileName.endsWith(timeStamp + CarbonCommonConstants.UPDATE_DELTA_FILE_EXT)
                   || fileName.endsWith(timeStamp + CarbonCommonConstants.UPDATE_INDEX_FILE_EXT)
@@ -417,7 +418,8 @@ public class CarbonUpdateUtil {
       CarbonFile segmentDir =
           FileFactory.getCarbonFile(segmentDirPath, FileFactory.getFileType(segmentDirPath));
       CarbonFile[] carbonDataFiles = segmentDir.listFiles(new CarbonFileFilter() {
-        @Override public boolean accept(CarbonFile file) {
+        @Override
+        public boolean accept(CarbonFile file) {
 
           if (file.getName().endsWith(CarbonCommonConstants.FACT_FILE_EXT)) {
             return true;
@@ -597,7 +599,8 @@ public class CarbonUpdateUtil {
           FileFactory.getFileType(CarbonTablePath.getMetadataPath(tablePath)));
 
       CarbonFile[] invalidUpdateStatusFiles = metaFolder.listFiles(new CarbonFileFilter() {
-        @Override public boolean accept(CarbonFile file) {
+        @Override
+        public boolean accept(CarbonFile file) {
           if (file.getName().startsWith(CarbonCommonConstants.TABLEUPDATESTATUS_FILENAME)) {
 
             // CHECK if this is valid or not.
diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockDetails.java b/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockDetails.java
index 045f0e7..7362b16 100644
--- a/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockDetails.java
+++ b/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockDetails.java
@@ -50,7 +50,8 @@ public class DeleteDeltaBlockDetails implements Serializable {
     blockletDetailsMap = new TreeMap<>();
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) return true;
     if (obj == null || !(obj instanceof DeleteDeltaBlockDetails)) return false;
 
@@ -60,7 +61,8 @@ public class DeleteDeltaBlockDetails implements Serializable {
 
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return blockName.hashCode();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockletDetails.java b/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockletDetails.java
index 6185134..4b87388 100644
--- a/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockletDetails.java
+++ b/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockletDetails.java
@@ -54,7 +54,8 @@ public class DeleteDeltaBlockletDetails implements Serializable {
     return deletedRows;
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
@@ -68,7 +69,8 @@ public class DeleteDeltaBlockletDetails implements Serializable {
     return id.equals(that.id) && (pageId.intValue() == that.pageId.intValue());
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return id.hashCode() + pageId.hashCode();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/SegmentUpdateDetails.java b/core/src/main/java/org/apache/carbondata/core/mutate/SegmentUpdateDetails.java
index 645851d..008bb3f 100644
--- a/core/src/main/java/org/apache/carbondata/core/mutate/SegmentUpdateDetails.java
+++ b/core/src/main/java/org/apache/carbondata/core/mutate/SegmentUpdateDetails.java
@@ -103,14 +103,16 @@ public class SegmentUpdateDetails implements Serializable {
     this.deltaFileStamps = deltaFileStamps;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = segmentName.hashCode();
     result = prime * result + blockName.hashCode();
     return result;
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (obj == null) {
       return false;
 
diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/UpdateVO.java b/core/src/main/java/org/apache/carbondata/core/mutate/UpdateVO.java
index 7b4efd0..c9d093c 100644
--- a/core/src/main/java/org/apache/carbondata/core/mutate/UpdateVO.java
+++ b/core/src/main/java/org/apache/carbondata/core/mutate/UpdateVO.java
@@ -56,7 +56,8 @@ public class UpdateVO implements Serializable {
     this.updateDeltaStartTimestamp = updateDeltaStartTimestamp;
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     UpdateVO updateVO = (UpdateVO) o;
@@ -76,7 +77,8 @@ public class UpdateVO implements Serializable {
 
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = factTimestamp != null ? factTimestamp.hashCode() : 0;
     result = 31 * result + (updateDeltaStartTimestamp != null ?
         updateDeltaStartTimestamp.hashCode() :
diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/data/RowCountDetailsVO.java b/core/src/main/java/org/apache/carbondata/core/mutate/data/RowCountDetailsVO.java
index b7264fa..ad116b6 100644
--- a/core/src/main/java/org/apache/carbondata/core/mutate/data/RowCountDetailsVO.java
+++ b/core/src/main/java/org/apache/carbondata/core/mutate/data/RowCountDetailsVO.java
@@ -43,7 +43,8 @@ public class RowCountDetailsVO implements Serializable {
     return deletedRowsInBlock;
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
@@ -60,7 +61,8 @@ public class RowCountDetailsVO implements Serializable {
 
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = (int) (totalNumberOfRows ^ (totalNumberOfRows >>> 32));
     result = 31 * result + (int) (deletedRowsInBlock ^ (deletedRowsInBlock >>> 32));
     return result;
diff --git a/core/src/main/java/org/apache/carbondata/core/preagg/QueryColumn.java b/core/src/main/java/org/apache/carbondata/core/preagg/QueryColumn.java
index 42daa6c..64b4967 100644
--- a/core/src/main/java/org/apache/carbondata/core/preagg/QueryColumn.java
+++ b/core/src/main/java/org/apache/carbondata/core/preagg/QueryColumn.java
@@ -57,7 +57,8 @@ public class QueryColumn {
     return timeseriesFunction;
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
@@ -76,7 +77,8 @@ public class QueryColumn {
         that.timeseriesFunction == null;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = columnSchema.hashCode();
     result = 31 * result + (timeseriesFunction != null ? timeseriesFunction.hashCode() : 0);
     result = 31 * result + (isFilterColumn ? 1 : 0);
diff --git a/core/src/main/java/org/apache/carbondata/core/readcommitter/LatestFilesReadCommittedScope.java b/core/src/main/java/org/apache/carbondata/core/readcommitter/LatestFilesReadCommittedScope.java
index 07db7d0..bba7099 100644
--- a/core/src/main/java/org/apache/carbondata/core/readcommitter/LatestFilesReadCommittedScope.java
+++ b/core/src/main/java/org/apache/carbondata/core/readcommitter/LatestFilesReadCommittedScope.java
@@ -111,7 +111,8 @@ public class LatestFilesReadCommittedScope implements ReadCommittedScope {
     this.loadMetadataDetails = loadMetadataDetailsArray;
   }
 
-  @Override public LoadMetadataDetails[] getSegmentList() throws IOException {
+  @Override
+  public LoadMetadataDetails[] getSegmentList() throws IOException {
     try {
       if (loadMetadataDetails == null) {
         takeCarbonIndexFileSnapShot();
@@ -123,7 +124,8 @@ public class LatestFilesReadCommittedScope implements ReadCommittedScope {
     }
   }
 
-  @Override public Map<String, String> getCommittedIndexFile(Segment segment) throws IOException {
+  @Override
+  public Map<String, String> getCommittedIndexFile(Segment segment) throws IOException {
     Map<String, String> indexFileStore = new HashMap<>();
     Map<String, List<String>> snapShot = readCommittedIndexFileSnapShot.getSegmentIndexFileMap();
     String segName;
@@ -176,7 +178,8 @@ public class LatestFilesReadCommittedScope implements ReadCommittedScope {
     }
   }
 
-  @Override public void takeCarbonIndexFileSnapShot() throws IOException {
+  @Override
+  public void takeCarbonIndexFileSnapShot() throws IOException {
     // Read the current file Path get the list of indexes from the path.
     CarbonFile file = FileFactory.getCarbonFile(carbonFilePath, configuration);
 
@@ -244,11 +247,13 @@ public class LatestFilesReadCommittedScope implements ReadCommittedScope {
     return configuration;
   }
 
-  @Override public void setConfiguration(Configuration configuration) {
+  @Override
+  public void setConfiguration(Configuration configuration) {
     this.configuration = configuration;
   }
 
-  @Override public String getFilePath() {
+  @Override
+  public String getFilePath() {
     return carbonFilePath;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/readcommitter/TableStatusReadCommittedScope.java b/core/src/main/java/org/apache/carbondata/core/readcommitter/TableStatusReadCommittedScope.java
index e4fd6f4..1dd912d 100644
--- a/core/src/main/java/org/apache/carbondata/core/readcommitter/TableStatusReadCommittedScope.java
+++ b/core/src/main/java/org/apache/carbondata/core/readcommitter/TableStatusReadCommittedScope.java
@@ -61,7 +61,8 @@ public class TableStatusReadCommittedScope implements ReadCommittedScope {
     this.loadMetadataDetails = loadMetadataDetails;
   }
 
-  @Override public LoadMetadataDetails[] getSegmentList() throws IOException {
+  @Override
+  public LoadMetadataDetails[] getSegmentList() throws IOException {
     try {
       if (loadMetadataDetails == null) {
         takeCarbonIndexFileSnapShot();
@@ -73,7 +74,8 @@ public class TableStatusReadCommittedScope implements ReadCommittedScope {
     }
   }
 
-  @Override public Map<String, String> getCommittedIndexFile(Segment segment) throws IOException {
+  @Override
+  public Map<String, String> getCommittedIndexFile(Segment segment) throws IOException {
     Map<String, String> indexFiles;
     if (segment.getSegmentFileName() == null) {
       String path =
@@ -98,22 +100,26 @@ public class TableStatusReadCommittedScope implements ReadCommittedScope {
     return segmentRefreshInfo;
   }
 
-  @Override public void takeCarbonIndexFileSnapShot() throws IOException {
+  @Override
+  public void takeCarbonIndexFileSnapShot() throws IOException {
     // Only Segment Information is updated.
     // File information will be fetched on the fly according to the fecthed segment info.
     this.loadMetadataDetails = SegmentStatusManager
         .readTableStatusFile(CarbonTablePath.getTableStatusFilePath(identifier.getTablePath()));
   }
 
-  @Override public Configuration getConfiguration() {
+  @Override
+  public Configuration getConfiguration() {
     return configuration;
   }
 
-  @Override public void setConfiguration(Configuration configuration) {
+  @Override
+  public void setConfiguration(Configuration configuration) {
     this.configuration = configuration;
   }
 
-  @Override public String getFilePath() {
+  @Override
+  public String getFilePath() {
     return identifier.getTablePath();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java
index 49dec4c..f3f55a0 100644
--- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java
@@ -66,7 +66,8 @@ public class CarbonDeleteDeltaFileReaderImpl implements CarbonDeleteDeltaFileRea
    * @return All deleted records for the specified block
    * @throws IOException if an I/O error occurs
    */
-  @Override public String read() throws IOException {
+  @Override
+  public String read() throws IOException {
     // Configure Buffer based on our requirement
     char[] buffer = new char[DEFAULT_BUFFER_SIZE];
     StringWriter sw = new StringWriter();
@@ -85,7 +86,8 @@ public class CarbonDeleteDeltaFileReaderImpl implements CarbonDeleteDeltaFileRea
    * @return DeleteDeltaBlockDetails
    * @throws IOException
    */
-  @Override public DeleteDeltaBlockDetails readJson() throws IOException {
+  @Override
+  public DeleteDeltaBlockDetails readJson() throws IOException {
     Gson gsonObjectToRead = new Gson();
     DataInputStream dataInputStream = null;
     BufferedReader buffReader = null;
diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteFilesDataReader.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteFilesDataReader.java
index f16433c..8c901dc 100644
--- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteFilesDataReader.java
+++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteFilesDataReader.java
@@ -201,7 +201,8 @@ public class CarbonDeleteFilesDataReader {
     DeleteDeltaFileReaderCallable(String deltaFile) {
       this.deltaFile = deltaFile;
     }
-    @Override public DeleteDeltaBlockDetails call() throws IOException {
+    @Override
+    public DeleteDeltaBlockDetails call() throws IOException {
       CarbonDeleteDeltaFileReaderImpl deltaFileReader =
           new CarbonDeleteDeltaFileReaderImpl(deltaFile, FileFactory.getFileType(deltaFile));
       return deltaFileReader.readJson();
diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryMetadataReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryMetadataReaderImpl.java
index 4f41b92..d3afc54 100644
--- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryMetadataReaderImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryMetadataReaderImpl.java
@@ -69,7 +69,8 @@ public class CarbonDictionaryMetadataReaderImpl implements CarbonDictionaryMetad
    * @return list of all dictionary meta chunks which contains information for each segment
    * @throws IOException if an I/O error occurs
    */
-  @Override public List<CarbonDictionaryColumnMetaChunk> read() throws IOException {
+  @Override
+  public List<CarbonDictionaryColumnMetaChunk> read() throws IOException {
     List<CarbonDictionaryColumnMetaChunk> dictionaryMetaChunks =
         new ArrayList<CarbonDictionaryColumnMetaChunk>(
             CarbonCommonConstants.DEFAULT_COLLECTION_SIZE);
@@ -101,7 +102,8 @@ public class CarbonDictionaryMetadataReaderImpl implements CarbonDictionaryMetad
    * @return last segment entry for dictionary chunk
    * @throws IOException if an I/O error occurs
    */
-  @Override public CarbonDictionaryColumnMetaChunk readLastEntryOfDictionaryMetaChunk()
+  @Override
+  public CarbonDictionaryColumnMetaChunk readLastEntryOfDictionaryMetaChunk()
       throws IOException {
     ColumnDictionaryChunkMeta dictionaryChunkMeta = null;
     // open dictionary meta thrift reader
@@ -118,7 +120,8 @@ public class CarbonDictionaryMetadataReaderImpl implements CarbonDictionaryMetad
     return getNewInstanceOfCarbonDictionaryColumnMetaChunk(dictionaryChunkMeta);
   }
 
-  @Override public CarbonDictionaryColumnMetaChunk readEntryOfDictionaryMetaChunk(long end_Offset)
+  @Override
+  public CarbonDictionaryColumnMetaChunk readEntryOfDictionaryMetaChunk(long end_Offset)
           throws IOException {
     ColumnDictionaryChunkMeta dictionaryChunkMeta = null;
     // open dictionary meta thrift reader
@@ -145,7 +148,8 @@ public class CarbonDictionaryMetadataReaderImpl implements CarbonDictionaryMetad
    *
    * @throws IOException if an I/O error occurs
    */
-  @Override public void close() throws IOException {
+  @Override
+  public void close() throws IOException {
     if (null != dictionaryMetadataFileReader) {
       dictionaryMetadataFileReader.close();
       dictionaryMetadataFileReader = null;
@@ -171,7 +175,8 @@ public class CarbonDictionaryMetadataReaderImpl implements CarbonDictionaryMetad
     if (null == dictionaryMetadataFileReader) {
       dictionaryMetadataFileReader =
           new ThriftReader(this.columnDictionaryMetadataFilePath, new ThriftReader.TBaseCreator() {
-            @Override public TBase create() {
+            @Override
+            public TBase create() {
               return new ColumnDictionaryChunkMeta();
             }
           });
diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImpl.java
index c66b9fb..f559655 100644
--- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImpl.java
@@ -73,7 +73,8 @@ public class CarbonDictionaryReaderImpl implements CarbonDictionaryReader {
    * @return list of byte array. Each byte array is unique dictionary value
    * @throws IOException if an I/O error occurs
    */
-  @Override public List<byte[]> read() throws IOException {
+  @Override
+  public List<byte[]> read() throws IOException {
     return read(0L);
   }
 
@@ -88,7 +89,8 @@ public class CarbonDictionaryReaderImpl implements CarbonDictionaryReader {
    * @return list of byte array. Each byte array is unique dictionary value
    * @throws IOException if an I/O error occurs
    */
-  @Override public List<byte[]> read(long startOffset) throws IOException {
+  @Override
+  public List<byte[]> read(long startOffset) throws IOException {
     List<CarbonDictionaryColumnMetaChunk> carbonDictionaryColumnMetaChunks =
         readDictionaryMetadataFile();
     // get the last entry for carbon dictionary meta chunk
@@ -112,7 +114,8 @@ public class CarbonDictionaryReaderImpl implements CarbonDictionaryReader {
    * @return iterator over byte array. Each byte array is unique dictionary value
    * @throws IOException if an I/O error occurs
    */
-  @Override public Iterator<byte[]> read(long startOffset, long endOffset) throws IOException {
+  @Override
+  public Iterator<byte[]> read(long startOffset, long endOffset) throws IOException {
     List<CarbonDictionaryColumnMetaChunk> carbonDictionaryColumnMetaChunks =
         readDictionaryMetadataFile();
     List<ColumnDictionaryChunk> columnDictionaryChunks =
@@ -127,7 +130,8 @@ public class CarbonDictionaryReaderImpl implements CarbonDictionaryReader {
    *
    * @throws IOException if an I/O error occurs
    */
-  @Override public void close() throws IOException {
+  @Override
+  public void close() throws IOException {
     if (null != dictionaryFileReader) {
       dictionaryFileReader.close();
       dictionaryFileReader = null;
@@ -294,7 +298,8 @@ public class CarbonDictionaryReaderImpl implements CarbonDictionaryReader {
       // dictionary thrift object contains a list of byte buffer
       dictionaryFileReader =
           new ThriftReader(this.columnDictionaryFilePath, new ThriftReader.TBaseCreator() {
-            @Override public TBase create() {
+            @Override
+            public TBase create() {
               return new ColumnDictionaryChunk();
             }
           });
diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonFooterReader.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonFooterReader.java
index 94778d7..579ca97 100644
--- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonFooterReader.java
+++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonFooterReader.java
@@ -66,7 +66,8 @@ public class CarbonFooterReader {
   private ThriftReader openThriftReader(String filePath) {
 
     return new ThriftReader(filePath, new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new FileFooter();
       }
     });
diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonFooterReaderV3.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonFooterReaderV3.java
index 8171e12..3fa714c 100644
--- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonFooterReaderV3.java
+++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonFooterReaderV3.java
@@ -66,7 +66,8 @@ public class CarbonFooterReaderV3 {
   private ThriftReader openThriftReader(String filePath) {
 
     return new ThriftReader(filePath, new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new FileFooter3();
       }
     });
diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonHeaderReader.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonHeaderReader.java
index d3d9177..a98f702 100644
--- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonHeaderReader.java
+++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonHeaderReader.java
@@ -73,7 +73,8 @@ public class CarbonHeaderReader {
   private ThriftReader openThriftReader(String filePath) {
     Configuration conf = configuration != null ? configuration : FileFactory.getConfiguration();
     return new ThriftReader(filePath, new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new FileHeader();
       }
     }, conf);
diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonIndexFileReader.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonIndexFileReader.java
index 27eaa32..59b2ad8 100644
--- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonIndexFileReader.java
+++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonIndexFileReader.java
@@ -51,7 +51,8 @@ public class CarbonIndexFileReader {
    */
   public IndexHeader readIndexHeader() throws IOException {
     return (IndexHeader) thriftReader.read(new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new IndexHeader();
       }
     });
@@ -72,7 +73,8 @@ public class CarbonIndexFileReader {
    */
   public BlockIndex readBlockIndexInfo() throws IOException {
     return (BlockIndex) thriftReader.read(new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new BlockIndex();
       }
     });
diff --git a/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java
index ef40c16..5487c80 100644
--- a/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java
@@ -78,7 +78,8 @@ public class CarbonDictionarySortIndexReaderImpl implements CarbonDictionarySort
    * In case of no member for column empty list will be return
    * @throws IOException In case any I/O error occurs
    */
-  @Override public List<Integer> readSortIndex() throws IOException {
+  @Override
+  public List<Integer> readSortIndex() throws IOException {
     if (null == columnSortInfo) {
       readColumnSortInfo();
     }
@@ -113,7 +114,8 @@ public class CarbonDictionarySortIndexReaderImpl implements CarbonDictionarySort
    * @return The method return's the list of dictionary inverted sort Index
    * @throws IOException In case any I/O error occurs
    */
-  @Override public List<Integer> readInvertedSortIndex() throws IOException {
+  @Override
+  public List<Integer> readInvertedSortIndex() throws IOException {
     if (null == columnSortInfo) {
       readColumnSortInfo();
     }
@@ -180,7 +182,8 @@ public class CarbonDictionarySortIndexReaderImpl implements CarbonDictionarySort
   private void openThriftReader() throws IOException {
     this.dictionarySortIndexThriftReader =
         new ThriftReader(this.sortIndexFilePath, new ThriftReader.TBaseCreator() {
-          @Override public TBase create() {
+          @Override
+          public TBase create() {
             return new ColumnSortInfo();
           }
         });
@@ -194,7 +197,8 @@ public class CarbonDictionarySortIndexReaderImpl implements CarbonDictionarySort
    *
    * @throws IOException if an I/O error occurs
    */
-  @Override public void close() throws IOException {
+  @Override
+  public void close() throws IOException {
     if (null != dictionarySortIndexThriftReader) {
       dictionarySortIndexThriftReader.close();
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/ArrayQueryType.java b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/ArrayQueryType.java
index 76fa067..23aee6c 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/ArrayQueryType.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/ArrayQueryType.java
@@ -37,7 +37,8 @@ public class ArrayQueryType extends ComplexQueryType implements GenericQueryType
     super(name, parentName, blockIndex);
   }
 
-  @Override public void addChildren(GenericQueryType children) {
+  @Override
+  public void addChildren(GenericQueryType children) {
     if (this.getName().equals(children.getParentName())) {
       this.children = children;
     } else {
@@ -45,19 +46,23 @@ public class ArrayQueryType extends ComplexQueryType implements GenericQueryType
     }
   }
 
-  @Override public String getName() {
+  @Override
+  public String getName() {
     return name;
   }
 
-  @Override public void setName(String name) {
+  @Override
+  public void setName(String name) {
     this.name = name;
   }
 
-  @Override public String getParentName() {
+  @Override
+  public String getParentName() {
     return parentName;
   }
 
-  @Override public void setParentName(String parentName) {
+  @Override
+  public void setParentName(String parentName) {
     this.parentName = parentName;
 
   }
@@ -78,17 +83,20 @@ public class ArrayQueryType extends ComplexQueryType implements GenericQueryType
     }
   }
 
-  @Override public int getColsCount() {
+  @Override
+  public int getColsCount() {
     return children.getColsCount() + 1;
   }
 
-  @Override public void fillRequiredBlockData(RawBlockletColumnChunks blockChunkHolder)
+  @Override
+  public void fillRequiredBlockData(RawBlockletColumnChunks blockChunkHolder)
       throws IOException {
     readBlockDataChunk(blockChunkHolder);
     children.fillRequiredBlockData(blockChunkHolder);
   }
 
-  @Override public Object getDataBasedOnDataType(ByteBuffer dataBuffer) {
+  @Override
+  public Object getDataBasedOnDataType(ByteBuffer dataBuffer) {
     Object[] data = fillData(dataBuffer);
     if (data == null) {
       return null;
@@ -108,12 +116,14 @@ public class ArrayQueryType extends ComplexQueryType implements GenericQueryType
     return data;
   }
 
-  @Override public Object getDataBasedOnColumn(ByteBuffer dataBuffer, CarbonDimension parent,
+  @Override
+  public Object getDataBasedOnColumn(ByteBuffer dataBuffer, CarbonDimension parent,
       CarbonDimension child) {
     throw new UnsupportedOperationException("Operation Unsupported for ArrayType");
   }
 
-  @Override public Object getDataBasedOnColumnList(Map<CarbonDimension, ByteBuffer> childBuffer,
+  @Override
+  public Object getDataBasedOnColumnList(Map<CarbonDimension, ByteBuffer> childBuffer,
       CarbonDimension presentColumn) {
     throw new UnsupportedOperationException("Operation Unsupported for ArrayType");
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/PrimitiveQueryType.java b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/PrimitiveQueryType.java
index 5666665..b275a27 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/PrimitiveQueryType.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/PrimitiveQueryType.java
@@ -69,28 +69,34 @@ public class PrimitiveQueryType extends ComplexQueryType implements GenericQuery
         DirectDictionaryKeyGeneratorFactory.getDirectDictionaryGenerator(DataTypes.DATE);
   }
 
-  @Override public void addChildren(GenericQueryType children) {
+  @Override
+  public void addChildren(GenericQueryType children) {
 
   }
 
-  @Override public String getName() {
+  @Override
+  public String getName() {
     return name;
   }
 
-  @Override public void setName(String name) {
+  @Override
+  public void setName(String name) {
     this.name = name;
   }
 
-  @Override public String getParentName() {
+  @Override
+  public String getParentName() {
     return parentName;
   }
 
-  @Override public void setParentName(String parentName) {
+  @Override
+  public void setParentName(String parentName) {
     this.parentName = parentName;
 
   }
 
-  @Override public int getColsCount() {
+  @Override
+  public int getColsCount() {
     return 1;
   }
 
@@ -106,16 +112,19 @@ public class PrimitiveQueryType extends ComplexQueryType implements GenericQuery
     dataOutputStream.write(currentVal);
   }
 
-  @Override public void fillRequiredBlockData(RawBlockletColumnChunks blockChunkHolder)
+  @Override
+  public void fillRequiredBlockData(RawBlockletColumnChunks blockChunkHolder)
       throws IOException {
     readBlockDataChunk(blockChunkHolder);
   }
 
-  @Override public Object getDataBasedOnDataType(ByteBuffer dataBuffer) {
+  @Override
+  public Object getDataBasedOnDataType(ByteBuffer dataBuffer) {
     return getDataObject(dataBuffer, -1);
   }
 
-  @Override public Object getDataBasedOnColumn(ByteBuffer dataBuffer, CarbonDimension parent,
+  @Override
+  public Object getDataBasedOnColumn(ByteBuffer dataBuffer, CarbonDimension parent,
       CarbonDimension child) {
     Object actualData;
 
@@ -175,7 +184,8 @@ public class PrimitiveQueryType extends ComplexQueryType implements GenericQuery
     return actualData;
   }
 
-  @Override public Object getDataBasedOnColumnList(Map<CarbonDimension, ByteBuffer> childBuffer,
+  @Override
+  public Object getDataBasedOnColumnList(Map<CarbonDimension, ByteBuffer> childBuffer,
       CarbonDimension presentColumn) {
     return getDataBasedOnColumn(childBuffer.get(presentColumn), presentColumn, presentColumn);
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/StructQueryType.java b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/StructQueryType.java
index 04e7070..372622d 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/StructQueryType.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/StructQueryType.java
@@ -43,7 +43,8 @@ public class StructQueryType extends ComplexQueryType implements GenericQueryTyp
     this.parentName = parentName;
   }
 
-  @Override public void addChildren(GenericQueryType newChild) {
+  @Override
+  public void addChildren(GenericQueryType newChild) {
     if (this.getName().equals(newChild.getParentName())) {
       this.children.add(newChild);
     } else {
@@ -54,24 +55,29 @@ public class StructQueryType extends ComplexQueryType implements GenericQueryTyp
 
   }
 
-  @Override public String getName() {
+  @Override
+  public String getName() {
     return name;
   }
 
-  @Override public void setName(String name) {
+  @Override
+  public void setName(String name) {
     this.name = name;
   }
 
-  @Override public String getParentName() {
+  @Override
+  public String getParentName() {
     return parentName;
   }
 
-  @Override public void setParentName(String parentName) {
+  @Override
+  public void setParentName(String parentName) {
     this.parentName = parentName;
 
   }
 
-  @Override public int getColsCount() {
+  @Override
+  public int getColsCount() {
     int colsCount = 1;
     for (int i = 0; i < children.size(); i++) {
       colsCount += children.get(i).getColsCount();
@@ -79,7 +85,8 @@ public class StructQueryType extends ComplexQueryType implements GenericQueryTyp
     return colsCount;
   }
 
-  @Override public void parseBlocksAndReturnComplexColumnByteArray(
+  @Override
+  public void parseBlocksAndReturnComplexColumnByteArray(
       DimensionRawColumnChunk[] dimensionColumnDataChunks,
       DimensionColumnPage[][] dimensionColumnPages, int rowNumber, int pageNumber,
       DataOutputStream dataOutputStream) throws IOException {
@@ -96,7 +103,8 @@ public class StructQueryType extends ComplexQueryType implements GenericQueryTyp
     }
   }
 
-  @Override public void fillRequiredBlockData(RawBlockletColumnChunks blockChunkHolder)
+  @Override
+  public void fillRequiredBlockData(RawBlockletColumnChunks blockChunkHolder)
       throws IOException {
     readBlockDataChunk(blockChunkHolder);
 
@@ -105,7 +113,8 @@ public class StructQueryType extends ComplexQueryType implements GenericQueryTyp
     }
   }
 
-  @Override public Object getDataBasedOnDataType(ByteBuffer dataBuffer) {
+  @Override
+  public Object getDataBasedOnDataType(ByteBuffer dataBuffer) {
     int childLength = dataBuffer.getShort();
     Object[] fields = new Object[childLength];
     for (int i = 0; i < childLength; i++) {
@@ -114,7 +123,8 @@ public class StructQueryType extends ComplexQueryType implements GenericQueryTyp
     return DataTypeUtil.getDataTypeConverter().wrapWithGenericRow(fields);
   }
 
-  @Override public Object getDataBasedOnColumn(ByteBuffer dataBuffer, CarbonDimension parent,
+  @Override
+  public Object getDataBasedOnColumn(ByteBuffer dataBuffer, CarbonDimension parent,
       CarbonDimension child) {
     int childLength;
     if (parent.getOrdinal() < child.getOrdinal()) {
@@ -134,7 +144,8 @@ public class StructQueryType extends ComplexQueryType implements GenericQueryTyp
     }
   }
 
-  @Override public Object getDataBasedOnColumnList(Map<CarbonDimension, ByteBuffer> childBuffer,
+  @Override
+  public Object getDataBasedOnColumnList(Map<CarbonDimension, ByteBuffer> childBuffer,
       CarbonDimension presentColumn) {
     // Traverse through the Complex Tree and check if the at present column is same as the
     // column present in the child column then fill it up else add null to the column.
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java
index 1d76de6..17f5d2c 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java
@@ -38,7 +38,8 @@ public class QueryExecutionException extends Exception {
   /**
    * getLocalizedMessage
    */
-  @Override public String getLocalizedMessage() {
+  @Override
+  public String getLocalizedMessage() {
     return super.getLocalizedMessage();
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java
index b3128a7..36a4727 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java
@@ -756,7 +756,8 @@ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> {
    *
    * @throws QueryExecutionException
    */
-  @Override public void finish() throws QueryExecutionException {
+  @Override
+  public void finish() throws QueryExecutionException {
     CarbonUtil.clearBlockCache(queryProperties.dataBlocks);
     Throwable exceptionOccurred = null;
     if (null != queryIterator) {
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/DeleteDeltaInfo.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/DeleteDeltaInfo.java
index 52fa529..8e9e1a3 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/DeleteDeltaInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/DeleteDeltaInfo.java
@@ -49,7 +49,8 @@ public class DeleteDeltaInfo {
     return latestDeleteDeltaFileTimestamp;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + Arrays.hashCode(deleteDeltaFile);
@@ -59,7 +60,8 @@ public class DeleteDeltaInfo {
     return result;
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java b/core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java
index 262904f..08ea041 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java
@@ -437,7 +437,8 @@ public class ExpressionResult implements Comparable<ExpressionResult> {
     return evaluateResultListFinal;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     if (null != expressionResults) {
@@ -451,7 +452,8 @@ public class ExpressionResult implements Comparable<ExpressionResult> {
     return result;
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (!(obj instanceof ExpressionResult)) {
       return false;
     }
@@ -508,7 +510,8 @@ public class ExpressionResult implements Comparable<ExpressionResult> {
     return value == null;
   }
 
-  @Override public int compareTo(ExpressionResult o) {
+  @Override
+  public int compareTo(ExpressionResult o) {
     try {
       DataType type = o.dataType;
       if (type == DataTypes.SHORT ||
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/expression/conditional/ImplicitExpression.java b/core/src/main/java/org/apache/carbondata/core/scan/expression/conditional/ImplicitExpression.java
index eab564e..606dd35 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/expression/conditional/ImplicitExpression.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/expression/conditional/ImplicitExpression.java
@@ -69,7 +69,8 @@ public class ImplicitExpression extends Expression {
     blockletIds.add(Integer.parseInt(blockletPath.substring(blockId.length() + 1)));
   }
 
-  @Override public ExpressionResult evaluate(RowIntf value)
+  @Override
+  public ExpressionResult evaluate(RowIntf value)
       throws FilterUnsupportedException, FilterIllegalMemberException {
     throw new UnsupportedOperationException("Operation not supported for Implicit expression");
   }
@@ -78,14 +79,17 @@ public class ImplicitExpression extends Expression {
     return blockIdToBlockletIdMapping;
   }
 
-  @Override public ExpressionType getFilterExpressionType() {
+  @Override
+  public ExpressionType getFilterExpressionType() {
     return ExpressionType.IMPLICIT;
   }
 
-  @Override public void findAndSetChild(Expression oldExpr, Expression newExpr) {
+  @Override
+  public void findAndSetChild(Expression oldExpr, Expression newExpr) {
   }
 
-  @Override public String getString() {
+  @Override
+  public String getString() {
     StringBuilder value = new StringBuilder();
     value.append("ImplicitExpression(");
     for (Map.Entry<String, Set<Integer>> entry : blockIdToBlockletIdMapping.entrySet()) {
@@ -103,7 +107,8 @@ public class ImplicitExpression extends Expression {
     return value.toString();
   }
 
-  @Override public String getStatement() {
+  @Override
+  public String getStatement() {
     return getString();
   }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/FalseExpression.java b/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/FalseExpression.java
index b01dc08..3a2c7be 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/FalseExpression.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/FalseExpression.java
@@ -64,7 +64,8 @@ public class FalseExpression  extends BinaryConditionalExpression {
   public ExpressionType getFilterExpressionType() {
     return ExpressionType.FALSE;
   }
-  @Override public String getString() {
+  @Override
+  public String getString() {
     return "False(" + (null == left ? null : left.getString());
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/RangeExpression.java b/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/RangeExpression.java
index b49b6f9..9d5a318 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/RangeExpression.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/RangeExpression.java
@@ -59,7 +59,8 @@ public class RangeExpression extends BinaryConditionalExpression {
     return ExpressionType.RANGE;
   }
 
-  @Override public String getString() {
+  @Override
+  public String getString() {
     return "Range(" + left.getString() + ',' + right.getString() + ')';
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/TrueExpression.java b/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/TrueExpression.java
index 43a05f4..d84d0bd 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/TrueExpression.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/expression/logical/TrueExpression.java
@@ -62,7 +62,8 @@ public class TrueExpression extends BinaryConditionalExpression {
   public ExpressionType getFilterExpressionType() {
     return ExpressionType.TRUE;
   }
-  @Override public String getString() {
+  @Override
+  public String getString() {
     return "True(" + (null == left ? null : left.getString());
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java
index 493e7e7..f808e27 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java
@@ -96,7 +96,8 @@ public class FilterExpressionProcessor implements FilterProcessor {
    * @param partitionInfo
    * @return
    */
-  @Override public BitSet getFilteredPartitions(Expression expressionTree,
+  @Override
+  public BitSet getFilteredPartitions(Expression expressionTree,
       PartitionInfo partitionInfo) {
     Partitioner partitioner = PartitionUtil.getPartitioner(partitionInfo);
     return createPartitionFilterTree(expressionTree, partitionInfo).applyFilter(partitioner);
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java
index cb9c930..2d4af60 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java
@@ -609,7 +609,8 @@ public final class FilterUtil {
 
     java.util.Comparator<byte[]> filterNoDictValueComaparator = new java.util.Comparator<byte[]>() {
 
-      @Override public int compare(byte[] filterMember1, byte[] filterMember2) {
+      @Override
+      public int compare(byte[] filterMember1, byte[] filterMember2) {
         // TODO Auto-generated method stub
         return ByteUtil.UnsafeComparer.INSTANCE.compareTo(filterMember1, filterMember2);
       }
@@ -895,7 +896,8 @@ public final class FilterUtil {
       List<String> evaluateResultListFinal) {
     java.util.Comparator<String> filterActualValueComaparator = new java.util.Comparator<String>() {
 
-      @Override public int compare(String filterMember1, String filterMember2) {
+      @Override
+      public int compare(String filterMember1, String filterMember2) {
         return compareFilterMembersBasedOnActualDataType(filterMember1, filterMember2,
             columnExpression.getDataType());
       }
@@ -2183,7 +2185,8 @@ public final class FilterUtil {
    */
   private static byte[][] getSortedEncodedFilters(List<byte[]> encodedFilters) {
     java.util.Comparator<byte[]> filterNoDictValueComaparator = new java.util.Comparator<byte[]>() {
-      @Override public int compare(byte[] filterMember1, byte[] filterMember2) {
+      @Override
+      public int compare(byte[] filterMember1, byte[] filterMember2) {
         return ByteUtil.UnsafeComparer.INSTANCE.compareTo(filterMember1, filterMember2);
       }
     };
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/AndFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/AndFilterExecuterImpl.java
index f0feb0e..da63a2b 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/AndFilterExecuterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/AndFilterExecuterImpl.java
@@ -65,13 +65,15 @@ public class AndFilterExecuterImpl implements FilterExecuter, ImplicitColumnFilt
     return leftFilters;
   }
 
-  @Override public boolean applyFilter(RowIntf value, int dimOrdinalMax)
+  @Override
+  public boolean applyFilter(RowIntf value, int dimOrdinalMax)
       throws FilterUnsupportedException, IOException {
     return leftExecuter.applyFilter(value, dimOrdinalMax) &&
         rightExecuter.applyFilter(value, dimOrdinalMax);
   }
 
-  @Override public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
+  @Override
+  public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
       boolean[] isMinMaxSet) {
     BitSet leftFilters = leftExecuter.isScanRequired(blockMaxValue, blockMinValue, isMinMaxSet);
     if (leftFilters.isEmpty()) {
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/BitSetUpdaterFactory.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/BitSetUpdaterFactory.java
index 95bf09d..abdf6ff 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/BitSetUpdaterFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/BitSetUpdaterFactory.java
@@ -45,7 +45,8 @@ public final class BitSetUpdaterFactory {
    * Below class will be used to updating the bitset in case of include filter
    */
   static class IncludeFilterBitSetUpdater implements FilterBitSetUpdater {
-    @Override public void updateBitset(BitSet bitSet, int bitIndex) {
+    @Override
+    public void updateBitset(BitSet bitSet, int bitIndex) {
       bitSet.set(bitIndex);
     }
   }
@@ -54,7 +55,8 @@ public final class BitSetUpdaterFactory {
    * Below class will be used to updating the bitset in case of exclude filter
    */
   static class ExcludeFilterBitSetUpdater implements FilterBitSetUpdater {
-    @Override public void updateBitset(BitSet bitSet, int bitIndex) {
+    @Override
+    public void updateBitset(BitSet bitSet, int bitIndex) {
       bitSet.flip(bitIndex);
     }
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/ImplicitIncludeFilterExecutorImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/ImplicitIncludeFilterExecutorImpl.java
index c932504..d545119 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/ImplicitIncludeFilterExecutorImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/ImplicitIncludeFilterExecutorImpl.java
@@ -70,7 +70,8 @@ public class ImplicitIncludeFilterExecutorImpl
     return false;
   }
 
-  @Override public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
+  @Override
+  public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
       boolean[] isMinMaxSet) {
     return null;
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/IncludeFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/IncludeFilterExecuterImpl.java
index bfa2460..53860ee 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/IncludeFilterExecuterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/IncludeFilterExecuterImpl.java
@@ -245,7 +245,8 @@ public class IncludeFilterExecuterImpl implements FilterExecuter {
     return null;
   }
 
-  @Override public boolean applyFilter(RowIntf value, int dimOrdinalMax) {
+  @Override
+  public boolean applyFilter(RowIntf value, int dimOrdinalMax) {
     if (isDimensionPresentInCurrentBlock) {
       byte[][] filterValues = dimColumnExecuterInfo.getFilterKeys();
       byte[] col = (byte[])value.getVal(dimColumnEvaluatorInfo.getDimension().getOrdinal());
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java
index 6b37e60..5aae594 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java
@@ -115,7 +115,8 @@ public class RowLevelRangeGrtThanFiterExecuterImpl extends RowLevelFilterExecute
     }
   }
 
-  @Override public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
+  @Override
+  public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
       boolean[] isMinMaxSet) {
     BitSet bitSet = new BitSet(1);
     boolean isScanRequired = false;
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java
index 24c2e3c..91a2e17 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java
@@ -113,7 +113,8 @@ public class RowLevelRangeGrtrThanEquaToFilterExecuterImpl extends RowLevelFilte
     }
   }
 
-  @Override public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
+  @Override
+  public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
       boolean[] isMinMaxSet) {
     BitSet bitSet = new BitSet(1);
     boolean isScanRequired = false;
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanEqualFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanEqualFilterExecuterImpl.java
index 0dbdf79..ed0efea 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanEqualFilterExecuterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanEqualFilterExecuterImpl.java
@@ -113,7 +113,8 @@ public class RowLevelRangeLessThanEqualFilterExecuterImpl extends RowLevelFilter
     }
   }
 
-  @Override public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
+  @Override
+  public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
       boolean[] isMinMaxSet) {
     BitSet bitSet = new BitSet(1);
     byte[] minValue = null;
@@ -597,7 +598,8 @@ public class RowLevelRangeLessThanEqualFilterExecuterImpl extends RowLevelFilter
     return bitSet;
   }
 
-  @Override public void readColumnChunks(RawBlockletColumnChunks rawBlockletColumnChunks)
+  @Override
+  public void readColumnChunks(RawBlockletColumnChunks rawBlockletColumnChunks)
       throws IOException {
     if (isDimensionPresentInCurrentBlock[0]) {
       if (!dimColEvaluatorInfoList.get(0).getDimension().hasEncoding(Encoding.DICTIONARY)) {
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFilterExecuterImpl.java
index acd918a..3e0b55d 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFilterExecuterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFilterExecuterImpl.java
@@ -113,7 +113,8 @@ public class RowLevelRangeLessThanFilterExecuterImpl extends RowLevelFilterExecu
     }
   }
 
-  @Override public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
+  @Override
+  public BitSet isScanRequired(byte[][] blockMaxValue, byte[][] blockMinValue,
       boolean[] isMinMaxSet) {
     BitSet bitSet = new BitSet(1);
     byte[] minValue = null;
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/intf/RowImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/intf/RowImpl.java
index dfde5ed..93794ed 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/intf/RowImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/intf/RowImpl.java
@@ -24,19 +24,23 @@ public class RowImpl implements RowIntf {
     row = new Object[0];
   }
 
-  @Override public Object getVal(int index) {
+  @Override
+  public Object getVal(int index) {
     return row[index];
   }
 
-  @Override public Object[] getValues() {
+  @Override
+  public Object[] getValues() {
     return row;
   }
 
-  @Override public void setValues(final Object[] row) {
+  @Override
+  public void setValues(final Object[] row) {
     this.row = row;
   }
 
-  @Override public int size() {
+  @Override
+  public int size() {
     return this.row.length;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/optimizer/RangeFilterOptmizer.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/optimizer/RangeFilterOptmizer.java
index 3032bb5..78f04b5 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/optimizer/RangeFilterOptmizer.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/optimizer/RangeFilterOptmizer.java
@@ -30,7 +30,8 @@ public class RangeFilterOptmizer implements FilterOptimizer {
 
   }
 
-  @Override public Expression optimizeFilter() {
+  @Override
+  public Expression optimizeFilter() {
     // Check if Range Filter can be applied.
     // rangeExpEvaluator.rangeExpressionEvaluatorGraphBased(null, null);
     rangeExpEvaluator.rangeExpressionEvaluatorMapBased();
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/AndFilterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/AndFilterImpl.java
index 3c35e17..1d756f4 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/AndFilterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/AndFilterImpl.java
@@ -34,7 +34,8 @@ public class AndFilterImpl implements PartitionFilterIntf {
     this.right = right;
   }
 
-  @Override public BitSet applyFilter(Partitioner partitioner) {
+  @Override
+  public BitSet applyFilter(Partitioner partitioner) {
     BitSet leftBitSet = left.applyFilter(partitioner);
     BitSet rightBitSet = right.applyFilter(partitioner);
     leftBitSet.and(rightBitSet);
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/EqualToFilterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/EqualToFilterImpl.java
index 4df892d..93657b2 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/EqualToFilterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/EqualToFilterImpl.java
@@ -40,7 +40,8 @@ public class EqualToFilterImpl implements PartitionFilterIntf {
     this.partitionInfo = partitionInfo;
   }
 
-  @Override public BitSet applyFilter(Partitioner partitioner) {
+  @Override
+  public BitSet applyFilter(Partitioner partitioner) {
     BitSet partitionMap = PartitionUtil.generateBitSetBySize(partitioner.numPartitions(), false);
     if (equalTo.isNull) {
       partitionMap.set(partitioner.getPartition(null));
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/InFilterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/InFilterImpl.java
index 0f45b32..1974ee1 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/InFilterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/InFilterImpl.java
@@ -42,7 +42,8 @@ public class InFilterImpl implements PartitionFilterIntf {
     this.partitionInfo = partitionInfo;
   }
 
-  @Override public BitSet applyFilter(Partitioner partitioner) {
+  @Override
+  public BitSet applyFilter(Partitioner partitioner) {
     BitSet partitionMap = PartitionUtil.generateBitSetBySize(partitioner.numPartitions(), false);
     ListExpression list = (ListExpression) in.getRight();
     for (Expression expr : list.getChildren()) {
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/KeepAllPartitionFilterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/KeepAllPartitionFilterImpl.java
index edde6ba..8ad3be6 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/KeepAllPartitionFilterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/KeepAllPartitionFilterImpl.java
@@ -27,7 +27,8 @@ import org.apache.carbondata.core.scan.partition.Partitioner;
  */
 public class KeepAllPartitionFilterImpl implements PartitionFilterIntf {
 
-  @Override public BitSet applyFilter(Partitioner partitioner) {
+  @Override
+  public BitSet applyFilter(Partitioner partitioner) {
     return PartitionUtil.generateBitSetBySize(partitioner.numPartitions(), true);
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/OrFilterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/OrFilterImpl.java
index 5581e40..804a92a 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/OrFilterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/OrFilterImpl.java
@@ -34,7 +34,8 @@ public class OrFilterImpl implements PartitionFilterIntf {
     this.right = right;
   }
 
-  @Override public BitSet applyFilter(Partitioner partitioner) {
+  @Override
+  public BitSet applyFilter(Partitioner partitioner) {
     BitSet leftBitSet = left.applyFilter(partitioner);
     BitSet rightBitSet = right.applyFilter(partitioner);
     leftBitSet.or(rightBitSet);
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/PruneAllPartitionFilterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/PruneAllPartitionFilterImpl.java
index 155e391..4b4625e 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/PruneAllPartitionFilterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/PruneAllPartitionFilterImpl.java
@@ -27,7 +27,8 @@ import org.apache.carbondata.core.scan.partition.Partitioner;
  */
 public class PruneAllPartitionFilterImpl implements PartitionFilterIntf {
 
-  @Override public BitSet applyFilter(Partitioner partitioner) {
+  @Override
+  public BitSet applyFilter(Partitioner partitioner) {
     return PartitionUtil.generateBitSetBySize(partitioner.numPartitions(), false);
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/RangeFilterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/RangeFilterImpl.java
index 6ed4cbc..6484f1d 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/RangeFilterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/partition/RangeFilterImpl.java
@@ -48,7 +48,8 @@ public class RangeFilterImpl implements PartitionFilterIntf {
     this.partitionInfo = partitionInfo;
   }
 
-  @Override public BitSet applyFilter(Partitioner partitioner) {
+  @Override
+  public BitSet applyFilter(Partitioner partitioner) {
 
     SimpleDateFormat timestampFormatter = new SimpleDateFormat(CarbonProperties.getInstance()
         .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java
index 2fd1996..20da026 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java
@@ -66,7 +66,8 @@ public class ConditionalFilterResolverImpl implements FilterResolverIntf {
    *
    * @throws FilterUnsupportedException
    */
-  @Override public void resolve(AbsoluteTableIdentifier absoluteTableIdentifier)
+  @Override
+  public void resolve(AbsoluteTableIdentifier absoluteTableIdentifier)
       throws FilterUnsupportedException, IOException {
     FilterResolverMetadata metadata = new FilterResolverMetadata();
     metadata.setTableIdentifier(absoluteTableIdentifier);
@@ -194,7 +195,8 @@ public class ConditionalFilterResolverImpl implements FilterResolverIntf {
    *
    * @return left node of type FilterResolverIntf instance
    */
-  @Override public FilterResolverIntf getRight() {
+  @Override
+  public FilterResolverIntf getRight() {
     // TODO Auto-generated method stub
     return null;
   }
@@ -237,7 +239,8 @@ public class ConditionalFilterResolverImpl implements FilterResolverIntf {
   /**
    * get the start key based on the filter surrogates
    */
-  @Override public void getEndKey(SegmentProperties segmentProperties, long[] endKeys,
+  @Override
+  public void getEndKey(SegmentProperties segmentProperties, long[] endKeys,
       SortedMap<Integer, byte[]> setOfEndKeyByteArray, List<long[]> endKeyList) {
     if (null != dimColResolvedFilterInfo) {
       FilterUtil.getEndKey(dimColResolvedFilterInfo.getDimensionResolvedFilterInstance(), endKeys,
@@ -253,7 +256,8 @@ public class ConditionalFilterResolverImpl implements FilterResolverIntf {
    *
    * @return the filter executer type
    */
-  @Override public FilterExecuterType getFilterExecuterType() {
+  @Override
+  public FilterExecuterType getFilterExecuterType() {
     switch (exp.getFilterExpressionType()) {
       case NOT_EQUALS:
       case NOT_IN:
@@ -306,7 +310,8 @@ public class ConditionalFilterResolverImpl implements FilterResolverIntf {
   }
 
 
-  @Override public Expression getFilterExpression() {
+  @Override
+  public Expression getFilterExpression() {
     // TODO Auto-generated method stub
     return exp;
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/LogicalFilterResolverImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/LogicalFilterResolverImpl.java
index 368cd9a..e48456f 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/LogicalFilterResolverImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/LogicalFilterResolverImpl.java
@@ -57,7 +57,8 @@ public class LogicalFilterResolverImpl implements FilterResolverIntf {
    *
    * @param absoluteTableIdentifier
    */
-  @Override public void resolve(AbsoluteTableIdentifier absoluteTableIdentifier) {
+  @Override
+  public void resolve(AbsoluteTableIdentifier absoluteTableIdentifier) {
 
   }
 
@@ -81,24 +82,29 @@ public class LogicalFilterResolverImpl implements FilterResolverIntf {
     return rightEvalutor;
   }
 
-  @Override public DimColumnResolvedFilterInfo getDimColResolvedFilterInfo() {
+  @Override
+  public DimColumnResolvedFilterInfo getDimColResolvedFilterInfo() {
     return null;
   }
 
-  @Override public MeasureColumnResolvedFilterInfo getMsrColResolvedFilterInfo() {
+  @Override
+  public MeasureColumnResolvedFilterInfo getMsrColResolvedFilterInfo() {
     return null;
   }
-  @Override public void getStartKey(SegmentProperties segmentProperties, long[] startKey,
+  @Override
+  public void getStartKey(SegmentProperties segmentProperties, long[] startKey,
       SortedMap<Integer, byte[]> setOfStartKeyByteArray, List<long[]> startKeyList) {
 
   }
 
-  @Override public void getEndKey(SegmentProperties segmentProperties, long[] endKeys,
+  @Override
+  public void getEndKey(SegmentProperties segmentProperties, long[] endKeys,
       SortedMap<Integer, byte[]> setOfEndKeyByteArray, List<long[]> endKeyList) {
 
   }
 
-  @Override public FilterExecuterType getFilterExecuterType() {
+  @Override
+  public FilterExecuterType getFilterExecuterType() {
     switch (filterExpressionType) {
       case OR:
         return FilterExecuterType.OR;
@@ -110,7 +116,8 @@ public class LogicalFilterResolverImpl implements FilterResolverIntf {
     }
   }
 
-  @Override public Expression getFilterExpression() {
+  @Override
+  public Expression getFilterExpression() {
     return filterExpression;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/RowLevelFilterResolverImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/RowLevelFilterResolverImpl.java
index f4d6fe8..4075fd9 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/RowLevelFilterResolverImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/RowLevelFilterResolverImpl.java
@@ -86,7 +86,8 @@ public class RowLevelFilterResolverImpl extends ConditionalFilterResolverImpl {
    * special executer since it get all the rows of the specified filter dimension
    * and will be send to the spark for processing
    */
-  @Override public FilterExecuterType getFilterExecuterType() {
+  @Override
+  public FilterExecuterType getFilterExecuterType() {
     return FilterExecuterType.ROWLEVEL;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/RowLevelRangeFilterResolverImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/RowLevelRangeFilterResolverImpl.java
index 963b445..91e2e5b 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/RowLevelRangeFilterResolverImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/RowLevelRangeFilterResolverImpl.java
@@ -147,7 +147,8 @@ public class RowLevelRangeFilterResolverImpl extends ConditionalFilterResolverIm
    *
    * @return end IndexKey
    */
-  @Override public void getEndKey(SegmentProperties segmentProperties, long[] endKeys,
+  @Override
+  public void getEndKey(SegmentProperties segmentProperties, long[] endKeys,
       SortedMap<Integer, byte[]> noDicEndKeys, List<long[]> endKeyList) {
     switch (exp.getFilterExpressionType()) {
       case LESSTHAN:
@@ -197,7 +198,8 @@ public class RowLevelRangeFilterResolverImpl extends ConditionalFilterResolverIm
       }
     }
     Comparator<byte[]> filterNoDictValueComaparator = new Comparator<byte[]>() {
-      @Override public int compare(byte[] filterMember1, byte[] filterMember2) {
+      @Override
+      public int compare(byte[] filterMember1, byte[] filterMember2) {
         return ByteUtil.UnsafeComparer.INSTANCE.compareTo(filterMember1, filterMember2);
       }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/DimColumnResolvedFilterInfo.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/DimColumnResolvedFilterInfo.java
index 13dfbcd..47ff35c 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/DimColumnResolvedFilterInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/DimColumnResolvedFilterInfo.java
@@ -140,7 +140,8 @@ public class DimColumnResolvedFilterInfo extends ColumnResolvedFilterInfo implem
     return dimColumnResolvedFilterInfo;
   }
 
-  @Override public CarbonMeasure getMeasure() {
+  @Override
+  public CarbonMeasure getMeasure() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/FalseConditionalResolverImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/FalseConditionalResolverImpl.java
index b5468ce..16c5f09 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/FalseConditionalResolverImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/FalseConditionalResolverImpl.java
@@ -31,7 +31,8 @@ public class FalseConditionalResolverImpl extends ConditionalFilterResolverImpl
     super(exp, isExpressionResolve, isIncludeFilter, false);
   }
 
-  @Override public void resolve(AbsoluteTableIdentifier absoluteTableIdentifier) {
+  @Override
+  public void resolve(AbsoluteTableIdentifier absoluteTableIdentifier) {
   }
 
   /**
@@ -39,7 +40,8 @@ public class FalseConditionalResolverImpl extends ConditionalFilterResolverImpl
    * the executer type for the filter resolution, False Expresssion willl not execute anything.
    * it will return empty bitset
    */
-  @Override public FilterExecuterType getFilterExecuterType() {
+  @Override
+  public FilterExecuterType getFilterExecuterType() {
     return FilterExecuterType.FALSE;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/MeasureColumnResolvedFilterInfo.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/MeasureColumnResolvedFilterInfo.java
index ad5e0c6..dcb4a3d 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/MeasureColumnResolvedFilterInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/MeasureColumnResolvedFilterInfo.java
@@ -117,7 +117,8 @@ public class MeasureColumnResolvedFilterInfo extends ColumnResolvedFilterInfo
     return carbonMeasure;
   }
 
-  @Override public CarbonDimension getDimension() {
+  @Override
+  public CarbonDimension getDimension() {
     throw new UnsupportedOperationException("Operation not supported");
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/TrueConditionalResolverImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/TrueConditionalResolverImpl.java
index 3e58538..406efcc 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/TrueConditionalResolverImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/TrueConditionalResolverImpl.java
@@ -32,7 +32,8 @@ public class TrueConditionalResolverImpl extends ConditionalFilterResolverImpl {
     super(exp, isExpressionResolve, isIncludeFilter, false);
   }
 
-  @Override public void resolve(AbsoluteTableIdentifier absoluteTableIdentifier) {
+  @Override
+  public void resolve(AbsoluteTableIdentifier absoluteTableIdentifier) {
   }
 
   /**
@@ -41,7 +42,8 @@ public class TrueConditionalResolverImpl extends ConditionalFilterResolverImpl {
    * special executer since it get all the rows of the specified filter dimension
    * and will be send to the spark for processing
    */
-  @Override public FilterExecuterType getFilterExecuterType() {
+  @Override
+  public FilterExecuterType getFilterExecuterType() {
     return FilterExecuterType.TRUE;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/ImplicitColumnVisitor.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/ImplicitColumnVisitor.java
index 1653a4a..8c0b7f2 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/ImplicitColumnVisitor.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/ImplicitColumnVisitor.java
@@ -42,7 +42,8 @@ public class ImplicitColumnVisitor implements ResolvedFilterInfoVisitorIntf {
    *                                       filter models.
    */
 
-  @Override public void populateFilterResolvedInfo(ColumnResolvedFilterInfo visitableObj,
+  @Override
+  public void populateFilterResolvedInfo(ColumnResolvedFilterInfo visitableObj,
       FilterResolverMetadata metadata) throws FilterUnsupportedException {
     if (visitableObj instanceof DimColumnResolvedFilterInfo) {
       ColumnFilterInfo resolvedFilterObject = null;
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/partition/HashPartitioner.java b/core/src/main/java/org/apache/carbondata/core/scan/partition/HashPartitioner.java
index 240c449..8562abb 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/partition/HashPartitioner.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/partition/HashPartitioner.java
@@ -28,11 +28,13 @@ public class HashPartitioner implements Partitioner {
     this.numPartitions = numPartitions;
   }
 
-  @Override public int numPartitions() {
+  @Override
+  public int numPartitions() {
     return numPartitions;
   }
 
-  @Override public int getPartition(Object key) {
+  @Override
+  public int getPartition(Object key) {
     if (key == null) {
       return 0;
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/partition/ListPartitioner.java b/core/src/main/java/org/apache/carbondata/core/scan/partition/ListPartitioner.java
index f6cc6b2..8936b0d 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/partition/ListPartitioner.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/partition/ListPartitioner.java
@@ -63,11 +63,13 @@ public class ListPartitioner implements Partitioner {
    * add extra default partition
    * @return
    */
-  @Override public int numPartitions() {
+  @Override
+  public int numPartitions() {
     return numPartitions + 1;
   }
 
-  @Override public int getPartition(Object key) {
+  @Override
+  public int getPartition(Object key) {
     Integer partition = map.get(key);
     if (partition == null) {
       return 0;
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/partition/RangePartitioner.java b/core/src/main/java/org/apache/carbondata/core/scan/partition/RangePartitioner.java
index e61aefd..478196b 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/partition/RangePartitioner.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/partition/RangePartitioner.java
@@ -70,11 +70,13 @@ public class RangePartitioner implements Partitioner {
    *
    * @return
    */
-  @Override public int numPartitions() {
+  @Override
+  public int numPartitions() {
     return numPartitions + 1;
   }
 
-  @Override public int getPartition(Object key) {
+  @Override
+  public int getPartition(Object key) {
     if (key == null) {
       return 0;
     } else {
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/processor/DataBlockIterator.java b/core/src/main/java/org/apache/carbondata/core/scan/processor/DataBlockIterator.java
index 4f635c6..84b5227 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/processor/DataBlockIterator.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/processor/DataBlockIterator.java
@@ -203,7 +203,8 @@ public class DataBlockIterator extends CarbonIterator<List<Object[]>> {
 
   private Future<BlockletScannedResult> scanNextBlockletAsync() {
     return executorService.submit(new Callable<BlockletScannedResult>() {
-      @Override public BlockletScannedResult call() throws Exception {
+      @Override
+      public BlockletScannedResult call() throws Exception {
         if (futureIo == null) {
           futureIo = readNextBlockletAsync();
         }
@@ -224,7 +225,8 @@ public class DataBlockIterator extends CarbonIterator<List<Object[]>> {
 
   private Future<RawBlockletColumnChunks> readNextBlockletAsync() {
     return executorService.submit(new Callable<RawBlockletColumnChunks>() {
-      @Override public RawBlockletColumnChunks call() throws Exception {
+      @Override
+      public RawBlockletColumnChunks call() throws Exception {
         try {
           TaskMetricsMap.getInstance().registerThreadCallback();
           if (blockletIterator.hasNext()) {
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/RowBatch.java b/core/src/main/java/org/apache/carbondata/core/scan/result/RowBatch.java
index 0f11df7..e22a5c8 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/RowBatch.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/RowBatch.java
@@ -83,7 +83,8 @@ public class RowBatch extends CarbonIterator<Object[]> {
    *
    * @return {@code true} if the iteration has more elements
    */
-  @Override public boolean hasNext() {
+  @Override
+  public boolean hasNext() {
     return counter < rows.size();
   }
 
@@ -92,7 +93,8 @@ public class RowBatch extends CarbonIterator<Object[]> {
    *
    * @return the next element in the iteration
    */
-  @Override public Object[] next() {
+  @Override
+  public Object[] next() {
     if (!hasNext()) {
       throw new NoSuchElementException();
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResult.java b/core/src/main/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResult.java
index 0a7338f..102f541 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResult.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResult.java
@@ -39,7 +39,8 @@ public class FilterQueryScannedResult extends BlockletScannedResult {
    * @return dictionary key array for all the dictionary dimension
    * selected in query
    */
-  @Override public byte[] getDictionaryKeyArray() {
+  @Override
+  public byte[] getDictionaryKeyArray() {
     ++currentRow;
     return getDictionaryKeyArray(pageFilteredRowId[pageCounter][currentRow]);
   }
@@ -48,12 +49,14 @@ public class FilterQueryScannedResult extends BlockletScannedResult {
    * @return dictionary key integer array for all the dictionary dimension
    * selected in query
    */
-  @Override public int[] getDictionaryKeyIntegerArray() {
+  @Override
+  public int[] getDictionaryKeyIntegerArray() {
     ++currentRow;
     return getDictionaryKeyIntegerArray(pageFilteredRowId[pageCounter][currentRow]);
   }
 
-  @Override public void fillValidRowIdsBatchFilling(int rowId, int batchSize) {
+  @Override
+  public void fillValidRowIdsBatchFilling(int rowId, int batchSize) {
     // row id will be different for every batch so clear it before filling
     clearValidRowIdList();
     int startPosition = rowId;
@@ -72,11 +75,13 @@ public class FilterQueryScannedResult extends BlockletScannedResult {
    *
    * @return complex type key array
    */
-  @Override public byte[][] getComplexTypeKeyArray() {
+  @Override
+  public byte[][] getComplexTypeKeyArray() {
     return getComplexTypeKeyArray(pageFilteredRowId[pageCounter][currentRow]);
   }
 
-  @Override public List<byte[][]> getComplexTypeKeyArrayBatch(int batchSize) {
+  @Override
+  public List<byte[][]> getComplexTypeKeyArrayBatch(int batchSize) {
     return getComplexTypeKeyArrayBatch();
   }
 
@@ -86,7 +91,8 @@ public class FilterQueryScannedResult extends BlockletScannedResult {
    *
    * @return no dictionary key array for all the no dictionary dimension
    */
-  @Override public byte[][] getNoDictionaryKeyArray() {
+  @Override
+  public byte[][] getNoDictionaryKeyArray() {
     return getNoDictionaryKeyArray(pageFilteredRowId[pageCounter][currentRow]);
   }
 
@@ -95,7 +101,8 @@ public class FilterQueryScannedResult extends BlockletScannedResult {
    *
    * @return valid row id
    */
-  @Override public int getCurrentRowId() {
+  @Override
+  public int getCurrentRowId() {
     return pageFilteredRowId[pageCounter][currentRow];
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResult.java b/core/src/main/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResult.java
index 36a1017..1ba6992 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResult.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResult.java
@@ -38,7 +38,8 @@ public class NonFilterQueryScannedResult extends BlockletScannedResult {
    * @return dictionary key array for all the dictionary dimension selected in
    * query
    */
-  @Override public byte[] getDictionaryKeyArray() {
+  @Override
+  public byte[] getDictionaryKeyArray() {
     ++currentRow;
     return getDictionaryKeyArray(currentRow);
   }
@@ -47,7 +48,8 @@ public class NonFilterQueryScannedResult extends BlockletScannedResult {
    * @return dictionary key integer array for all the dictionary dimension
    * selected in query
    */
-  @Override public int[] getDictionaryKeyIntegerArray() {
+  @Override
+  public int[] getDictionaryKeyIntegerArray() {
     ++currentRow;
     return getDictionaryKeyIntegerArray(currentRow);
   }
@@ -57,11 +59,13 @@ public class NonFilterQueryScannedResult extends BlockletScannedResult {
    *
    * @return complex type key array
    */
-  @Override public byte[][] getComplexTypeKeyArray() {
+  @Override
+  public byte[][] getComplexTypeKeyArray() {
     return getComplexTypeKeyArray(currentRow);
   }
 
-  @Override public List<byte[][]> getComplexTypeKeyArrayBatch(int batchSize) {
+  @Override
+  public List<byte[][]> getComplexTypeKeyArrayBatch(int batchSize) {
     return getComplexTypeKeyArrayBatch();
   }
 
@@ -71,11 +75,13 @@ public class NonFilterQueryScannedResult extends BlockletScannedResult {
    *
    * @return no dictionary key array for all the no dictionary dimension
    */
-  @Override public byte[][] getNoDictionaryKeyArray() {
+  @Override
+  public byte[][] getNoDictionaryKeyArray() {
     return getNoDictionaryKeyArray(currentRow);
   }
 
-  @Override public void fillValidRowIdsBatchFilling(int rowId, int batchSize) {
+  @Override
+  public void fillValidRowIdsBatchFilling(int rowId, int batchSize) {
     // row id will be different for every batch so clear it before filling
     clearValidRowIdList();
     int startPosition = rowId;
@@ -92,7 +98,8 @@ public class NonFilterQueryScannedResult extends BlockletScannedResult {
    *
    * @return valid row id
    */
-  @Override public int getCurrentRowId() {
+  @Override
+  public int getCurrentRowId() {
     return currentRow;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/AbstractDetailQueryResultIterator.java b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/AbstractDetailQueryResultIterator.java
index 9144bd8..ec57ab2 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/AbstractDetailQueryResultIterator.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/AbstractDetailQueryResultIterator.java
@@ -295,7 +295,8 @@ public abstract class AbstractDetailQueryResultIterator<E> extends CarbonIterato
     throw new UnsupportedOperationException("Please use VectorDetailQueryResultIterator");
   }
 
-  @Override public void close() {
+  @Override
+  public void close() {
     if (null != dataBlockIterator) {
       dataBlockIterator.close();
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/ChunkRowIterator.java b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/ChunkRowIterator.java
index 03efc3d..1adb7e5 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/ChunkRowIterator.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/ChunkRowIterator.java
@@ -48,7 +48,8 @@ public class ChunkRowIterator extends CarbonIterator<Object[]> {
    *
    * @return {@code true} if the iteration has more elements
    */
-  @Override public boolean hasNext() {
+  @Override
+  public boolean hasNext() {
     if (currentChunk != null && currentChunk.hasNext()) {
       return true;
     } else if (iterator != null && iterator.hasNext()) {
@@ -63,7 +64,8 @@ public class ChunkRowIterator extends CarbonIterator<Object[]> {
    *
    * @return the next element in the iteration
    */
-  @Override public Object[] next() {
+  @Override
+  public Object[] next() {
     return currentChunk.next();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/DetailQueryResultIterator.java b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/DetailQueryResultIterator.java
index c073c78..60b7136 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/DetailQueryResultIterator.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/DetailQueryResultIterator.java
@@ -37,7 +37,8 @@ public class DetailQueryResultIterator extends AbstractDetailQueryResultIterator
     super(infos, queryModel, execService);
   }
 
-  @Override public RowBatch next() {
+  @Override
+  public RowBatch next() {
     return getBatchResult();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/PartitionSpliterRawResultIterator.java b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/PartitionSpliterRawResultIterator.java
index 773fbd7..f19b3a5 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/PartitionSpliterRawResultIterator.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/PartitionSpliterRawResultIterator.java
@@ -29,7 +29,8 @@ public class PartitionSpliterRawResultIterator extends CarbonIterator<Object[]>
     this.iterator = iterator;
   }
 
-  @Override public boolean hasNext() {
+  @Override
+  public boolean hasNext() {
     if (null == batch || checkBatchEnd(batch)) {
       if (iterator.hasNext()) {
         batch = iterator.next();
@@ -42,7 +43,8 @@ public class PartitionSpliterRawResultIterator extends CarbonIterator<Object[]>
     return !checkBatchEnd(batch);
   }
 
-  @Override public Object[] next() {
+  @Override
+  public Object[] next() {
     if (batch == null) {
       batch = iterator.next();
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/ColumnVectorInfo.java b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/ColumnVectorInfo.java
index 6a9b3b3..ad0a86b 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/ColumnVectorInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/ColumnVectorInfo.java
@@ -39,11 +39,13 @@ public class ColumnVectorInfo implements Comparable<ColumnVectorInfo> {
   public BitSet deletedRows;
   public DecimalConverterFactory.DecimalConverter decimalConverter;
 
-  @Override public int compareTo(ColumnVectorInfo o) {
+  @Override
+  public int compareTo(ColumnVectorInfo o) {
     return ordinal - o.ordinal;
   }
 
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
@@ -59,7 +61,8 @@ public class ColumnVectorInfo implements Comparable<ColumnVectorInfo> {
     return ordinal == ((ColumnVectorInfo) obj).ordinal;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + (ordinal);
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonColumnVectorImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonColumnVectorImpl.java
index 18f440a..494ac8f 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonColumnVectorImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonColumnVectorImpl.java
@@ -101,100 +101,120 @@ public class CarbonColumnVectorImpl implements CarbonColumnVector {
 
   }
 
-  @Override public void putBoolean(int rowId, boolean value) {
+  @Override
+  public void putBoolean(int rowId, boolean value) {
     byteArr[rowId] =  (byte)((value) ? 1 : 0);
   }
 
-  @Override public void putFloat(int rowId, float value) {
+  @Override
+  public void putFloat(int rowId, float value) {
     floats[rowId] = value;
   }
 
-  @Override public void putShort(int rowId, short value) {
+  @Override
+  public void putShort(int rowId, short value) {
     shorts[rowId] = value;
   }
 
-  @Override public void putShorts(int rowId, int count, short value) {
+  @Override
+  public void putShorts(int rowId, int count, short value) {
     for (int i = 0; i < count; ++i) {
       shorts[i + rowId] = value;
     }
   }
 
-  @Override public void putInt(int rowId, int value) {
+  @Override
+  public void putInt(int rowId, int value) {
     ints[rowId] = value;
   }
 
-  @Override public void putInts(int rowId, int count, int value) {
+  @Override
+  public void putInts(int rowId, int count, int value) {
     for (int i = 0; i < count; ++i) {
       ints[i + rowId] = value;
     }
   }
 
-  @Override public void putLong(int rowId, long value) {
+  @Override
+  public void putLong(int rowId, long value) {
     longs[rowId] = value;
   }
 
-  @Override public void putLongs(int rowId, int count, long value) {
+  @Override
+  public void putLongs(int rowId, int count, long value) {
     for (int i = 0; i < count; ++i) {
       longs[i + rowId] = value;
     }
   }
 
-  @Override public void putDecimal(int rowId, BigDecimal  value, int precision) {
+  @Override
+  public void putDecimal(int rowId, BigDecimal  value, int precision) {
     decimals[rowId] = value;
   }
 
-  @Override public void putDecimals(int rowId, int count, BigDecimal value, int precision) {
+  @Override
+  public void putDecimals(int rowId, int count, BigDecimal value, int precision) {
     for (int i = 0; i < count; ++i) {
       decimals[i + rowId] = value;
     }
   }
 
-  @Override public void putDouble(int rowId, double value) {
+  @Override
+  public void putDouble(int rowId, double value) {
     doubles[rowId] = value;
   }
 
-  @Override public void putDoubles(int rowId, int count, double value) {
+  @Override
+  public void putDoubles(int rowId, int count, double value) {
     for (int i = 0; i < count; ++i) {
       doubles[i + rowId] = value;
     }
   }
 
-  @Override public void putByteArray(int rowId, byte[] value) {
+  @Override
+  public void putByteArray(int rowId, byte[] value) {
     bytes[rowId] = value;
   }
 
-  @Override public void putByte(int rowId, byte value) {
+  @Override
+  public void putByte(int rowId, byte value) {
     byteArr[rowId] = value;
   }
 
-  @Override public void putByteArray(int rowId, int count, byte[] value) {
+  @Override
+  public void putByteArray(int rowId, int count, byte[] value) {
     for (int i = 0; i < count; ++i) {
       bytes[i + rowId] = value;
     }
   }
 
-  @Override public void putByteArray(int rowId, int offset, int length, byte[] value) {
+  @Override
+  public void putByteArray(int rowId, int offset, int length, byte[] value) {
     bytes[rowId] = new byte[length];
     System.arraycopy(value, offset, bytes[rowId], 0, length);
   }
 
-  @Override public void putNull(int rowId) {
+  @Override
+  public void putNull(int rowId) {
     nullBytes.set(rowId);
     anyNullsSet = true;
   }
 
-  @Override public void putNulls(int rowId, int count) {
+  @Override
+  public void putNulls(int rowId, int count) {
     for (int i = 0; i < count; ++i) {
       nullBytes.set(rowId + i);
     }
     anyNullsSet = true;
   }
 
-  @Override public void putNotNull(int rowId) {
+  @Override
+  public void putNotNull(int rowId) {
 
   }
 
-  @Override public void putNotNull(int rowId, int count) {
+  @Override
+  public void putNotNull(int rowId, int count) {
 
   }
 
@@ -203,15 +223,18 @@ public class CarbonColumnVectorImpl implements CarbonColumnVector {
   }
 
 
-  @Override public boolean isNull(int rowId) {
+  @Override
+  public boolean isNull(int rowId) {
     return nullBytes.get(rowId);
   }
 
-  @Override public void putObject(int rowId, Object obj) {
+  @Override
+  public void putObject(int rowId, Object obj) {
     data[rowId] = obj;
   }
 
-  @Override public Object getData(int rowId) {
+  @Override
+  public Object getData(int rowId) {
     if (!loaded) {
       loadPage();
     }
@@ -278,7 +301,8 @@ public class CarbonColumnVectorImpl implements CarbonColumnVector {
     }
   }
 
-  @Override public void reset() {
+  @Override
+  public void reset() {
     nullBytes.clear();
     if (dataType == DataTypes.BOOLEAN || dataType == DataTypes.BYTE) {
       Arrays.fill(byteArr, (byte) 0);
@@ -305,7 +329,8 @@ public class CarbonColumnVectorImpl implements CarbonColumnVector {
 
   }
 
-  @Override public DataType getType() {
+  @Override
+  public DataType getType() {
     return dataType;
   }
 
@@ -319,19 +344,23 @@ public class CarbonColumnVectorImpl implements CarbonColumnVector {
     this.blockDataType = blockDataType;
   }
 
-  @Override public void setFilteredRowsExist(boolean filteredRowsExist) {
+  @Override
+  public void setFilteredRowsExist(boolean filteredRowsExist) {
 
   }
 
-  @Override public void setDictionary(CarbonDictionary dictionary) {
+  @Override
+  public void setDictionary(CarbonDictionary dictionary) {
     this.carbonDictionary = dictionary;
   }
 
-  @Override public boolean hasDictionary() {
+  @Override
+  public boolean hasDictionary() {
     return null != this.carbonDictionary;
   }
 
-  @Override public CarbonColumnVector getDictionaryVector() {
+  @Override
+  public CarbonColumnVector getDictionaryVector() {
     return dictionaryVector;
   }
 
@@ -341,43 +370,50 @@ public class CarbonColumnVectorImpl implements CarbonColumnVector {
    */
   public final boolean anyNullsSet() { return anyNullsSet; }
 
-  @Override public void putFloats(int rowId, int count, float[] src, int srcIndex) {
+  @Override
+  public void putFloats(int rowId, int count, float[] src, int srcIndex) {
     for (int i = srcIndex; i < count; i++) {
       floats[rowId ++] = src[i];
     }
   }
 
-  @Override public void putShorts(int rowId, int count, short[] src, int srcIndex) {
+  @Override
+  public void putShorts(int rowId, int count, short[] src, int srcIndex) {
     for (int i = srcIndex; i < count; i++) {
       shorts[rowId ++] = src[i];
     }
   }
 
-  @Override public void putInts(int rowId, int count, int[] src, int srcIndex) {
+  @Override
+  public void putInts(int rowId, int count, int[] src, int srcIndex) {
     for (int i = srcIndex; i < count; i++) {
       ints[rowId ++] = src[i];
     }
   }
 
-  @Override public void putLongs(int rowId, int count, long[] src, int srcIndex) {
+  @Override
+  public void putLongs(int rowId, int count, long[] src, int srcIndex) {
     for (int i = srcIndex; i < count; i++) {
       longs[rowId ++] = src[i];
     }
   }
 
-  @Override public void putDoubles(int rowId, int count, double[] src, int srcIndex) {
+  @Override
+  public void putDoubles(int rowId, int count, double[] src, int srcIndex) {
     for (int i = srcIndex; i < count; i++) {
       doubles[rowId ++] = src[i];
     }
   }
 
-  @Override public void putBytes(int rowId, int count, byte[] src, int srcIndex) {
+  @Override
+  public void putBytes(int rowId, int count, byte[] src, int srcIndex) {
     for (int i = srcIndex; i < count; i++) {
       byteArr[rowId ++] = src[i];
     }
   }
 
-  @Override public void setLazyPage(LazyPageLoader lazyPage) {
+  @Override
+  public void setLazyPage(LazyPageLoader lazyPage) {
     this.lazyPage = lazyPage;
   }
 
@@ -388,7 +424,8 @@ public class CarbonColumnVectorImpl implements CarbonColumnVector {
     loaded = true;
   }
 
-  @Override public void putArray(int rowId, int offset, int length) {
+  @Override
+  public void putArray(int rowId, int offset, int length) {
     if (offsets == null) {
       offsets = new int[batchSize];
       lengths = new int[batchSize];
@@ -397,7 +434,8 @@ public class CarbonColumnVectorImpl implements CarbonColumnVector {
     lengths[rowId] = length;
   }
 
-  @Override public void putAllByteArray(byte[] data, int offset, int length) {
+  @Override
+  public void putAllByteArray(byte[] data, int offset, int length) {
     byteArr = data;
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonDictionaryImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonDictionaryImpl.java
index 135ec3f..9efad25 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonDictionaryImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonDictionaryImpl.java
@@ -37,31 +37,38 @@ public class CarbonDictionaryImpl implements CarbonDictionary {
     this.actualSize = actualSize;
   }
 
-  @Override public int getDictionaryActualSize() {
+  @Override
+  public int getDictionaryActualSize() {
     return actualSize;
   }
 
-  @Override public int getDictionarySize() {
+  @Override
+  public int getDictionarySize() {
     return this.dictionary.length;
   }
 
-  @Override public boolean isDictionaryUsed() {
+  @Override
+  public boolean isDictionaryUsed() {
     return this.isDictUsed;
   }
 
-  @Override public void setDictionaryUsed() {
+  @Override
+  public void setDictionaryUsed() {
     this.isDictUsed = true;
   }
 
-  @Override public byte[] getDictionaryValue(int index) {
+  @Override
+  public byte[] getDictionaryValue(int index) {
     return dictionary[index];
   }
 
-  @Override public byte[][] getAllDictionaryValues() {
+  @Override
+  public byte[][] getAllDictionaryValues() {
     return dictionary;
   }
 
-  @Override public byte[] getAllDictionaryValuesInSingleArray() {
+  @Override
+  public byte[] getAllDictionaryValuesInSingleArray() {
     if (singleArrayDictValues == null) {
       dictLens = new int[dictionary.length];
       dictOffsets = new int[dictionary.length];
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/AbstractCarbonColumnarVector.java b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/AbstractCarbonColumnarVector.java
index 9083a20..aeeba53 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/AbstractCarbonColumnarVector.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/AbstractCarbonColumnarVector.java
@@ -143,7 +143,8 @@ public abstract class AbstractCarbonColumnarVector
     throw new UnsupportedOperationException("Not allowed from here " + getClass().getName());
   }
 
-  @Override public void putAllByteArray(byte[] data, int offset, int length) {
+  @Override
+  public void putAllByteArray(byte[] data, int offset, int length) {
     columnVector.putAllByteArray(data, offset, length);
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithDeleteDelta.java b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithDeleteDelta.java
index 67eb6ec..63cb42c 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithDeleteDelta.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithDeleteDelta.java
@@ -212,7 +212,8 @@ class ColumnarVectorWrapperDirectWithDeleteDelta extends AbstractCarbonColumnarV
     }
   }
 
-  @Override public void putArray(int rowId, int offset, int length) {
+  @Override
+  public void putArray(int rowId, int offset, int length) {
     if (!deletedRows.get(rowId)) {
       columnVector.putArray(counter++, offset, length);
     }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithDeleteDeltaAndInvertedIndex.java b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithDeleteDeltaAndInvertedIndex.java
index 2dd70bc..e322954 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithDeleteDeltaAndInvertedIndex.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithDeleteDeltaAndInvertedIndex.java
@@ -78,7 +78,8 @@ public class ColumnarVectorWrapperDirectWithDeleteDeltaAndInvertedIndex
     }
   }
 
-  @Override public void putAllByteArray(byte[] data, int offset, int length) {
+  @Override
+  public void putAllByteArray(byte[] data, int offset, int length) {
     carbonColumnVector.putAllByteArray(data, offset, length);
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithInvertedIndex.java b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithInvertedIndex.java
index aa816ef..14a1c43 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithInvertedIndex.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/directread/ColumnarVectorWrapperDirectWithInvertedIndex.java
@@ -147,7 +147,8 @@ public class ColumnarVectorWrapperDirectWithInvertedIndex extends AbstractCarbon
     return columnVector.getBlockDataType();
   }
 
-  @Override public void putArray(int rowId, int offset, int length) {
+  @Override
+  public void putArray(int rowId, int offset, int length) {
     columnVector.putArray(invertedIndex[rowId], offset, length);
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/scanner/impl/BlockletFullScanner.java b/core/src/main/java/org/apache/carbondata/core/scan/scanner/impl/BlockletFullScanner.java
index 1760aba..a501768 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/scanner/impl/BlockletFullScanner.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/scanner/impl/BlockletFullScanner.java
@@ -165,7 +165,8 @@ public class BlockletFullScanner implements BlockletScanner {
     return emptyResult;
   }
 
-  @Override public boolean isScanRequired(DataRefNode dataBlock) {
+  @Override
+  public boolean isScanRequired(DataRefNode dataBlock) {
     // For non filter it is always true
     return true;
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/wrappers/ByteArrayWrapper.java b/core/src/main/java/org/apache/carbondata/core/scan/wrappers/ByteArrayWrapper.java
index 253c21c..ff70aff 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/wrappers/ByteArrayWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/wrappers/ByteArrayWrapper.java
@@ -107,7 +107,8 @@ public class ByteArrayWrapper implements Comparable<ByteArrayWrapper>, Serializa
   /**
    * to generate the hash code
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     // first generate the has code of the dictionary column
     int len = dictionaryKey.length;
     int result = 1;
@@ -134,7 +135,8 @@ public class ByteArrayWrapper implements Comparable<ByteArrayWrapper>, Serializa
    *
    * @param other object
    */
-  @Override public boolean equals(Object other) {
+  @Override
+  public boolean equals(Object other) {
     if (null == other || !(other instanceof ByteArrayWrapper)) {
       return false;
     }
@@ -177,7 +179,8 @@ public class ByteArrayWrapper implements Comparable<ByteArrayWrapper>, Serializa
    *
    * @param other ArrayWrapper Object
    */
-  @Override public int compareTo(ByteArrayWrapper other) {
+  @Override
+  public int compareTo(ByteArrayWrapper other) {
     // compare will be as follows
     //compare dictionary column
     // then no dictionary column
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/wrappers/IntArrayWrapper.java b/core/src/main/java/org/apache/carbondata/core/scan/wrappers/IntArrayWrapper.java
index c1a75d5..09d99aa 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/wrappers/IntArrayWrapper.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/wrappers/IntArrayWrapper.java
@@ -30,7 +30,8 @@ public class IntArrayWrapper {
     this.data = data;
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
@@ -41,7 +42,8 @@ public class IntArrayWrapper {
     return Arrays.equals(data, that.data);
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return Arrays.hashCode(data);
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/service/impl/ColumnUniqueIdGenerator.java b/core/src/main/java/org/apache/carbondata/core/service/impl/ColumnUniqueIdGenerator.java
index 2816e85..767ae28 100644
--- a/core/src/main/java/org/apache/carbondata/core/service/impl/ColumnUniqueIdGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/service/impl/ColumnUniqueIdGenerator.java
@@ -28,7 +28,8 @@ public class ColumnUniqueIdGenerator implements ColumnUniqueIdService {
 
   private static ColumnUniqueIdService columnUniqueIdService = new ColumnUniqueIdGenerator();
 
-  @Override public String generateUniqueId(ColumnSchema columnSchema) {
+  @Override
+  public String generateUniqueId(ColumnSchema columnSchema) {
     return UUID.randomUUID().toString();
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/service/impl/DictionaryFactory.java b/core/src/main/java/org/apache/carbondata/core/service/impl/DictionaryFactory.java
index 83ef25f..b1329b2 100644
--- a/core/src/main/java/org/apache/carbondata/core/service/impl/DictionaryFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/service/impl/DictionaryFactory.java
@@ -42,7 +42,8 @@ public class DictionaryFactory implements DictionaryService {
    * @param dictionaryColumnUniqueIdentifier
    * @return
    */
-  @Override public CarbonDictionaryWriter getDictionaryWriter(
+  @Override
+  public CarbonDictionaryWriter getDictionaryWriter(
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier) {
     return new CarbonDictionaryWriterImpl(dictionaryColumnUniqueIdentifier);
   }
@@ -53,7 +54,8 @@ public class DictionaryFactory implements DictionaryService {
    * @param dictionaryColumnUniqueIdentifier
    * @return
    */
-  @Override public CarbonDictionarySortIndexWriter getDictionarySortIndexWriter(
+  @Override
+  public CarbonDictionarySortIndexWriter getDictionarySortIndexWriter(
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier) {
     return new CarbonDictionarySortIndexWriterImpl(dictionaryColumnUniqueIdentifier);
   }
@@ -64,7 +66,8 @@ public class DictionaryFactory implements DictionaryService {
    * @param dictionaryColumnUniqueIdentifier
    * @return
    */
-  @Override public CarbonDictionaryMetadataReader getDictionaryMetadataReader(
+  @Override
+  public CarbonDictionaryMetadataReader getDictionaryMetadataReader(
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier) {
     return new CarbonDictionaryMetadataReaderImpl(dictionaryColumnUniqueIdentifier);
   }
@@ -75,7 +78,8 @@ public class DictionaryFactory implements DictionaryService {
    * @param dictionaryColumnUniqueIdentifier
    * @return
    */
-  @Override public CarbonDictionaryReader getDictionaryReader(
+  @Override
+  public CarbonDictionaryReader getDictionaryReader(
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier) {
     return new CarbonDictionaryReaderImpl(dictionaryColumnUniqueIdentifier);
   }
@@ -86,7 +90,8 @@ public class DictionaryFactory implements DictionaryService {
    * @param dictionaryColumnUniqueIdentifier
    * @return
    */
-  @Override public CarbonDictionarySortIndexReader getDictionarySortIndexReader(
+  @Override
+  public CarbonDictionarySortIndexReader getDictionarySortIndexReader(
       DictionaryColumnUniqueIdentifier dictionaryColumnUniqueIdentifier) {
     return new CarbonDictionarySortIndexReaderImpl(dictionaryColumnUniqueIdentifier);
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/stats/TaskStatistics.java b/core/src/main/java/org/apache/carbondata/core/stats/TaskStatistics.java
index 9197196..e63da18 100644
--- a/core/src/main/java/org/apache/carbondata/core/stats/TaskStatistics.java
+++ b/core/src/main/java/org/apache/carbondata/core/stats/TaskStatistics.java
@@ -93,7 +93,8 @@ public class TaskStatistics implements Serializable {
     return this;
   }
 
-  @Override public String toString() {
+  @Override
+  public String toString() {
     StringBuilder builder = new StringBuilder();
     printStatisticTable(Arrays.asList(this), builder, "");
     return builder.toString();
diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/FileFormat.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/FileFormat.java
index 29f2564..d68429b 100644
--- a/core/src/main/java/org/apache/carbondata/core/statusmanager/FileFormat.java
+++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/FileFormat.java
@@ -61,18 +61,21 @@ public class FileFormat implements Serializable {
         this.format.equalsIgnoreCase("ROW_V1"));
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     FileFormat that = (FileFormat) o;
     return Objects.equals(format, that.format);
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     return Objects.hash(format);
   }
 
-  @Override public String toString() {
+  @Override
+  public String toString() {
     return format;
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java
index 355dbfd..f160b49 100644
--- a/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java
+++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java
@@ -196,7 +196,8 @@ public class LoadMetadataDetails implements Serializable {
   /* (non-Javadoc)
    * @see java.lang.Object#hashCode()
    */
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     final int prime = 31;
     int result = 1;
     result = prime * result + ((loadName == null) ? 0 : loadName.hashCode());
@@ -206,7 +207,8 @@ public class LoadMetadataDetails implements Serializable {
   /* (non-Javadoc)
    * @see java.lang.Object#equals(java.lang.Object)
    */
-  @Override public boolean equals(Object obj) {
+  @Override
+  public boolean equals(Object obj) {
     if (obj == null) {
       return false;
 
@@ -440,7 +442,8 @@ public class LoadMetadataDetails implements Serializable {
     this.segmentFile = segmentFile;
   }
 
-  @Override public String toString() {
+  @Override
+  public String toString() {
     return "LoadMetadataDetails{" + "loadStatus=" + loadStatus + ", loadName='" + loadName + '\''
         + ", loadStartTime='" + loadStartTime + '\'' + ", segmentFile='" + segmentFile + '\'' + '}';
   }
diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentRefreshInfo.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentRefreshInfo.java
index 11fb73f..88b9176 100644
--- a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentRefreshInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentRefreshInfo.java
@@ -57,7 +57,8 @@ public class SegmentRefreshInfo implements Serializable {
     return false;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = segmentUpdatedTimestamp.hashCode();
     result = 31 * result + countOfFileInSegment.hashCode();
     return result;
diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java
index c329a0a..ec02d84 100644
--- a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java
+++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java
@@ -216,7 +216,8 @@ public class SegmentUpdateStatusManager {
     // else scan the segment for the delta files with the respective timestamp.
     CarbonFile[] files = segDir.listFiles(new CarbonFileFilter() {
 
-      @Override public boolean accept(CarbonFile pathName) {
+      @Override
+      public boolean accept(CarbonFile pathName) {
         String fileName = pathName.getName();
         if (fileName.endsWith(CarbonCommonConstants.UPDATE_DELTA_FILE_EXT)) {
           String firstPart = fileName.substring(0, fileName.indexOf('.'));
@@ -358,7 +359,8 @@ public class SegmentUpdateStatusManager {
     List<String> deltaList = segmentDeleteDeltaListMap.get(blockDir);
     if (deltaList == null) {
       CarbonFile[] files = FileFactory.getCarbonFile(blockDir).listFiles(new CarbonFileFilter() {
-        @Override public boolean accept(CarbonFile pathName) {
+        @Override
+        public boolean accept(CarbonFile pathName) {
           String fileName = pathName.getName();
           if (fileName.endsWith(extension) && pathName.getSize() > 0) {
             return true;
@@ -415,7 +417,8 @@ public class SegmentUpdateStatusManager {
 
         return segDir.listFiles(new CarbonFileFilter() {
 
-          @Override public boolean accept(CarbonFile pathName) {
+          @Override
+          public boolean accept(CarbonFile pathName) {
             String fileName = pathName.getName();
             if (fileName.endsWith(CarbonCommonConstants.DELETE_DELTA_FILE_EXT)
                 && pathName.getSize() > 0) {
diff --git a/core/src/main/java/org/apache/carbondata/core/util/BlockletDataMapUtil.java b/core/src/main/java/org/apache/carbondata/core/util/BlockletDataMapUtil.java
index 5a988c4..f22462b 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/BlockletDataMapUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/BlockletDataMapUtil.java
@@ -153,7 +153,8 @@ public class BlockletDataMapUtil {
     CarbonFile carbonFile = FileFactory.getCarbonFile(segmentFilePath, configuration);
     if (carbonFile instanceof AbstractDFSCarbonFile && !(carbonFile instanceof S3CarbonFile)) {
       PathFilter pathFilter = new PathFilter() {
-        @Override public boolean accept(Path path) {
+        @Override
+        public boolean accept(Path path) {
           return CarbonTablePath.isCarbonDataFile(path.getName());
         }
       };
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonThreadFactory.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonThreadFactory.java
index b471638..a15068d 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonThreadFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonThreadFactory.java
@@ -46,7 +46,8 @@ public class CarbonThreadFactory implements ThreadFactory {
     this.withTime = withTime;
   }
 
-  @Override public Thread newThread(Runnable r) {
+  @Override
+  public Thread newThread(Runnable r) {
     final Thread thread = defaultFactory.newThread(r);
     if (withTime) {
       thread.setName(name + "_" + System.currentTimeMillis());
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
index 141ed76..42dd54c 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
@@ -297,7 +297,8 @@ public final class CarbonUtil {
       throws IOException, InterruptedException {
     UserGroupInformation.getLoginUser().doAs(new PrivilegedExceptionAction<Void>() {
 
-      @Override public Void run() throws Exception {
+      @Override
+      public Void run() throws Exception {
         for (int i = 0; i < path.length; i++) {
           CarbonFile carbonFile = FileFactory.getCarbonFile(path[i].getAbsolutePath());
           boolean delete = carbonFile.delete();
@@ -314,7 +315,8 @@ public final class CarbonUtil {
       throws IOException, InterruptedException {
     UserGroupInformation.getLoginUser().doAs(new PrivilegedExceptionAction<Void>() {
 
-      @Override public Void run() throws Exception {
+      @Override
+      public Void run() throws Exception {
         for (int i = 0; i < file.length; i++) {
           boolean delete = file[i].delete();
           if (!delete) {
@@ -330,7 +332,8 @@ public final class CarbonUtil {
       throws IOException, InterruptedException {
     UserGroupInformation.getLoginUser().doAs(new PrivilegedExceptionAction<Void>() {
 
-      @Override public Void run() throws Exception {
+      @Override
+      public Void run() throws Exception {
         for (int i = 0; i < file.length; i++) {
           boolean delete = file[i].delete();
           if (!delete) {
@@ -1451,7 +1454,8 @@ public final class CarbonUtil {
 
   public static BlockletHeader readBlockletHeader(byte[] data) throws IOException {
     return (BlockletHeader) read(data, new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new BlockletHeader();
       }
     }, 0, data.length);
@@ -1461,7 +1465,8 @@ public final class CarbonUtil {
       throws IOException {
     byte[] data = dataChunkBuffer.array();
     return (DataChunk3) read(data, new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new DataChunk3();
       }
     }, offset, length);
@@ -1469,7 +1474,8 @@ public final class CarbonUtil {
 
   public static DataChunk3 readDataChunk3(InputStream stream) throws IOException {
     TBaseCreator creator = new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new DataChunk3();
       }
     };
@@ -1487,7 +1493,8 @@ public final class CarbonUtil {
       throws IOException {
     byte[] data = dataChunkBuffer.array();
     return (DataChunk2) read(data, new ThriftReader.TBaseCreator() {
-      @Override public TBase create() {
+      @Override
+      public TBase create() {
         return new DataChunk2();
       }
     }, offset, length);
diff --git a/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverter.java b/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverter.java
index 61b4f37..efb7925 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverter.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverter.java
@@ -52,7 +52,8 @@ public class DataFileFooterConverter extends AbstractDataFileFooterConverter {
   /**
    * Below method will be used to convert thrift file meta to wrapper file meta
    */
-  @Override public DataFileFooter readDataFileFooter(TableBlockInfo tableBlockInfo)
+  @Override
+  public DataFileFooter readDataFileFooter(TableBlockInfo tableBlockInfo)
       throws IOException {
     DataFileFooter dataFileFooter = new DataFileFooter();
     FileReader fileReader = null;
@@ -132,7 +133,8 @@ public class DataFileFooterConverter extends AbstractDataFileFooterConverter {
     return blockletInfo;
   }
 
-  @Override public List<ColumnSchema> getSchema(TableBlockInfo tableBlockInfo) throws IOException {
+  @Override
+  public List<ColumnSchema> getSchema(TableBlockInfo tableBlockInfo) throws IOException {
     FileReader fileReader = null;
     List<ColumnSchema> columnSchemaList = new ArrayList<ColumnSchema>();
     try {
diff --git a/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverter2.java b/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverter2.java
index db52991..eaf21fe 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverter2.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverter2.java
@@ -50,7 +50,8 @@ public class DataFileFooterConverter2 extends AbstractDataFileFooterConverter {
   /**
    * Below method will be used to convert thrift file meta to wrapper file meta
    */
-  @Override public DataFileFooter readDataFileFooter(TableBlockInfo tableBlockInfo)
+  @Override
+  public DataFileFooter readDataFileFooter(TableBlockInfo tableBlockInfo)
       throws IOException {
     DataFileFooter dataFileFooter = new DataFileFooter();
     CarbonFooterReader reader =
@@ -146,7 +147,8 @@ public class DataFileFooterConverter2 extends AbstractDataFileFooterConverter {
     return numberOfDimensionColumns;
   }
 
-  @Override public List<ColumnSchema> getSchema(TableBlockInfo tableBlockInfo) throws IOException {
+  @Override
+  public List<ColumnSchema> getSchema(TableBlockInfo tableBlockInfo) throws IOException {
     return new DataFileFooterConverter(configuration).getSchema(tableBlockInfo);
   }
 }
diff --git a/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverterV3.java b/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverterV3.java
index d278f7a..dc99067 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverterV3.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/DataFileFooterConverterV3.java
@@ -57,7 +57,8 @@ public class DataFileFooterConverterV3 extends AbstractDataFileFooterConverter {
    *        table block info
    * @return data file footer
    */
-  @Override public DataFileFooter readDataFileFooter(TableBlockInfo tableBlockInfo)
+  @Override
+  public DataFileFooter readDataFileFooter(TableBlockInfo tableBlockInfo)
       throws IOException {
     CarbonHeaderReader carbonHeaderReader = new CarbonHeaderReader(tableBlockInfo.getFilePath());
     FileHeader fileHeader = carbonHeaderReader.readHeader();
@@ -105,7 +106,8 @@ public class DataFileFooterConverterV3 extends AbstractDataFileFooterConverter {
     return dataFileFooter;
   }
 
-  @Override public List<ColumnSchema> getSchema(TableBlockInfo tableBlockInfo) throws IOException {
+  @Override
+  public List<ColumnSchema> getSchema(TableBlockInfo tableBlockInfo) throws IOException {
     CarbonHeaderReader carbonHeaderReader = new CarbonHeaderReader(tableBlockInfo.getFilePath());
     FileHeader fileHeader = carbonHeaderReader.readHeader();
     List<ColumnSchema> columnSchemaList = new ArrayList<ColumnSchema>();
diff --git a/core/src/main/java/org/apache/carbondata/core/util/DataTypeConverterImpl.java b/core/src/main/java/org/apache/carbondata/core/util/DataTypeConverterImpl.java
index d579167..86e5550 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/DataTypeConverterImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/DataTypeConverterImpl.java
@@ -49,7 +49,8 @@ public class DataTypeConverterImpl implements DataTypeConverter, Serializable {
     return new BigDecimal(data.toString());
   }
 
-  @Override public Object convertFromDecimalToBigDecimal(Object data) {
+  @Override
+  public Object convertFromDecimalToBigDecimal(Object data) {
     return convertFromBigDecimalToDecimal(data);
   }
 
diff --git a/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java b/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
index 3e0edb1..660c705 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
@@ -52,7 +52,8 @@ public final class DataTypeUtil {
       LogServiceFactory.getLogService(DataTypeUtil.class.getName());
 
   private static final ThreadLocal<DateFormat> timeStampformatter = new ThreadLocal<DateFormat>() {
-    @Override protected DateFormat initialValue() {
+    @Override
+    protected DateFormat initialValue() {
       DateFormat dateFormat = new SimpleDateFormat(CarbonProperties.getInstance()
           .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
               CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
@@ -62,7 +63,8 @@ public final class DataTypeUtil {
   };
 
   private static final ThreadLocal<DateFormat> dateformatter = new ThreadLocal<DateFormat>() {
... 7015 lines suppressed ...