Repository: hive Updated Branches: refs/heads/master 565ff8559 -> 37be57b64
HIVE-17582 : Followup of HIVE15708 (Slim Bouguerra via Ashutosh Chauhan) Signed-off-by: Ashutosh Chauhan <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/37be57b6 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/37be57b6 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/37be57b6 Branch: refs/heads/master Commit: 37be57b647932eab98e9ce77c44f10a0c58f1a6a Parents: 565ff85 Author: Slim Bouguerra <[email protected]> Authored: Fri Sep 22 16:05:54 2017 -0700 Committer: Ashutosh Chauhan <[email protected]> Committed: Fri Sep 22 16:05:54 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hive/druid/io/DruidQueryBasedInputFormat.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/37be57b6/druid-handler/src/java/org/apache/hadoop/hive/druid/io/DruidQueryBasedInputFormat.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/io/DruidQueryBasedInputFormat.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/io/DruidQueryBasedInputFormat.java index bcabbd6..3711595 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/io/DruidQueryBasedInputFormat.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/io/DruidQueryBasedInputFormat.java @@ -27,7 +27,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.calcite.adapter.druid.DruidTable; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; @@ -122,8 +121,8 @@ public class DruidQueryBasedInputFormat extends InputFormat<NullWritable, DruidW LOG.warn("Druid query is empty; creating Select query"); } String dataSource = conf.get(Constants.DRUID_DATA_SOURCE); - if (dataSource == null) { - throw new IOException("Druid data source cannot be empty"); + if (dataSource == null || dataSource.isEmpty()) { + throw new IOException("Druid data source cannot be empty or null"); } druidQuery = createSelectStarQuery(dataSource); druidQueryType = Query.SELECT; @@ -166,7 +165,7 @@ public class DruidQueryBasedInputFormat extends InputFormat<NullWritable, DruidW // Create Select query SelectQueryBuilder builder = new Druids.SelectQueryBuilder(); builder.dataSource(dataSource); - final List<Interval> intervals = Arrays.asList(); + final List<Interval> intervals = Arrays.asList(DruidStorageHandlerUtils.DEFAULT_INTERVAL); builder.intervals(intervals); builder.pagingSpec(PagingSpec.newSpec(1)); Map<String, Object> context = new HashMap<>();
