combineDateTime UDF fix & version bump to 0.20.3-ALPHA

kohesive · Sep 14, 2017 · 8ad5719 · 8ad5719
1 parent d3ea98d
commit 8ad5719
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group = uy.kohesive.elasticsearch
-version = 0.20.2-ALPHA
+version = 0.20.3-ALPHA
 
 version_gradle=3.5
 version_kotlin=1.1.2

diff --git a/src/main/kotlin/uy/kohesive/elasticsearch/dataimport/Udfs.kt b/src/main/kotlin/uy/kohesive/elasticsearch/dataimport/Udfs.kt
@@ -46,10 +46,11 @@ object DataImportHandlerUdfs {
             return null
         }
 
-        val dd = date.time / 86400000L * 86400000L
-        val tt = time.time - time.time / 86400000L * 86400000L
+//        val dd = (date.time / 86400000L * 86400000L) - date.timezoneOffset * 60000
+//        val tt = time.time - time.time / 86400000L * 86400000L
+//        return Timestamp(dd + tt)
 
-        return Timestamp(dd + tt)
+        return Timestamp(date.year, date.month, date.date, time.hours, time.minutes, time.seconds, 0)
     }
 
 }