This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/main by this push:
new 63aec9be93 [MINOR] Fix static code analysis warnings, part II
63aec9be93 is described below
commit 63aec9be93672816b28a93a44057d7c18c5a28dc
Author: Matthias Boehm <[email protected]>
AuthorDate: Wed Jul 19 16:42:35 2023 +0200
[MINOR] Fix static code analysis warnings, part II
This patch applies additional changes from an automated static code
analysis. These changes include a number of minor bugs in tests and
system code. The most important bug fix, is the inactive IPA early
abort feature (avoiding unnecessary compilation overhead).
---
scripts/nn/layers/low_rank_affine.dml | 2 +-
scripts/nn/layers/lstm.dml | 2 +-
.../java/org/apache/sysds/hops/AggBinaryOp.java | 21 +++++------------
.../java/org/apache/sysds/hops/AggUnaryOp.java | 7 ++----
src/main/java/org/apache/sysds/hops/NaryOp.java | 1 +
.../apache/sysds/hops/ParameterizedBuiltinOp.java | 1 +
.../apache/sysds/hops/codegen/cplan/CNodeRow.java | 1 +
.../org/apache/sysds/hops/cost/ComputeCost.java | 1 +
.../ipa/IPAPassCompressionWorkloadAnalysis.java | 25 ++++++++++----------
.../sysds/hops/ipa/InterProceduralAnalysis.java | 1 +
.../java/org/apache/sysds/lops/CentralMoment.java | 4 ++--
.../org/apache/sysds/parser/BooleanExpression.java | 3 +--
.../apache/sysds/runtime/codegen/SpoofRowwise.java | 2 +-
.../runtime/compress/bitmap/BitmapEncoder.java | 3 +--
.../runtime/compress/colgroup/ColGroupRLE.java | 1 -
.../sysds/runtime/compress/lib/CLALibCompAgg.java | 2 +-
.../runtime/compress/lib/CLALibLeftMultBy.java | 2 +-
.../sysds/runtime/compress/lib/CLALibScalar.java | 3 +--
.../runtime/controlprogram/BasicProgramBlock.java | 6 ++---
.../federated/FederatedStatistics.java | 2 +-
.../monitoring/services/WorkerService.java | 3 +--
.../controlprogram/paramserv/HEParamServer.java | 2 +-
.../org/apache/sysds/runtime/data/TensorBlock.java | 1 +
.../runtime/frame/data/columns/ArrayFactory.java | 4 ++--
.../runtime/frame/data/columns/BooleanArray.java | 3 +--
.../runtime/frame/data/columns/DoubleArray.java | 8 +++----
.../cp/AggregateBinaryCPInstruction.java | 7 +++---
.../cp/AggregateTernaryCPInstruction.java | 4 +---
.../fed/AggregateTernaryFEDInstruction.java | 11 ++++-----
.../instructions/fed/ReorgFEDInstruction.java | 2 +-
.../instructions/fed/ReshapeFEDInstruction.java | 1 -
.../spark/AggregateTernarySPInstruction.java | 4 +---
.../apache/sysds/runtime/lineage/LineageCache.java | 1 +
.../lineage/LineageEstimatorStatistics.java | 2 +-
.../runtime/lineage/LineageSparkCacheEviction.java | 3 +--
.../data/BinaryBlockToTextCellConverter.java | 27 ++++++++--------------
.../org/apache/sysds/runtime/meta/MetaDataAll.java | 7 +++---
.../runtime/transform/decode/DecoderFactory.java | 2 +-
.../transform/encode/MultiColumnEncoder.java | 4 ++--
.../apache/sysds/runtime/util/UtilFunctions.java | 2 +-
.../org/apache/sysds/test/AutomatedTestBase.java | 1 -
.../applications/EntityResolutionBinaryTest.java | 2 +-
.../component/compress/colgroup/ColGroupTest.java | 3 +--
.../compress/estim/sample/SampleDistinctTest.java | 4 ++--
.../compress/mapping/MappingTestUtil.java | 7 ++++++
.../component/frame/array/FrameArrayTests.java | 17 +++-----------
.../test/functions/aggregate/AggregateNaNTest.java | 8 +++----
.../sysds/test/functions/data/rand/SampleTest.java | 3 +--
.../ParForColwiseDataPartitioningTest.java | 4 ++--
49 files changed, 101 insertions(+), 136 deletions(-)
diff --git a/scripts/nn/layers/low_rank_affine.dml
b/scripts/nn/layers/low_rank_affine.dml
index 32293f99ce..b9c6096dda 100644
--- a/scripts/nn/layers/low_rank_affine.dml
+++ b/scripts/nn/layers/low_rank_affine.dml
@@ -68,7 +68,7 @@ backward = function(matrix[double] dout, matrix[double] X,
* - db: Gradient wrt `b`, of shape (1, M).
*/
dX = dout %*% t(V) %*% t(U)
-
+
# If out = Z %*% L, then dL = t(Z) %*% dout
# Substituting Z = X %*% U and L = V, we get
dV = t(U) %*% t(X) %*% dout
diff --git a/scripts/nn/layers/lstm.dml b/scripts/nn/layers/lstm.dml
index 44942d2cee..93034df4b2 100644
--- a/scripts/nn/layers/lstm.dml
+++ b/scripts/nn/layers/lstm.dml
@@ -162,7 +162,7 @@ backward = function(matrix[double] dout, matrix[double] dc,
M = as.integer(ncol(W)/4)
N1 = nrow(out0)
if(N != N1) {
- # Allow for smaller out0 for last batch
+ # Allow for smaller out0 for last batch
# out0 = out0[1:N,]
# c0 = c0[1:N,]
stop("Unsupported operation: The batch size of previous iteration " + N1 +
" is different than the batch size of current iteration " + N)
diff --git a/src/main/java/org/apache/sysds/hops/AggBinaryOp.java
b/src/main/java/org/apache/sysds/hops/AggBinaryOp.java
index 50200675c0..14ac2c5efc 100644
--- a/src/main/java/org/apache/sysds/hops/AggBinaryOp.java
+++ b/src/main/java/org/apache/sysds/hops/AggBinaryOp.java
@@ -366,14 +366,9 @@ public class AggBinaryOp extends MultiThreadedHop {
}
private boolean isOuterProduct() {
- if ( getInput().get(0).isVector() &&
getInput().get(1).isVector() ) {
- if ( getInput().get(0).getDim1() == 1 &&
getInput().get(0).getDim1() > 1
- && getInput().get(1).getDim1() > 1 &&
getInput().get(1).getDim2() == 1 )
- return true;
- else
- return false;
- }
- return false;
+ return ( getInput().get(0).isVector() &&
getInput().get(1).isVector() )
+ && ( getInput().get(0).getDim1() == 1 &&
getInput().get(0).getDim1() > 1
+ && getInput().get(1).getDim1() > 1 &&
getInput().get(1).getDim2() == 1 );
}
@Override
@@ -979,15 +974,12 @@ public class AggBinaryOp extends MultiThreadedHop {
return ret;
}
- private SparkAggType getSparkMMAggregationType( boolean agg )
- {
+ private SparkAggType getSparkMMAggregationType( boolean agg ) {
if( !agg )
return SparkAggType.NONE;
-
if( dimsKnown() && getDim1()<=getBlocksize() &&
getDim2()<=getBlocksize() )
return SparkAggType.SINGLE_BLOCK;
- else
- return SparkAggType.MULTI_BLOCK;
+ return SparkAggType.MULTI_BLOCK;
}
private boolean requiresAggregation(MMultMethod method)
@@ -1224,8 +1216,7 @@ public class AggBinaryOp extends MultiThreadedHop {
//final mmult method decision
if ( cpmm_costs < rmm_costs )
return MMultMethod.CPMM;
- else
- return MMultMethod.RMM;
+ return MMultMethod.RMM;
}
private static double getRMMCostEstimate( long m1_rows, long m1_cols,
long m1_blen,
diff --git a/src/main/java/org/apache/sysds/hops/AggUnaryOp.java
b/src/main/java/org/apache/sysds/hops/AggUnaryOp.java
index dfe0ffd61b..dcd68b055e 100644
--- a/src/main/java/org/apache/sysds/hops/AggUnaryOp.java
+++ b/src/main/java/org/apache/sysds/hops/AggUnaryOp.java
@@ -423,16 +423,13 @@ public class AggUnaryOp extends MultiThreadedHop
return !noAggRequired;
}
- private SparkAggType getSparkUnaryAggregationType( boolean agg )
- {
+ private SparkAggType getSparkUnaryAggregationType( boolean agg ) {
if( !agg )
return SparkAggType.NONE;
-
if( getDataType()==DataType.SCALAR //in case of scalars the
block dims are not set
|| dimsKnown() && getDim1()<=getBlocksize() &&
getDim2()<=getBlocksize() )
return SparkAggType.SINGLE_BLOCK;
- else
- return SparkAggType.MULTI_BLOCK;
+ return SparkAggType.MULTI_BLOCK;
}
private boolean isTernaryAggregateRewriteApplicable()
diff --git a/src/main/java/org/apache/sysds/hops/NaryOp.java
b/src/main/java/org/apache/sysds/hops/NaryOp.java
index e974d95bc9..0a6e93ca14 100644
--- a/src/main/java/org/apache/sysds/hops/NaryOp.java
+++ b/src/main/java/org/apache/sysds/hops/NaryOp.java
@@ -236,6 +236,7 @@ public class NaryOp extends Hop {
case LIST:
setDim1(getInput().size());
setDim2(1);
+ break;
case PRINTF:
case EVAL:
//do nothing:
diff --git a/src/main/java/org/apache/sysds/hops/ParameterizedBuiltinOp.java
b/src/main/java/org/apache/sysds/hops/ParameterizedBuiltinOp.java
index 59b957ac5b..4e70a3bf09 100644
--- a/src/main/java/org/apache/sysds/hops/ParameterizedBuiltinOp.java
+++ b/src/main/java/org/apache/sysds/hops/ParameterizedBuiltinOp.java
@@ -741,6 +741,7 @@ public class ParameterizedBuiltinOp extends
MultiThreadedHop {
case CONTAINS:
if(getTargetHop().optFindExecType() ==
ExecType.SPARK)
_etype = ExecType.SPARK;
+ break;
default:
// Do not change execution type.
}
diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeRow.java
b/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeRow.java
index 13c8e10fca..77dec97cbe 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeRow.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeRow.java
@@ -153,6 +153,7 @@ private static final String TEMPLATE_ROWAGG_OUT_CUDA =
"\t\tif(threadIdx.x == 0
return tmp;
}
+ @SuppressWarnings("fallthrough")
private String getOutputStatement(String varName) {
switch( _type ) {
case NO_AGG:
diff --git a/src/main/java/org/apache/sysds/hops/cost/ComputeCost.java
b/src/main/java/org/apache/sysds/hops/cost/ComputeCost.java
index 3ac64b6018..d0bf82f23a 100644
--- a/src/main/java/org/apache/sysds/hops/cost/ComputeCost.java
+++ b/src/main/java/org/apache/sysds/hops/cost/ComputeCost.java
@@ -177,6 +177,7 @@ public class ComputeCost {
case BIASADD:
case BIASMULT:
costs = 2;
+ break;
default:
LOG.warn("Cost model not "
+ "implemented yet for:
"+((DnnOp)currentHop).getOp());
diff --git
a/src/main/java/org/apache/sysds/hops/ipa/IPAPassCompressionWorkloadAnalysis.java
b/src/main/java/org/apache/sysds/hops/ipa/IPAPassCompressionWorkloadAnalysis.java
index 9b689b8801..18faec51f6 100644
---
a/src/main/java/org/apache/sysds/hops/ipa/IPAPassCompressionWorkloadAnalysis.java
+++
b/src/main/java/org/apache/sysds/hops/ipa/IPAPassCompressionWorkloadAnalysis.java
@@ -56,19 +56,20 @@ public class IPAPassCompressionWorkloadAnalysis extends
IPAPass {
Map<Long, WTreeRoot> map =
WorkloadAnalyzer.getAllCandidateWorkloads(prog);
// Add compression instruction to all remaining locations
- for(Entry<Long, WTreeRoot> e : map.entrySet()) {
- final WTreeRoot tree = e.getValue();
- final CostEstimatorBuilder b = new
CostEstimatorBuilder(tree);
- final boolean shouldCompress = b.shouldTryToCompress();
- // Filter out compression plans that is known to be bad
- if(shouldCompress)
- tree.getRoot().setRequiresCompression(tree);
- else if(LOG.isTraceEnabled())
- LOG.trace("IPAPass Says no Compress:\n" + tree
+ "\n" + b);
- else if(LOG.isDebugEnabled())
- LOG.debug("IPApass Says no Compress:\n" +
tree.getRoot() + "\n" + b);
+ if( map != null ) {
+ for(Entry<Long, WTreeRoot> e : map.entrySet()) {
+ final WTreeRoot tree = e.getValue();
+ final CostEstimatorBuilder b = new
CostEstimatorBuilder(tree);
+ final boolean shouldCompress =
b.shouldTryToCompress();
+ // Filter out compression plans that is known
to be bad
+ if(shouldCompress)
+
tree.getRoot().setRequiresCompression(tree);
+ else if(LOG.isTraceEnabled())
+ LOG.trace("IPAPass Says no Compress:\n"
+ tree + "\n" + b);
+ else if(LOG.isDebugEnabled())
+ LOG.debug("IPApass Says no Compress:\n"
+ tree.getRoot() + "\n" + b);
+ }
}
-
return map != null;
}
}
diff --git
a/src/main/java/org/apache/sysds/hops/ipa/InterProceduralAnalysis.java
b/src/main/java/org/apache/sysds/hops/ipa/InterProceduralAnalysis.java
index 20644faac9..2480f0d10c 100644
--- a/src/main/java/org/apache/sysds/hops/ipa/InterProceduralAnalysis.java
+++ b/src/main/java/org/apache/sysds/hops/ipa/InterProceduralAnalysis.java
@@ -232,6 +232,7 @@ public class InterProceduralAnalysis
+ " repetitions due to reached
fixpoint.");
break;
}
+ lastSizes = fcallSizes;
//step 3: rebuild function call graph if necessary
if( rebuildFGraph && i < repetitions-1 )
diff --git a/src/main/java/org/apache/sysds/lops/CentralMoment.java
b/src/main/java/org/apache/sysds/lops/CentralMoment.java
index 8972b4f4c2..87fa3b6ee6 100644
--- a/src/main/java/org/apache/sysds/lops/CentralMoment.java
+++ b/src/main/java/org/apache/sysds/lops/CentralMoment.java
@@ -85,7 +85,7 @@ public class CentralMoment extends Lop
InstructionUtils.concatOperands(sb,
getExecType().toString(), "cm",
getInputs().get(0).prepInputOperand(input1),
-
getInputs().get((input3!=null)?2:1).prepScalarInputOperand(getExecType()),
+
getInputs().get(1).prepScalarInputOperand(getExecType()),
prepOutputOperand(output));
}
else {
@@ -93,7 +93,7 @@ public class CentralMoment extends Lop
getExecType().toString(), "cm",
getInputs().get(0).prepInputOperand(input1),
getInputs().get(1).prepInputOperand(input2),
-
getInputs().get((input3!=null)?2:1).prepScalarInputOperand(getExecType()),
+
getInputs().get(2).prepScalarInputOperand(getExecType()),
prepOutputOperand(output));
}
if( getExecType() == ExecType.CP || getExecType() ==
ExecType.FED ) {
diff --git a/src/main/java/org/apache/sysds/parser/BooleanExpression.java
b/src/main/java/org/apache/sysds/parser/BooleanExpression.java
index 568ada8ea0..8929d24309 100644
--- a/src/main/java/org/apache/sysds/parser/BooleanExpression.java
+++ b/src/main/java/org/apache/sysds/parser/BooleanExpression.java
@@ -136,9 +136,8 @@ public class BooleanExpression extends Expression
public String toString(){
if (_opcode == BooleanOp.NOT) {
return "(" + _opcode.toString() + " " +
_left.toString() + ")";
- } else {
- return "(" + _left.toString() + " " +
_opcode.toString() + " " + _right.toString() + ")";
}
+ return "(" + _left.toString() + " " + _opcode.toString() + " "
+ _right.toString() + ")";
}
@Override
diff --git a/src/main/java/org/apache/sysds/runtime/codegen/SpoofRowwise.java
b/src/main/java/org/apache/sysds/runtime/codegen/SpoofRowwise.java
index fae7605d45..02cb4f9dff 100644
--- a/src/main/java/org/apache/sysds/runtime/codegen/SpoofRowwise.java
+++ b/src/main/java/org/apache/sysds/runtime/codegen/SpoofRowwise.java
@@ -322,7 +322,7 @@ public abstract class SpoofRowwise extends SpoofOperator
default: rows = 0;
cols = 0;
}
}
- };
+ }
private void allocateOutputMatrix(int m, int n, int n2, MatrixBlock
out) {
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/bitmap/BitmapEncoder.java
b/src/main/java/org/apache/sysds/runtime/compress/bitmap/BitmapEncoder.java
index 90e8cf1cdb..0dc3e0e754 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/bitmap/BitmapEncoder.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/bitmap/BitmapEncoder.java
@@ -207,8 +207,7 @@ public class BitmapEncoder {
}
return new Bitmap(offsetsLists, values, numRows);
}
- else
- return null;
+ return null;
}
static class CompSizeDArrayIListEntry implements
Comparator<DArrayIListEntry> {
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
index a04cb53c1a..692e2496a8 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
@@ -518,7 +518,6 @@ public class ColGroupRLE extends AColGroupOffset {
if(!zeroRows[i]) {
final int id = i + rl;
c[id] = builtin.execute(c[id], 0);
- ;
}
}
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCompAgg.java
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCompAgg.java
index 0e592671fb..109f751457 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCompAgg.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCompAgg.java
@@ -345,7 +345,7 @@ public final class CLALibCompAgg {
}
private static void
divideByNumberOfCellsForMeanCols(CompressedMatrixBlock m1, MatrixBlock ret) {
- double div = (double) m1.getNumRows();
+ double div = m1.getNumRows();
if(ret.isInSparseFormat()) {
SparseBlock sb = ret.getSparseBlock();
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibLeftMultBy.java
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibLeftMultBy.java
index 731d8f5ecf..6029a87d46 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibLeftMultBy.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibLeftMultBy.java
@@ -199,7 +199,7 @@ public final class CLALibLeftMultBy {
rowSums = that.rowSum(k).getDenseBlockValues();
// add the correction layer for the subtracted common
values.
- if(rowSums != null && constV != null) {
+ if(rowSums != null) {
if(ret.isEmpty())
ret.allocateDenseBlock();
else
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibScalar.java
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibScalar.java
index 0860e0f433..0da3f2d969 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibScalar.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibScalar.java
@@ -152,8 +152,7 @@ public final class CLALibScalar {
else
newColGroups.add(grp.scalarOperation(new
RightScalarOperator(Multiply.getMultiplyFnObject(), -1)));
}
- if(c != null)
- newColGroups.add(c);
+ newColGroups.add(c);
return newColGroups;
}
diff --git
a/src/main/java/org/apache/sysds/runtime/controlprogram/BasicProgramBlock.java
b/src/main/java/org/apache/sysds/runtime/controlprogram/BasicProgramBlock.java
index c28a82a8c4..997e6814f1 100644
---
a/src/main/java/org/apache/sysds/runtime/controlprogram/BasicProgramBlock.java
+++
b/src/main/java/org/apache/sysds/runtime/controlprogram/BasicProgramBlock.java
@@ -101,12 +101,10 @@ public class BasicProgramBlock extends ProgramBlock
RecompileStatistics.incrementRecompileSB();
}
}
- catch(Exception ex)
- {
+ catch(Exception ex) {
if( _sb != null )
throw new DMLRuntimeException("Unable to
recompile program block (lines "+_sb.getBeginLine()+"-"+_sb.getEndLine()+").",
ex);
- else
- throw new DMLRuntimeException("Unable to
recompile program block.", ex);
+ throw new DMLRuntimeException("Unable to recompile
program block.", ex);
}
//statement-block-level, lineage-based reuse
diff --git
a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedStatistics.java
b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedStatistics.java
index 189d3c72bb..48481a9065 100644
---
a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedStatistics.java
+++
b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedStatistics.java
@@ -504,7 +504,7 @@ public class FederatedStatistics {
public static void addWorkerRequest(RequestModel request) {
if (!workerFederatedRequests.containsKey(request.type)) {
workerFederatedRequests.put(request.type, request);
- };
+ }
workerFederatedRequests.get(request.type).count++;
}
diff --git
a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/monitoring/services/WorkerService.java
b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/monitoring/services/WorkerService.java
index 4c7989a9f7..a2ee284340 100644
---
a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/monitoring/services/WorkerService.java
+++
b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/monitoring/services/WorkerService.java
@@ -151,8 +151,7 @@ public class WorkerService {
var eventId =
entityRepository.createEntity(eventEntity);
for(var stageEntity :
eventEntity.stages) {
stageEntity.eventId = eventId;
- if(stageEntity
!= null)
-
entityRepository.createEntity(stageEntity);
+
entityRepository.createEntity(stageEntity);
}
});
}
diff --git
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/HEParamServer.java
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/HEParamServer.java
index f5846a400d..63b6309aad 100644
---
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/HEParamServer.java
+++
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/HEParamServer.java
@@ -128,7 +128,7 @@ public class HEParamServer extends LocalParamServer {
for (int i = 0; i < encrypted_models.size(); i++) {
summands[i] = (CiphertextMatrix)
encrypted_models.get(i).getData(matrix_idx);
}
- result[matrix_idx] =
_seal_server.accumulateCiphertexts(summands);;
+ result[matrix_idx] =
_seal_server.accumulateCiphertexts(summands);
});
if (tAgg != null) {
ParamServStatistics.accHEAccumulation((long)tAgg.stop());
diff --git a/src/main/java/org/apache/sysds/runtime/data/TensorBlock.java
b/src/main/java/org/apache/sysds/runtime/data/TensorBlock.java
index e85f1681d7..c651bcef30 100644
--- a/src/main/java/org/apache/sysds/runtime/data/TensorBlock.java
+++ b/src/main/java/org/apache/sysds/runtime/data/TensorBlock.java
@@ -647,6 +647,7 @@ public class TensorBlock implements
CacheBlock<TensorBlock>, Externalizable {
switch (bt._vt) {
case UINT4:
size += getLength() / 2 + getLength() %
2;
+ break;
case UINT8:
size += 1 * getLength(); break;
case INT32:
diff --git
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/ArrayFactory.java
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/ArrayFactory.java
index 5291badcea..55d32f15be 100644
---
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/ArrayFactory.java
+++
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/ArrayFactory.java
@@ -91,7 +91,7 @@ public interface ArrayFactory {
case STRING:
// cannot be known since strings have
dynamic length
// lets assume something large to make
it somewhat safe.
- return Array.baseMemoryCost() + (long)
MemoryEstimates.stringCost(12) * _numRows;
+ return Array.baseMemoryCost() +
MemoryEstimates.stringCost(12) * _numRows;
default: // not applicable
throw new DMLRuntimeException("Invalid
type to estimate size of :" + type);
}
@@ -116,7 +116,7 @@ public interface ArrayFactory {
case STRING:
// cannot be known since strings have
dynamic length
// lets assume something large to make
it somewhat safe.
- return Array.baseMemoryCost() + (long)
MemoryEstimates.stringCost(12) * _numRows;
+ return Array.baseMemoryCost() +
MemoryEstimates.stringCost(12) * _numRows;
case CHARACTER:
return Array.baseMemoryCost() + (long)
MemoryEstimates.charArrayCost(_numRows);
default: // not applicable
diff --git
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/BooleanArray.java
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/BooleanArray.java
index 22f9505655..f34d95233f 100644
---
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/BooleanArray.java
+++
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/BooleanArray.java
@@ -354,8 +354,7 @@ public class BooleanArray extends ABooleanArray {
public boolean equals(Array<Boolean> other) {
if(other instanceof BooleanArray)
return Arrays.equals(_data, ((BooleanArray)
other)._data);
- else
- return false;
+ return false;
}
@Override
diff --git
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/DoubleArray.java
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/DoubleArray.java
index 6ac63cba8c..575313a450 100644
--- a/src/main/java/org/apache/sysds/runtime/frame/data/columns/DoubleArray.java
+++ b/src/main/java/org/apache/sysds/runtime/frame/data/columns/DoubleArray.java
@@ -186,7 +186,7 @@ public class DoubleArray extends Array<Double> {
case FP32:
switch(c) {
case FP64:
- state = c;
+ state = c; break;
default:
}
break;
@@ -194,7 +194,7 @@ public class DoubleArray extends Array<Double> {
switch(c) {
case FP64:
case FP32:
- state = c;
+ state = c; break;
default:
}
break;
@@ -203,7 +203,7 @@ public class DoubleArray extends Array<Double> {
case FP64:
case FP32:
case INT64:
- state = c;
+ state = c; break;
default:
}
break;
@@ -214,7 +214,7 @@ public class DoubleArray extends Array<Double> {
case FP32:
case INT64:
case INT32:
- state = c;
+ state = c; break;
default:
}
break;
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/cp/AggregateBinaryCPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/cp/AggregateBinaryCPInstruction.java
index d421c214e0..c17fcb0ad4 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/cp/AggregateBinaryCPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/cp/AggregateBinaryCPInstruction.java
@@ -65,11 +65,10 @@ public class AggregateBinaryCPInstruction extends
BinaryCPInstruction {
if(numFields == 6) {
boolean isLeftTransposed =
Boolean.parseBoolean(parts[5]);
boolean isRightTransposed =
Boolean.parseBoolean(parts[6]);
- return new AggregateBinaryCPInstruction(aggbin, in1,
in2, out, opcode, str, isLeftTransposed,
- isRightTransposed);
+ return new AggregateBinaryCPInstruction(aggbin,
+ in1, in2, out, opcode, str, isLeftTransposed,
isRightTransposed);
}
- else
- return new AggregateBinaryCPInstruction(aggbin, in1,
in2, out, opcode, str);
+ return new AggregateBinaryCPInstruction(aggbin, in1, in2, out,
opcode, str);
}
@Override
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/cp/AggregateTernaryCPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/cp/AggregateTernaryCPInstruction.java
index 007ad2d5dd..01c966314e 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/cp/AggregateTernaryCPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/cp/AggregateTernaryCPInstruction.java
@@ -55,9 +55,7 @@ public class AggregateTernaryCPInstruction extends
ComputationCPInstruction {
AggregateTernaryOperator op =
InstructionUtils.parseAggregateTernaryOperator(opcode, numThreads);
return new AggregateTernaryCPInstruction(op, in1, in2,
in3, out, opcode, str);
}
- else {
- throw new
DMLRuntimeException("AggregateTernaryInstruction.parseInstruction():: Unknown
opcode " + opcode);
- }
+ throw new
DMLRuntimeException("AggregateTernaryInstruction.parseInstruction():: Unknown
opcode " + opcode);
}
@Override
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/fed/AggregateTernaryFEDInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/fed/AggregateTernaryFEDInstruction.java
index f8e8f8ad22..c581ef6405 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/fed/AggregateTernaryFEDInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/fed/AggregateTernaryFEDInstruction.java
@@ -95,9 +95,7 @@ public class AggregateTernaryFEDInstruction extends
ComputationFEDInstruction {
AggregateTernaryOperator op =
InstructionUtils.parseAggregateTernaryOperator(opcode, numThreads);
return new AggregateTernaryFEDInstruction(op, in1, in2,
in3, out, opcode, str, fedOut);
}
- else {
- throw new
DMLRuntimeException("AggregateTernaryInstruction.parseInstruction():: Unknown
opcode " + opcode);
- }
+ throw new
DMLRuntimeException("AggregateTernaryInstruction.parseInstruction():: Unknown
opcode " + opcode);
}
@Override
@@ -188,10 +186,9 @@ public class AggregateTernaryFEDInstruction extends
ComputationFEDInstruction {
throw new DMLRuntimeException("Federated
AggregateTernary not supported with the "
+ "following federated objects: " +
mo1.isFederated() + ":" + mo1.getFedMapping() + " "
+ mo2.isFederated() + ":" +
mo2.getFedMapping());
- else
- throw new DMLRuntimeException("Federated
AggregateTernary not supported with the "
- + "following federated objects: " +
mo1.isFederated() + ":" + mo1.getFedMapping() + " "
- + mo2.isFederated() + ":" +
mo2.getFedMapping() + mo3.isFederated() + ":" + mo3.getFedMapping());
+ throw new DMLRuntimeException("Federated
AggregateTernary not supported with the "
+ + "following federated objects: " +
mo1.isFederated() + ":" + mo1.getFedMapping() + " "
+ + mo2.isFederated() + ":" + mo2.getFedMapping()
+ mo3.isFederated() + ":" + mo3.getFedMapping());
}
}
}
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/fed/ReorgFEDInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/fed/ReorgFEDInstruction.java
index 415da80185..b9763aaf2b 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/fed/ReorgFEDInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/fed/ReorgFEDInstruction.java
@@ -386,7 +386,7 @@ public class ReorgFEDInstruction extends
UnaryFEDInstruction {
res.copy(0, res.getNumRows()-1, _slice[0],
_slice[1]-1, tmp, false);
} else {
res = new MatrixBlock(_len, _slice[1], 0.0);
- res.copy(_slice[0], _slice[1]-1, 0,
mb.getNumColumns() - 1, tmp, false);;
+ res.copy(_slice[0], _slice[1]-1, 0,
mb.getNumColumns() - 1, tmp, false);
}
MatrixObject mout =
ExecutionContext.createMatrixObject(res);
mout.setDiag(true);
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/fed/ReshapeFEDInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/fed/ReshapeFEDInstruction.java
index 70808ec244..73de9261a3 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/fed/ReshapeFEDInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/fed/ReshapeFEDInstruction.java
@@ -25,7 +25,6 @@ import java.util.stream.Collectors;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.sysds.common.Types;
-import org.apache.sysds.lops.Lop;
import org.apache.sysds.runtime.DMLRuntimeException;
import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/spark/AggregateTernarySPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/spark/AggregateTernarySPInstruction.java
index 672404a86e..29134a0dc0 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/spark/AggregateTernarySPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/spark/AggregateTernarySPInstruction.java
@@ -55,9 +55,7 @@ public class AggregateTernarySPInstruction extends
ComputationSPInstruction {
AggregateTernaryOperator op =
InstructionUtils.parseAggregateTernaryOperator(opcode);
return new AggregateTernarySPInstruction(op, in1, in2,
in3, out, opcode, str);
}
- else {
- throw new
DMLRuntimeException("AggregateTernaryInstruction.parseInstruction():: Unknown
opcode " + opcode);
- }
+ throw new
DMLRuntimeException("AggregateTernaryInstruction.parseInstruction():: Unknown
opcode " + opcode);
}
@Override
diff --git a/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java
b/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java
index 557a95d3b8..5ef81d3133 100644
--- a/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java
+++ b/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java
@@ -1130,6 +1130,7 @@ public class LineageCache
return false;
}
+ @SuppressWarnings("unused")
private static boolean persistRDD(LineageCacheEntry centry, long
estimatedSize) {
// If already persisted, change the status and return true.
// Else, persist, change cache status and return false.
diff --git
a/src/main/java/org/apache/sysds/runtime/lineage/LineageEstimatorStatistics.java
b/src/main/java/org/apache/sysds/runtime/lineage/LineageEstimatorStatistics.java
index 2f3d057a6e..c7aee361ee 100644
---
a/src/main/java/org/apache/sysds/runtime/lineage/LineageEstimatorStatistics.java
+++
b/src/main/java/org/apache/sysds/runtime/lineage/LineageEstimatorStatistics.java
@@ -65,7 +65,7 @@ public class LineageEstimatorStatistics {
for (int i=1; i<=instCount; i++) {
MutableTriple<String, Long, Double> op =
LineageEstimator.computeSavingInst.poll();
int tl =
String.valueOf(op.getRight()*1e-3).indexOf(".");
- if (op != null && op.getRight() > 0)
+ if (op.getRight() > 0)
sb.append(String.valueOf(i)
+
String.format("%"+(4-String.valueOf(i).length())+"s", "") // 4-length(i) spaces
+ op.getLeft()
diff --git
a/src/main/java/org/apache/sysds/runtime/lineage/LineageSparkCacheEviction.java
b/src/main/java/org/apache/sysds/runtime/lineage/LineageSparkCacheEviction.java
index 8dfbc44032..65648508f8 100644
---
a/src/main/java/org/apache/sysds/runtime/lineage/LineageSparkCacheEviction.java
+++
b/src/main/java/org/apache/sysds/runtime/lineage/LineageSparkCacheEviction.java
@@ -28,7 +28,6 @@ import
org.apache.sysds.runtime.lineage.LineageCacheConfig.LineageCacheStatus;
import org.apache.sysds.runtime.util.CommonThreadPool;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import java.util.TreeSet;
import java.util.concurrent.Executors;
@@ -229,7 +228,7 @@ public class LineageSparkCacheEviction
@Override
public void run() {
// Trigger a Spark job
- long ret = rdd.count();
+ rdd.count();
}
}
}
diff --git
a/src/main/java/org/apache/sysds/runtime/matrix/data/BinaryBlockToTextCellConverter.java
b/src/main/java/org/apache/sysds/runtime/matrix/data/BinaryBlockToTextCellConverter.java
index 9758aae23d..0e62df8fdf 100644
---
a/src/main/java/org/apache/sysds/runtime/matrix/data/BinaryBlockToTextCellConverter.java
+++
b/src/main/java/org/apache/sysds/runtime/matrix/data/BinaryBlockToTextCellConverter.java
@@ -113,25 +113,18 @@ Converter<MatrixIndexes, MatrixBlock, NullWritable, Text>
{
if(sparseIterator==null)
return null;
- else
- {
- IJV cell = sparseIterator.next();
- i = cell.getI() + startIndexes.getRowIndex();
- j = cell.getJ() + startIndexes.getColumnIndex();
- v = cell.getV();
- }
-
- }else
- {
+ IJV cell = sparseIterator.next();
+ i = cell.getI() + startIndexes.getRowIndex();
+ j = cell.getJ() + startIndexes.getColumnIndex();
+ v = cell.getV();
+ }
+ else {
if(denseArray==null)
return null;
- else
- {
- i=startIndexes.getRowIndex() +
nextInDenseArray/thisBlockWidth;
- j=startIndexes.getColumnIndex() +
nextInDenseArray%thisBlockWidth;
- v=denseArray[nextInDenseArray];
- nextInDenseArray++;
- }
+ i=startIndexes.getRowIndex() +
nextInDenseArray/thisBlockWidth;
+ j=startIndexes.getColumnIndex() +
nextInDenseArray%thisBlockWidth;
+ v=denseArray[nextInDenseArray];
+ nextInDenseArray++;
}
value.set(i+" "+j+" "+v);
return pair;
diff --git a/src/main/java/org/apache/sysds/runtime/meta/MetaDataAll.java
b/src/main/java/org/apache/sysds/runtime/meta/MetaDataAll.java
index cb007d27e9..8a139edf5e 100644
--- a/src/main/java/org/apache/sysds/runtime/meta/MetaDataAll.java
+++ b/src/main/java/org/apache/sysds/runtime/meta/MetaDataAll.java
@@ -184,6 +184,7 @@ public class MetaDataAll extends DataIdentifier {
}
else
setHasHeader(false);
+ break;
case DataExpression.DELIM_SPARSE:
setSparseDelim((boolean) val);
}
}
@@ -299,9 +300,9 @@ public class MetaDataAll extends DataIdentifier {
addVarParam(key.toString(), boolId, varParams);
switch(key.toString().toUpperCase()) {
- case
DataExpression.DELIM_HAS_HEADER_ROW: ;
- case
DataExpression.DELIM_FILL: ;
- case
DataExpression.DELIM_SPARSE: ;
+ case
DataExpression.DELIM_HAS_HEADER_ROW:
+ case
DataExpression.DELIM_FILL:
+ case
DataExpression.DELIM_SPARSE:
}
}
diff --git
a/src/main/java/org/apache/sysds/runtime/transform/decode/DecoderFactory.java
b/src/main/java/org/apache/sysds/runtime/transform/decode/DecoderFactory.java
index 9189253efe..0a400e6da9 100644
---
a/src/main/java/org/apache/sysds/runtime/transform/decode/DecoderFactory.java
+++
b/src/main/java/org/apache/sysds/runtime/transform/decode/DecoderFactory.java
@@ -41,7 +41,7 @@ public class DecoderFactory
Dummycode,
PassThrough,
Recode,
- };
+ }
public static Decoder createDecoder(String spec, String[] colnames,
ValueType[] schema, FrameBlock meta) {
return createDecoder(spec, colnames, schema, meta,
meta.getNumColumns(), -1, -1);
diff --git
a/src/main/java/org/apache/sysds/runtime/transform/encode/MultiColumnEncoder.java
b/src/main/java/org/apache/sysds/runtime/transform/encode/MultiColumnEncoder.java
index 2e64709b64..7a2cc1d660 100644
---
a/src/main/java/org/apache/sysds/runtime/transform/encode/MultiColumnEncoder.java
+++
b/src/main/java/org/apache/sysds/runtime/transform/encode/MultiColumnEncoder.java
@@ -318,7 +318,7 @@ public class MultiColumnEncoder implements Encoder {
for(ColumnEncoderComposite columnEncoder : _columnEncoders)
columnEncoder.updateAllDCEncoders();
int numCols = getNumOutCols();
- long estNNz = (long) in.getNumRows() * (hasUDF ? numCols :
hasWE ? getEstNNzRow() : (long) in.getNumColumns());
+ long estNNz = (long) in.getNumRows() * (hasUDF ? numCols :
hasWE ? getEstNNzRow() : in.getNumColumns());
// FIXME: estimate nnz for multiple encoders including
dummycode and embedding
boolean sparse =
MatrixBlock.evalSparseFormatInMemory(in.getNumRows(), numCols, estNNz) &&
!hasUDF;
MatrixBlock out = new MatrixBlock(in.getNumRows(), numCols,
sparse, estNNz);
@@ -1126,7 +1126,7 @@ public class MultiColumnEncoder implements Encoder {
boolean hasWE =
_encoder.getColumnEncoders().stream().anyMatch(e ->
e.hasEncoder(ColumnEncoderWordEmbedding.class));
int numCols = _encoder.getNumOutCols();
boolean hasDC =
_encoder.getColumnEncoders(ColumnEncoderDummycode.class).size() > 0;
- long estNNz = (long) _input.getNumRows() * (hasUDF ?
numCols : (long) _input.getNumColumns());
+ long estNNz = (long) _input.getNumRows() * (hasUDF ?
numCols : _input.getNumColumns());
boolean sparse =
MatrixBlock.evalSparseFormatInMemory(_input.getNumRows(), numCols, estNNz) &&
!hasUDF;
_output.reset(_input.getNumRows(), numCols, sparse,
estNNz);
outputMatrixPreProcessing(_output, _input, hasDC,
hasWE);
diff --git a/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
b/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
index cd6a484326..38d8458a0e 100644
--- a/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
+++ b/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
@@ -512,7 +512,7 @@ public class UtilFunctions {
case INT64: return (Long)in;
case INT32: return (Integer)in;
case BOOLEAN: return ((Boolean)in) ? 1 : 0;
- case CHARACTER: return (int)((Character)in);
+ case CHARACTER: return (Character)in;
case STRING:
try {
return !((String) in).isEmpty() ?
Double.parseDouble((String) in) : 0;
diff --git a/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
b/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
index 4a20b25290..096107228d 100644
--- a/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
+++ b/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
@@ -1177,7 +1177,6 @@ public abstract class AutomatedTestBase {
protected void runRScript(boolean newWay) {
String executionFile = sourceDirectory + selectedTest + ".R";
- ;
if(fullRScriptName != null)
executionFile = fullRScriptName;
diff --git
a/src/test/java/org/apache/sysds/test/applications/EntityResolutionBinaryTest.java
b/src/test/java/org/apache/sysds/test/applications/EntityResolutionBinaryTest.java
index 85a6d095a5..5f403d9db5 100644
---
a/src/test/java/org/apache/sysds/test/applications/EntityResolutionBinaryTest.java
+++
b/src/test/java/org/apache/sysds/test/applications/EntityResolutionBinaryTest.java
@@ -55,7 +55,7 @@ public class EntityResolutionBinaryTest extends
AutomatedTestBase {
public void testScriptEndToEnd(int numLshHashtables, int
numLshHyperplanes) {
TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
- fullDMLScriptName =
"./scripts/staging/entity-resolution/binary-entity-resolution.dml";;
+ fullDMLScriptName =
"./scripts/staging/entity-resolution/binary-entity-resolution.dml";
programArgs = new String[]{
"-nvargs", //
diff --git
a/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupTest.java
b/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupTest.java
index 2668bbbbe5..6c1b7ea113 100644
---
a/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupTest.java
+++
b/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupTest.java
@@ -2255,8 +2255,7 @@ public class ColGroupTest extends ColGroupBase {
// both should be null, or both should not be.
if(g2 == null)
assertTrue(g2n == null);
- else if(g2 != null)
- assertTrue(g2n != null);
+ assertTrue(g2n != null);
}
catch(Exception e) {
e.printStackTrace();
diff --git
a/src/test/java/org/apache/sysds/test/component/compress/estim/sample/SampleDistinctTest.java
b/src/test/java/org/apache/sysds/test/component/compress/estim/sample/SampleDistinctTest.java
index 3ecc4ca894..d8c8019bb4 100644
---
a/src/test/java/org/apache/sysds/test/component/compress/estim/sample/SampleDistinctTest.java
+++
b/src/test/java/org/apache/sysds/test/component/compress/estim/sample/SampleDistinctTest.java
@@ -184,8 +184,8 @@ public class SampleDistinctTest {
}
else if(c < frequencies.length)
fail("estimate is lower than observed elements");
- else if(c > Math.ceil((double) total / p) - frequencies.length
+ total)
+ else if(c > Math.ceil(total / p) - frequencies.length + total)
fail("estimate " + c + " is larger than theoretical max
uniques "
- + (Math.ceil((double) total / p) -
frequencies.length + total) + " using: " + type);
+ + (Math.ceil(total / p) - frequencies.length +
total) + " using: " + type);
}
}
diff --git
a/src/test/java/org/apache/sysds/test/component/compress/mapping/MappingTestUtil.java
b/src/test/java/org/apache/sysds/test/component/compress/mapping/MappingTestUtil.java
index 978e385da5..08a247f726 100644
---
a/src/test/java/org/apache/sysds/test/component/compress/mapping/MappingTestUtil.java
+++
b/src/test/java/org/apache/sysds/test/component/compress/mapping/MappingTestUtil.java
@@ -39,18 +39,25 @@ public class MappingTestUtil {
switch(m.getType()) {
case ZERO:
ret[idx++] = MapToFactory.resizeForce(m,
MAP_TYPE.ZERO);
+ break;
case BIT:
ret[idx++] = MapToFactory.resizeForce(m,
MAP_TYPE.UBYTE);
+ break;
case UBYTE:
ret[idx++] = MapToFactory.resizeForce(m,
MAP_TYPE.BYTE);
+ break;
case BYTE:
ret[idx++] = MapToFactory.resizeForce(m,
MAP_TYPE.CHAR);
+ break;
case CHAR:
ret[idx++] = MapToFactory.resizeForce(m,
MAP_TYPE.CHAR_BYTE);
+ break;
case CHAR_BYTE:
ret[idx++] = MapToFactory.resizeForce(m,
MAP_TYPE.INT);
+ break;
case INT:
// none
+ break;
}
return ret;
}
diff --git
a/src/test/java/org/apache/sysds/test/component/frame/array/FrameArrayTests.java
b/src/test/java/org/apache/sysds/test/component/frame/array/FrameArrayTests.java
index 6419b85ba3..48f7f0bd2d 100644
---
a/src/test/java/org/apache/sysds/test/component/frame/array/FrameArrayTests.java
+++
b/src/test/java/org/apache/sysds/test/component/frame/array/FrameArrayTests.java
@@ -228,6 +228,7 @@ public class FrameArrayTests {
case BOOLEAN:
if(a instanceof BooleanArray) // just in case
we overwrite the BitSet to boolean Array type.
estSize =
BooleanArray.estimateInMemorySize(a.size());
+ break;
default: // nothing
}
if(a.getFrameArrayType() == FrameArrayType.DDC)
@@ -344,28 +345,15 @@ public class FrameArrayTests {
switch(a.getFrameArrayType()) {
case FP64:
- x = a.get();
- return;
case FP32:
- x = a.get();
- return;
case INT32:
- x = a.get();
- return;
case BOOLEAN:
- x = a.get();
- return;
case INT64:
- x = a.get();
- return;
case BITSET:
- x = a.get();
- return;
case STRING:
- x = a.get();
- return;
case CHARACTER:
x = a.get();
+ break;
case OPTIONAL:
try {
a.get();
@@ -376,6 +364,7 @@ public class FrameArrayTests {
return;
case DDC:
a.get();
+ break;
default:
throw new NotImplementedException();
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/aggregate/AggregateNaNTest.java
b/src/test/java/org/apache/sysds/test/functions/aggregate/AggregateNaNTest.java
index cd3bb1fc87..216c7becec 100644
---
a/src/test/java/org/apache/sysds/test/functions/aggregate/AggregateNaNTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/aggregate/AggregateNaNTest.java
@@ -116,10 +116,10 @@ public class AggregateNaNTest extends AutomatedTestBase
double ret = -1;
switch(type) {
- case 0: ret = mb.sum();
- case 1: ret = mb.sumSq();
- case 2: ret = mb.min();
- case 3: ret = mb.max();
+ case 0: ret = mb.sum(); break;
+ case 1: ret = mb.sumSq(); break;
+ case 2: ret = mb.min(); break;
+ case 3: ret = mb.max(); break;
}
Assert.assertTrue(Double.isNaN(ret));
diff --git
a/src/test/java/org/apache/sysds/test/functions/data/rand/SampleTest.java
b/src/test/java/org/apache/sysds/test/functions/data/rand/SampleTest.java
index d44444b584..b36a9432d8 100644
--- a/src/test/java/org/apache/sysds/test/functions/data/rand/SampleTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/data/rand/SampleTest.java
@@ -115,6 +115,7 @@ public class SampleTest extends AutomatedTestBase
}
}
+ @SuppressWarnings("fallthrough")
private void runSampleTest() {
getAndLoadTestConfiguration(TEST_NAME);
@@ -156,7 +157,5 @@ public class SampleTest extends AutomatedTestBase
}
runTest(expectedException);
-
}
-
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForColwiseDataPartitioningTest.java
b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForColwiseDataPartitioningTest.java
index d979e899e4..c025824434 100644
---
a/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForColwiseDataPartitioningTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForColwiseDataPartitioningTest.java
@@ -34,7 +34,6 @@ import org.apache.sysds.test.TestUtils;
public class ParForColwiseDataPartitioningTest extends AutomatedTestBase
{
-
private final static String TEST_NAME = "parfor_cdatapartitioning";
private final static String TEST_DIR = "functions/parfor/";
private final static String TEST_CLASS_DIR = TEST_DIR +
ParForColwiseDataPartitioningTest.class.getSimpleName() + "/";
@@ -285,6 +284,7 @@ public class ParForColwiseDataPartitioningTest extends
AutomatedTestBase
scriptNum=2;
else
scriptNum=3;
+ break;
case REMOTE_SPARK:
if( mode==PExecMode.LOCAL ){
if( !multiParts )
@@ -319,7 +319,7 @@ public class ParForColwiseDataPartitioningTest extends
AutomatedTestBase
sparsity = sparsity2;
else
sparsity = sparsity1;
- double[][] V = getRandomMatrix(rows, cols, 0, 1, sparsity,
seed);
+ double[][] V = getRandomMatrix(rows, cols, 0, 1,
sparsity, seed);
writeInputMatrix("V", V, true);
boolean exceptionExpected = false;
