Repository: incubator-impala Updated Branches: refs/heads/master fed75810b -> 3c870aa36
IMPALA-6009: Upgrade Guava to 14.0.1 Builds are breaking because the latest hive-exec snapshot jar includes Guava 14.0.1 classes which conflict with the version Impala depends on (11.0.2). Between versions 11.0.2 and 14.0.1 Guava changed the API of some Hasher methods that Impala uses. As a workaround this patch upgrades Impala's Guava dependency to version 14.0.1 to be consistent with the classes in hive-exec. Testing: - mvn compile succeeded Change-Id: Iddc5da8849d5aa7317d3dc572884d05dee859bdd Reviewed-on: http://gerrit.cloudera.org:8080/8198 Reviewed-by: Bharath Vissapragada <[email protected]> Reviewed-by: Dimitris Tsirogiannis <[email protected]> Reviewed-by: Alex Behm <[email protected]> Tested-by: Alex Behm <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/3c870aa3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/3c870aa3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/3c870aa3 Branch: refs/heads/master Commit: 3c870aa360c5c2447ba0412e7758e3d78333110a Parents: fed7581 Author: Alex Behm <[email protected]> Authored: Tue Oct 3 09:46:38 2017 -0700 Committer: Alex Behm <[email protected]> Committed: Tue Oct 3 21:03:53 2017 +0000 ---------------------------------------------------------------------- fe/pom.xml | 2 +- .../impala/analysis/ColumnLineageGraph.java | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/3c870aa3/fe/pom.xml ---------------------------------------------------------------------- diff --git a/fe/pom.xml b/fe/pom.xml index a0330d7..e8a3ae5 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -333,7 +333,7 @@ under the License. <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>11.0.2</version> + <version>14.0.1</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/3c870aa3/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java b/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java index bc535ff..4c7df89 100644 --- a/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java +++ b/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java @@ -17,7 +17,6 @@ package org.apache.impala.analysis; -import java.util.Arrays; import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; @@ -25,6 +24,14 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; +import org.apache.impala.catalog.Table; +import org.apache.impala.common.Id; +import org.apache.impala.common.IdGenerator; +import org.apache.impala.thrift.TEdgeType; +import org.apache.impala.thrift.TLineageGraph; +import org.apache.impala.thrift.TMultiEdge; +import org.apache.impala.thrift.TQueryCtx; +import org.apache.impala.thrift.TVertex; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; @@ -33,14 +40,6 @@ import org.json.simple.parser.ParseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.impala.catalog.Table; -import org.apache.impala.common.Id; -import org.apache.impala.common.IdGenerator; -import org.apache.impala.thrift.TEdgeType; -import org.apache.impala.thrift.TQueryCtx; -import org.apache.impala.thrift.TLineageGraph; -import org.apache.impala.thrift.TMultiEdge; -import org.apache.impala.thrift.TVertex; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -590,7 +589,7 @@ public class ColumnLineageGraph { private String getQueryHash(String queryStr) { Hasher hasher = Hashing.md5().newHasher(); - hasher.putString(queryStr); + hasher.putUnencodedChars(queryStr); return hasher.hash().toString(); }
