You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2017/09/07 13:17:27 UTC
carbondata git commit: [CARBONDATA-1461]resolved bug for date and
timestamp in hive
Repository: carbondata
Updated Branches:
refs/heads/master 531dcd234 -> 01492fce4
[CARBONDATA-1461]resolved bug for date and timestamp in hive
This closes #1338
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/01492fce
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/01492fce
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/01492fce
Branch: refs/heads/master
Commit: 01492fce4713a4be47397e66d2b1c05dae102df7
Parents: 531dcd2
Author: anubhav100 <an...@knoldus.in>
Authored: Thu Sep 7 17:37:43 2017 +0530
Committer: chenliang613 <ch...@apache.org>
Committed: Thu Sep 7 21:17:16 2017 +0800
----------------------------------------------------------------------
.../carbondata/hive/CarbonDictionaryDecodeReadSupport.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/01492fce/integration/hive/src/main/java/org/apache/carbondata/hive/CarbonDictionaryDecodeReadSupport.java
----------------------------------------------------------------------
diff --git a/integration/hive/src/main/java/org/apache/carbondata/hive/CarbonDictionaryDecodeReadSupport.java b/integration/hive/src/main/java/org/apache/carbondata/hive/CarbonDictionaryDecodeReadSupport.java
index 5eae253..b0adc69 100644
--- a/integration/hive/src/main/java/org/apache/carbondata/hive/CarbonDictionaryDecodeReadSupport.java
+++ b/integration/hive/src/main/java/org/apache/carbondata/hive/CarbonDictionaryDecodeReadSupport.java
@@ -34,7 +34,6 @@ import org.apache.carbondata.core.metadata.schema.table.column.CarbonColumn;
import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension;
import org.apache.carbondata.core.util.CarbonUtil;
import org.apache.carbondata.core.util.path.CarbonStorePath;
-
import org.apache.carbondata.hadoop.readsupport.CarbonReadSupport;
import org.apache.hadoop.hive.common.type.HiveDecimal;
@@ -43,18 +42,16 @@ import org.apache.hadoop.hive.serde2.io.DoubleWritable;
import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
-
import org.apache.hadoop.io.ArrayWritable;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
-
import org.apache.spark.sql.catalyst.expressions.GenericInternalRow;
import org.apache.spark.sql.catalyst.util.GenericArrayData;
/**
- * This is the class to decode dictionary encoded column data back to its original value.
+ * This is the class to decode dictionary encoded column data back to its original value.
*/
public class CarbonDictionaryDecodeReadSupport<T> implements CarbonReadSupport<T> {
@@ -233,9 +230,9 @@ public class CarbonDictionaryDecodeReadSupport<T> implements CarbonReadSupport<T
case SHORT:
return new ShortWritable((Short) obj);
case DATE:
- return new DateWritable(new Date((long) obj));
+ return new DateWritable(new Date((Integer) obj));
case TIMESTAMP:
- return new TimestampWritable(new Timestamp((long) obj));
+ return new TimestampWritable(new Timestamp((long) obj / 1000));
case STRING:
return new Text(obj.toString());
case DECIMAL: