From fe6cd2e854b5725eabaa0b0a656f998482ff9bde Mon Sep 17 00:00:00 2001 From: Slim Date: Fri, 1 Dec 2017 09:09:16 -0800 Subject: [PATCH 6/7] update guava Change-Id: I2c0c48dbea6a62913384d2c568cd523121793381 --- .../test/org/apache/hadoop/hive/ql/io/TestDruidRecordWriter.java | 4 +--- .../org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java | 6 +++--- pom.xml | 2 +- ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageLogger.java | 3 ++- 4 files changed, 7 insertions(+), 8 deletions(-) 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 465c512..05024f8 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.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 void testTimeStampColumnName() { 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 { 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..e131ea4 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 @@ -290,7 +290,7 @@ public LlapTaskUmbilicalProtocol run() throws Exception { 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 void onSuccess(TaskRunner2Result result) { 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; diff --git a/pom.xml b/pom.xml index 1682f47..80f4190 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ 3.1.0 0.1.2 0.10.1 - 14.0.1 + 16.0.1 2.4.11 1.3.166 3.0.0-beta1 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 2f764f8..73db8b9 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 @@ -47,6 +47,7 @@ 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; @@ -463,7 +464,7 @@ private void writeVertices(JsonWriter writer, Set vertices) throws IOExc */ private String getQueryHash(String queryStr) { Hasher hasher = Hashing.md5().newHasher(); - hasher.putString(queryStr); + hasher.putBytes(queryStr.getBytes(Charset.defaultCharset())); return hasher.hash().toString(); } } -- 2.8.4 (Apple Git-73)