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
commit c957a19fd21d2ada57439beae0448c9fd219d381 Author: Matthias Boehm <[email protected]> AuthorDate: Wed Jan 3 10:26:08 2024 +0100 [MINOR] Fix code quality issues (value types, imports, casts) --- src/main/java/org/apache/sysds/hops/LiteralOp.java | 1 + .../org/apache/sysds/parser/BuiltinFunctionExpression.java | 13 +++++++------ .../runtime/compress/colgroup/mapping/MapToCharPByte.java | 2 +- .../runtime/compress/colgroup/mapping/MapToFactory.java | 4 ++-- .../java/org/apache/sysds/runtime/data/LibTensorAgg.java | 3 +-- .../org/apache/sysds/runtime/data/SparseBlockFactory.java | 3 --- .../java/org/apache/sysds/runtime/data/TensorBlock.java | 3 +-- .../sysds/runtime/frame/data/columns/ArrayFactory.java | 2 +- .../sysds/runtime/frame/data/columns/HashLongArray.java | 4 ++-- .../sysds/runtime/frame/data/lib/FrameLibApplySchema.java | 1 - .../runtime/instructions/cp/UnaryScalarCPInstruction.java | 1 - .../org/apache/sysds/runtime/lineage/LineageCache.java | 1 + .../java/org/apache/sysds/runtime/util/DataConverter.java | 4 +--- .../sysds/test/component/compress/offset/OffsetTests.java | 14 +++++++------- .../compress/offset/OffsetTestsDefaultConstructor.java | 10 +++++----- .../sysds/test/component/matrix/DenseAndSparseTest.java | 1 + .../part1/BuiltinImageSamplePairingLinearizedTest.java | 1 - .../sysds/test/functions/caching/PinVariablesTest.java | 1 - 18 files changed, 31 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/apache/sysds/hops/LiteralOp.java b/src/main/java/org/apache/sysds/hops/LiteralOp.java index 0feb052538..32739652f8 100644 --- a/src/main/java/org/apache/sysds/hops/LiteralOp.java +++ b/src/main/java/org/apache/sysds/hops/LiteralOp.java @@ -255,6 +255,7 @@ public class LiteralOp extends Hop case FP64: return String.valueOf(value_double); case STRING: + case HASH64: return value_string; case CHARACTER: return value_string; diff --git a/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java b/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java index fa0354843b..fa1a163036 100644 --- a/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java +++ b/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java @@ -633,12 +633,6 @@ public class BuiltinFunctionExpression extends DataIdentifier { output.setDimensions(0, 0); output.setBlocksize(0); switch (id.getValueType()) { - case STRING: // TODO think about what we want to get when we sum tensor of strings - case CHARACTER: // TODO here also for Characters. - case FP64: - case FP32: - output.setValueType(ValueType.FP64); - break; case INT64: case INT32: case UINT8: @@ -646,6 +640,13 @@ public class BuiltinFunctionExpression extends DataIdentifier { case BOOLEAN: output.setValueType(ValueType.INT64); break; + case STRING: + case CHARACTER: + case FP64: + case FP32: + case HASH64: //default + output.setValueType(ValueType.FP64); + break; case UNKNOWN: throw new NotImplementedException(); } diff --git a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToCharPByte.java b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToCharPByte.java index 99d5387884..a37d5bc75a 100644 --- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToCharPByte.java +++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToCharPByte.java @@ -269,7 +269,7 @@ public class MapToCharPByte extends AMapToData { @Override public int getMaxPossible() { - return (int) Character.MAX_VALUE * 256; + return Character.MAX_VALUE * 256; } @Override diff --git a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToFactory.java b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToFactory.java index 4bba0fa399..1727bedbd9 100644 --- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToFactory.java +++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToFactory.java @@ -80,7 +80,7 @@ public interface MapToFactory { return new MapToUByte(numTuples, size); else if(numTuples <= 256) return new MapToByte(numTuples, size); - else if(numTuples <= ((int) Character.MAX_VALUE) + 1) + else if(numTuples <= Character.MAX_VALUE + 1) return new MapToChar(numTuples, size); else if(numTuples <= MapToCharPByte.max) return new MapToCharPByte(numTuples, size); @@ -170,7 +170,7 @@ public interface MapToFactory { return MapToBit.getInMemorySize(size); else if(numTuples <= 256) return MapToByte.getInMemorySize(size); - else if(numTuples <= ((int) Character.MAX_VALUE) + 1) + else if(numTuples <= Character.MAX_VALUE + 1) return MapToChar.getInMemorySize(size); else if(numTuples <= MapToCharPByte.max) return MapToCharPByte.getInMemorySize(size); diff --git a/src/main/java/org/apache/sysds/runtime/data/LibTensorAgg.java b/src/main/java/org/apache/sysds/runtime/data/LibTensorAgg.java index 91c09049b3..0a2ac0299d 100644 --- a/src/main/java/org/apache/sysds/runtime/data/LibTensorAgg.java +++ b/src/main/java/org/apache/sysds/runtime/data/LibTensorAgg.java @@ -261,8 +261,7 @@ public class LibTensorAgg { out.set(new int[out.getNumDims()], sum); break; } - case CHARACTER: - case UNKNOWN: + default: throw new NotImplementedException(); } } diff --git a/src/main/java/org/apache/sysds/runtime/data/SparseBlockFactory.java b/src/main/java/org/apache/sysds/runtime/data/SparseBlockFactory.java index 6b04cf6d71..e03fab9963 100644 --- a/src/main/java/org/apache/sysds/runtime/data/SparseBlockFactory.java +++ b/src/main/java/org/apache/sysds/runtime/data/SparseBlockFactory.java @@ -19,9 +19,6 @@ package org.apache.sysds.runtime.data; -import java.util.Arrays; - -import org.apache.commons.lang.NotImplementedException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.sysds.runtime.matrix.data.MatrixBlock; 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 ff68197074..e0a59adc34 100644 --- a/src/main/java/org/apache/sysds/runtime/data/TensorBlock.java +++ b/src/main/java/org/apache/sysds/runtime/data/TensorBlock.java @@ -668,8 +668,7 @@ public class TensorBlock implements CacheBlock<TensorBlock>, Externalizable { getNextIndexes(bt.getDims(), ix); } break; - case CHARACTER: - case UNKNOWN: + default: throw new NotImplementedException(); } } 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 2fd6a74837..ad2a3c2d57 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 @@ -50,7 +50,7 @@ public interface ArrayFactory { } public static OptionalArray<Object> createHash64Opt(String[] col){ - return new OptionalArray<Object>(col, ValueType.HASH64); + return new OptionalArray<>(col, ValueType.HASH64); } public static HashLongArray createHash64(long[] col){ diff --git a/src/main/java/org/apache/sysds/runtime/frame/data/columns/HashLongArray.java b/src/main/java/org/apache/sysds/runtime/frame/data/columns/HashLongArray.java index 506c5d435f..39d326e0bc 100644 --- a/src/main/java/org/apache/sysds/runtime/frame/data/columns/HashLongArray.java +++ b/src/main/java/org/apache/sysds/runtime/frame/data/columns/HashLongArray.java @@ -76,7 +76,7 @@ public class HashLongArray extends Array<Object> { @Override public void set(int index, String value) { - _data[index] = parseHashLong((String) value); + _data[index] = parseHashLong(value); } @Override @@ -156,7 +156,7 @@ public class HashLongArray extends Array<Object> { OptionalArray<Object> ot = (OptionalArray<Object>) other; if(ot._a instanceof HashLongArray) { - Array<Object> a = this.append((HashLongArray) ot._a); + Array<Object> a = this.append(ot._a); return OptionalArray.appendOther(ot, a); } else { diff --git a/src/main/java/org/apache/sysds/runtime/frame/data/lib/FrameLibApplySchema.java b/src/main/java/org/apache/sysds/runtime/frame/data/lib/FrameLibApplySchema.java index f782933307..92372ecab2 100644 --- a/src/main/java/org/apache/sysds/runtime/frame/data/lib/FrameLibApplySchema.java +++ b/src/main/java/org/apache/sysds/runtime/frame/data/lib/FrameLibApplySchema.java @@ -20,7 +20,6 @@ package org.apache.sysds.runtime.frame.data.lib; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; diff --git a/src/main/java/org/apache/sysds/runtime/instructions/cp/UnaryScalarCPInstruction.java b/src/main/java/org/apache/sysds/runtime/instructions/cp/UnaryScalarCPInstruction.java index ba87869e37..ff186eabd7 100644 --- a/src/main/java/org/apache/sysds/runtime/instructions/cp/UnaryScalarCPInstruction.java +++ b/src/main/java/org/apache/sysds/runtime/instructions/cp/UnaryScalarCPInstruction.java @@ -23,7 +23,6 @@ import org.apache.sysds.api.DMLScript; import org.apache.sysds.common.Types.ValueType; import org.apache.sysds.runtime.DMLScriptException; import org.apache.sysds.runtime.controlprogram.context.ExecutionContext; -import org.apache.sysds.runtime.lineage.LineageGPUCacheEviction; import org.apache.sysds.runtime.matrix.operators.Operator; import org.apache.sysds.runtime.matrix.operators.UnaryOperator; 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 6678e338b1..dcb67d81ed 100644 --- a/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java +++ b/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java @@ -1437,6 +1437,7 @@ public class LineageCache return outName; } + @SuppressWarnings("unused") private static boolean allInputsSpark(Instruction inst, ExecutionContext ec) { CPOperand in1 = ((ComputationSPInstruction)inst).input1; CPOperand in2 = ((ComputationSPInstruction)inst).input2; diff --git a/src/main/java/org/apache/sysds/runtime/util/DataConverter.java b/src/main/java/org/apache/sysds/runtime/util/DataConverter.java index c575baf021..86e7bde452 100644 --- a/src/main/java/org/apache/sysds/runtime/util/DataConverter.java +++ b/src/main/java/org/apache/sysds/runtime/util/DataConverter.java @@ -1095,9 +1095,7 @@ public class DataConverter { case BOOLEAN: sb.append(((Boolean) tb.get(ix)).toString().toUpperCase()); break; - case STRING: - case UNKNOWN: - case CHARACTER: + default: sb.append("\"").append(tb.get(ix)).append("\""); break; } diff --git a/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTests.java b/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTests.java index d98375e83a..73c26e1c26 100644 --- a/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTests.java +++ b/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTests.java @@ -82,13 +82,13 @@ public class OffsetTests { tests.add(new Object[] {new int[] {0}, t}); tests.add(new Object[] {new int[] {500}, t}); tests.add(new Object[] {new int[] {1442}, t}); - tests.add(new Object[] {new int[] {Character.MAX_VALUE, ((int) Character.MAX_VALUE) + 1}, t}); + tests.add(new Object[] {new int[] {Character.MAX_VALUE, Character.MAX_VALUE + 1}, t}); tests.add(new Object[] {new int[] {0, 256}, t}); tests.add(new Object[] {new int[] {0, 254}, t}); tests.add(new Object[] {new int[] {0, Character.MAX_VALUE}, t}); tests.add(new Object[] {new int[] {2, Character.MAX_VALUE + 2}, t}); - tests.add(new Object[] {new int[] {0, ((int) Character.MAX_VALUE) + 1}, t}); - tests.add(new Object[] {new int[] {0, ((int) Character.MAX_VALUE) - 1}, t}); + tests.add(new Object[] {new int[] {0, Character.MAX_VALUE + 1}, t}); + tests.add(new Object[] {new int[] {0, Character.MAX_VALUE - 1}, t}); tests.add(new Object[] {new int[] {0, 256 * 2}, t}); tests.add(new Object[] {new int[] {0, 255 * 2}, t}); tests.add(new Object[] {new int[] {0, 254 * 2}, t}); @@ -122,10 +122,10 @@ public class OffsetTests { } } - tests.add(new Object[] {new int[] {Character.MAX_VALUE, ((int) Character.MAX_VALUE) * 2}, OFF_TYPE.CHAR}); - tests.add(new Object[] {new int[] {0, Character.MAX_VALUE, ((int) Character.MAX_VALUE) * 2}, OFF_TYPE.CHAR}); - tests.add(new Object[] {new int[] {1, (int) Character.MAX_VALUE * 2 + 3, (int) Character.MAX_VALUE * 4 + 4, - (int) Character.MAX_VALUE * 16 + 4}, OFF_TYPE.CHAR}); + tests.add(new Object[] {new int[] {Character.MAX_VALUE, Character.MAX_VALUE * 2}, OFF_TYPE.CHAR}); + tests.add(new Object[] {new int[] {0, Character.MAX_VALUE, Character.MAX_VALUE * 2}, OFF_TYPE.CHAR}); + tests.add(new Object[] {new int[] {1, Character.MAX_VALUE * 2 + 3, Character.MAX_VALUE * 4 + 4, + Character.MAX_VALUE * 16 + 4}, OFF_TYPE.CHAR}); return tests; } diff --git a/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTestsDefaultConstructor.java b/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTestsDefaultConstructor.java index 179ece9b7a..e7535d812a 100644 --- a/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTestsDefaultConstructor.java +++ b/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTestsDefaultConstructor.java @@ -60,15 +60,15 @@ public class OffsetTestsDefaultConstructor { tests.add(new Object[] {new int[] {1023}}); tests.add(new Object[] {new int[] {0, 1, 2, 3, 4, 5}}); tests.add(new Object[] {new int[] {0}}); - tests.add(new Object[] {new int[] {Character.MAX_VALUE, ((int) Character.MAX_VALUE) + 1}}); - tests.add(new Object[] {new int[] {Character.MAX_VALUE, ((int) Character.MAX_VALUE) * 2}}); + tests.add(new Object[] {new int[] {Character.MAX_VALUE, Character.MAX_VALUE + 1}}); + tests.add(new Object[] {new int[] {Character.MAX_VALUE, Character.MAX_VALUE * 2}}); tests.add(new Object[] {new int[] {0, 256}}); tests.add(new Object[] {new int[] {0, 254}}); tests.add(new Object[] {new int[] {0, Character.MAX_VALUE}}); - tests.add(new Object[] {new int[] {0, Character.MAX_VALUE, ((int) Character.MAX_VALUE) * 2}}); + tests.add(new Object[] {new int[] {0, Character.MAX_VALUE, Character.MAX_VALUE * 2}}); tests.add(new Object[] {new int[] {2, Character.MAX_VALUE + 2}}); - tests.add(new Object[] {new int[] {0, ((int) Character.MAX_VALUE) + 1}}); - tests.add(new Object[] {new int[] {0, ((int) Character.MAX_VALUE) - 1}}); + tests.add(new Object[] {new int[] {0, Character.MAX_VALUE + 1}}); + tests.add(new Object[] {new int[] {0, Character.MAX_VALUE - 1}}); tests.add(new Object[] {new int[] {0, 256 * 2}}); tests.add(new Object[] {new int[] {0, 255 * 2}}); tests.add(new Object[] {new int[] {0, 254 * 2}}); diff --git a/src/test/java/org/apache/sysds/test/component/matrix/DenseAndSparseTest.java b/src/test/java/org/apache/sysds/test/component/matrix/DenseAndSparseTest.java index 788d90a97f..17b24ea2c1 100644 --- a/src/test/java/org/apache/sysds/test/component/matrix/DenseAndSparseTest.java +++ b/src/test/java/org/apache/sysds/test/component/matrix/DenseAndSparseTest.java @@ -93,6 +93,7 @@ public class DenseAndSparseTest { return tests; } + @SuppressWarnings("unused") private static MatrixBlock forcedDense(int row, int col, double min, double max, double spar, int seed) { MatrixBlock x = TestUtils.generateTestMatrixBlock(row, col, min, max, spar, seed); x.sparseToDense(); diff --git a/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinImageSamplePairingLinearizedTest.java b/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinImageSamplePairingLinearizedTest.java index 5cfe345747..ef9f38606b 100644 --- a/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinImageSamplePairingLinearizedTest.java +++ b/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinImageSamplePairingLinearizedTest.java @@ -18,7 +18,6 @@ */ package org.apache.sysds.test.functions.builtin.part1; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/src/test/java/org/apache/sysds/test/functions/caching/PinVariablesTest.java b/src/test/java/org/apache/sysds/test/functions/caching/PinVariablesTest.java index b88b036615..346102398c 100644 --- a/src/test/java/org/apache/sysds/test/functions/caching/PinVariablesTest.java +++ b/src/test/java/org/apache/sysds/test/functions/caching/PinVariablesTest.java @@ -19,7 +19,6 @@ package org.apache.sysds.test.functions.caching; -import org.apache.oro.util.Cache; import org.apache.sysds.common.Types; import org.apache.sysds.runtime.controlprogram.LocalVariableMap; import org.apache.sysds.runtime.controlprogram.caching.CacheableData;
