diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidScanQueryRecordReader.java druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidScanQueryRecordReader.java index 5bbee637cd..6a843aaf16 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidScanQueryRecordReader.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidScanQueryRecordReader.java @@ -24,9 +24,9 @@ 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 @@ private static final TypeReference TYPE_REFERENCE = new TypeReference() { }; - private Iterator> compactedValues = Iterators.emptyIterator(); + private Iterator> compactedValues = Collections.emptyIterator(); @Override protected JavaType getResultTypeDef() { return DruidStorageHandlerUtils.JSON_MAPPER.getTypeFactory().constructType(TYPE_REFERENCE); diff --git pom.xml pom.xml index e58f92517b..750b7ec9c0 100644 --- pom.xml +++ pom.xml @@ -149,7 +149,7 @@ 0.1.2 0.13.0-incubating 1.2.0-3f79e055 - 19.0 + 20.0 2.4.11 1.3.166 3.1.0 diff --git ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java index b723820f7b..e38a0675b8 100644 --- ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java +++ ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java @@ -86,7 +86,7 @@ public BasicStats build(Partish p) { 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()); } diff --git standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java index 101d6759c5..7dafcfbae3 100644 --- standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java +++ standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java @@ -451,9 +451,9 @@ Partition build() { HostAndPort hp = HostAndPort.fromString(host) .withDefaultPort(port); - LOG.info("Connecting to {}:{}", hp.getHostText(), hp.getPort()); + LOG.info("Connecting to {}:{}", hp.getHost(), hp.getPort()); - return new URI(THRIFT_SCHEMA, null, hp.getHostText(), hp.getPort(), + return new URI(THRIFT_SCHEMA, null, hp.getHost(), hp.getPort(), null, null, null); } diff --git standalone-metastore/pom.xml standalone-metastore/pom.xml index 08b458703d..6255c5ca38 100644 --- standalone-metastore/pom.xml +++ standalone-metastore/pom.xml @@ -79,7 +79,7 @@ 0.1.2 3.1.0 - 19.0 + 20.0 3.1.0 2.6.1 2.9.5 diff --git storage-api/pom.xml storage-api/pom.xml index 06c10d0a89..75776e10fc 100644 --- storage-api/pom.xml +++ storage-api/pom.xml @@ -32,7 +32,7 @@ 2.6 1.1.3 - 19.0 + 20.0 3.1.0 4.11 1.7.10