Skip to content

Commit d25fee2

Browse files
dhatchayaniravipesala
dhatchayani
authored and
ravipesala
committed
[CARBONDATA-1326] Fixed normal/low priority findbug issues
This closes apache#1204
1 parent f089287 commit d25fee2

17 files changed

+59
-95
lines changed

‎core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,6 @@ public final class CarbonCommonConstants {
186186
public static final byte[] MEMBER_DEFAULT_VAL_ARRAY =
187187
MEMBER_DEFAULT_VAL.getBytes(Charset.forName(DEFAULT_CHARSET));
188188

189-
/**
190-
* Bytes for string 0, it is used in codegen in case of null values.
191-
*/
192-
public static final byte[] ZERO_BYTE_ARRAY = "0".getBytes();
193189
/**
194190
* FILE STATUS IN-PROGRESS
195191
*/
@@ -963,12 +959,12 @@ public final class CarbonCommonConstants {
963959
/**
964960
* If the level 2 compaction is done in minor then new compacted segment will end with .2
965961
*/
966-
public static String LEVEL2_COMPACTION_INDEX = ".2";
962+
public static final String LEVEL2_COMPACTION_INDEX = ".2";
967963

968964
/**
969965
* Indicates compaction
970966
*/
971-
public static String COMPACTION_KEY_WORD = "COMPACTION";
967+
public static final String COMPACTION_KEY_WORD = "COMPACTION";
972968

973969
/**
974970
* hdfs temporary directory key
@@ -985,30 +981,30 @@ public final class CarbonCommonConstants {
985981
/**
986982
* File created in case of minor compaction request
987983
*/
988-
public static String minorCompactionRequiredFile = "compactionRequired_minor";
984+
public static final String minorCompactionRequiredFile = "compactionRequired_minor";
989985

990986
/**
991987
* File created in case of major compaction request
992988
*/
993-
public static String majorCompactionRequiredFile = "compactionRequired_major";
989+
public static final String majorCompactionRequiredFile = "compactionRequired_major";
994990

995991
/**
996992
* @Deprecated : This property has been deprecated.
997993
* Property for enabling system level compaction lock.1 compaction can run at once.
998994
*/
999995
@CarbonProperty
1000-
public static String ENABLE_CONCURRENT_COMPACTION = "carbon.concurrent.compaction";
996+
public static final String ENABLE_CONCURRENT_COMPACTION = "carbon.concurrent.compaction";
1001997

1002998
/**
1003999
* Default value of Property for enabling system level compaction lock.1 compaction can run
10041000
* at once.
10051001
*/
1006-
public static String DEFAULT_ENABLE_CONCURRENT_COMPACTION = "true";
1002+
public static final String DEFAULT_ENABLE_CONCURRENT_COMPACTION = "true";
10071003

10081004
/**
10091005
* Compaction system level lock folder.
10101006
*/
1011-
public static String SYSTEM_LEVEL_COMPACTION_LOCK_FOLDER = "SystemCompactionLock";
1007+
public static final String SYSTEM_LEVEL_COMPACTION_LOCK_FOLDER = "SystemCompactionLock";
10121008

10131009
/**
10141010
* This batch size is used to send rows from load step to another step in batches.
@@ -1048,34 +1044,34 @@ public final class CarbonCommonConstants {
10481044
/**
10491045
* columns which gets updated in update will have header ends with this extension.
10501046
*/
1051-
public static String UPDATED_COL_EXTENSION = "-updatedColumn";
1047+
public static final String UPDATED_COL_EXTENSION = "-updatedColumn";
10521048

10531049
/**
10541050
* appending the key to differentiate the update flow with insert flow.
10551051
*/
1056-
public static String RDDUTIL_UPDATE_KEY = "UPDATE_";
1052+
public static final String RDDUTIL_UPDATE_KEY = "UPDATE_";
10571053

10581054
/**
10591055
* to determine to use the rdd persist or not.
10601056
*/
10611057
@CarbonProperty
1062-
public static String isPersistEnabled = "carbon.update.persist.enable";
1058+
public static final String isPersistEnabled = "carbon.update.persist.enable";
10631059

10641060
/**
10651061
* for enabling or disabling Horizontal Compaction.
10661062
*/
10671063
@CarbonProperty
1068-
public static String isHorizontalCompactionEnabled = "carbon.horizontal.compaction.enable";
1064+
public static final String isHorizontalCompactionEnabled = "carbon.horizontal.compaction.enable";
10691065

10701066
/**
10711067
* Default value for HorizontalCompaction is true.
10721068
*/
1073-
public static String defaultIsHorizontalCompactionEnabled = "true";
1069+
public static final String defaultIsHorizontalCompactionEnabled = "true";
10741070

10751071
/**
10761072
* by default rdd will be persisted in the update case.
10771073
*/
1078-
public static String defaultValueIsPersistEnabled = "true";
1074+
public static final String defaultValueIsPersistEnabled = "true";
10791075

10801076
/**
10811077
* current data file version
@@ -1089,7 +1085,7 @@ public final class CarbonCommonConstants {
10891085
/**
10901086
* Maximum no of column supported
10911087
*/
1092-
public static int DEFAULT_MAX_NUMBER_OF_COLUMNS = 20000;
1088+
public static final int DEFAULT_MAX_NUMBER_OF_COLUMNS = 20000;
10931089

10941090
/**
10951091
* Maximum waiting time (in seconds) for a query for requested executors to be started

‎core/src/main/java/org/apache/carbondata/core/keygenerator/KeyGenerator.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,6 @@ public interface KeyGenerator extends Serializable, Comparator<byte[]> {
8989
*/
9090
int getKeySizeInBytes();
9191

92-
/**
93-
* It gets the specified index and size from the single key aka byte aray
94-
*
95-
* @param key
96-
* @param index
97-
* @param size
98-
* @return
99-
*/
100-
long[] getSubKeyArray(byte[] key, int index, int size);
10192

10293
/**
10394
* returns key bytes offset

‎core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/AbstractKeyGenerator.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ public int compare(byte[] buffer1, int offset1, int length1, byte[] buffer2, int
6666
return 0;
6767
}
6868

69-
@Override public int[] getKeyByteOffsets(int index) {
70-
return null;
71-
}
72-
7369
@Override public int getDimCount() {
7470
return 0;
7571
}

‎core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/MultiDimKeyVarLengthGenerator.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,6 @@ public int getKeySizeInBytes() {
6666
return bits.getByteSize();
6767
}
6868

69-
@Override public long[] getSubKeyArray(byte[] key, int index, int size) {
70-
if (index < 0 || size == 0) {
71-
return null;
72-
}
73-
long[] keys = bits.getKeyArray(key, 0);
74-
long[] rtn = new long[size];
75-
System.arraycopy(keys, index, rtn, 0, size);
76-
return rtn;
77-
}
78-
7969
@Override public int[] getKeyByteOffsets(int index) {
8070
return byteRangesForKeys[index];
8171
}

‎core/src/main/java/org/apache/carbondata/core/locks/CarbonLockFactory.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class CarbonLockFactory {
5252
*/
5353
public static ICarbonLock getCarbonLockObj(CarbonTableIdentifier tableIdentifier,
5454
String lockFile) {
55-
switch (lockTypeConfigured.toUpperCase()) {
55+
switch (lockTypeConfigured) {
5656
case CarbonCommonConstants.CARBON_LOCK_TYPE_LOCAL:
5757
return new LocalFileLock(tableIdentifier, lockFile);
5858

@@ -74,7 +74,7 @@ public static ICarbonLock getCarbonLockObj(CarbonTableIdentifier tableIdentifier
7474
* @return carbon lock
7575
*/
7676
public static ICarbonLock getCarbonLockObj(String locFileLocation, String lockFile) {
77-
switch (lockTypeConfigured.toUpperCase()) {
77+
switch (lockTypeConfigured) {
7878
case CarbonCommonConstants.CARBON_LOCK_TYPE_LOCAL:
7979
return new LocalFileLock(locFileLocation, lockFile);
8080

@@ -94,7 +94,8 @@ public static ICarbonLock getCarbonLockObj(String locFileLocation, String lockFi
9494
*/
9595
private static void getLockTypeConfigured() {
9696
lockTypeConfigured = CarbonProperties.getInstance()
97-
.getProperty(CarbonCommonConstants.LOCK_TYPE, CarbonCommonConstants.LOCK_TYPE_DEFAULT);
97+
.getProperty(CarbonCommonConstants.LOCK_TYPE, CarbonCommonConstants.LOCK_TYPE_DEFAULT)
98+
.toUpperCase();
9899
LOGGER.info("Configured lock type is: " + lockTypeConfigured);
99100
}
100101

‎core/src/main/java/org/apache/carbondata/core/metadata/CarbonTableIdentifier.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
*/
2626
public class CarbonTableIdentifier implements Serializable {
2727

28+
private static final long serialVersionUID = -0L;
29+
2830
/**
2931
* database name
3032
*/

‎core/src/main/java/org/apache/carbondata/core/metadata/ValueEncoderMeta.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
*/
3030
public class ValueEncoderMeta implements Serializable {
3131

32+
private static final long serialVersionUID = -0L;
33+
3234
/**
3335
* maxValue
3436
*/

‎core/src/main/java/org/apache/carbondata/core/metadata/schema/BucketingInfo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
*/
2828
public class BucketingInfo implements Serializable {
2929

30+
private static final long serialVersionUID = -0L;
31+
3032
private List<ColumnSchema> listOfColumns;
3133

3234
private int numberOfBuckets;

‎core/src/main/java/org/apache/carbondata/core/metadata/schema/PartitionInfo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
*/
3030
public class PartitionInfo implements Serializable {
3131

32+
private static final long serialVersionUID = -0L;
33+
3234
private List<ColumnSchema> columnSchemaList;
3335

3436
private PartitionType partitionType;

‎core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,18 +185,14 @@ public void setStorePath(String storePath) {
185185
return false;
186186
}
187187
TableInfo other = (TableInfo) obj;
188-
if (databaseName == null) {
189-
if (other.databaseName != null) {
190-
return false;
191-
}
192-
} else if (!tableUniqueName.equals(other.tableUniqueName)) {
188+
if ((databaseName == null && other.databaseName != null) || (databaseName != null
189+
&& other.databaseName == null)) {
193190
return false;
194191
}
195192

196-
if (tableUniqueName == null) {
197-
if (other.tableUniqueName != null) {
198-
return false;
199-
}
193+
if ((tableUniqueName == null && other.tableUniqueName != null) || (tableUniqueName != null
194+
&& other.tableUniqueName == null)) {
195+
return false;
200196
} else if (!tableUniqueName.equals(other.tableUniqueName)) {
201197
return false;
202198
}

‎core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public String getString() throws FilterIllegalMemberException {
187187
}
188188
return parser.format(new Timestamp((long) value));
189189
} else if (value instanceof Integer) {
190-
return parser.format(new java.sql.Date((int)value));
190+
return parser.format(new java.sql.Date((long)value));
191191
}
192192
return value.toString();
193193
default:
@@ -308,7 +308,6 @@ public BigDecimal getDecimal() throws FilterIllegalMemberException {
308308
case LONG:
309309
return new BigDecimal((long) value);
310310
case DOUBLE:
311-
return new BigDecimal(value.toString());
312311
case DECIMAL:
313312
return new BigDecimal(value.toString());
314313
case DATE:
@@ -546,7 +545,9 @@ public boolean isNull() {
546545
default:
547546
return this.getString().compareTo(o.getString());
548547
}
549-
} catch (Exception e) {
548+
} catch (ParseException e) {
549+
return -1;
550+
} catch (FilterIllegalMemberException e) {
550551
return -1;
551552
}
552553
}

‎core/src/main/java/org/apache/carbondata/core/scan/expression/RangeExpressionEvaluator.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ public void replaceWithRangeExpression(
120120

121121
for (FilterModificationNode exp : filterExp) {
122122
if ((exp.getExpType() == GREATERTHAN) || (exp.getExpType() == GREATERTHAN_EQUALTO)) {
123-
if ((null == endMax) || ((null != endMax) && (checkLiteralValue(exp.getCurrentExp(),
124-
endMax.getCurrentExp())))) {
123+
if ((null == endMax) || checkLiteralValue(exp.getCurrentExp(),
124+
endMax.getCurrentExp())) {
125125
if (null == startMin) {
126126
startMin = exp;
127127
} else {
@@ -141,8 +141,8 @@ public void replaceWithRangeExpression(
141141
}
142142
}
143143
if ((exp.getExpType() == LESSTHAN) || (exp.getExpType() == LESSTHAN_EQUALTO)) {
144-
if ((null == startMin) || ((null != startMin) && (checkLiteralValue(exp.getCurrentExp(),
145-
startMin.getCurrentExp())))) {
144+
if ((null == startMin) || checkLiteralValue(exp.getCurrentExp(),
145+
startMin.getCurrentExp())) {
146146
if (null == endMax) {
147147
endMax = exp;
148148
} else {
@@ -411,10 +411,10 @@ private Expression traverseTree(Expression currentNode, Expression parentNode) {
411411
ExpressionType srcExpType = getExpressionType(this.getSrcNode());
412412
ExpressionType tarExpType = getExpressionType(currentNode);
413413

414-
if ((null != srcColumnName) && (null != tarColumnName) && (srcColumnName == tarColumnName)
415-
&& (srcExpType != ExpressionType.FALSE) && (tarExpType != ExpressionType.FALSE) && (
416-
(matchExpType(srcExpType, tarExpType)) && checkLiteralValue(this.getSrcNode(),
417-
currentNode))) {
414+
if ((null != srcColumnName) && (null != tarColumnName) && (srcColumnName
415+
.equals(tarColumnName)) && (srcExpType != ExpressionType.FALSE) && (tarExpType
416+
!= ExpressionType.FALSE) && ((matchExpType(srcExpType, tarExpType)) && checkLiteralValue(
417+
this.getSrcNode(), currentNode))) {
418418
this.setTarNode(currentNode);
419419
this.setTarParentNode(parentNode);
420420
return parentNode;

‎core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -357,11 +357,6 @@ private FilterResolverIntf createFilterResolverTree(Expression expressionTree,
357357
BinaryExpression currentExpression = null;
358358
switch (filterExpressionType) {
359359
case OR:
360-
currentExpression = (BinaryExpression) expressionTree;
361-
return new LogicalFilterResolverImpl(
362-
createFilterResolverTree(currentExpression.getLeft(), tableIdentifier),
363-
createFilterResolverTree(currentExpression.getRight(), tableIdentifier),
364-
currentExpression);
365360
case AND:
366361
currentExpression = (BinaryExpression) expressionTree;
367362
return new LogicalFilterResolverImpl(

‎core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.math.BigDecimal;
2222
import java.nio.ByteBuffer;
2323
import java.nio.charset.Charset;
24+
import java.text.ParseException;
2425
import java.text.SimpleDateFormat;
2526
import java.util.ArrayList;
2627
import java.util.Arrays;
@@ -322,7 +323,8 @@ public static boolean checkIfLeftExpressionRequireEvaluation(Expression expressi
322323
* @return
323324
*/
324325
public static boolean checkIfDataTypeNotTimeStamp(Expression expression) {
325-
if (expression.getFilterExpressionType() == ExpressionType.LITERAL) {
326+
if (expression.getFilterExpressionType() == ExpressionType.LITERAL
327+
&& expression instanceof LiteralExpression) {
326328
DataType dataType = ((LiteralExpression) expression).getLiteralExpDataType();
327329
if (!(dataType == DataType.TIMESTAMP || dataType == DataType.DATE)) {
328330
return true;
@@ -1288,7 +1290,9 @@ public static int compareFilterKeyBasedOnDataType(String dictionaryVal, String m
12881290
default:
12891291
return -1;
12901292
}
1291-
} catch (Exception e) {
1293+
} catch (ParseException e) {
1294+
return -1;
1295+
} catch (NumberFormatException e) {
12921296
return -1;
12931297
}
12941298
}
@@ -1361,8 +1365,7 @@ public static void traverseResolverTreeAndGetStartAndEndKey(SegmentProperties se
13611365
if (segmentProperties.getNumberOfNoDictSortColumns() == 0) {
13621366
listOfStartKeyByteArray = new ArrayList<byte[]>();
13631367
listOfEndKeyByteArray = new ArrayList<byte[]>();
1364-
} else if (segmentProperties.getNumberOfNoDictSortColumns() < listOfStartKeyByteArray
1365-
.size()) {
1368+
} else {
13661369
while (segmentProperties.getNumberOfNoDictSortColumns() < listOfStartKeyByteArray.size()) {
13671370
listOfStartKeyByteArray.remove(listOfStartKeyByteArray.size() - 1);
13681371
listOfEndKeyByteArray.remove(listOfEndKeyByteArray.size() - 1);
@@ -1428,7 +1431,9 @@ private static int compareFilterMembersBasedOnActualDataType(String filterMember
14281431
default:
14291432
return filterMember1.compareTo(filterMember2);
14301433
}
1431-
} catch (Exception e) {
1434+
} catch (ParseException e) {
1435+
return -1;
1436+
} catch (NumberFormatException e) {
14321437
return -1;
14331438
}
14341439
}

0 commit comments

Comments
 (0)