fix Date serialization

apache · Apr 9, 2015 · da64742 · da64742
1 parent 59266d1
commit da64742
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/R/pkg/R/deserialize.R b/R/pkg/R/deserialize.R
@@ -76,7 +76,7 @@ readType <- function(con) {
 }
 
 readDate <- function(con) {
-  as.Date(readInt(con), origin = "1970-01-01")
+  as.Date(readString(con))
 }
 
 readTime <- function(con) {

diff --git a/R/pkg/R/serialize.R b/R/pkg/R/serialize.R
@@ -172,7 +172,7 @@ writeEnv <- function(con, env) {
 }
 
 writeDate <- function(con, date) {
-  writeInt(con, as.integer(date))
+  writeString(con, as.character(date))
 }
 
 writeTime <- function(con, time) {

diff --git a/core/src/main/scala/org/apache/spark/api/r/SerDe.scala b/core/src/main/scala/org/apache/spark/api/r/SerDe.scala
@@ -100,8 +100,7 @@ private[spark] object SerDe {
   }
 
   def readDate(in: DataInputStream): Date = {
-    val d = in.readInt()
-    new Date(d.toLong * 24 * 3600 * 1000)
+    Date.valueOf(readString(in))
   }
 
   def readTime(in: DataInputStream): Time = {
@@ -277,7 +276,7 @@ private[spark] object SerDe {
   }
 
   def writeDate(out: DataOutputStream, value: Date): Unit = {
-    out.writeInt((value.getTime / 1000 / 3600 / 24).toInt)
+    writeString(out, value.toString)
   }
 
   def writeTime(out: DataOutputStream, value: Time): Unit = {