[systemds] branch master updated: [MINOR] Fix javadoc issues, corrupted merge, and transform spec reads

[mboehm7]

This is an automated email from the ASF dual-hosted git repository.

mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/master by this push:
     new b2b6b3d  [MINOR] Fix javadoc issues, corrupted merge, and transform 
spec reads
b2b6b3d is described below

commit b2b6b3dbcf6c714d7f63d3686a05454f40a152ea
Author: Matthias Boehm <mboe...@gmail.com>
AuthorDate: Sat Jun 5 22:46:02 2021 +0200

    [MINOR] Fix javadoc issues, corrupted merge, and transform spec reads
---
 .../instructions/fed/ParameterizedBuiltinFEDInstruction.java   |  2 +-
 src/main/java/org/apache/sysds/runtime/io/ListReader.java      |  2 +-
 src/main/java/org/apache/sysds/runtime/io/ListWriter.java      |  2 +-
 src/main/java/org/apache/sysds/runtime/util/HDFSTool.java      | 10 +++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/fed/ParameterizedBuiltinFEDInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/fed/ParameterizedBuiltinFEDInstruction.java
index 08331a6..6839387 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/fed/ParameterizedBuiltinFEDInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/fed/ParameterizedBuiltinFEDInstruction.java
@@ -179,7 +179,7 @@ public class ParameterizedBuiltinFEDInstruction extends 
ComputationFEDInstructio
                long ncolId = FederationUtils.getNextFedDataID();
                CPOperand ncolOp = new CPOperand(String.valueOf(ncolId), 
ValueType.INT64, DataType.SCALAR);
 
-               String unaryString = 
InstructionUtils.constructUnaryInstString(instString, "ncol", ncolOp, output);
+               String unaryString = 
InstructionUtils.constructUnaryInstString(instString, "ncol", output, ncolOp);
                FederatedRequest fr2 = 
FederationUtils.callInstruction(unaryString, ncolOp,
                        new CPOperand[] {output}, new long[] 
{out.getFedMapping().getID()});
                FederatedRequest fr3 = new 
FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
diff --git a/src/main/java/org/apache/sysds/runtime/io/ListReader.java 
b/src/main/java/org/apache/sysds/runtime/io/ListReader.java
index 1569658..e3182d3 100644
--- a/src/main/java/org/apache/sysds/runtime/io/ListReader.java
+++ b/src/main/java/org/apache/sysds/runtime/io/ListReader.java
@@ -51,7 +51,7 @@ public class ListReader
         * @param fmtStr format string
         * @param props file format properties
         * @return list object
-        * @throws DMLRuntimeException
+        * @throws DMLRuntimeException if inconsistent meta data or read fails
         */
        public static ListObject readListFromHDFS(String fname, String fmtStr, 
FileFormatProperties props)
                throws DMLRuntimeException
diff --git a/src/main/java/org/apache/sysds/runtime/io/ListWriter.java 
b/src/main/java/org/apache/sysds/runtime/io/ListWriter.java
index d5b95d7..352430a 100644
--- a/src/main/java/org/apache/sysds/runtime/io/ListWriter.java
+++ b/src/main/java/org/apache/sysds/runtime/io/ListWriter.java
@@ -43,7 +43,7 @@ public class ListWriter
         * @param fname directory name 
         * @param fmtStr format string
         * @param props file format properties
-        * @throws DMLRuntimeException
+        * @throws DMLRuntimeException if write fails
         */
        public static void writeListToHDFS(ListObject lo, String fname, String 
fmtStr, FileFormatProperties props)
                throws DMLRuntimeException
diff --git a/src/main/java/org/apache/sysds/runtime/util/HDFSTool.java 
b/src/main/java/org/apache/sysds/runtime/util/HDFSTool.java
index b44b7ce..1967e24 100644
--- a/src/main/java/org/apache/sysds/runtime/util/HDFSTool.java
+++ b/src/main/java/org/apache/sysds/runtime/util/HDFSTool.java
@@ -313,7 +313,15 @@ public class HDFSTool
        
        public static ScalarObject readScalarObjectFromHDFSFile(String fname, 
ValueType vt) {
                try {
-                       return ScalarObjectFactory.createScalarObject(vt, 
readObjectFromHDFSFile(fname, vt));
+                       Object obj = null;
+                       switch( vt ) {
+                               case INT64:   obj = 
readIntegerFromHDFSFile(fname); break;
+                               case FP64:    obj = 
readDoubleFromHDFSFile(fname); break;
+                               case BOOLEAN: obj = 
readBooleanFromHDFSFile(fname); break;
+                               case STRING:
+                               default:      obj = 
readStringFromHDFSFile(fname);
+                       }
+                       return ScalarObjectFactory.createScalarObject(vt, obj);
                }
                catch(Exception ex) {
                        throw new DMLRuntimeException(ex);