This is an automated email from the ASF dual-hosted git repository. baunsgaard pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/systemds.git
commit 3554613c4df6348a4454bed48bbc0cc329c6541f Author: baunsgaard <[email protected]> AuthorDate: Thu Jan 19 09:31:40 2023 +0100 [MINOR] Fix various warnings --- .../sysds/runtime/instructions/cp/DataGenCPInstruction.java | 1 - .../runtime/instructions/spark/ComputationSPInstruction.java | 1 + .../java/org/apache/sysds/runtime/lineage/LineageCache.java | 6 +++--- .../apache/sysds/test/component/misc/IOUtilFunctionsTest.java | 1 - .../sysds/test/functions/countDistinct/CountDistinctBase.java | 2 +- .../countDistinct/CountDistinctColAliasException.java | 11 ++--------- .../countDistinct/CountDistinctRowAliasException.java | 10 +--------- .../CountDistinctApproxColAliasException.java | 10 +--------- .../CountDistinctApproxRowAliasException.java | 10 +--------- 9 files changed, 10 insertions(+), 42 deletions(-) diff --git a/src/main/java/org/apache/sysds/runtime/instructions/cp/DataGenCPInstruction.java b/src/main/java/org/apache/sysds/runtime/instructions/cp/DataGenCPInstruction.java index 4b09eab538..ad218bbbed 100644 --- a/src/main/java/org/apache/sysds/runtime/instructions/cp/DataGenCPInstruction.java +++ b/src/main/java/org/apache/sysds/runtime/instructions/cp/DataGenCPInstruction.java @@ -19,7 +19,6 @@ package org.apache.sysds.runtime.instructions.cp; -import java.util.Arrays; import java.util.Random; import org.apache.commons.lang3.ArrayUtils; diff --git a/src/main/java/org/apache/sysds/runtime/instructions/spark/ComputationSPInstruction.java b/src/main/java/org/apache/sysds/runtime/instructions/spark/ComputationSPInstruction.java index 90312e0731..09ac134702 100644 --- a/src/main/java/org/apache/sysds/runtime/instructions/spark/ComputationSPInstruction.java +++ b/src/main/java/org/apache/sysds/runtime/instructions/spark/ComputationSPInstruction.java @@ -148,6 +148,7 @@ public abstract class ComputationSPInstruction extends SPInstruction implements return toPersistAndCache; } + @SuppressWarnings("unchecked") public void checkpointRDD(ExecutionContext ec) { if (!toPersistAndCache) return; 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 0391583b4c..b3a81a9e1a 100644 --- a/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java +++ b/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java @@ -150,9 +150,9 @@ public class LineageCache if (!((SparkExecutionContext) ec).isRDDCached(rdd.getRDD().id())) //Return if the RDD is not cached in the executors return false; - if (rdd == null && e.getCacheStatus() == LineageCacheStatus.NOTCACHED) - return false; - else + // if (rdd == null && e.getCacheStatus() == LineageCacheStatus.NOTCACHED) + // return false; + // else ((SparkExecutionContext) ec).setRDDHandleForVariable(outName, rdd); } else { //TODO handle locks on gpu objects diff --git a/src/test/java/org/apache/sysds/test/component/misc/IOUtilFunctionsTest.java b/src/test/java/org/apache/sysds/test/component/misc/IOUtilFunctionsTest.java index e39c5413f9..92d18af25b 100644 --- a/src/test/java/org/apache/sysds/test/component/misc/IOUtilFunctionsTest.java +++ b/src/test/java/org/apache/sysds/test/component/misc/IOUtilFunctionsTest.java @@ -20,7 +20,6 @@ package org.apache.sysds.test.component.misc; import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.fail; import org.apache.sysds.runtime.io.IOUtilFunctions; import org.junit.Test; diff --git a/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctBase.java b/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctBase.java index 72838b63c9..2db40afd81 100644 --- a/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctBase.java +++ b/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctBase.java @@ -68,7 +68,7 @@ public abstract class CountDistinctBase extends AutomatedTestBase { programArgs = new String[] {"-args", String.valueOf(numberDistinct), String.valueOf(rows), String.valueOf(cols), String.valueOf(sparsity), outputPath}; - runTest(true, false, null, -1); + runTest(null); if(dir.isRowCol()) { writeExpectedScalar("A", numberDistinct); diff --git a/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctColAliasException.java b/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctColAliasException.java index 8af98ea790..75722ea1e4 100644 --- a/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctColAliasException.java +++ b/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctColAliasException.java @@ -22,14 +22,10 @@ package org.apache.sysds.test.functions.countDistinct; import org.apache.sysds.common.Types; import org.apache.sysds.test.TestConfiguration; import org.apache.sysds.test.TestUtils; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; -public class CountDistinctColAliasException extends CountDistinctBase { - @Rule - public ExpectedException exceptionRule = ExpectedException.none(); +public class CountDistinctColAliasException extends CountDistinctBase { private final static String TEST_NAME = "countDistinctColAliasException"; private final static String TEST_DIR = "functions/countDistinct/"; @@ -60,11 +56,8 @@ public class CountDistinctColAliasException extends CountDistinctBase { this.percentTolerance = 0.2; } - @Test + @Test(expected = AssertionError.class) public void testCPSparseSmall() { - exceptionRule.expect(AssertionError.class); - exceptionRule.expectMessage("Invalid number of arguments for function col_count_distinct(). " + - "This function only takes 1 or 2 arguments."); Types.ExecType execType = Types.ExecType.CP; diff --git a/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctRowAliasException.java b/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctRowAliasException.java index dd5c4c2a05..49881d47f9 100644 --- a/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctRowAliasException.java +++ b/src/test/java/org/apache/sysds/test/functions/countDistinct/CountDistinctRowAliasException.java @@ -22,15 +22,10 @@ package org.apache.sysds.test.functions.countDistinct; import org.apache.sysds.common.Types; import org.apache.sysds.test.TestConfiguration; import org.apache.sysds.test.TestUtils; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; public class CountDistinctRowAliasException extends CountDistinctBase { - @Rule - public ExpectedException exceptionRule = ExpectedException.none(); - private final static String TEST_NAME = "countDistinctRowAliasException"; private final static String TEST_DIR = "functions/countDistinct/"; private final static String TEST_CLASS_DIR = TEST_DIR + CountDistinctRowAliasException.class.getSimpleName() + "/"; @@ -60,11 +55,8 @@ public class CountDistinctRowAliasException extends CountDistinctBase { this.percentTolerance = 0.2; } - @Test + @Test(expected= AssertionError.class) public void testCPSparseSmall() { - exceptionRule.expect(AssertionError.class); - exceptionRule.expectMessage("Invalid number of arguments for function row_count_distinct(). " + - "This function only takes 1 or 2 arguments."); Types.ExecType execType = Types.ExecType.CP; diff --git a/src/test/java/org/apache/sysds/test/functions/countDistinctApprox/CountDistinctApproxColAliasException.java b/src/test/java/org/apache/sysds/test/functions/countDistinctApprox/CountDistinctApproxColAliasException.java index 8ea94a3a88..1d18770668 100644 --- a/src/test/java/org/apache/sysds/test/functions/countDistinctApprox/CountDistinctApproxColAliasException.java +++ b/src/test/java/org/apache/sysds/test/functions/countDistinctApprox/CountDistinctApproxColAliasException.java @@ -23,15 +23,10 @@ import org.apache.sysds.common.Types; import org.apache.sysds.test.TestConfiguration; import org.apache.sysds.test.TestUtils; import org.apache.sysds.test.functions.countDistinct.CountDistinctBase; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; public class CountDistinctApproxColAliasException extends CountDistinctBase { - @Rule - public ExpectedException exceptionRule = ExpectedException.none(); - private final static String TEST_NAME = "countDistinctApproxColAliasException"; private final static String TEST_DIR = "functions/countDistinctApprox/"; private final static String TEST_CLASS_DIR = TEST_DIR + CountDistinctApproxColAliasException.class.getSimpleName() + "/"; @@ -61,11 +56,8 @@ public class CountDistinctApproxColAliasException extends CountDistinctBase { this.percentTolerance = 0.2; } - @Test + @Test(expected = AssertionError.class) public void testCPSparseSmall() { - exceptionRule.expect(AssertionError.class); - exceptionRule.expectMessage("Too many parameters: function colCountDistinctApprox takes at least 1" + - " and at most 2 parameters"); Types.ExecType execType = Types.ExecType.CP; diff --git a/src/test/java/org/apache/sysds/test/functions/countDistinctApprox/CountDistinctApproxRowAliasException.java b/src/test/java/org/apache/sysds/test/functions/countDistinctApprox/CountDistinctApproxRowAliasException.java index 5693985a91..2e3f9c235c 100644 --- a/src/test/java/org/apache/sysds/test/functions/countDistinctApprox/CountDistinctApproxRowAliasException.java +++ b/src/test/java/org/apache/sysds/test/functions/countDistinctApprox/CountDistinctApproxRowAliasException.java @@ -23,15 +23,10 @@ import org.apache.sysds.common.Types; import org.apache.sysds.test.TestConfiguration; import org.apache.sysds.test.TestUtils; import org.apache.sysds.test.functions.countDistinct.CountDistinctBase; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; public class CountDistinctApproxRowAliasException extends CountDistinctBase { - @Rule - public ExpectedException exceptionRule = ExpectedException.none(); - private final static String TEST_NAME = "countDistinctApproxRowAliasException"; private final static String TEST_DIR = "functions/countDistinctApprox/"; private final static String TEST_CLASS_DIR = TEST_DIR + CountDistinctApproxRowAliasException.class.getSimpleName() + "/"; @@ -61,11 +56,8 @@ public class CountDistinctApproxRowAliasException extends CountDistinctBase { this.percentTolerance = 0.2; } - @Test + @Test(expected = AssertionError.class) public void testCPSparseSmall() { - exceptionRule.expect(AssertionError.class); - exceptionRule.expectMessage("Too many parameters: function rowCountDistinctApprox takes at least 1" + - " and at most 2 parameters"); Types.ExecType execType = Types.ExecType.CP;
