This is an automated email from the ASF dual-hosted git repository.
zhangzc 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 70ab62f [checkstyle] optimize java code checkstyle for
WhitespaceAfter rule
70ab62f is described below
commit 70ab62fcccdf8f840d8a70d2820ec347dfc29781
Author: lamber-ken <[email protected]>
AuthorDate: Tue Nov 26 20:35:53 2019 +0800
[checkstyle] optimize java code checkstyle for WhitespaceAfter rule
optimize java code checkstyle for WhitespaceAfter rule
This closes #3484
---
.../core/datamap/dev/fgdatamap/FineGrainBlocklet.java | 2 +-
.../carbondata/core/datamap/status/DataMapStatus.java | 2 +-
.../apache/carbondata/core/indexstore/Blocklet.java | 2 +-
.../core/indexstore/BlockletDataMapIndexWrapper.java | 2 +-
.../carbondata/core/keygenerator/mdkey/Bits.java | 18 +++++++++---------
.../core/keygenerator/mdkey/NumberCompressor.java | 6 +++---
.../carbondata/core/memory/UnsafeMemoryManager.java | 2 +-
.../carbondata/core/metadata/schema/PartitionInfo.java | 2 +-
.../metadata/schema/datamap/DataMapClassProvider.java | 2 +-
.../carbondata/core/scan/executor/util/QueryUtil.java | 2 +-
.../core/scan/expression/MatchExpression.java | 2 +-
.../core/scan/expression/logical/FalseExpression.java | 4 ++--
.../core/scan/expression/logical/TrueExpression.java | 4 ++--
.../apache/carbondata/core/scan/filter/FilterUtil.java | 2 +-
.../scan/filter/executer/AndFilterExecuterImpl.java | 2 +-
.../filter/executer/ExcludeFilterExecuterImpl.java | 2 +-
.../filter/executer/IncludeFilterExecuterImpl.java | 2 +-
.../core/stats/QueryStatisticsRecorderDummy.java | 2 +-
.../apache/carbondata/core/util/CarbonProperties.java | 4 ++--
.../org/apache/carbondata/core/util/CarbonUtil.java | 4 ++--
dev/javastyle-config.xml | 16 +++-------------
.../carbondata/hadoop/api/CarbonTableInputFormat.java | 2 +-
.../apache/carbondata/presto/CarbonVectorBatch.java | 2 +-
.../org/apache/carbondata/presto/PrestoFilterUtil.java | 2 +-
.../carbondata/presto/impl/CarbonLocalInputSplit.java | 2 +-
.../converter/impl/BinaryFieldConverterImpl.java | 2 +-
.../processing/loading/csvinput/CSVInputFormat.java | 2 +-
.../processing/loading/model/LoadOption.java | 2 +-
.../processing/loading/sort/SortStepRowHandler.java | 2 +-
.../store/CarbonFactDataHandlerColumnar.java | 4 ++--
.../store/writer/v3/CarbonFactDataWriterImplV3.java | 2 +-
.../carbondata/processing/util/CarbonLoaderUtil.java | 4 ++--
.../org/apache/carbondata/sdk/file/CarbonReader.java | 2 +-
.../carbondata/sdk/file/CarbonReaderBuilder.java | 2 +-
.../java/org/apache/carbondata/tool/CarbonCli.java | 6 +++---
35 files changed, 55 insertions(+), 65 deletions(-)
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 ed45e01..1162d2f 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
@@ -57,7 +57,7 @@ public class FineGrainBlocklet extends Blocklet implements
Serializable {
return pages;
}
- public static class Page implements Writable,Serializable {
+ public static class Page implements Writable, Serializable {
private int pageId;
diff --git
a/core/src/main/java/org/apache/carbondata/core/datamap/status/DataMapStatus.java
b/core/src/main/java/org/apache/carbondata/core/datamap/status/DataMapStatus.java
index 428dc3d..fce16c8 100644
---
a/core/src/main/java/org/apache/carbondata/core/datamap/status/DataMapStatus.java
+++
b/core/src/main/java/org/apache/carbondata/core/datamap/status/DataMapStatus.java
@@ -21,5 +21,5 @@ package org.apache.carbondata.core.datamap.status;
* DataMap status
*/
public enum DataMapStatus {
- ENABLED,DISABLED,DROPPED
+ ENABLED, DISABLED, DROPPED
}
diff --git
a/core/src/main/java/org/apache/carbondata/core/indexstore/Blocklet.java
b/core/src/main/java/org/apache/carbondata/core/indexstore/Blocklet.java
index fc93066..215752f 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/Blocklet.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/Blocklet.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.io.Writable;
/**
* Blocklet
*/
-public class Blocklet implements Writable,Serializable {
+public class Blocklet implements Writable, Serializable {
/** file path of this blocklet */
private String filePath;
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 b93a7bc..2c650bb 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
@@ -38,7 +38,7 @@ public class BlockletDataMapIndexWrapper implements
Cacheable, Serializable {
// size of the wrapper. basically the total size of the datamaps this
wrapper is holding
private long wrapperSize;
- public BlockletDataMapIndexWrapper(String segmentId,List<BlockDataMap>
dataMaps) {
+ public BlockletDataMapIndexWrapper(String segmentId, List<BlockDataMap>
dataMaps) {
this.dataMaps = dataMaps;
this.wrapperSize = 0L;
this.segmentId = segmentId;
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 a292083..9ce585a 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
@@ -123,9 +123,9 @@ public class Bits implements Serializable {
long val = keys[i];
- int idx = ll >> 6;// divide by 64 to get the new word index
- int position = ll & 0x3f;// to ignore sign bit and consider the remaining
- val = val & (LONG_MAX >> (MAX_LENGTH - lens[i]));// To control the
+ int idx = ll >> 6; // divide by 64 to get the new word index
+ int position = ll & 0x3f; // to ignore sign bit and consider the
remaining
+ val = val & (LONG_MAX >> (MAX_LENGTH - lens[i])); // To control the
// logic so that
// any val do not
// exceed the
@@ -135,13 +135,13 @@ public class Bits implements Serializable {
words[idx] = (word | mask);
ll += lens[i];
- int nextIndex = ll >> 6;// This is divide by 64
+ int nextIndex = ll >> 6; // This is divide by 64
if (nextIndex != idx) {
int consideredBits = lens[i] - ll & 0x3f;
//Check for spill over only if all the bits are not considered
if (consideredBits < lens[i]) {
- mask = (val >> (lens[i] - ll & 0x3f));//& (0x7fffffffffffffffL >>
(0x3f-pos));
+ mask = (val >> (lens[i] - ll & 0x3f)); //& (0x7fffffffffffffffL >>
(0x3f-pos));
word = words[nextIndex];
words[nextIndex] = (word | mask);
}
@@ -160,9 +160,9 @@ public class Bits implements Serializable {
long val = keys[i];
- int index = ll >> 6;// divide by 64 to get the new word index
- int pos = ll & 0x3f;// to ignore sign bit and consider the remaining
- val = val & (LONG_MAX >> (MAX_LENGTH - lens[i]));// To control the
+ int index = ll >> 6; // divide by 64 to get the new word index
+ int pos = ll & 0x3f; // to ignore sign bit and consider the remaining
+ val = val & (LONG_MAX >> (MAX_LENGTH - lens[i])); // To control the
// logic so that
// any val do not
// exceed the
@@ -172,7 +172,7 @@ public class Bits implements Serializable {
words[index] = (word | mask);
ll += lens[i];
- int nextIndex = ll >> 6;// This is divide by 64
+ int nextIndex = ll >> 6; // This is divide by 64
if (nextIndex != index) {
int consideredBits = lens[i] - ll & 0x3f;
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 601b917..b79fa85 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
@@ -77,15 +77,15 @@ public class NumberCompressor {
long val = keys[i];
- index = ll >> 6;// divide by 64 to get the new word index
- pos = ll & 0x3f;// to ignore sign bit and consider the remaining
+ index = ll >> 6; // divide by 64 to get the new word index
+ pos = ll & 0x3f; // to ignore sign bit and consider the remaining
// val = val & controlBits;
long mask = (val << pos);
long word = words[index];
words[index] = (word | mask);
ll += bitsLength;
- nextIndex = ll >> 6;// This is divide by 64
+ nextIndex = ll >> 6; // This is divide by 64
if (nextIndex != index) {
int consideredBits = bitsLength - ll & 0x3f;
diff --git
a/core/src/main/java/org/apache/carbondata/core/memory/UnsafeMemoryManager.java
b/core/src/main/java/org/apache/carbondata/core/memory/UnsafeMemoryManager.java
index f4c4f85..d060cac 100644
---
a/core/src/main/java/org/apache/carbondata/core/memory/UnsafeMemoryManager.java
+++
b/core/src/main/java/org/apache/carbondata/core/memory/UnsafeMemoryManager.java
@@ -41,7 +41,7 @@ public class UnsafeMemoryManager {
private static boolean offHeap =
Boolean.parseBoolean(CarbonProperties.getInstance()
.getProperty(CarbonCommonConstants.ENABLE_OFFHEAP_SORT,
CarbonCommonConstants.ENABLE_OFFHEAP_SORT_DEFAULT));
- private static Map<String,Set<MemoryBlock>> taskIdToOffheapMemoryBlockMap;
+ private static Map<String, Set<MemoryBlock>> taskIdToOffheapMemoryBlockMap;
static {
long size = 0L;
String configuredWorkingMemorySize = null;
diff --git
a/core/src/main/java/org/apache/carbondata/core/metadata/schema/PartitionInfo.java
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/PartitionInfo.java
index 7a0e17f..cd69b83 100644
---
a/core/src/main/java/org/apache/carbondata/core/metadata/schema/PartitionInfo.java
+++
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/PartitionInfo.java
@@ -203,7 +203,7 @@ public class PartitionInfo implements Serializable,
Writable {
public void readFields(DataInput input) throws IOException {
int colSchemaSize = input.readInt();
this.columnSchemaList = new ArrayList<>(colSchemaSize);
- for (int i = 0;i < colSchemaSize; i++) {
+ for (int i = 0; i < colSchemaSize; i++) {
ColumnSchema colSchema = new ColumnSchema();
colSchema.readFields(input);
this.columnSchemaList.add(colSchema);
diff --git
a/core/src/main/java/org/apache/carbondata/core/metadata/schema/datamap/DataMapClassProvider.java
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/datamap/DataMapClassProvider.java
index 772bb40..33cf25a 100644
---
a/core/src/main/java/org/apache/carbondata/core/metadata/schema/datamap/DataMapClassProvider.java
+++
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/datamap/DataMapClassProvider.java
@@ -29,7 +29,7 @@ package org.apache.carbondata.core.metadata.schema.datamap;
public enum DataMapClassProvider {
PREAGGREGATE("org.apache.carbondata.core.datamap.AggregateDataMap",
"preaggregate"),
TIMESERIES("org.apache.carbondata.core.datamap.TimeSeriesDataMap",
"timeseries"),
-
LUCENE("org.apache.carbondata.datamap.lucene.LuceneFineGrainDataMapFactory","lucene"),
+ LUCENE("org.apache.carbondata.datamap.lucene.LuceneFineGrainDataMapFactory",
"lucene"),
BLOOMFILTER("org.apache.carbondata.datamap.bloom.BloomCoarseGrainDataMapFactory",
"bloomfilter"),
MV("org.apache.carbondata.core.datamap.MVDataMap", "mv");
diff --git
a/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java
b/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java
index 068d3c6..22711ca 100644
---
a/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java
+++
b/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java
@@ -768,7 +768,7 @@ public class QueryUtil {
} else if (dt == DataTypes.BOOLEAN) {
vector.putBoolean(vectorRow, ByteUtil.toBoolean(value[0]));
} else if (dt == DataTypes.BYTE) {
- vector.putByte(vectorRow,value[0]);
+ vector.putByte(vectorRow, value[0]);
} else if (dt == DataTypes.SHORT) {
vector.putShort(vectorRow, ByteUtil.toXorShort(value, 0, length));
} else if (dt == DataTypes.INT) {
diff --git
a/core/src/main/java/org/apache/carbondata/core/scan/expression/MatchExpression.java
b/core/src/main/java/org/apache/carbondata/core/scan/expression/MatchExpression.java
index 309ce12..ff6c5c0 100644
---
a/core/src/main/java/org/apache/carbondata/core/scan/expression/MatchExpression.java
+++
b/core/src/main/java/org/apache/carbondata/core/scan/expression/MatchExpression.java
@@ -46,7 +46,7 @@ public class MatchExpression extends Expression {
@Override
public ExpressionResult evaluate(RowIntf value)
throws FilterUnsupportedException, FilterIllegalMemberException {
- return new ExpressionResult(DataTypes.BOOLEAN,true);
+ return new ExpressionResult(DataTypes.BOOLEAN, true);
}
@Override
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 5bdd73f..8d0e921 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
@@ -35,7 +35,7 @@ public class FalseExpression extends
BinaryConditionalExpression {
private static final long serialVersionUID = -8390184061336799370L;
public FalseExpression(Expression child1) {
- super(child1, new LiteralExpression(null,null));
+ super(child1, new LiteralExpression(null, null));
}
/**
@@ -50,7 +50,7 @@ public class FalseExpression extends
BinaryConditionalExpression {
@Override
public ExpressionResult evaluate(RowIntf value)
throws FilterUnsupportedException, FilterIllegalMemberException {
- return new ExpressionResult(DataTypes.BOOLEAN,false);
+ return new ExpressionResult(DataTypes.BOOLEAN, false);
}
/**
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 f00b9c5..734ed10 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
@@ -36,7 +36,7 @@ public class TrueExpression extends
BinaryConditionalExpression {
private static final long serialVersionUID = -8390184061336799370L;
public TrueExpression(Expression child1) {
- super(child1, new LiteralExpression(null,null));
+ super(child1, new LiteralExpression(null, null));
}
/**
@@ -51,7 +51,7 @@ public class TrueExpression extends
BinaryConditionalExpression {
@Override
public ExpressionResult evaluate(RowIntf value)
throws FilterUnsupportedException, FilterIllegalMemberException {
- return new ExpressionResult(DataTypes.BOOLEAN,true);
+ return new ExpressionResult(DataTypes.BOOLEAN, true);
}
/**
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 f29ea42..a096051 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
@@ -823,7 +823,7 @@ public final class FilterUtil {
}
private static List<Integer> prepareExcludeFilterMembers(
- Dictionary forwardDictionary,List<Integer> includeSurrogates)
+ Dictionary forwardDictionary, List<Integer> includeSurrogates)
throws FilterUnsupportedException {
DictionaryChunksWrapper dictionaryWrapper;
RoaringBitmap bitMapOfSurrogates = RoaringBitmap.bitmapOf(
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 20e57ee..bbacc71 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
@@ -100,7 +100,7 @@ public class AndFilterExecuterImpl implements
FilterExecuter, ImplicitColumnFilt
BitSet leftFilters = null;
if (leftExecuter instanceof ImplicitColumnFilterExecutor) {
leftFilters = ((ImplicitColumnFilterExecutor) leftExecuter)
- .isFilterValuesPresentInBlockOrBlocklet(maxValue,
minValue,uniqueBlockPath, isMinMaxSet);
+ .isFilterValuesPresentInBlockOrBlocklet(maxValue, minValue,
uniqueBlockPath, isMinMaxSet);
} else {
leftFilters = leftExecuter
.isScanRequired(maxValue, minValue, isMinMaxSet);
diff --git
a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/ExcludeFilterExecuterImpl.java
b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/ExcludeFilterExecuterImpl.java
index 5a9095c..a7e0ff2 100644
---
a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/ExcludeFilterExecuterImpl.java
+++
b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/ExcludeFilterExecuterImpl.java
@@ -198,7 +198,7 @@ public class ExcludeFilterExecuterImpl implements
FilterExecuter {
// the filter values. The one that matches sets it Bitset.
BitSet bitSet = new BitSet(numerOfRows);
bitSet.flip(0, numerOfRows);
- FilterExecutorUtil.executeIncludeExcludeFilterForMeasure(columnPage,bitSet,
+ FilterExecutorUtil.executeIncludeExcludeFilterForMeasure(columnPage,
bitSet,
msrColumnExecutorInfo, msrColumnEvaluatorInfo, filterBitSetUpdater);
return bitSet;
}
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 ee366bd..37e035b 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
@@ -281,7 +281,7 @@ public class IncludeFilterExecuterImpl implements
FilterExecuter {
// Get the measure values from the chunk. compare sequentially with the
// the filter values. The one that matches sets it Bitset.
BitSet bitSet = new BitSet(rowsInPage);
- FilterExecutorUtil.executeIncludeExcludeFilterForMeasure(columnPage,bitSet,
+ FilterExecutorUtil.executeIncludeExcludeFilterForMeasure(columnPage,
bitSet,
msrColumnExecutorInfo, msrColumnEvaluatorInfo, filterBitSetUpdater);
return bitSet;
}
diff --git
a/core/src/main/java/org/apache/carbondata/core/stats/QueryStatisticsRecorderDummy.java
b/core/src/main/java/org/apache/carbondata/core/stats/QueryStatisticsRecorderDummy.java
index 854aac3..511cffe 100644
---
a/core/src/main/java/org/apache/carbondata/core/stats/QueryStatisticsRecorderDummy.java
+++
b/core/src/main/java/org/apache/carbondata/core/stats/QueryStatisticsRecorderDummy.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
/**
* Class will be used to record and log the query statistics
*/
-public class QueryStatisticsRecorderDummy implements
QueryStatisticsRecorder,Serializable {
+public class QueryStatisticsRecorderDummy implements QueryStatisticsRecorder,
Serializable {
/**
* serialization version
diff --git
a/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java
b/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java
index e114586..c5e1dcc 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java
@@ -373,7 +373,7 @@ public final class CarbonProperties {
new SimpleDateFormat(dateFormat);
} catch (Exception e) {
LOGGER.warn(String.format("The value \"%s\" configured for key \"%s\" is
invalid. " +
- "Using the default value \"%s\"",dateFormat, key, key));
+ "Using the default value \"%s\"", dateFormat, key, key));
carbonProperties.setProperty(key, defaultValue);
}
}
@@ -452,7 +452,7 @@ public final class CarbonProperties {
boolean isValidBooleanValue =
CarbonUtil.validateBoolean(customBlockDistributionStr);
if (!isValidBooleanValue) {
LOGGER.warn(String.format("The custom block distribution value \"%s\" is
invalid. " +
- "Using the default value \"false\"",customBlockDistributionStr));
+ "Using the default value \"false\"",
customBlockDistributionStr));
carbonProperties.setProperty(CARBON_CUSTOM_BLOCK_DISTRIBUTION, "false");
}
}
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 05ac316..a90bd32 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
@@ -2248,7 +2248,7 @@ public final class CarbonUtil {
CarbonHeaderReader carbonHeaderReader = new
CarbonHeaderReader(fistFilePath, configuration);
List<ColumnSchema> columnSchemaList = carbonHeaderReader.readSchema();
// only columnSchema is the valid entry, reset all dummy entries.
- TableSchema tableSchema = getDummyTableSchema(tableName,columnSchemaList);
+ TableSchema tableSchema = getDummyTableSchema(tableName, columnSchemaList);
ThriftWrapperSchemaConverterImpl thriftWrapperSchemaConverter =
new ThriftWrapperSchemaConverterImpl();
@@ -2274,7 +2274,7 @@ public final class CarbonUtil {
// This API will avoid IO operation to get the columnSchema list.
// ColumnSchema list will be filled during blocklet loading (where actual
IO happens)
List<ColumnSchema> columnSchemaList = new ArrayList<>();
- TableSchema tableSchema = getDummyTableSchema(tableName,columnSchemaList);
+ TableSchema tableSchema = getDummyTableSchema(tableName, columnSchemaList);
ThriftWrapperSchemaConverterImpl thriftWrapperSchemaConverter =
new ThriftWrapperSchemaConverterImpl();
org.apache.carbondata.format.TableSchema thriftFactTable =
diff --git a/dev/javastyle-config.xml b/dev/javastyle-config.xml
index 6e84966..b477bd3 100644
--- a/dev/javastyle-config.xml
+++ b/dev/javastyle-config.xml
@@ -172,7 +172,6 @@
<!-- Checks for redundant imports. -->
<module name="RedundantImport">
- <property name="severity" value="error"/>
<message key="import.redundancy" value="Redundant import {0}."/>
</module>
@@ -182,9 +181,7 @@
</module>
<!-- Checks for placement of the left curly brace ('{'). -->
- <module name="LeftCurly">
- <property name="severity" value="error"/>
- </module>
+ <module name="LeftCurly"/>
<!-- Checks for complicated boolean expressions. -->
<module name="SimplifyBooleanExpression">
@@ -192,13 +189,10 @@
</module>
<!-- Checks for empty statements. -->
- <module name="EmptyStatement">
- <property name="severity" value="error"/>
- </module>
+ <module name="EmptyStatement"/>
<!-- Checks for empty line separator between tokens. -->
<module name="EmptyLineSeparator">
- <property name="severity" value="error"/>
<property name="allowMultipleEmptyLines" value="false"/>
<property name="tokens" value="PACKAGE_DEF, IMPORT, CLASS_DEF,
INTERFACE_DEF, ENUM_DEF,
STATIC_INIT, INSTANCE_INIT,
METHOD_DEF,CTOR_DEF"/>
@@ -206,27 +200,23 @@
<!-- Checks for commas, semicolons and typecasts are followed by
whitespace. -->
<module name="WhitespaceAfter">
- <property name="severity" value="info"/>
- <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+ <property name="tokens" value="COMMA, SEMI"/>
</module>
<!-- Checks for there is no whitespace after unary operators. -->
<module name="NoWhitespaceAfter">
- <property name="severity" value="error"/>
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT,
UNARY_MINUS, UNARY_PLUS"/>
<property name="allowLineBreaks" value="true"/>
</module>
<!-- Checks for there is no whitespace before unary operators. -->
<module name="NoWhitespaceBefore">
- <property name="severity" value="error"/>
<property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
<property name="allowLineBreaks" value="true"/>
</module>
<!-- Checks for assign operators are at the end of the line. -->
<module name="OperatorWrap">
- <property name="severity" value="error"/>
<property name="option" value="eol"/>
<property name="tokens" value="ASSIGN"/>
</module>
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 addce8d..deae842 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
@@ -152,7 +152,7 @@ public class CarbonTableInputFormat<T> extends
CarbonInputFormat<T> {
if (filteredNormalSegments.size() == 0) {
return getSplitsOfStreaming(job, streamSegments, carbonTable);
}
- setSegmentsToAccess(job.getConfiguration(),filteredNormalSegments);
+ setSegmentsToAccess(job.getConfiguration(), filteredNormalSegments);
}
// remove entry in the segment index if there are invalid segments
for (Segment segment : segments.getInvalidSegments()) {
diff --git
a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbonVectorBatch.java
b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbonVectorBatch.java
index 37b63be..425b8aa 100644
---
a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbonVectorBatch.java
+++
b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbonVectorBatch.java
@@ -74,7 +74,7 @@ public class CarbonVectorBatch {
return new CarbonVectorBatch(schema, readSupport,
CarbonV3DataFormatConstants.NUMBER_OF_ROWS_PER_BLOCKLET_COLUMN_PAGE_DEFAULT);
} else {
- return new CarbonVectorBatch(schema, readSupport,DEFAULT_BATCH_SIZE);
+ return new CarbonVectorBatch(schema, readSupport, DEFAULT_BATCH_SIZE);
}
}
diff --git
a/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoFilterUtil.java
b/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoFilterUtil.java
index 3683bf1..70955bb 100755
---
a/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoFilterUtil.java
+++
b/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoFilterUtil.java
@@ -94,7 +94,7 @@ public class PrestoFilterUtil {
return DataTypes.TIMESTAMP;
} else if (colType.getTypeInfo() instanceof DecimalTypeInfo) {
DecimalTypeInfo typeInfo = (DecimalTypeInfo) colType.getTypeInfo();
- return
DataTypes.createDecimalType(typeInfo.getPrecision(),typeInfo.getScale());
+ return DataTypes.createDecimalType(typeInfo.getPrecision(),
typeInfo.getScale());
} else {
return DataTypes.STRING;
}
diff --git
a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java
b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java
index f5e4f87..dc50b8e 100755
---
a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java
+++
b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java
@@ -39,7 +39,7 @@ public class CarbonLocalInputSplit {
private String path;
private long start; // the start offset of the block in a carbondata file.
private long length; // the length of the block.
- private List<String> locations;// locations are the locations for different
replicas.
+ private List<String> locations; // locations are the locations for different
replicas.
private short version;
private String[] deleteDeltaFiles;
private String blockletId;
diff --git
a/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/BinaryFieldConverterImpl.java
b/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/BinaryFieldConverterImpl.java
index 47c7dae..d006704 100644
---
a/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/BinaryFieldConverterImpl.java
+++
b/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/BinaryFieldConverterImpl.java
@@ -44,7 +44,7 @@ public class BinaryFieldConverterImpl implements
FieldConverter {
private DataField dataField;
private BinaryDecoder binaryDecoder;
public BinaryFieldConverterImpl(DataField dataField, String nullformat, int
index,
- boolean isEmptyBadRecord,BinaryDecoder binaryDecoder) {
+ boolean isEmptyBadRecord, BinaryDecoder binaryDecoder) {
this.dataType = dataField.getColumn().getDataType();
this.dimension = (CarbonDimension) dataField.getColumn();
this.nullformat = nullformat;
diff --git
a/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/CSVInputFormat.java
b/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/CSVInputFormat.java
index 87d026b..d7dbc75 100644
---
a/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/CSVInputFormat.java
+++
b/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/CSVInputFormat.java
@@ -136,7 +136,7 @@ public class CSVInputFormat extends
FileInputFormat<NullWritable, StringArrayWri
} else {
try {
BooleanUtils.toBoolean(CarbonProperties.getInstance()
- .getProperty(CarbonCommonConstants.CARBON_SKIP_EMPTY_LINE),"true",
"false");
+ .getProperty(CarbonCommonConstants.CARBON_SKIP_EMPTY_LINE),
"true", "false");
configuration.set(SKIP_EMPTY_LINE, CarbonProperties.getInstance()
.getProperty(CarbonCommonConstants.CARBON_SKIP_EMPTY_LINE));
} catch (Exception e) {
diff --git
a/processing/src/main/java/org/apache/carbondata/processing/loading/model/LoadOption.java
b/processing/src/main/java/org/apache/carbondata/processing/loading/model/LoadOption.java
index 419824b..1ee79e9 100644
---
a/processing/src/main/java/org/apache/carbondata/processing/loading/model/LoadOption.java
+++
b/processing/src/main/java/org/apache/carbondata/processing/loading/model/LoadOption.java
@@ -63,7 +63,7 @@ public class LoadOption {
optionsFinal.put(
"escapechar",
- CarbonLoaderUtil.getEscapeChar(Maps.getOrDefault(options,"escapechar",
"\\")));
+ CarbonLoaderUtil.getEscapeChar(Maps.getOrDefault(options,
"escapechar", "\\")));
optionsFinal.put(
"serialization_null_format",
diff --git
a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/SortStepRowHandler.java
b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/SortStepRowHandler.java
index e3015c9..a0cd3bd 100644
---
a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/SortStepRowHandler.java
+++
b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/SortStepRowHandler.java
@@ -258,7 +258,7 @@ public class SortStepRowHandler implements Serializable {
Object[] measure = new Object[this.measureCnt];
// unpack the no sort fields and measure fields
unpackNoSortFromBytes(noSortDimsAndMeasures, dictSortDims, noDictSortDims,
measure);
- return new IntermediateSortTempRow(dictSortDims, noDictSortDims,measure);
+ return new IntermediateSortTempRow(dictSortDims, noDictSortDims, measure);
}
/**
diff --git
a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java
b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java
index 7f57f4f..12bd2dd 100644
---
a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java
+++
b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java
@@ -169,13 +169,13 @@ public class CarbonFactDataHandlerColumnar implements
CarbonFactHandler {
producerExecutorService =
Executors.newFixedThreadPool(model.getNumberOfCores(),
new CarbonThreadFactory(
String.format("ProducerPool:%s, range: %d",
- model.getTableName(),model.getBucketId()), true));
+ model.getTableName(), model.getBucketId()), true));
producerExecutorServiceTaskList =
new ArrayList<>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE);
LOGGER.debug("Initializing writer executors");
consumerExecutorService = Executors.newFixedThreadPool(1, new
CarbonThreadFactory(
String.format("ConsumerPool:%s, range: %d",
- model.getTableName(),model.getBucketId()), true));
+ model.getTableName(), model.getBucketId()), true));
consumerExecutorServiceTaskList = new ArrayList<>(1);
semaphore = new Semaphore(numberOfCores);
tablePageList = new TablePageList();
diff --git
a/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java
b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java
index 5dcd321..a4cc4d0 100644
---
a/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java
+++
b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java
@@ -140,7 +140,7 @@ public class CarbonFactDataWriterImplV3 extends
AbstractFactDataWriter {
*/
@Override
public void writeTablePage(TablePage tablePage)
- throws CarbonDataWriterException,IOException {
+ throws CarbonDataWriterException, IOException {
// condition for writting all the pages
if (!tablePage.isLastPage()) {
diff --git
a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java
b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java
index 8ca5ae6..60c5abe 100644
---
a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java
+++
b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java
@@ -550,7 +550,7 @@ public final class CarbonLoaderUtil {
public static Map<String, List<Distributable>>
nodeBlockMapping(List<Distributable> blockInfos,
int noOfNodesInput, List<String> activeNodes) {
return nodeBlockMapping(blockInfos, noOfNodesInput, activeNodes,
- BlockAssignmentStrategy.BLOCK_NUM_FIRST,null);
+ BlockAssignmentStrategy.BLOCK_NUM_FIRST, null);
}
/**
@@ -562,7 +562,7 @@ public final class CarbonLoaderUtil {
public static Map<String, List<Distributable>>
nodeBlockMapping(List<Distributable> blockInfos) {
// -1 if number of nodes has to be decided based on block location
information
return nodeBlockMapping(blockInfos, -1, null,
- BlockAssignmentStrategy.BLOCK_NUM_FIRST,null);
+ BlockAssignmentStrategy.BLOCK_NUM_FIRST, null);
}
/**
diff --git
a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
b/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
index 6e43f7f..0b52241 100644
--- a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
+++ b/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
@@ -84,7 +84,7 @@ public class CarbonReader<T> {
// until all the readers are processed.
// If readers count is very high,
// we get OOM as GC not happened for any of the content in
CarbonVectorizedRecordReader
- readers.set(index,null);
+ readers.set(index, null);
index++;
currentReader = readers.get(index);
return currentReader.nextKeyValue();
diff --git
a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java
b/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java
index 7ab4a41..536da6f 100644
---
a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java
+++
b/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java
@@ -279,7 +279,7 @@ public class CarbonReaderBuilder {
// set cache level to blocklet level
Map<String, String> tableProperties =
table.getTableInfo().getFactTable().getTableProperties();
- tableProperties.put(CarbonCommonConstants.CACHE_LEVEL,"BLOCKLET");
+ tableProperties.put(CarbonCommonConstants.CACHE_LEVEL, "BLOCKLET");
table.getTableInfo().getFactTable().setTableProperties(tableProperties);
}
final CarbonFileInputFormat format = new CarbonFileInputFormat();
diff --git a/tools/cli/src/main/java/org/apache/carbondata/tool/CarbonCli.java
b/tools/cli/src/main/java/org/apache/carbondata/tool/CarbonCli.java
index fac7b8d..207331b 100644
--- a/tools/cli/src/main/java/org/apache/carbondata/tool/CarbonCli.java
+++ b/tools/cli/src/main/java/org/apache/carbondata/tool/CarbonCli.java
@@ -48,7 +48,7 @@ public class CarbonCli {
}
private static Options buildOptions() {
- Option help = new Option("h", "help", false,"print this message");
+ Option help = new Option("h", "help", false, "print this message");
Option path = OptionBuilder.withArgName("path")
.hasArg()
.withDescription("the path which contains carbondata files, nested
folder is supported")
@@ -67,8 +67,8 @@ public class CarbonCli {
.isRequired(true)
.create("cmd");
- Option all = new Option("a", "all",false, "print all information");
- Option schema = new Option("s", "schema",false, "print the schema");
+ Option all = new Option("a", "all", false, "print all information");
+ Option schema = new Option("s", "schema", false, "print the schema");
Option segment = new Option("m", "showSegment", false, "print segment
information");
Option tblProperties = new Option("t", "tblProperties", false, "print
table properties");
Option columnMeta = new Option("k", "columnChunkMeta", false, "print
column chunk meta");
