You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2018/04/27 20:38:45 UTC
hive git commit: HIVE-19239 : Check for possible null timestamp
fields during SerDe from Druid events (Slim Bouguerra via Ashutosh Chauhan)
Repository: hive
Updated Branches:
refs/heads/master 6f547098f -> cbc3863b3
HIVE-19239 : Check for possible null timestamp fields during SerDe from Druid events (Slim Bouguerra via Ashutosh Chauhan)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/cbc3863b
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/cbc3863b
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/cbc3863b
Branch: refs/heads/master
Commit: cbc3863b31b69556d0a564bfd6db46732c2f9b37
Parents: 6f54709
Author: Slim Bouguerra <sl...@gmail.com>
Authored: Wed Apr 18 11:24:00 2018 -0700
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Fri Apr 27 13:38:39 2018 -0700
----------------------------------------------------------------------
.../serde/DruidGroupByQueryRecordReader.java | 22 +++++++++-----------
.../serde/DruidTimeseriesQueryRecordReader.java | 16 +++++++-------
2 files changed, 17 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/cbc3863b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java
----------------------------------------------------------------------
diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java
index 765f1cb..00a4b72 100644
--- a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java
+++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java
@@ -17,31 +17,29 @@
*/
package org.apache.hadoop.hive.druid.serde;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.metamx.http.client.HttpClient;
import io.druid.data.input.MapBasedRow;
+import io.druid.data.input.Row;
import io.druid.query.dimension.DimensionSpec;
import io.druid.query.dimension.ExtractionDimensionSpec;
import io.druid.query.extraction.TimeFormatExtractionFn;
+import io.druid.query.groupby.GroupByQuery;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.druid.DruidStorageHandlerUtils;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.mapreduce.InputSplit;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-
-import io.druid.data.input.Row;
-import io.druid.query.groupby.GroupByQuery;
import org.joda.time.format.ISODateTimeFormat;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
import static org.apache.hadoop.hive.druid.serde.DruidSerDeUtils.ISO_TIME_FORMAT;
/**
@@ -133,7 +131,7 @@ public class DruidGroupByQueryRecordReader
DruidWritable value = new DruidWritable();
// 1) The timestamp column
value.getValue().put(DruidStorageHandlerUtils.EVENT_TIMESTAMP_COLUMN,
- currentRow.getTimestamp().getMillis()
+ currentRow.getTimestamp() == null ? null : currentRow.getTimestamp().getMillis()
);
// 2) The dimension columns
value.getValue().putAll(currentEvent);
@@ -147,7 +145,7 @@ public class DruidGroupByQueryRecordReader
value.getValue().clear();
// 1) The timestamp column
value.getValue().put(DruidStorageHandlerUtils.EVENT_TIMESTAMP_COLUMN,
- currentRow.getTimestamp().getMillis()
+ currentRow.getTimestamp() == null ? null : currentRow.getTimestamp().getMillis()
);
// 2) The dimension columns
value.getValue().putAll(currentEvent);
http://git-wip-us.apache.org/repos/asf/hive/blob/cbc3863b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTimeseriesQueryRecordReader.java
----------------------------------------------------------------------
diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTimeseriesQueryRecordReader.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTimeseriesQueryRecordReader.java
index f07f212..d726248 100644
--- a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTimeseriesQueryRecordReader.java
+++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTimeseriesQueryRecordReader.java
@@ -17,17 +17,15 @@
*/
package org.apache.hadoop.hive.druid.serde;
-import java.io.IOException;
-
-import com.fasterxml.jackson.databind.JavaType;
-import org.apache.hadoop.hive.druid.DruidStorageHandlerUtils;
-import org.apache.hadoop.io.NullWritable;
-
import com.fasterxml.jackson.core.type.TypeReference;
-
+import com.fasterxml.jackson.databind.JavaType;
import io.druid.query.Result;
import io.druid.query.timeseries.TimeseriesQuery;
import io.druid.query.timeseries.TimeseriesResultValue;
+import org.apache.hadoop.hive.druid.DruidStorageHandlerUtils;
+import org.apache.hadoop.io.NullWritable;
+
+import java.io.IOException;
/**
* Record reader for results for Druid TimeseriesQuery.
@@ -63,7 +61,7 @@ public class DruidTimeseriesQueryRecordReader
// Create new value
DruidWritable value = new DruidWritable();
value.getValue().put(DruidStorageHandlerUtils.EVENT_TIMESTAMP_COLUMN,
- current.getTimestamp().getMillis()
+ current.getTimestamp() == null ? null : current.getTimestamp().getMillis()
);
value.getValue().putAll(current.getValue().getBaseObject());
return value;
@@ -75,7 +73,7 @@ public class DruidTimeseriesQueryRecordReader
// Update value
value.getValue().clear();
value.getValue().put(DruidStorageHandlerUtils.EVENT_TIMESTAMP_COLUMN,
- current.getTimestamp().getMillis()
+ current.getTimestamp() == null ? null : current.getTimestamp().getMillis()
);
value.getValue().putAll(current.getValue().getBaseObject());
return true;