You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2016/08/16 17:05:45 UTC
incubator-systemml git commit: [SYSTEMML-774] Add getTimestamp to
MLBlock for Spark 1.6
Repository: incubator-systemml
Updated Branches:
refs/heads/master 6df0d2348 -> 2ccd00c01
[SYSTEMML-774] Add getTimestamp to MLBlock for Spark 1.6
Closes #213.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/2ccd00c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/2ccd00c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/2ccd00c0
Branch: refs/heads/master
Commit: 2ccd00c018cdb8f7c5eaf059915e796e1152509b
Parents: 6df0d23
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Tue Aug 16 10:02:48 2016 -0700
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Tue Aug 16 10:02:48 2016 -0700
----------------------------------------------------------------------
src/main/java/org/apache/sysml/api/MLBlock.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/2ccd00c0/src/main/java/org/apache/sysml/api/MLBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/MLBlock.java b/src/main/java/org/apache/sysml/api/MLBlock.java
index 1801395..934c4b0 100644
--- a/src/main/java/org/apache/sysml/api/MLBlock.java
+++ b/src/main/java/org/apache/sysml/api/MLBlock.java
@@ -20,6 +20,7 @@ package org.apache.sysml.api;
import java.math.BigDecimal;
import java.sql.Date;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -28,7 +29,6 @@ import org.apache.spark.sql.Row;
import org.apache.spark.sql.types.DataType;
import org.apache.spark.sql.types.StructField;
import org.apache.spark.sql.types.StructType;
-
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
@@ -258,5 +258,12 @@ public class MLBlock implements Row {
return new StructType(fields);
}
+ // required for Spark 1.6+
+ public Timestamp getTimestamp(int position) {
+ // position 0 = MatrixIndexes and position 1 = MatrixBlock,
+ // so return null since neither is of date type
+ return null;
+ }
+
}