add WhitespaceAround and ParenPad
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/256dbed2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/256dbed2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/256dbed2 Branch: refs/heads/master Commit: 256dbed257b76c3be836f43d9b6981e71e2d45a5 Parents: 97405ad Author: QiangCai <qiang...@qq.com> Authored: Mon Jan 16 01:38:25 2017 +0800 Committer: QiangCai <qiang...@qq.com> Committed: Wed Jan 25 19:52:13 2017 +0800 ---------------------------------------------------------------------- .../carbondata/core/cache/CacheProvider.java | 4 +-- .../carbondata/core/cache/CarbonLRUCache.java | 2 +- .../dictionary/ReverseDictionaryCache.java | 2 +- .../BlockletLevelDeleteDeltaDataCache.java | 2 +- .../core/compression/BigIntCompressor.java | 2 +- .../core/constants/CarbonCommonConstants.java | 4 +-- .../datastore/AbstractBlockIndexStoreCache.java | 2 +- .../datastore/TableSegmentUniqueIdentifier.java | 2 +- .../core/datastore/block/BlockletInfos.java | 2 +- .../core/datastore/block/TableTaskInfo.java | 4 +-- .../core/datastore/block/TaskBlockInfo.java | 2 +- .../BlockIndexerStorageForNoInvertedIndex.java | 4 +-- .../datastore/columnar/ColumnWithIntIndex.java | 2 +- .../columnar/ColumnWithIntIndexForHighCard.java | 2 +- .../compression/decimal/CompressByteArray.java | 3 +- .../core/devapi/GeneratingBiDictionary.java | 2 +- .../IncrementalColumnDictionaryGenerator.java | 4 +-- .../MultiDimKeyVarLengthEquiSplitGenerator.java | 2 +- ...tiDimKeyVarLengthVariableSplitGenerator.java | 2 +- .../TimeStampDirectDictionaryGenerator.java | 9 +++-- .../keygenerator/mdkey/NumberCompressor.java | 2 +- .../carbondata/core/locks/HdfsFileLock.java | 2 +- .../core/metadata/schema/table/CarbonTable.java | 2 +- .../core/mutate/CarbonUpdateUtil.java | 11 +++--- .../core/mutate/SegmentUpdateDetails.java | 8 +++-- .../carbondata/core/mutate/TupleIdEnum.java | 2 +- .../data/BlockletDeleteDeltaCacheLoader.java | 2 +- .../reader/CarbonDeleteFilesDataReader.java | 2 +- .../impl/DictionaryBasedResultCollector.java | 12 +++---- .../core/scan/complextypes/StructQueryType.java | 2 +- .../executor/impl/AbstractQueryExecutor.java | 2 +- .../core/scan/expression/ExpressionResult.java | 15 ++++---- .../scan/filter/FilterExpressionProcessor.java | 2 +- .../carbondata/core/scan/filter/FilterUtil.java | 8 ++--- .../RowLevelRangeGrtThanFiterExecuterImpl.java | 2 +- .../RowLevelRangeLessThanFiterExecuterImpl.java | 2 +- .../scan/result/iterator/RawResultIterator.java | 16 ++++----- .../DriverQueryStatisticsRecorderDummy.java | 2 +- .../DriverQueryStatisticsRecorderImpl.java | 6 ++-- .../core/statusmanager/LoadMetadataDetails.java | 2 +- .../statusmanager/SegmentStatusManager.java | 8 ++--- .../SegmentUpdateStatusManager.java | 20 +++++------ .../carbondata/core/util/DataTypeUtil.java | 4 +-- .../core/util/ValueCompressionUtil.java | 19 +++++----- .../core/util/path/CarbonTablePath.java | 5 ++- .../sortindex/CarbonDictionarySortModel.java | 2 +- dev/javastyle-config.xml | 3 ++ format/src/main/thrift/dictionary.thrift | 1 - .../carbondata/hadoop/CarbonInputFormat.java | 4 +-- .../carbondata/hadoop/CarbonRecordReader.java | 2 +- .../hadoop/api/CarbonTableInputFormat.java | 2 +- .../impl/DictionaryDecodedReadSupportImpl.java | 2 +- .../carbondata/spark/load/CarbonLoaderUtil.java | 6 ++-- .../spark/load/DeleteLoadFolders.java | 4 +-- .../spark/merger/CarbonCompactionUtil.java | 6 ++-- .../spark/merger/CarbonDataMergerUtil.java | 6 ++-- .../merger/CarbonDataMergerUtilResult.java | 8 +++-- .../spark/merger/RowResultMerger.java | 8 ++--- .../readsupport/SparkRowReadSupportImpl.java | 4 +-- .../processing/csvload/DataGraphExecuter.java | 2 +- .../processing/csvreaderstep/CsvInput.java | 8 ++--- .../processing/csvreaderstep/CsvInputMeta.java | 4 +-- .../csvreaderstep/UnivocityCsvParser.java | 4 +-- .../processing/mdkeygen/MDKeyGenStep.java | 3 +- .../processing/newflow/DataLoadExecutor.java | 2 +- .../newflow/DataLoadProcessBuilder.java | 2 +- .../impl/ComplexFieldConverterImpl.java | 2 +- .../impl/DictionaryFieldConverterImpl.java | 2 +- .../impl/MeasureFieldConverterImpl.java | 2 +- .../converter/impl/RowConverterImpl.java | 2 +- .../newflow/dictionary/InMemBiDictionary.java | 4 +-- .../partition/impl/HashPartitionerImpl.java | 2 +- ...arallelReadMergeSorterWithBucketingImpl.java | 2 +- .../sort/unsafe/UnsafeMemoryManager.java | 12 +++---- .../merger/UnsafeIntermediateFileMerger.java | 2 +- .../metadata/ColumnSchemaDetailsWrapper.java | 2 +- .../sortdata/IntermediateFileMerger.java | 4 +-- .../store/CarbonFactDataHandlerColumnar.java | 4 +-- .../CarbonCSVBasedDimSurrogateKeyGen.java | 2 +- .../csvbased/CarbonCSVBasedSeqGenMeta.java | 4 +-- .../csvbased/CarbonCSVBasedSeqGenStep.java | 38 ++++++++++---------- .../FileStoreSurrogateKeyGenForCSV.java | 2 +- .../util/CarbonDataProcessorUtil.java | 6 ++-- .../processing/util/CarbonSchemaParser.java | 2 +- 84 files changed, 198 insertions(+), 195 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/cache/CacheProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/CacheProvider.java b/core/src/main/java/org/apache/carbondata/core/cache/CacheProvider.java index 776927f..25a8976 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/CacheProvider.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/CacheProvider.java @@ -173,9 +173,9 @@ public class CacheProvider { * Below method will be used to clear the cache */ public void dropAllCache() { - if(null != carbonLRUCache) { + if (null != carbonLRUCache) { carbonLRUCache.clear(); - carbonLRUCache= null; + carbonLRUCache = null; } cacheTypeToCacheMap.clear(); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/cache/CarbonLRUCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/CarbonLRUCache.java b/core/src/main/java/org/apache/carbondata/core/cache/CarbonLRUCache.java index f7bffd0..151ec58 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/CarbonLRUCache.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/CarbonLRUCache.java @@ -158,7 +158,7 @@ public final class CarbonLRUCache { currentSize = currentSize - cacheable.getMemorySize(); } Cacheable remove = lruCacheMap.remove(key); - if(null != remove) { + if (null != remove) { LOGGER.info("Removed entry from InMemory lru cache :: " + key); } } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCache.java ---------------------------------------------------------------------- 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 aaa4c07..55dfa0e 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 @@ -166,7 +166,7 @@ public class ReverseDictionaryCache<K extends DictionaryColumnUniqueIdentifier, throws IOException { Dictionary reverseDictionary = null; // dictionary is only for primitive data type - assert(!dictionaryColumnUniqueIdentifier.getDataType().isComplexType()); + assert (!dictionaryColumnUniqueIdentifier.getDataType().isComplexType()); String columnIdentifier = dictionaryColumnUniqueIdentifier.getColumnIdentifier().getColumnId(); ColumnReverseDictionaryInfo columnReverseDictionaryInfo = getColumnReverseDictionaryInfo(dictionaryColumnUniqueIdentifier, columnIdentifier); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/cache/update/BlockletLevelDeleteDeltaDataCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/update/BlockletLevelDeleteDeltaDataCache.java b/core/src/main/java/org/apache/carbondata/core/cache/update/BlockletLevelDeleteDeltaDataCache.java index 92350f3..5d2e8ce 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/update/BlockletLevelDeleteDeltaDataCache.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/update/BlockletLevelDeleteDeltaDataCache.java @@ -28,7 +28,7 @@ public class BlockletLevelDeleteDeltaDataCache { public BlockletLevelDeleteDeltaDataCache(int[] deleteDeltaFileData, String timeStamp) { deleteDelataDataCache = RoaringBitmap.bitmapOf(deleteDeltaFileData); - this.timeStamp=timeStamp; + this.timeStamp = timeStamp; } public boolean contains(int key) { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/compression/BigIntCompressor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/compression/BigIntCompressor.java b/core/src/main/java/org/apache/carbondata/core/compression/BigIntCompressor.java index d041aff..8e43684 100644 --- a/core/src/main/java/org/apache/carbondata/core/compression/BigIntCompressor.java +++ b/core/src/main/java/org/apache/carbondata/core/compression/BigIntCompressor.java @@ -113,7 +113,7 @@ public class BigIntCompressor extends ValueCompressor { intResult[j] = (int) (maxValue - value[j]); } } else { - for (int j=0; j < value.length; j++) { + for (int j = 0; j < value.length; j++) { intResult[j] = (int) value[j]; } } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java index df3f9f1..437144c 100644 --- a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java +++ b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java @@ -812,11 +812,11 @@ public final class CarbonCommonConstants { /** * 16 mb size */ - public static final long CARBON_16MB = 16*1024*1024; + public static final long CARBON_16MB = 16 * 1024 * 1024; /** * 256 mb size */ - public static final long CARBON_256MB = 256*1024*1024; + public static final long CARBON_256MB = 256 * 1024 * 1024; /** * COMPACTED is property to indicate whether seg is compacted or not. http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/datastore/AbstractBlockIndexStoreCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/AbstractBlockIndexStoreCache.java b/core/src/main/java/org/apache/carbondata/core/datastore/AbstractBlockIndexStoreCache.java index 340f290..5e8c8a3 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/AbstractBlockIndexStoreCache.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/AbstractBlockIndexStoreCache.java @@ -73,7 +73,7 @@ public abstract class AbstractBlockIndexStoreCache<K, V> this.carbonStorePath = carbonStorePath; this.lruCache = lruCache; blockInfoLock = new ConcurrentHashMap<BlockInfo, Object>(); - segmentIDLock= new ConcurrentHashMap<String, Object>(); + segmentIDLock = new ConcurrentHashMap<String, Object>(); segmentIdToBlockListMap = new ConcurrentHashMap<>(); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java ---------------------------------------------------------------------- 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 906d10a..888689b 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 @@ -106,7 +106,7 @@ public class TableSegmentUniqueIdentifier { + carbonTableIdentifier.getTableId() + CarbonCommonConstants.FILE_SEPARATOR + segmentId; } public void setIsSegmentUpdated(boolean isSegmentUpdated) { - this.isSegmentUpdated=isSegmentUpdated; + this.isSegmentUpdated = isSegmentUpdated; } public boolean isSegmentUpdated() { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockletInfos.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockletInfos.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockletInfos.java index dcd16ae..563d1dc 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockletInfos.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockletInfos.java @@ -38,7 +38,7 @@ public class BlockletInfos implements Serializable { /** * default constructor */ - public BlockletInfos(){ + public BlockletInfos() { } /** * constructor to initialize the blockletinfo http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/datastore/block/TableTaskInfo.java ---------------------------------------------------------------------- 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 f569fd6..73aa810 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 @@ -41,14 +41,14 @@ public class TableTaskInfo implements Distributable { return tableBlockInfoList; } - public TableTaskInfo(String taskId, List<TableBlockInfo> tableBlockInfoList){ + public TableTaskInfo(String taskId, List<TableBlockInfo> tableBlockInfoList) { this.taskId = taskId; this.tableBlockInfoList = tableBlockInfoList; } @Override public String[] getLocations() { Set<String> locations = new HashSet<String>(); - for(TableBlockInfo tableBlockInfo: tableBlockInfoList){ + for (TableBlockInfo tableBlockInfo : tableBlockInfoList) { locations.addAll(Arrays.asList(tableBlockInfo.getLocations())); } locations.toArray(new String[locations.size()]); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/datastore/block/TaskBlockInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/TaskBlockInfo.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/TaskBlockInfo.java index 8ab8b39..eb707c2 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/block/TaskBlockInfo.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/TaskBlockInfo.java @@ -32,7 +32,7 @@ public class TaskBlockInfo { // stores TableBlockInfo list of each task private Map<String, List<TableBlockInfo>> taskBlockInfoMapping; - public TaskBlockInfo(){ + public TaskBlockInfo() { taskBlockInfoMapping = new HashMap<>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/datastore/columnar/BlockIndexerStorageForNoInvertedIndex.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/BlockIndexerStorageForNoInvertedIndex.java b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/BlockIndexerStorageForNoInvertedIndex.java index bd5c825..d9875a0 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/BlockIndexerStorageForNoInvertedIndex.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/BlockIndexerStorageForNoInvertedIndex.java @@ -43,7 +43,7 @@ public class BlockIndexerStorageForNoInvertedIndex implements IndexStorage<int[] int start = 0; List<Integer> map = new ArrayList<Integer>(CarbonCommonConstants.CONSTANT_SIZE_TEN); int length = keyBlockInput.length; - for(int i = 1; i < length; i++) { + for (int i = 1; i < length; i++) { if (ByteUtil.UnsafeComparer.INSTANCE.compareTo(prvKey, keyBlockInput[i]) != 0) { prvKey = keyBlockInput[i]; list.add(keyBlockInput[i]); @@ -91,7 +91,7 @@ public class BlockIndexerStorageForNoInvertedIndex implements IndexStorage<int[] private int[] convertToArray(List<Integer> list) { int[] shortArray = new int[list.size()]; - for(int i = 0; i < shortArray.length; i++) { + for (int i = 0; i < shortArray.length; i++) { shortArray[i] = list.get(i); } return shortArray; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithIntIndex.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithIntIndex.java b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithIntIndex.java index 57bf817..fa52e09 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithIntIndex.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithIntIndex.java @@ -67,7 +67,7 @@ public class ColumnWithIntIndex implements Comparable<ColumnWithIntIndex> { } @Override public boolean equals(Object obj) { - if(obj == null || getClass() != obj.getClass()) { + if (obj == null || getClass() != obj.getClass()) { return false; } ColumnWithIntIndex o = (ColumnWithIntIndex)obj; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithIntIndexForHighCard.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithIntIndexForHighCard.java b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithIntIndexForHighCard.java index 073467a..73f59d7 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithIntIndexForHighCard.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/columnar/ColumnWithIntIndexForHighCard.java @@ -34,7 +34,7 @@ public class ColumnWithIntIndexForHighCard extends ColumnWithIntIndex } @Override public boolean equals(Object obj) { - if(obj == null || getClass() != obj.getClass()) { + if (obj == null || getClass() != obj.getClass()) { return false; } ColumnWithIntIndexForHighCard o = (ColumnWithIntIndexForHighCard)obj; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressByteArray.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressByteArray.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressByteArray.java index b5e3a9d..e517e41 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressByteArray.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressByteArray.java @@ -72,12 +72,11 @@ public class CompressByteArray extends ValueCompressionHolder<byte[]> { int length = 0; byte[] actualValue = null; //CHECKSTYLE:OFF Approval No:Approval-367 - while (buffer.hasRemaining()) {//CHECKSTYLE:ON + while (buffer.hasRemaining()) { //CHECKSTYLE:ON length = buffer.getInt(); actualValue = new byte[length]; buffer.get(actualValue); valsList.add(actualValue); - } return valsList.get(0); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/devapi/GeneratingBiDictionary.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/devapi/GeneratingBiDictionary.java b/core/src/main/java/org/apache/carbondata/core/devapi/GeneratingBiDictionary.java index d60e709..7d961f8 100644 --- a/core/src/main/java/org/apache/carbondata/core/devapi/GeneratingBiDictionary.java +++ b/core/src/main/java/org/apache/carbondata/core/devapi/GeneratingBiDictionary.java @@ -32,7 +32,7 @@ public abstract class GeneratingBiDictionary<K, V> implements BiDictionary<K, V> return key; } else { K newKey = generator.generateKey(value); - assert(newKey != null); + assert (newKey != null); put(newKey, value); return newKey; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java ---------------------------------------------------------------------- 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 3cb558a..df49dc0 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 @@ -204,7 +204,7 @@ public class IncrementalColumnDictionaryGenerator implements BiDictionary<Intege DictionaryService dictionaryService, CarbonTableIdentifier tableIdentifier, ColumnIdentifier columnIdentifier, - String storePath) throws IOException{ + String storePath) throws IOException { CarbonDictionarySortIndexWriter carbonDictionarySortIndexWriter = null; try { CarbonDictionarySortInfoPreparator preparator = new CarbonDictionarySortInfoPreparator(); @@ -230,7 +230,7 @@ public class IncrementalColumnDictionaryGenerator implements BiDictionary<Intege * @param dictionaryWriter * @throws IOException */ - private void updateMetaData(CarbonDictionaryWriter dictionaryWriter) throws IOException{ + private void updateMetaData(CarbonDictionaryWriter dictionaryWriter) throws IOException { if (null != dictionaryWriter) { dictionaryWriter.commit(); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/keygenerator/columnar/impl/MultiDimKeyVarLengthEquiSplitGenerator.java ---------------------------------------------------------------------- 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 f5a0f69..f628bca 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 @@ -213,7 +213,7 @@ public class MultiDimKeyVarLengthEquiSplitGenerator extends MultiDimKeyVarLength } @Override public boolean equals(Object obj) { - if(!(obj instanceof MultiDimKeyVarLengthEquiSplitGenerator)) { + if (!(obj instanceof MultiDimKeyVarLengthEquiSplitGenerator)) { return false; } MultiDimKeyVarLengthEquiSplitGenerator o = (MultiDimKeyVarLengthEquiSplitGenerator)obj; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/keygenerator/columnar/impl/MultiDimKeyVarLengthVariableSplitGenerator.java ---------------------------------------------------------------------- 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 c305206..cb52045 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 @@ -214,7 +214,7 @@ public class MultiDimKeyVarLengthVariableSplitGenerator extends MultiDimKeyVarLe } @Override public boolean equals(Object obj) { - if(!(obj instanceof MultiDimKeyVarLengthVariableSplitGenerator)) { + if (!(obj instanceof MultiDimKeyVarLengthVariableSplitGenerator)) { return false; } MultiDimKeyVarLengthVariableSplitGenerator o = (MultiDimKeyVarLengthVariableSplitGenerator)obj; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java ---------------------------------------------------------------------- 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 3b2c1ab..a139f4c 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 @@ -114,10 +114,9 @@ public class TimeStampDirectDictionaryGenerator implements DirectDictionaryGener initialize(); } - public TimeStampDirectDictionaryGenerator( ) { - this(CarbonProperties.getInstance() - .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, - CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)); + public TimeStampDirectDictionaryGenerator() { + this(CarbonProperties.getInstance().getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, + CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)); } /** @@ -222,7 +221,7 @@ public class TimeStampDirectDictionaryGenerator implements DirectDictionaryGener } } - public void initialize(){ + public void initialize() { if (simpleDateFormatLocal.get() == null) { simpleDateFormatLocal.set(new SimpleDateFormat(dateFormat)); simpleDateFormatLocal.get().setLenient(false); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java index 1504cd4..af58f50 100644 --- a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java +++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java @@ -158,7 +158,7 @@ public class NumberCompressor { } for (int j = ls; j < m; j++) { l <<= BYTE_LENGTH; - l ^= key[offset+j] & 0xFF; + l ^= key[offset + j] & 0xFF; } words[i] = l; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java ---------------------------------------------------------------------- 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 863a762..3c8a1fd 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 @@ -66,7 +66,7 @@ public class HdfsFileLock extends AbstractCarbonLock { public HdfsFileLock(String lockFileLocation, String lockFile) { this.location = tmpPath + CarbonCommonConstants.FILE_SEPARATOR + lockFileLocation + CarbonCommonConstants.FILE_SEPARATOR + lockFile; - LOGGER.info("HDFS lock path:"+this.location); + LOGGER.info("HDFS lock path:" + this.location); initRetry(); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java ---------------------------------------------------------------------- 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 62fec1e..8a3d550 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 @@ -270,7 +270,7 @@ public class CarbonTable implements Serializable { private void addImplicitDimension(int dimensionOrdinal, List<CarbonDimension> dimensions) { dimensions.add(new CarbonImplicitDimension(dimensionOrdinal, CarbonCommonConstants.CARBON_IMPLICIT_COLUMN_POSITIONID)); - dimensions.add(new CarbonImplicitDimension(dimensionOrdinal+1, + dimensions.add(new CarbonImplicitDimension(dimensionOrdinal + 1, CarbonCommonConstants.CARBON_IMPLICIT_COLUMN_TUPLEID)); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java ---------------------------------------------------------------------- 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 fe38a56..00dfbc7 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 @@ -144,10 +144,9 @@ public class CarbonUpdateUtil { if (index != -1) { // update the element in existing list. SegmentUpdateDetails blockDetail = oldList.get(index); - if(blockDetail.getDeleteDeltaStartTimestamp().isEmpty() || - (isCompaction == true)) { + if (blockDetail.getDeleteDeltaStartTimestamp().isEmpty() || (isCompaction == true)) { blockDetail - .setDeleteDeltaStartTimestamp(newBlockEntry.getDeleteDeltaStartTimestamp()); + .setDeleteDeltaStartTimestamp(newBlockEntry.getDeleteDeltaStartTimestamp()); } blockDetail.setDeleteDeltaEndTimestamp(newBlockEntry.getDeleteDeltaEndTimestamp()); blockDetail.setStatus(newBlockEntry.getStatus()); @@ -309,7 +308,7 @@ public class CarbonUpdateUtil { String partitionDir = carbonTablePath.getPartitionDir(partitionId); CarbonFile file = FileFactory.getCarbonFile(partitionDir, FileFactory.getFileType(partitionDir)); - if(!file.exists()) { + if (!file.exists()) { return; } for (CarbonFile eachDir : file.listFiles()) { @@ -735,9 +734,9 @@ public class CarbonUpdateUtil { * @param segmentBlockCount * @return */ - public static List<String> getListOfSegmentsToMarkDeleted( Map<String, Long> segmentBlockCount) { + public static List<String> getListOfSegmentsToMarkDeleted(Map<String, Long> segmentBlockCount) { List<String> segmentsToBeDeleted = - new ArrayList<>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE); + new ArrayList<>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE); for (Map.Entry<String, Long> eachSeg : segmentBlockCount.entrySet()) { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/mutate/SegmentUpdateDetails.java ---------------------------------------------------------------------- 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 d2b5232..6f7eef4 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 @@ -74,9 +74,13 @@ public class SegmentUpdateDetails implements Serializable { this.deleteDeltaStartTimestamp = deleteDeltaStartTimestamp; } - public void setStatus(String status) { this.status = status;} + public void setStatus(String status) { + this.status = status; + } - public String getStatus() {return this.status;} + public String getStatus() { + return this.status; + } @Override public int hashCode() { final int prime = 31; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/mutate/TupleIdEnum.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/TupleIdEnum.java b/core/src/main/java/org/apache/carbondata/core/mutate/TupleIdEnum.java index 999dd6f..0c1318c 100644 --- a/core/src/main/java/org/apache/carbondata/core/mutate/TupleIdEnum.java +++ b/core/src/main/java/org/apache/carbondata/core/mutate/TupleIdEnum.java @@ -32,7 +32,7 @@ public enum TupleIdEnum { this.index = index; } - public int getTupleIdIndex(){ + public int getTupleIdIndex() { return this.index; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/mutate/data/BlockletDeleteDeltaCacheLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/data/BlockletDeleteDeltaCacheLoader.java b/core/src/main/java/org/apache/carbondata/core/mutate/data/BlockletDeleteDeltaCacheLoader.java index 25451fe..6665c5b 100644 --- a/core/src/main/java/org/apache/carbondata/core/mutate/data/BlockletDeleteDeltaCacheLoader.java +++ b/core/src/main/java/org/apache/carbondata/core/mutate/data/BlockletDeleteDeltaCacheLoader.java @@ -39,7 +39,7 @@ public class BlockletDeleteDeltaCacheLoader implements DeleteDeltaCacheLoaderInt DataRefNode blockletNode, AbsoluteTableIdentifier absoluteIdentifier) { this.blockletID = blockletID; this.blockletNode = blockletNode; - this.absoluteIdentifier= absoluteIdentifier; + this.absoluteIdentifier = absoluteIdentifier; } /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteFilesDataReader.java ---------------------------------------------------------------------- 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 5753510..89219e1 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 @@ -154,7 +154,7 @@ public class CarbonDeleteFilesDataReader { try { List<DeleteDeltaBlockletDetails> blockletDetails = taskSubmitList.get(i).get().getBlockletDetails(); - for(DeleteDeltaBlockletDetails blocklet : blockletDetails ) { + for (DeleteDeltaBlockletDetails blocklet : blockletDetails) { deleteDeltaResultSet.addBlockletDetails(blocklet); } } catch (Throwable e) { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java index 92d61ab..752bea8 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java @@ -58,8 +58,8 @@ public class DictionaryBasedResultCollector extends AbstractScannedResultCollect QueryDimension[] queryDimensions = tableBlockExecutionInfos.getQueryDimensions(); List<Integer> dictionaryIndexes = new ArrayList<Integer>(); for (int i = 0; i < queryDimensions.length; i++) { - if(queryDimensions[i].getDimension().hasEncoding(Encoding.DICTIONARY) || - queryDimensions[i].getDimension().hasEncoding(Encoding.DIRECT_DICTIONARY) ) { + if (queryDimensions[i].getDimension().hasEncoding(Encoding.DICTIONARY) || queryDimensions[i] + .getDimension().hasEncoding(Encoding.DIRECT_DICTIONARY)) { dictionaryIndexes.add(queryDimensions[i].getDimension().getOrdinal()); } } @@ -69,10 +69,10 @@ public class DictionaryBasedResultCollector extends AbstractScannedResultCollect int[] actualIndexInSurrogateKey = new int[dictionaryIndexes.size()]; int index = 0; for (int i = 0; i < queryDimensions.length; i++) { - if(queryDimensions[i].getDimension().hasEncoding(Encoding.DICTIONARY) || - queryDimensions[i].getDimension().hasEncoding(Encoding.DIRECT_DICTIONARY) ) { - actualIndexInSurrogateKey[index++] = Arrays.binarySearch(primitive, - queryDimensions[i].getDimension().getOrdinal()); + if (queryDimensions[i].getDimension().hasEncoding(Encoding.DICTIONARY) || queryDimensions[i] + .getDimension().hasEncoding(Encoding.DIRECT_DICTIONARY)) { + actualIndexInSurrogateKey[index++] = + Arrays.binarySearch(primitive, queryDimensions[i].getDimension().getOrdinal()); } } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/scan/complextypes/StructQueryType.java ---------------------------------------------------------------------- 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 e95fbb4..75b97c7 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 @@ -89,7 +89,7 @@ public class StructQueryType extends ComplexQueryType implements GenericQueryTyp ByteBuffer byteArray = ByteBuffer.wrap(input); int childElement = byteArray.getInt(); dataOutputStream.writeInt(childElement); - if (childElement > 0){ + if (childElement > 0) { for (int i = 0; i < childElement; i++) { children.get(i) .parseBlocksAndReturnComplexColumnByteArray(dimensionColumnDataChunks, rowNumber, http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java ---------------------------------------------------------------------- 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 8a3598b..82c193f 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 @@ -475,7 +475,7 @@ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> { */ @Override public void finish() throws QueryExecutionException { CarbonUtil.clearBlockCache(queryProperties.dataBlocks); - if(null != queryIterator) { + if (null != queryIterator) { queryIterator.close(); } if (null != queryProperties.executorService) { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java ---------------------------------------------------------------------- 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 28d0f7e..e61ab3a 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 @@ -98,7 +98,7 @@ public class ExpressionResult implements Comparable<ExpressionResult> { return (int) (((Timestamp) value).getTime()); } else { if (isLiteral) { - Long l = (Long) value /1000; + Long l = (Long) value / 1000; return l.intValue(); } return (Integer) value; @@ -150,7 +150,7 @@ public class ExpressionResult implements Comparable<ExpressionResult> { return (short) (((Timestamp) value).getTime()); } else { if (isLiteral) { - Long l = ((long)value/1000); + Long l = ((long) value / 1000); return l.shortValue(); } return (Short) value; @@ -183,7 +183,7 @@ public class ExpressionResult implements Comparable<ExpressionResult> { return parser.format((java.sql.Date) value); } else if (value instanceof Long) { if (isLiteral) { - return parser.format(new Timestamp((long) value/1000)); + return parser.format(new Timestamp((long) value / 1000)); } return parser.format(new Timestamp((long) value)); } else if (value instanceof Integer) { @@ -230,7 +230,7 @@ public class ExpressionResult implements Comparable<ExpressionResult> { return (double) ((Timestamp) value).getTime(); } else { if (isLiteral) { - Long l = (Long) value/1000; + Long l = (Long) value / 1000; return l.doubleValue(); } return (Double) (value); @@ -322,7 +322,7 @@ public class ExpressionResult implements Comparable<ExpressionResult> { return new BigDecimal(((Timestamp) value).getTime()); } else { if (isLiteral) { - return new BigDecimal((long)value/1000); + return new BigDecimal((long) value / 1000); } return new BigDecimal((long) value); } @@ -376,7 +376,7 @@ public class ExpressionResult implements Comparable<ExpressionResult> { return ((Timestamp) value).getTime(); } else { if (isLiteral) { - return (Long) value/1000; + return (Long) value / 1000; } return (Long) value; } @@ -522,8 +522,7 @@ public class ExpressionResult implements Comparable<ExpressionResult> { return val1.compareTo(val2); case DATE: case TIMESTAMP: - - String format= CarbonUtil.getFormatFromProperty(o.dataType); + String format = CarbonUtil.getFormatFromProperty(o.dataType); SimpleDateFormat parser = new SimpleDateFormat(format); Date date1 = parser.parse(this.getString()); Date date2 = parser.parse(o.getString()); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java ---------------------------------------------------------------------- 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 0af49e5..9eb1be6 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 @@ -314,7 +314,7 @@ public class FilterExpressionProcessor implements FilterProcessor { } break; default: - if(expression instanceof ConditionalExpression) { + if (expression instanceof ConditionalExpression) { condExpression = (ConditionalExpression) expression; if (condExpression.isSingleDimension() && condExpression.getColumnList().get(0).getCarbonColumn().getDataType() http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java ---------------------------------------------------------------------- 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 14f45c1..e933f98 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 @@ -653,7 +653,7 @@ public final class FilterUtil { */ public static void getStartKey(Map<CarbonDimension, List<DimColumnFilterInfo>> dimensionFilter, long[] startKey, List<long[]> startKeyList) { - for(int i = 0; i < startKey.length; i++) { + for (int i = 0; i < startKey.length; i++) { // The min surrogate key is 1, set it as the init value for starkey of each column level startKey[i] = 1; } @@ -1078,7 +1078,7 @@ public final class FilterUtil { .compare((Boolean.parseBoolean(dictionaryVal)), (Boolean.parseBoolean(memberVal))); case DATE: case TIMESTAMP: - String format= CarbonUtil.getFormatFromProperty(dataType); + String format = CarbonUtil.getFormatFromProperty(dataType); SimpleDateFormat parser = new SimpleDateFormat(format); Date dateToStr; Date dictionaryDate; @@ -1202,8 +1202,8 @@ public final class FilterUtil { if (CarbonCommonConstants.MEMBER_DEFAULT_VAL.equals(filterMember1)) { return 1; } - String format= null; - if(dataType==DataType.DATE) { + String format = null; + if (dataType == DataType.DATE) { format = CarbonProperties.getInstance() .getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java ---------------------------------------------------------------------- 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 c638f2d..cd60190 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 @@ -176,7 +176,7 @@ public class RowLevelRangeGrtThanFiterExecuterImpl extends RowLevelFilterExecute start = CarbonUtil.getFirstIndexUsingBinarySearch( (FixedLengthDimensionDataChunk) dimensionColumnDataChunk, startIndex, numerOfRows - 1, filterValues[k], true); - if(start >= 0){ + if (start >= 0) { start = CarbonUtil.nextGreaterValueToTarget(start, (FixedLengthDimensionDataChunk) dimensionColumnDataChunk, filterValues[k], numerOfRows); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java index 27aadd5..9a8b254 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java @@ -220,7 +220,7 @@ public class RowLevelRangeLessThanFiterExecuterImpl extends RowLevelFilterExecut start = CarbonUtil.getFirstIndexUsingBinarySearch( (FixedLengthDimensionDataChunk) dimensionColumnDataChunk, startIndex, numerOfRows - 1, filterValues[k], false); - if(start >= 0) { + if (start >= 0) { start = CarbonUtil.nextLesserValueToTarget(start, (FixedLengthDimensionDataChunk) dimensionColumnDataChunk, filterValues[k]); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/RawResultIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/RawResultIterator.java b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/RawResultIterator.java index 6c54329..70d0958 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/RawResultIterator.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/RawResultIterator.java @@ -89,7 +89,7 @@ public class RawResultIterator extends CarbonIterator<Object[]> { } if (!checkIfBatchIsProcessedCompletely(batch)) { try { - if(null != currentConveretedRawRow){ + if (null != currentConveretedRawRow) { counter++; Object[] currentConveretedRawRowTemp = this.currentConveretedRawRow; currentConveretedRawRow = null; @@ -106,7 +106,7 @@ public class RawResultIterator extends CarbonIterator<Object[]> { counter = 0; } try { - if(null != currentConveretedRawRow){ + if (null != currentConveretedRawRow) { counter++; Object[] currentConveretedRawRowTemp = this.currentConveretedRawRow; currentConveretedRawRow = null; @@ -126,10 +126,10 @@ public class RawResultIterator extends CarbonIterator<Object[]> { * @return */ public Object[] fetchConverted() throws KeyGenException { - if(null != currentConveretedRawRow){ + if (null != currentConveretedRawRow) { return currentConveretedRawRow; } - if(hasNext()) + if (hasNext()) { Object[] rawRow = batch.getRawRow(counter); currentConveretedRawRow = convertRow(rawRow); @@ -155,12 +155,10 @@ public class RawResultIterator extends CarbonIterator<Object[]> { * @param batch * @return */ - private boolean checkIfBatchIsProcessedCompletely(BatchResult batch){ - if(counter < batch.getSize()) - { + private boolean checkIfBatchIsProcessedCompletely(BatchResult batch) { + if (counter < batch.getSize()) { return false; - } - else{ + } else { return true; } } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderDummy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderDummy.java b/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderDummy.java index 76f04ca..09b0862 100644 --- a/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderDummy.java +++ b/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderDummy.java @@ -19,7 +19,7 @@ package org.apache.carbondata.core.stats; /** * Class will be used to record and log the query statistics */ -public class DriverQueryStatisticsRecorderDummy implements QueryStatisticsRecorder{ +public class DriverQueryStatisticsRecorderDummy implements QueryStatisticsRecorder { private DriverQueryStatisticsRecorderDummy() { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderImpl.java b/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderImpl.java index dbabf5c..b38632f 100644 --- a/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderImpl.java @@ -32,7 +32,7 @@ import org.apache.commons.lang3.StringUtils; /** * Class will be used to record and log the query statistics */ -public class DriverQueryStatisticsRecorderImpl implements QueryStatisticsRecorder{ +public class DriverQueryStatisticsRecorderImpl implements QueryStatisticsRecorder { private static final LogService LOGGER = LogServiceFactory.getLogService(DriverQueryStatisticsRecorderImpl.class.getName()); @@ -100,7 +100,7 @@ public class DriverQueryStatisticsRecorderImpl implements QueryStatisticsRecorde Map.Entry<String, List<QueryStatistic>> entry = entries.next(); String queryId = entry.getKey(); // clear the unknown query statistics - if(StringUtils.isEmpty(queryId)) { + if (StringUtils.isEmpty(queryId)) { entries.remove(); } else { // clear the timeout query statistics @@ -211,7 +211,7 @@ public class DriverQueryStatisticsRecorderImpl implements QueryStatisticsRecorde printLine(" ", (len4 - load_blocks_time.length())) + load_blocks_time + "|" + "\n"); tableInfo.append(line2).append("\n"); - tableInfo.append("|" + printLine(" ", len1 ) + "|" + + tableInfo.append("|" + printLine(" ", len1) + "|" + printLine(" ", (len2 - "Block allocation".length())) + "Block allocation" + "|" + printLine(" ", len3) + "|" + printLine(" ", (len4 - block_allocation_time.length())) + http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java ---------------------------------------------------------------------- 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 7cbc0a1..c2acedb 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 @@ -106,7 +106,7 @@ public class LoadMetadataDetails implements Serializable { * @return the modificationOrdeletionTimesStamp */ public long getModificationOrdeletionTimesStamp() { - if(null == modificationOrdeletionTimesStamp) { + if (null == modificationOrdeletionTimesStamp) { return 0; } return convertTimeStampToLong(modificationOrdeletionTimesStamp); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java index c516c59..c2c41e5 100644 --- a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java +++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java @@ -255,7 +255,7 @@ public class SegmentStatusManager { updateDeletionStatus(loadIds, listOfLoadFolderDetailsArray, invalidLoadIds); if (invalidLoadIds.isEmpty()) { // All or None , if anything fails then dont write - if(carbonTableStatusLock.lockWithRetries()) { + if (carbonTableStatusLock.lockWithRetries()) { LOG.info("Table status lock has been successfully acquired"); // To handle concurrency scenarios, always take latest metadata before writing // into status file. @@ -338,7 +338,7 @@ public class SegmentStatusManager { updateDeletionStatus(loadDate, listOfLoadFolderDetailsArray, invalidLoadTimestamps, loadStartTime); if (invalidLoadTimestamps.isEmpty()) { - if(carbonTableStatusLock.lockWithRetries()) { + if (carbonTableStatusLock.lockWithRetries()) { LOG.info("Table status lock has been successfully acquired."); // To handle concurrency scenarios, always take latest metadata before writing // into status file. @@ -568,11 +568,11 @@ public class SegmentStatusManager { * @return */ public String getUpdateStatusFileName(LoadMetadataDetails[] segmentList) { - if(segmentList.length == 0) { + if (segmentList.length == 0) { return ""; } else { - for(LoadMetadataDetails eachSeg : segmentList) { + for (LoadMetadataDetails eachSeg : segmentList) { // file name stored in 0th segment. if (eachSeg.getLoadName().equalsIgnoreCase("0")) { return eachSeg.getUpdateStatusFileName(); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java ---------------------------------------------------------------------- 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 f14485b..c822935 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 @@ -92,7 +92,7 @@ public class SegmentUpdateStatusManager { */ private void populateMap() { blockAndDetailsMap = new HashMap<>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE); - for(SegmentUpdateDetails blockDetails : updateDetails) { + for (SegmentUpdateDetails blockDetails : updateDetails) { String blockIdentifier = CarbonUpdateUtil .getSegmentBlockNameKey(blockDetails.getSegmentName(), blockDetails.getActualBlockName()); @@ -355,7 +355,7 @@ public class SegmentUpdateStatusManager { .equalsIgnoreCase(segment) && !CarbonUpdateUtil.isBlockInvalid(block.getStatus())) { final long deltaStartTimestamp = getStartTimeOfDeltaFile(extension, block); // If there is no delete delete file , then return null - if(deltaStartTimestamp == 0) { + if (deltaStartTimestamp == 0) { return deleteFileList; } final long deltaEndTimeStamp = getEndTimeOfDeltaFile(extension, block); @@ -383,9 +383,9 @@ public class SegmentUpdateStatusManager { long timestamp = Long.parseLong(firstPart .substring(firstPart.lastIndexOf(CarbonCommonConstants.HYPHEN) + 1, firstPart.length())); - if (blockNameFromTuple.equals(blockName) && (( - Long.compare(timestamp, deltaEndTimeStamp ) <= 0) && ( - Long.compare(timestamp, deltaStartTimestamp) >= 0))) { + if (blockNameFromTuple.equals(blockName) && ( + (Long.compare(timestamp, deltaEndTimeStamp) <= 0) && ( + Long.compare(timestamp, deltaStartTimestamp) >= 0))) { return true; } } @@ -394,7 +394,7 @@ public class SegmentUpdateStatusManager { }); for (CarbonFile cfile : files) { - if(null == deleteFileList) { + if (null == deleteFileList) { deleteFileList = new ArrayList<String>(files.length); } deleteFileList.add(cfile.getCanonicalPath()); @@ -592,7 +592,7 @@ public class SegmentUpdateStatusManager { boolean validBlock = true; - for(SegmentUpdateDetails blockDetails : getUpdateStatusDetails()) { + for (SegmentUpdateDetails blockDetails : getUpdateStatusDetails()) { if (blockDetails.getActualBlockName().equalsIgnoreCase(eachFile.getName()) && CarbonUpdateUtil.isBlockInvalid(blockDetails.getStatus())) { validBlock = false; @@ -667,7 +667,7 @@ public class SegmentUpdateStatusManager { // get the updated status file identifier from the table status. String tableUpdateStatusIdentifier = getUpdatedStatusIdentifier(); - if(null == tableUpdateStatusIdentifier) { + if (null == tableUpdateStatusIdentifier) { return new SegmentUpdateDetails[0]; } @@ -836,7 +836,7 @@ public class SegmentUpdateStatusManager { String startTimestampOfUpdate = "" ; String endTimestampOfUpdate = ""; - for(LoadMetadataDetails segment : segmentDetails){ + for (LoadMetadataDetails segment : segmentDetails) { // find matching segment and return timestamp. if (segment.getLoadName().equalsIgnoreCase(segmentId)) { timestampOfOriginalFacts = segment.getLoadStartTime(); @@ -889,7 +889,7 @@ public class SegmentUpdateStatusManager { }); // gather the task numbers. - for(CarbonFile updateFiles : files) { + for (CarbonFile updateFiles : files) { listOfInvalidBlocks.add(updateFiles.getName()); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java ---------------------------------------------------------------------- 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 2f9cd19..bf19e08 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 @@ -193,7 +193,7 @@ public final class DataTypeUtil { public static BigDecimal byteToBigDecimal(byte[] raw, int offset, int length) { int scale = (raw[offset] & 0xFF); byte[] unscale = new byte[length - 1]; - System.arraycopy(raw, offset+1, unscale, 0, unscale.length); + System.arraycopy(raw, offset + 1, unscale, 0, unscale.length); BigInteger sig = new BigInteger(unscale); return new BigDecimal(sig, scale); } @@ -367,7 +367,7 @@ public final class DataTypeUtil { default: return data; } - if(null != parsedValue) { + if (null != parsedValue) { return data; } return null; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java b/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java index d4e084d..6a14373 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java @@ -135,7 +135,7 @@ public final class ValueCompressionUtil { //Here we should use the Max abs as max to getDatatype, let's say -1 and -10000000, -1 is max, //but we can't use -1 to getDatatype, we should use -10000000. double absMaxValue = Math.abs((double) maxValue) >= Math.abs((double) minValue) ? - (double) maxValue:(double) minValue; + (double) maxValue : (double) minValue; DataType adaptiveDataType = getDataType(absMaxValue, mantissa, dataTypeSelected); DataType deltaDataType = getDataType((double) maxValue - (double) minValue, mantissa, dataTypeSelected); @@ -225,9 +225,11 @@ public final class ValueCompressionUtil { * @return compressor based on actualdatatype */ public static ValueCompressor getValueCompressor(CompressionFinder compressorFinder) { - switch(compressorFinder.getMeasureStoreType()) { - case 'd': return new BigIntCompressor(); - default : return new DoubleCompressor(); + switch (compressorFinder.getMeasureStoreType()) { + case 'd': + return new BigIntCompressor(); + default: + return new DoubleCompressor(); } } @@ -239,10 +241,9 @@ public final class ValueCompressionUtil { private static ValueCompressionHolder[] getValueCompressionHolder( CompressionFinder[] compressionFinders) { ValueCompressionHolder[] valueCompressionHolders = - new ValueCompressionHolder[compressionFinders.length]; - for (int i=0; i< compressionFinders.length; i++) { - valueCompressionHolders[i] = - getValueCompressionHolder(compressionFinders[i]); + new ValueCompressionHolder[compressionFinders.length]; + for (int i = 0; i < compressionFinders.length; i++) { + valueCompressionHolders[i] = getValueCompressionHolder(compressionFinders[i]); } return valueCompressionHolders; } @@ -255,7 +256,7 @@ public final class ValueCompressionUtil { */ private static ValueCompressionHolder getValueCompressionHolder( CompressionFinder compressionFinder) { - switch(compressionFinder.getMeasureStoreType()) { + switch (compressionFinder.getMeasureStoreType()) { default: return getValueCompressionHolder(compressionFinder.getCompType(), compressionFinder.getActualDataType(), compressionFinder.getConvertedDataType()); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java index 39b3629..854db71 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java +++ b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java @@ -258,9 +258,8 @@ public class CarbonTablePath extends Path { CarbonFile[] files = carbonFile.listFiles(new CarbonFileFilter() { @Override public boolean accept(CarbonFile file) { - if(bucketNumber.equals("-1")) { - return file.getName().startsWith(taskId) && file.getName() - .endsWith(INDEX_FILE_EXT); + if (bucketNumber.equals("-1")) { + return file.getName().startsWith(taskId) && file.getName().endsWith(INDEX_FILE_EXT); } return file.getName().startsWith(taskId + "-" + bucketNumber) && file.getName() .endsWith(INDEX_FILE_EXT); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/core/src/main/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortModel.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortModel.java b/core/src/main/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortModel.java index df40a1d..5235dd7 100644 --- a/core/src/main/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortModel.java +++ b/core/src/main/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortModel.java @@ -102,7 +102,7 @@ public class CarbonDictionarySortModel implements Comparable<CarbonDictionarySor return val1.compareTo(val2); case DATE: case TIMESTAMP: - String format= CarbonUtil.getFormatFromProperty(dataType); + String format = CarbonUtil.getFormatFromProperty(dataType); SimpleDateFormat parser = new SimpleDateFormat(format); Date date1 = null; Date date2 = null; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/dev/javastyle-config.xml ---------------------------------------------------------------------- diff --git a/dev/javastyle-config.xml b/dev/javastyle-config.xml index 1df8708..6c42182 100644 --- a/dev/javastyle-config.xml +++ b/dev/javastyle-config.xml @@ -166,5 +166,8 @@ </module> <module name="CommentsIndentation"/> <module name="UnusedImports"/> + + <module name="ParenPad"/> + <module name="WhitespaceAround"/> </module> </module> http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/format/src/main/thrift/dictionary.thrift ---------------------------------------------------------------------- diff --git a/format/src/main/thrift/dictionary.thrift b/format/src/main/thrift/dictionary.thrift index f59a088..4eb0b25 100644 --- a/format/src/main/thrift/dictionary.thrift +++ b/format/src/main/thrift/dictionary.thrift @@ -21,7 +21,6 @@ * File format description for carbon dictionary file */ namespace java org.apache.carbondata.format - struct ColumnDictionaryChunk { 1: list<binary> values; // the values in dictionary order, each value is represented in binary format } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java ---------------------------------------------------------------------- diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java index 2cee974..4f81438 100644 --- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java +++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java @@ -245,7 +245,7 @@ public class CarbonInputFormat<T> extends FileInputFormat<Void, T> { if (invalidSegments.size() > 0) { List<TableSegmentUniqueIdentifier> invalidSegmentsIds = new ArrayList<>(invalidSegments.size()); - for(String segId: invalidSegments) { + for (String segId : invalidSegments) { invalidSegmentsIds.add(new TableSegmentUniqueIdentifier(identifier, segId)); } cacheClient.getSegmentAccessClient().invalidateAll(invalidSegmentsIds); @@ -256,7 +256,7 @@ public class CarbonInputFormat<T> extends FileInputFormat<Void, T> { Expression filter = getFilterPredicates(job.getConfiguration()); CarbonTable carbonTable = getCarbonTable(job.getConfiguration()); // this will be null in case of corrupt schema file. - if(null == carbonTable){ + if (null == carbonTable) { throw new IOException("Missing/Corrupt schema file for table."); } CarbonInputFormatUtil.processFilterExpression(filter, carbonTable); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java ---------------------------------------------------------------------- diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java index 6ee048a..27c8b2f 100644 --- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java +++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java @@ -64,7 +64,7 @@ public class CarbonRecordReader<T> extends RecordReader<Void, T> { if (inputSplit instanceof CarbonInputSplit) { splitList = new ArrayList<>(1); splitList.add((CarbonInputSplit) inputSplit); - } else if (inputSplit instanceof CarbonMultiBlockSplit){ + } else if (inputSplit instanceof CarbonMultiBlockSplit) { // contains multiple blocks, this is an optimization for concurrent query. CarbonMultiBlockSplit multiBlockSplit = (CarbonMultiBlockSplit) inputSplit; splitList = multiBlockSplit.getAllSplits(); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java ---------------------------------------------------------------------- diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java index 0807309..ae9c676 100644 --- a/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java +++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonTableInputFormat.java @@ -150,7 +150,7 @@ public class CarbonTableInputFormat<T> extends FileInputFormat<Void, T> { } catch (IOException e) { throw new RuntimeException("Error while reading filter expression", e); } - assert(filter instanceof Expression); + assert (filter instanceof Expression); return (Expression) filter; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/hadoop/src/main/java/org/apache/carbondata/hadoop/readsupport/impl/DictionaryDecodedReadSupportImpl.java ---------------------------------------------------------------------- diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/readsupport/impl/DictionaryDecodedReadSupportImpl.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/readsupport/impl/DictionaryDecodedReadSupportImpl.java index 2d741fe..ec02ab0 100644 --- a/hadoop/src/main/java/org/apache/carbondata/hadoop/readsupport/impl/DictionaryDecodedReadSupportImpl.java +++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/readsupport/impl/DictionaryDecodedReadSupportImpl.java @@ -23,7 +23,7 @@ public class DictionaryDecodedReadSupportImpl extends AbstractDictionaryDecodedReadSupport<Object[]> { @Override public Object[] readRow(Object[] data) { - assert(data.length == dictionaries.length); + assert (data.length == dictionaries.length); for (int i = 0; i < dictionaries.length; i++) { if (dictionaries[i] != null) { data[i] = dictionaries[i].getDictionaryValueForKey((int) data[i]); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java index 9cc5c99..85e3cd7 100644 --- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java +++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java @@ -573,7 +573,7 @@ public final class CarbonLoaderUtil { noofNodes = activeNodes.size(); } int blocksPerNode = blockInfos.size() / noofNodes; - blocksPerNode = blocksPerNode <=0 ? 1 : blocksPerNode; + blocksPerNode = blocksPerNode <= 0 ? 1 : blocksPerNode; // sort the flattened data. Collections.sort(flattenedList); @@ -804,7 +804,7 @@ public final class CarbonLoaderUtil { try { String hostName = InetAddress.getLocalHost().getHostName(); isActiveNode = activeNode.contains(hostName); - if(isActiveNode){ + if (isActiveNode) { return hostName; } } catch (UnknownHostException ue) { @@ -814,7 +814,7 @@ public final class CarbonLoaderUtil { try { String hostAddress = InetAddress.getByName(nodeName).getHostAddress(); isActiveNode = activeNode.contains(hostAddress); - if(isActiveNode){ + if (isActiveNode) { return hostAddress; } } catch (UnknownHostException ue) { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java index 989d200..917de23 100644 --- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java +++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java @@ -99,8 +99,8 @@ public final class DeleteLoadFolders { } } // need to delete the complete folder. - if(status){ - if(!file.delete()){ + if (status) { + if (!file.delete()) { LOGGER.warn("Unable to delete the folder as per delete command " + file.getAbsolutePath()); status = false; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionUtil.java ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionUtil.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionUtil.java index 04a90bc..ed19b27 100644 --- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionUtil.java +++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonCompactionUtil.java @@ -145,7 +145,7 @@ public class CarbonCompactionUtil { return true; } } catch (IOException e) { - LOGGER.error("Exception in isFileExist compaction request file " + e.getMessage() ); + LOGGER.error("Exception in isFileExist compaction request file " + e.getMessage()); } return false; } @@ -172,7 +172,7 @@ public class CarbonCompactionUtil { } } catch (IOException e) { - LOGGER.error("Exception in determining the compaction request file " + e.getMessage() ); + LOGGER.error("Exception in determining the compaction request file " + e.getMessage()); } return CompactionType.MINOR_COMPACTION; } @@ -242,7 +242,7 @@ public class CarbonCompactionUtil { LOGGER.info("Compaction request file : " + statusFile + " already exist."); } } catch (IOException e) { - LOGGER.error("Exception in creating the compaction request file " + e.getMessage() ); + LOGGER.error("Exception in creating the compaction request file " + e.getMessage()); } return false; } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java index b103c47..14bed0a 100644 --- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java +++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java @@ -573,7 +573,7 @@ public final class CarbonDataMergerUtil { */ private static boolean isTwoDatesPresentInRequiredRange(Date segDate1, Date segDate2, long numberOfDaysAllowedToMerge) { - if(segDate1 == null || segDate2 == null) { + if (segDate1 == null || segDate2 == null) { return false; } // take 1 st date add the configured days . @@ -742,7 +742,7 @@ public final class CarbonDataMergerUtil { * @return */ private static boolean isMergedSegment(String segName) { - if(segName.contains(".")){ + if (segName.contains(".")) { return true; } return false; @@ -1324,7 +1324,7 @@ public final class CarbonDataMergerUtil { LoadMetadataDetails[] details = segmentStatusManager.readLoadMetadata(metadataPath); List<LoadMetadataDetails> originalList = Arrays.asList(details); for (LoadMetadataDetails segment : changedSegDetails) { - if(preservedSegment.contains(segment)) { + if (preservedSegment.contains(segment)) { continue; } originalList.get(originalList.indexOf(segment)).setMajorCompacted("true"); http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtilResult.java ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtilResult.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtilResult.java index 9e47294..214a231 100644 --- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtilResult.java +++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtilResult.java @@ -22,8 +22,12 @@ import org.apache.carbondata.core.mutate.SegmentUpdateDetails; public final class CarbonDataMergerUtilResult extends SegmentUpdateDetails { private boolean compactionStatus; - public boolean getCompactionStatus() {return compactionStatus;} + public boolean getCompactionStatus() { + return compactionStatus; + } - public void setCompactionStatus(Boolean status) {compactionStatus = status;} + public void setCompactionStatus(Boolean status) { + compactionStatus = status; + } } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/RowResultMerger.java ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/RowResultMerger.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/RowResultMerger.java index 105ae03..089cd0e 100644 --- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/RowResultMerger.java +++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/RowResultMerger.java @@ -158,7 +158,7 @@ public class RowResultMerger { // iterator the top record iterator = this.recordHolderHeap.poll(); Object[] convertedRow = iterator.next(); - if(null == convertedRow){ + if (null == convertedRow) { index--; continue; } @@ -182,7 +182,7 @@ public class RowResultMerger { iterator = this.recordHolderHeap.poll(); while (true) { Object[] convertedRow = iterator.next(); - if(null == convertedRow){ + if (null == convertedRow) { break; } // do it only once @@ -196,7 +196,7 @@ public class RowResultMerger { break; } } - if(isDataPresent) + if (isDataPresent) { this.dataHandler.finish(); } @@ -206,7 +206,7 @@ public class RowResultMerger { mergeStatus = false; } finally { try { - if(isDataPresent) { + if (isDataPresent) { this.dataHandler.closeHandler(); } } catch (CarbonDataWriterException e) { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/integration/spark2/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java b/integration/spark2/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java index cc2b920..652f56c 100644 --- a/integration/spark2/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java +++ b/integration/spark2/src/main/java/org/apache/carbondata/spark/readsupport/SparkRowReadSupportImpl.java @@ -40,9 +40,9 @@ public class SparkRowReadSupportImpl extends AbstractDictionaryDecodedReadSuppor continue; } if (dictionaries[i] == null) { - if(dataTypes[i].equals(DataType.INT)) { + if (dataTypes[i].equals(DataType.INT)) { data[i] = ((Long)(data[i])).intValue(); - } else if(dataTypes[i].equals(DataType.SHORT)) { + } else if (dataTypes[i].equals(DataType.SHORT)) { data[i] = ((Long)(data[i])).shortValue(); } } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/256dbed2/processing/src/main/java/org/apache/carbondata/processing/csvload/DataGraphExecuter.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/csvload/DataGraphExecuter.java b/processing/src/main/java/org/apache/carbondata/processing/csvload/DataGraphExecuter.java index 19d6a5f..8670182 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/csvload/DataGraphExecuter.java +++ b/processing/src/main/java/org/apache/carbondata/processing/csvload/DataGraphExecuter.java @@ -116,7 +116,7 @@ public class DataGraphExecuter { throws DataLoadingException { //This Method will validate the both fact and dimension csv files. - if (!schemaInfo.isAutoAggregateRequest() && model.getRddIteratorKey() == null ) { + if (!schemaInfo.isAutoAggregateRequest() && model.getRddIteratorKey() == null) { validateCSVFiles(schema); } execute(graphFilePath, schemaInfo);
