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 2017/12/21 23:23:59 UTC
hive git commit: HIVE-15393 : Update Guava version (Slim Bouguerra
via Ashutosh Chauhan)
Repository: hive
Updated Branches:
refs/heads/master b4b06ac15 -> 2a5ba5c9c
HIVE-15393 : Update Guava version (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/2a5ba5c9
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2a5ba5c9
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2a5ba5c9
Branch: refs/heads/master
Commit: 2a5ba5c9c6db65018355bcfb301e422e7c5d275f
Parents: b4b06ac
Author: Slim Bouguerra <sl...@gmail.com>
Authored: Thu Dec 21 15:23:08 2017 -0800
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Thu Dec 21 15:23:08 2017 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hive/common/JvmMetricsInfo.java | 5 +++--
.../org/apache/hadoop/hive/common/JvmPauseMonitor.java | 2 +-
.../hive/druid/serde/DruidSelectQueryRecordReader.java | 3 ++-
.../hive/druid/serde/DruidTopNQueryRecordReader.java | 3 ++-
.../apache/hadoop/hive/ql/io/TestDruidRecordWriter.java | 4 +---
.../apache/hadoop/hive/cli/control/CoreCliDriver.java | 4 ++--
.../hadoop/hive/util/ElapsedTimeLoggingWrapper.java | 2 +-
.../hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java | 10 +++++-----
.../hadoop/hive/llap/metrics/LlapDaemonCacheInfo.java | 3 ++-
.../hadoop/hive/llap/metrics/LlapDaemonExecutorInfo.java | 3 ++-
.../hadoop/hive/llap/metrics/LlapDaemonIOInfo.java | 3 ++-
.../hadoop/hive/llap/metrics/LlapDaemonJvmInfo.java | 3 ++-
.../llap/tezplugins/metrics/LlapTaskSchedulerInfo.java | 3 ++-
pom.xml | 2 +-
.../org/apache/hadoop/hive/ql/exec/FetchOperator.java | 5 +++--
.../org/apache/hadoop/hive/ql/hooks/LineageLogger.java | 3 ++-
.../hadoop/hive/ql/metadata/HiveMetaStoreChecker.java | 2 +-
.../ql/optimizer/calcite/stats/HiveRelMdPredicates.java | 11 ++++++-----
18 files changed, 40 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/common/src/java/org/apache/hadoop/hive/common/JvmMetricsInfo.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/common/JvmMetricsInfo.java b/common/src/java/org/apache/hadoop/hive/common/JvmMetricsInfo.java
index 3ab73c5..76dca04 100644
--- a/common/src/java/org/apache/hadoop/hive/common/JvmMetricsInfo.java
+++ b/common/src/java/org/apache/hadoop/hive/common/JvmMetricsInfo.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hive.common;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.apache.hadoop.metrics2.MetricsInfo;
@@ -58,8 +59,8 @@ public enum JvmMetricsInfo implements MetricsInfo {
@Override public String description() { return desc; }
@Override public String toString() {
- return Objects.toStringHelper(this)
- .add("name", name()).add("description", desc)
+ return MoreObjects.toStringHelper(this)
+ .add("name", name()).add("description", desc)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java b/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java
index cf080e3..fb7d7de 100644
--- a/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java
+++ b/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java
@@ -173,7 +173,7 @@ public class JvmPauseMonitor {
private class Monitor implements Runnable {
@Override
public void run() {
- Stopwatch sw = new Stopwatch();
+ Stopwatch sw = Stopwatch.createUnstarted();
Map<String, GcTimes> gcTimesBeforeSleep = getGcTimes();
while (shouldRun) {
sw.reset().start();
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSelectQueryRecordReader.java
----------------------------------------------------------------------
diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSelectQueryRecordReader.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSelectQueryRecordReader.java
index c0744b5..0cef3a0 100644
--- a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSelectQueryRecordReader.java
+++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSelectQueryRecordReader.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hive.druid.serde;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -48,7 +49,7 @@ public class DruidSelectQueryRecordReader
private Result<SelectResultValue> current;
- private Iterator<EventHolder> values = Iterators.emptyIterator();
+ private Iterator<EventHolder> values = Collections.emptyIterator();
@Override
protected JavaType getResultTypeDef() {
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTopNQueryRecordReader.java
----------------------------------------------------------------------
diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTopNQueryRecordReader.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTopNQueryRecordReader.java
index 6e1fffe..b39e799 100644
--- a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTopNQueryRecordReader.java
+++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTopNQueryRecordReader.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hive.druid.serde;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -46,7 +47,7 @@ public class DruidTopNQueryRecordReader
private Result<TopNResultValue> current;
- private Iterator<DimensionAndMetricValueExtractor> values = Iterators.emptyIterator();
+ private Iterator<DimensionAndMetricValueExtractor> values = Collections.emptyIterator();
@Override
protected JavaType getResultTypeDef() {
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/druid-handler/src/test/org/apache/hadoop/hive/ql/io/TestDruidRecordWriter.java
----------------------------------------------------------------------
diff --git a/druid-handler/src/test/org/apache/hadoop/hive/ql/io/TestDruidRecordWriter.java b/druid-handler/src/test/org/apache/hadoop/hive/ql/io/TestDruidRecordWriter.java
index 4bf3fa2..e0a11e9 100644
--- a/druid-handler/src/test/org/apache/hadoop/hive/ql/io/TestDruidRecordWriter.java
+++ b/druid-handler/src/test/org/apache/hadoop/hive/ql/io/TestDruidRecordWriter.java
@@ -64,7 +64,6 @@ import org.apache.hadoop.hive.druid.serde.DruidWritable;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -116,8 +115,7 @@ public class TestDruidRecordWriter {
DruidStorageHandlerUtils.DEFAULT_TIMESTAMP_COLUMN, DruidTable.DEFAULT_TIMESTAMP_COLUMN
);
}
- // This test fails due to conflict of guava classes with hive-exec jar.
- @Ignore
+
@Test
public void testWrite() throws IOException, SegmentLoadingException {
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreCliDriver.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreCliDriver.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreCliDriver.java
index a1762ec..d97ab3b 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreCliDriver.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreCliDriver.java
@@ -40,7 +40,7 @@ public class CoreCliDriver extends CliAdapter {
private static final Logger LOG = LoggerFactory.getLogger(CoreCliDriver.class);
private static QTestUtil qt;
-
+
public CoreCliDriver(AbstractCliConfig testCliConfig) {
super(testCliConfig);
}
@@ -153,7 +153,7 @@ public class CoreCliDriver extends CliAdapter {
@Override
public void runTest(String tname, String fname, String fpath) throws Exception {
- Stopwatch sw = new Stopwatch().start();
+ Stopwatch sw = Stopwatch.createStarted();
boolean skipped = false;
boolean failed = false;
try {
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/itests/util/src/main/java/org/apache/hadoop/hive/util/ElapsedTimeLoggingWrapper.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/util/ElapsedTimeLoggingWrapper.java b/itests/util/src/main/java/org/apache/hadoop/hive/util/ElapsedTimeLoggingWrapper.java
index 061a918..74f50ba 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/util/ElapsedTimeLoggingWrapper.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/util/ElapsedTimeLoggingWrapper.java
@@ -28,7 +28,7 @@ public abstract class ElapsedTimeLoggingWrapper<T> {
public abstract T invokeInternal() throws Exception;
public T invoke(String message, Logger LOG, boolean toStdErr) throws Exception {
- Stopwatch sw = new Stopwatch().start();
+ Stopwatch sw = Stopwatch.createStarted();
try {
T retVal = invokeInternal();
return retVal;
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java
index 87a692f..7971eda 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java
@@ -114,8 +114,8 @@ public class TaskRunnerCallable extends CallableWithNdc<TaskRunner2Result> {
private final String queryId;
private final HadoopShim tezHadoopShim;
private boolean shouldRunTask = true;
- final Stopwatch runtimeWatch = new Stopwatch();
- final Stopwatch killtimerWatch = new Stopwatch();
+ final Stopwatch runtimeWatch = Stopwatch.createUnstarted();
+ final Stopwatch killtimerWatch = Stopwatch.createUnstarted();
private final AtomicBoolean isStarted = new AtomicBoolean(false);
private final AtomicBoolean isCompleted = new AtomicBoolean(false);
private final AtomicBoolean killInvoked = new AtomicBoolean(false);
@@ -290,7 +290,7 @@ public class TaskRunnerCallable extends CallableWithNdc<TaskRunner2Result> {
FileSystem.closeAllForUGI(fsTaskUgi);
fragmentInfo.getQueryInfo().returnUmbilicalUgi(taskOwner);
LOG.info("ExecutionTime for Container: " + request.getContainerIdString() + "=" +
- runtimeWatch.stop().elapsedMillis());
+ runtimeWatch.stop().elapsed(TimeUnit.MILLISECONDS));
if (LOG.isDebugEnabled()) {
LOG.debug(
"canFinish post completion: " + taskSpec.getTaskAttemptID() + ": " + canFinish());
@@ -517,14 +517,14 @@ public class TaskRunnerCallable extends CallableWithNdc<TaskRunner2Result> {
LOG.info("Killed task {}", requestId);
if (killtimerWatch.isRunning()) {
killtimerWatch.stop();
- long elapsed = killtimerWatch.elapsedMillis();
+ long elapsed = killtimerWatch.elapsed(TimeUnit.MILLISECONDS);
LOG.info("Time to die for task {}", elapsed);
if (metrics != null) {
metrics.addMetricsPreemptionTimeToKill(elapsed);
}
}
if (metrics != null) {
- metrics.addMetricsPreemptionTimeLost(runtimeWatch.elapsedMillis());
+ metrics.addMetricsPreemptionTimeLost(runtimeWatch.elapsed(TimeUnit.MILLISECONDS));
metrics.incrExecutorTotalKilled();
}
break;
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonCacheInfo.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonCacheInfo.java b/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonCacheInfo.java
index 427a0b1..9b302d5 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonCacheInfo.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonCacheInfo.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hive.llap.metrics;
+import com.google.common.base.MoreObjects;
import org.apache.hadoop.metrics2.MetricsInfo;
import com.google.common.base.Objects;
@@ -50,7 +51,7 @@ public enum LlapDaemonCacheInfo implements MetricsInfo {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name()).add("description", desc)
.toString();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonExecutorInfo.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonExecutorInfo.java b/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonExecutorInfo.java
index 69d1c6f..63ce2be 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonExecutorInfo.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonExecutorInfo.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hive.llap.metrics;
+import com.google.common.base.MoreObjects;
import org.apache.hadoop.metrics2.MetricsInfo;
import com.google.common.base.Objects;
@@ -74,7 +75,7 @@ public enum LlapDaemonExecutorInfo implements MetricsInfo {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name()).add("description", desc)
.toString();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonIOInfo.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonIOInfo.java b/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonIOInfo.java
index f0fde62..979b2cc 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonIOInfo.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonIOInfo.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hive.llap.metrics;
+import com.google.common.base.MoreObjects;
import org.apache.hadoop.metrics2.MetricsInfo;
import com.google.common.base.Objects;
@@ -42,7 +43,7 @@ public enum LlapDaemonIOInfo implements MetricsInfo {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name()).add("description", desc)
.toString();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonJvmInfo.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonJvmInfo.java b/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonJvmInfo.java
index a817ed0..16e94c4 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonJvmInfo.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/metrics/LlapDaemonJvmInfo.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hive.llap.metrics;
+import com.google.common.base.MoreObjects;
import org.apache.hadoop.metrics2.MetricsInfo;
import com.google.common.base.Objects;
@@ -56,7 +57,7 @@ public enum LlapDaemonJvmInfo implements MetricsInfo {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name()).add("description", desc)
.toString();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/metrics/LlapTaskSchedulerInfo.java
----------------------------------------------------------------------
diff --git a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/metrics/LlapTaskSchedulerInfo.java b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/metrics/LlapTaskSchedulerInfo.java
index c190be8..014426f 100644
--- a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/metrics/LlapTaskSchedulerInfo.java
+++ b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/metrics/LlapTaskSchedulerInfo.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hive.llap.tezplugins.metrics;
+import com.google.common.base.MoreObjects;
import org.apache.hadoop.metrics2.MetricsInfo;
import com.google.common.base.Objects;
@@ -52,7 +53,7 @@ public enum LlapTaskSchedulerInfo implements MetricsInfo {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name()).add("description", desc)
.toString();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d16675..880f235 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
<dropwizard.version>3.1.0</dropwizard.version>
<dropwizard-metrics-hadoop-metrics2-reporter.version>0.1.2</dropwizard-metrics-hadoop-metrics2-reporter.version>
<druid.version>0.10.1</druid.version>
- <guava.version>14.0.1</guava.version>
+ <guava.version>19.0</guava.version>
<groovy.version>2.4.11</groovy.version>
<h2database.version>1.3.166</h2database.version>
<hadoop.version>3.0.0-beta1</hadoop.version>
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
index fb78bd8..961b36e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -109,7 +110,7 @@ public class FetchOperator implements Serializable {
private transient Iterator<Path> iterPath;
private transient Iterator<PartitionDesc> iterPartDesc;
- private transient Iterator<FetchInputFormatSplit> iterSplits = Iterators.emptyIterator();
+ private transient Iterator<FetchInputFormatSplit> iterSplits = Collections.emptyIterator();
private transient Path currPath;
private transient PartitionDesc currDesc;
@@ -591,7 +592,7 @@ public class FetchOperator implements Serializable {
this.currPath = null;
this.iterPath = null;
this.iterPartDesc = null;
- this.iterSplits = Iterators.emptyIterator();
+ this.iterSplits = Collections.emptyIterator();
} catch (Exception e) {
throw new HiveException("Failed with exception " + e.getMessage()
+ StringUtils.stringifyException(e));
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageLogger.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageLogger.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageLogger.java
index 06eb9c8..e0b0ffb 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageLogger.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageLogger.java
@@ -48,6 +48,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -497,7 +498,7 @@ public class LineageLogger implements ExecuteWithHookContext {
*/
private String getQueryHash(String queryStr) {
Hasher hasher = Hashing.md5().newHasher();
- hasher.putString(queryStr);
+ hasher.putBytes(queryStr.getBytes(Charset.defaultCharset()));
return hasher.hash().toString();
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
index 5737c66..fe32bf0 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
@@ -432,7 +432,7 @@ public class HiveMetaStoreChecker {
ExecutorService executor;
if (poolSize <= 1) {
LOG.debug("Using single-threaded version of MSCK-GetPaths");
- executor = MoreExecutors.sameThreadExecutor();
+ executor = MoreExecutors.newDirectExecutorService();
} else {
LOG.debug("Using multi-threaded version of MSCK-GetPaths with number of threads " + poolSize);
ThreadFactory threadFactory =
http://git-wip-us.apache.org/repos/asf/hive/blob/2a5ba5c9/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdPredicates.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdPredicates.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdPredicates.java
index 9bcdd0c..a3984ac 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdPredicates.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdPredicates.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hive.ql.optimizer.calcite.stats;
import java.util.ArrayList;
import java.util.BitSet;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -202,7 +203,7 @@ public class HiveRelMdPredicates implements MetadataHandler<BuiltInMetadata.Pred
final RelNode input = agg.getInput();
final RelOptPredicateList inputInfo = mq.getPulledUpPredicates(input);
final List<RexNode> aggPullUpPredicates = new ArrayList<>();
- final RexBuilder rexBuilder = agg.getCluster().getRexBuilder();
+ final RexBuilder rexBuilder = agg.getCluster().getRexBuilder();
ImmutableBitSet groupKeys = agg.getGroupSet();
Mapping m = Mappings.create(MappingType.PARTIAL_FUNCTION,
@@ -480,10 +481,10 @@ public class HiveRelMdPredicates implements MetadataHandler<BuiltInMetadata.Pred
}
return RelOptPredicateList.of(rexBuilder,
pulledUpPredicates, leftInferredPredicates, rightInferredPredicates);
- case LEFT:
- return RelOptPredicateList.of(rexBuilder,
+ case LEFT:
+ return RelOptPredicateList.of(rexBuilder,
leftPreds, EMPTY_LIST, rightInferredPredicates);
- case RIGHT:
+ case RIGHT:
return RelOptPredicateList.of(rexBuilder,
rightPreds, leftInferredPredicates, EMPTY_LIST);
default:
@@ -534,7 +535,7 @@ public class HiveRelMdPredicates implements MetadataHandler<BuiltInMetadata.Pred
public Iterator<Mapping> iterator() {
ImmutableBitSet fields = exprFields.get(predicate.toString());
if (fields.cardinality() == 0) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
return new ExprsItr(fields);
}