You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by mi...@apache.org on 2017/10/06 21:05:18 UTC
incubator-impala git commit: IMPALA-6021: Revert "IMPALA-6009:
Upgrade Guava to 14.0.1"
Repository: incubator-impala
Updated Branches:
refs/heads/master 6ff54ab3b -> 581dfe002
IMPALA-6021: Revert "IMPALA-6009: Upgrade Guava to 14.0.1"
This reverts commit 3c870aa360c5c2447ba0412e7758e3d78333110a.
Change-Id: Idd07d9b011ebd407d7a274725a10b6371d024186
Reviewed-on: http://gerrit.cloudera.org:8080/8225
Reviewed-by: Philip Zeyliger <ph...@cloudera.com>
Reviewed-by: Alex Behm <al...@cloudera.com>
Tested-by: Impala Public Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/581dfe00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/581dfe00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/581dfe00
Branch: refs/heads/master
Commit: 581dfe002e732a39fe53456ebca49ff261716f02
Parents: 6ff54ab
Author: Michael Brown <mi...@cloudera.com>
Authored: Fri Oct 6 08:49:04 2017 -0700
Committer: Impala Public Jenkins <im...@gerrit.cloudera.org>
Committed: Fri Oct 6 20:05:17 2017 +0000
----------------------------------------------------------------------
fe/pom.xml | 2 +-
.../impala/analysis/ColumnLineageGraph.java | 19 ++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/581dfe00/fe/pom.xml
----------------------------------------------------------------------
diff --git a/fe/pom.xml b/fe/pom.xml
index e8a3ae5..a0330d7 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>14.0.1</version>
+ <version>11.0.2</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/581dfe00/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 4c7df89..bc535ff 100644
--- a/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java
+++ b/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java
@@ -17,6 +17,7 @@
package org.apache.impala.analysis;
+import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
@@ -24,14 +25,6 @@ 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;
@@ -40,6 +33,14 @@ 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;
@@ -589,7 +590,7 @@ public class ColumnLineageGraph {
private String getQueryHash(String queryStr) {
Hasher hasher = Hashing.md5().newHasher();
- hasher.putUnencodedChars(queryStr);
+ hasher.putString(queryStr);
return hasher.hash().toString();
}