[hive] branch master updated: HIVE-21474: Preparation for bumping guava version (Peter Vary, reviewed by Slim Bouguerra and Zoltan Haindrich)

[pv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pvary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 447f03f  HIVE-21474: Preparation for bumping guava version (Peter Vary, reviewed by Slim Bouguerra and Zoltan Haindrich)
447f03f is described below

commit 447f03f6e91003afc4e653e7602d2222ad5468eb
Author: Peter Vary <pv...@cloudera.com>
AuthorDate: Mon Mar 25 09:39:59 2019 +0100

    HIVE-21474: Preparation for bumping guava version (Peter Vary, reviewed by Slim Bouguerra and Zoltan Haindrich)
---
 .../apache/hadoop/hive/druid/serde/DruidScanQueryRecordReader.java    | 4 ++--
 ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidScanQueryRecordReader.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidScanQueryRecordReader.java
index 5bbee63..6a843aa 100644
--- a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidScanQueryRecordReader.java
+++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidScanQueryRecordReader.java
@@ -24,9 +24,9 @@ import org.apache.hadoop.io.NullWritable;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JavaType;
-import com.google.common.collect.Iterators;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -38,7 +38,7 @@ public class DruidScanQueryRecordReader extends DruidQueryRecordReader<ScanResul
   private static final TypeReference<ScanResultValue> TYPE_REFERENCE = new TypeReference<ScanResultValue>() {
   };
 
-  private Iterator<List<Object>> compactedValues = Iterators.emptyIterator();
+  private Iterator<List<Object>> compactedValues = Collections.emptyIterator();
 
   @Override protected JavaType getResultTypeDef() {
     return DruidStorageHandlerUtils.JSON_MAPPER.getTypeFactory().constructType(TYPE_REFERENCE);
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java b/ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java
index b723820..e38a067 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java
@@ -86,7 +86,7 @@ public class BasicStats {
 
       final ExecutorService pool;
       if (threads <= 1) {
-        pool = MoreExecutors.sameThreadExecutor();
+        pool = MoreExecutors.newDirectExecutorService();
       } else {
         pool = Executors.newFixedThreadPool(threads, new ThreadFactoryBuilder().setDaemon(true).setNameFormat("Get-Partitions-Size-%d").build());
       }