This is an automated email from the ASF dual-hosted git repository.
estrauss 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 b49c5ffffb [SYSTEMDS-3842] Improve test coverage of API components:
ScriptExecutorUtils & JMLConnection
b49c5ffffb is described below
commit b49c5ffffb87d221f16c74364e022aa5fab1be3e
Author: e-strauss <[email protected]>
AuthorDate: Tue May 13 13:54:48 2025 +0200
[SYSTEMDS-3842] Improve test coverage of API components:
ScriptExecutorUtils & JMLConnection
Closes #2253.
---
.../java/org/apache/sysds/api/jmlc/Connection.java | 13 -
.../sysds/test/component/misc/DMLScriptTest.java | 45 +++
.../test/functions/jmlc/JMLConnectionTest.java | 418 +++++++++++++++++++++
3 files changed, 463 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/sysds/api/jmlc/Connection.java
b/src/main/java/org/apache/sysds/api/jmlc/Connection.java
index 29bc3a9f30..525c1a97bb 100644
--- a/src/main/java/org/apache/sysds/api/jmlc/Connection.java
+++ b/src/main/java/org/apache/sysds/api/jmlc/Connection.java
@@ -827,19 +827,6 @@ public class Connection implements Closeable
// Read transform meta data
////////////////////////////////////////////
- /**
- * Reads transform meta data from an HDFS file path and converts it
into an in-memory
- * FrameBlock object. The column names in the meta data file
'column.names' is processed
- * with default separator ','.
- *
- * @param metapath hdfs file path to meta data directory
- * @return FrameBlock object representing transform metadata
- * @throws IOException if IOException occurs
- */
- public FrameBlock readTransformMetaDataFromFile(String metapath) throws
IOException {
- return readTransformMetaDataFromFile(null, metapath,
TfUtils.TXMTD_SEP);
- }
-
/**
* Reads transform meta data from an HDFS file path and converts it
into an in-memory
* FrameBlock object. The column names in the meta data file
'column.names' is processed
diff --git
a/src/test/java/org/apache/sysds/test/component/misc/DMLScriptTest.java
b/src/test/java/org/apache/sysds/test/component/misc/DMLScriptTest.java
index 4244ce7421..f7cfb748b7 100644
--- a/src/test/java/org/apache/sysds/test/component/misc/DMLScriptTest.java
+++ b/src/test/java/org/apache/sysds/test/component/misc/DMLScriptTest.java
@@ -21,11 +21,16 @@
package org.apache.sysds.test.component.misc;
+import org.apache.commons.cli.ParseException;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.sysds.api.DMLScript;
+import org.apache.sysds.api.ScriptExecutorUtils;
+import org.apache.sysds.conf.ConfigurationManager;
import org.apache.sysds.parser.LanguageException;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContextFactory;
import org.apache.sysds.test.LoggingUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -33,6 +38,7 @@ import org.junit.Test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
+import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -359,5 +365,44 @@ public class DMLScriptTest {
public void createDMLScriptInstance(){
DMLScript script = new DMLScript();
Assert.assertTrue(script != null);
+
+ }
+
+ @Test
+ public void testLineageScriptExecutorUtilTestTest() throws IOException {
+ // just for code coverage
+ new ScriptExecutorUtils();
+
+ String cl = "systemds -lineage estimate -s \"print('hello')\"";
+ String[] args = cl.split(" ");
+ final PrintStream originalOut = System.out;
+ try {
+ final ByteArrayOutputStream outputStreamCaptor = new
ByteArrayOutputStream();
+ System.setOut(new PrintStream(outputStreamCaptor));
+ executeScript(args);
+ System.setOut(originalOut);
+ String[] lines =
outputStreamCaptor.toString().split(System.lineSeparator());
+ Assert.assertTrue(lines[0].startsWith("hello"));
+ Assert.assertTrue(Arrays.stream(lines).anyMatch(s ->
s.startsWith("Compute Time (Elapsed/Saved):")));
+ Assert.assertTrue(Arrays.stream(lines).anyMatch(s ->
s.startsWith("Space Used (C/R/L):")));
+ Assert.assertTrue(Arrays.stream(lines).anyMatch(s ->
s.startsWith("Cache Full Timestamp:")));
+ } finally {
+ System.setOut(originalOut);
+ }
+ }
+
+ @Test
+ public void testScriptExecutorUtilTestTest() throws IOException,
ParseException {
+ boolean old = DMLScript.USE_ACCELERATOR;
+ DMLScript.USE_ACCELERATOR = true;
+ try {
+ ExecutionContext ec = ExecutionContextFactory.createContext();
+ ScriptExecutorUtils.executeRuntimeProgram(null, ec,
ConfigurationManager.getDMLConfig(), 0, null);
+ } catch (Error e){
+ Assert.assertTrue("Expecting Message starting with \"Error while
loading native library. Instead got:"
+ + e.getMessage(), e.getMessage().startsWith("Error while
loading native library"));
+ } finally {
+ DMLScript.USE_ACCELERATOR = old;
+ }
}
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/jmlc/JMLConnectionTest.java
b/src/test/java/org/apache/sysds/test/functions/jmlc/JMLConnectionTest.java
new file mode 100644
index 0000000000..ac77371dfc
--- /dev/null
+++ b/src/test/java/org/apache/sysds/test/functions/jmlc/JMLConnectionTest.java
@@ -0,0 +1,418 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.test.functions.jmlc;
+
+import org.apache.sysds.api.DMLException;
+import org.apache.sysds.api.DMLScript;
+import org.apache.sysds.api.jmlc.Connection;
+import org.apache.sysds.common.Types;
+import org.apache.sysds.conf.CompilerConfig;
+import org.apache.sysds.conf.ConfigurationManager;
+import org.apache.sysds.parser.LanguageException;
+import org.apache.sysds.runtime.frame.data.FrameBlock;
+import org.apache.sysds.runtime.io.IOUtilFunctions;
+import org.apache.sysds.runtime.matrix.data.MatrixBlock;
+import org.apache.sysds.runtime.util.HDFSTool;
+import org.apache.sysds.test.AutomatedTestBase;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+/**
+ * Test input and output capabilities of JMLC Connection class.
+ */
[email protected]
+public class JMLConnectionTest extends AutomatedTestBase {
+ public static final String META = "{\"data_type\": \"matrix\",\n" +
+ " \"value_type\": \"double\", \n" +
+ " \"rows\": 1,\n" +
+ " \"cols\": 1,\n" +
+ " \"nnz\": 1,\n" +
+ " \"format\": \"csv\"}";
+ private final static String TEST_NAME = "JMLConnectionTest";
+ private final static String TEST_DIR = "functions/jmlc/";
+
+ @Override
+ public void setUp() {
+ addTestConfiguration(TEST_DIR, TEST_NAME);
+ getAndLoadTestConfiguration(TEST_NAME);
+ }
+
+ @Test
+ public void testConnectionInvalidArgName() throws DMLException {
+ Connection conn = new Connection();
+ boolean oldStat = DMLScript.STATISTICS;
+ boolean oldJMLCStat = DMLScript.JMLC_MEM_STATISTICS;
+ conn.gatherMemStats(true);
+ Assert.assertTrue(DMLScript.STATISTICS);
+ Assert.assertTrue(DMLScript.JMLC_MEM_STATISTICS);
+
+ HashMap<String,String> args = new HashMap<>();
+ args.put("TEST", "TEST");
+ args.put(null, "TEST");
+ try {
+ conn.prepareScript("print('hello')", args, new String[]
{}, new String[] {});
+ throw new AssertionError("Test should have thrown a
LanguageException");
+ } catch (LanguageException e) {
+ Assert.assertTrue(e.getMessage().startsWith("Invalid
argument names"));
+ } finally {
+ conn.close();
+ DMLScript.STATISTICS = oldStat;
+ DMLScript.JMLC_MEM_STATISTICS = oldJMLCStat;
+ }
+ }
+
+ @Test
+ public void testConnectionInvalidInName() throws DMLException {
+ Connection conn = new Connection();
+
+ boolean oldStat = DMLScript.STATISTICS;
+ boolean oldJMLCStat = DMLScript.JMLC_MEM_STATISTICS;
+
+ DMLScript.STATISTICS = true;
+ conn.gatherMemStats(false);
+ Assert.assertTrue(DMLScript.STATISTICS);
+
+ conn.gatherMemStats(true);
+ Assert.assertTrue(DMLScript.STATISTICS);
+
+ DMLScript.STATISTICS = false;
+ conn.gatherMemStats(false);
+ Assert.assertFalse(DMLScript.STATISTICS);
+
+ try (conn) {
+ conn.prepareScript("printx('hello')", new String[]{"$inScalar1",
null}, new String[]{null});
+ throw new AssertionError("Test should have thrown a
LanguageException");
+ } catch (LanguageException e) {
+ Assert.assertTrue(e.getMessage().startsWith("Invalid variable
names"));
+ } finally {
+ DMLScript.STATISTICS = oldStat;
+ DMLScript.JMLC_MEM_STATISTICS = oldJMLCStat;
+ }
+ }
+
+ @Test
+ public void testConnectionParseLanguageException() {
+ try (Connection conn = new Connection()) {
+ conn.prepareScript("printx('hello')", new String[]{}, new
String[]{});
+ throw new AssertionError("Test should have thrown a DMLException");
+ } catch (DMLException e) {
+ Throwable cause = e.getCause();
+ Assert.assertTrue(cause.getMessage().startsWith("ERROR: [line 1:0]
-> printx('hello') -- function printx is undefined in namespace .builtinNS"));
+ }
+ }
+
+ @Test
+ public void testConnectionParseException() {
+ try (Connection conn = new Connection()) {
+ conn.prepareScript("print('hello'", new String[]{}, new
String[]{});
+ throw new AssertionError("Test should have thrown a
ParseException");
+ } catch (Exception e) {
+ Assert.assertEquals("ParseException",
e.getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testConnectionClose() {
+ Connection conn = new Connection();
+ CompilerConfig old = ConfigurationManager.getCompilerConfig();
+ CompilerConfig tmp = new CompilerConfig();
+ tmp.set(CompilerConfig.ConfigType.CODEGEN_ENABLED, true);
+ ConfigurationManager.setGlobalConfig(tmp);
+ conn.close();
+ ConfigurationManager.setGlobalConfig(old);
+ }
+
+ @Test
+ public void testReadScriptHDFS() {
+ try (Connection conn = new Connection()) {
+ conn.readScript("hdfs://localhost:9000/Test");
+ } catch (IOException e) {
+
Assert.assertEquals("ConnectException",e.getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testReadScriptGPFS() {
+ try (Connection conn = new Connection()) {
+ conn.readScript("gpfs://localhost:9000/Test");
+ } catch (IOException e) {
+
Assert.assertEquals("UnsupportedFileSystemException",e.getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testReadScriptS3() {
+ try (Connection conn = new Connection()) {
+ conn.readScript("s3://bucket/Test");
+ } catch (IOException e) {
+
Assert.assertEquals("UnsupportedFileSystemException",e.getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testReadDoubleMatrixException() {
+ try (Connection conn = new Connection()) {
+ conn.readDoubleMatrix("test.csv");
+ } catch (IOException e) {
+ Assert.assertEquals("IOException",
e.getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testReadDoubleMatrixException2() {
+ try (Connection conn = new Connection()) {
+ conn.readDoubleMatrix("test.csv", null, 1, 1, 1, 1);
+ } catch (IOException e) {
+ Assert.assertEquals("IOException",
e.getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testReadDoubleMatrix() {
+ try (Connection conn = new Connection()) {
+ double[][] matrix =
conn.readDoubleMatrix("src/test/resources/component/compress/1-1.csv");
+ Assert.assertEquals(1.0, matrix[0][0], 0.0);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testReadDoubleMatrix2() {
+ try (Connection conn = new Connection()) {
+ double[][] matrix =
conn.readDoubleMatrix("src/test/resources/component/compress/1-1.csv",
Types.FileFormat.CSV, 1, 1, 1, 1);
+ Assert.assertEquals(1.0, matrix[0][0], 0.0);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testConvertToDoubleMatrix() {
+ try (Connection conn = new Connection()) {
+ double[][] matrix = conn.convertToDoubleMatrix("1",
META);
+ Assert.assertEquals(1.0, matrix[0][0], 0.0);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testConvertToDoubleMatrixException() {
+ try (Connection conn = new Connection()) {
+ String meta = "abc";
+ conn.convertToDoubleMatrix("1", meta);
+ } catch (IOException e) {
+ Throwable cause = e.getCause();
+ Assert.assertEquals("NullPointerException",
cause.getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testConvertToMatrix1() {
+ try (Connection conn = new Connection()) {
+ MatrixBlock mb = conn.convertToMatrix("1", META);
+ Assert.assertEquals(1.0, mb.get(0,0), 0.0);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testConvertToMatrixException1() {
+ try (Connection conn = new Connection()) {
+ conn.convertToMatrix("1", "{" + META);
+ } catch (IOException e) {
+ Throwable cause = e.getCause();
+ Assert.assertEquals("NullPointerException",
cause.getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testConvertToMatrix2() {
+ try (Connection conn = new Connection()) {
+ MatrixBlock mb = conn.convertToMatrix("1 1 1", 1, 1);
+ Assert.assertEquals(1.0, mb.get(0,0), 0.0);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testConvertToMatrixException2() {
+ try (Connection conn = new Connection()) {
+ conn.convertToMatrix("1 1", 1,1);
+ } catch (IOException e) {
+ Throwable cause = e.getCause();
+ Assert.assertEquals("StringIndexOutOfBoundsException",
cause.getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testConvertToMatrixCSV() {
+ try (Connection conn = new Connection()) {
+ MatrixBlock mb =
conn.convertToMatrix(IOUtilFunctions.toInputStream("1"), 1,1,"csv");
+ Assert.assertEquals(1.0, mb.get(0,0), 0.0);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testConvertToMatrixMM() {
+ try (Connection conn = new Connection()) {
+ MatrixBlock mb =
conn.convertToMatrix(IOUtilFunctions.toInputStream("%%MatrixMarket matrix
coordinate real"+
+ " general \n 1 1 1 \n 1 1 1.0"),
1,1,"mm");
+ Assert.assertEquals(1.0, mb.get(0,0), 0.0);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testConvertToMatrixInvalidFormat() {
+ try (Connection conn = new Connection()) {
+
conn.convertToMatrix(IOUtilFunctions.toInputStream("1"), 1,1,"abc");
+ } catch (IOException e) {
+ Assert.assertTrue(e.getMessage().startsWith("Invalid
input format"));
+ }
+ }
+
+ @Test
+ public void testReadFrame1() {
+ try (Connection conn = new Connection()) {
+ conn.readStringFrame("test.csv");
+ } catch (IOException e) {
+ Assert.assertEquals("IOException",
e.getCause().getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testReadFrame2() {
+ try (Connection conn = new Connection()) {
+ conn.readStringFrame("test.csv", Types.FileFormat.CSV,
1, 1);
+ } catch (IOException e) {
+
Assert.assertTrue(e.getCause().getMessage().startsWith("File test.csv does not
exist on HDFS/LFS"));
+ }
+ }
+
+ @Test
+ public void testConvertToStringFrame1() {
+ try (Connection conn = new Connection()) {
+ String[][] frame = conn.convertToStringFrame("Hello",
META);
+ Assert.assertEquals("Hello", frame[0][0]);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testConvertToStringFrameException1() {
+ try (Connection conn = new Connection()) {
+ conn.convertToFrame("Hello", "{" + META);
+ } catch (IOException e) {
+ Assert.assertEquals("NullPointerException",
e.getCause().getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testConvertToStringFrame2() {
+ try (Connection conn = new Connection()) {
+ String[][] frame = conn.convertToStringFrame("1 1
Hello", 1,1);
+ Assert.assertEquals("Hello", frame[0][0]);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testConvertToStringFrame3() {
+ try (Connection conn = new Connection()) {
+ String[][] frame =
conn.convertToStringFrame(IOUtilFunctions.toInputStream("Hello"), 1,1, "csv");
+ Assert.assertEquals("Hello", frame[0][0]);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testConvertToStringFrame4() {
+ try (Connection conn = new Connection()) {
+ String[][] frame =
conn.convertToStringFrame(IOUtilFunctions.toInputStream("%%MatrixMarket matrix
coordinate real"+
+ " general \n 1 1 1 \n 1 1 Hello"), 1,1,
"mm");
+ Assert.assertEquals("Hello", frame[0][0]);
+ } catch (IOException e) {
+ Assert.assertEquals("Failed to create frame reader for
unknown format: mm", e.getCause().getMessage());
+ }
+ }
+
+ @Test
+ public void testConvertToStringFrameException2() {
+ try (Connection conn = new Connection()) {
+ String[][] frame =
conn.convertToStringFrame(IOUtilFunctions.toInputStream("Hi"), 1,1, "abc");
+ Assert.assertEquals("Hello", frame[0][0]);
+ } catch (IOException e) {
+ Assert.assertTrue(e.getMessage().startsWith("Invalid
input format"));
+ }
+ }
+
+ @Test
+ public void testConvertToFrame() {
+ try (Connection conn = new Connection()) {
+ FrameBlock frame = conn.convertToFrame("1 1 Hello", 1,
1);
+ Assert.assertEquals("Hello", frame.get(0,0));
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testTransformMetaData1() {
+ try (Connection conn = new Connection()) {
+ String spec =
HDFSTool.readStringFromHDFSFile(SCRIPT_DIR +
TEST_DIR+"tfmtd_example2/spec.json");
+ FrameBlock frame =
conn.readTransformMetaDataFromFile(spec, SCRIPT_DIR + TEST_DIR +
"tfmtd_example2/");
+ Assert.assertEquals("91312ยท1", frame.get(0,0));
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Test
+ public void testTransformMetaData2() {
+ try (Connection conn = new Connection()) {
+ conn.readTransformMetaDataFromPath(SCRIPT_DIR +
TEST_DIR + "tfmtd_example2");
+ } catch (Exception e) {
+ Assert.assertEquals("NullPointerException",
e.getClass().getSimpleName());
+ }
+ }
+
+ @Test
+ public void testTransformMetaData3() {
+ try (Connection conn = new Connection()) {
+ String spec =
HDFSTool.readStringFromHDFSFile(SCRIPT_DIR +
TEST_DIR+"tfmtd_example2/spec.json");
+ conn.readTransformMetaDataFromPath(spec,SCRIPT_DIR +
TEST_DIR + "tfmtd_example2");
+ } catch (Exception e) {
+ Assert.assertEquals("NullPointerException",
e.getClass().getSimpleName());
+ }
+ }
+}
