Repository: tajo Updated Branches: refs/heads/master 356c48efa -> 4bed490dd
TAJO-1914: Remove imports of guava library of facebook. Closes #809 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/4bed490d Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4bed490d Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4bed490d Branch: refs/heads/master Commit: 4bed490dd3a60033f8d5fd742905e310bb0986a6 Parents: 356c48e Author: Jihoon Son <[email protected]> Authored: Wed Oct 7 00:45:26 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Wed Oct 7 00:45:41 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../test/java/org/apache/tajo/client/v2/TestTajoClientV2.java | 2 +- .../src/main/java/org/apache/tajo/parser/sql/SQLAnalyzer.java | 4 ++-- .../java/org/apache/tajo/storage/json/JsonLineDeserializer.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/4bed490d/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index f6f03d8..768e953 100644 --- a/CHANGES +++ b/CHANGES @@ -623,6 +623,8 @@ Release 0.11.0 - unreleased TASKS + TAJO-1914: Remove imports of guava library of facebook. (jihoon) + TAJO-1872: Increase the minimum split size and add a classpath to hadoop tools. (jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/4bed490d/tajo-core-tests/src/test/java/org/apache/tajo/client/v2/TestTajoClientV2.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/client/v2/TestTajoClientV2.java b/tajo-core-tests/src/test/java/org/apache/tajo/client/v2/TestTajoClientV2.java index f8a44d9..fba8b42 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/client/v2/TestTajoClientV2.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/client/v2/TestTajoClientV2.java @@ -18,7 +18,7 @@ package org.apache.tajo.client.v2; -import com.facebook.presto.hive.shaded.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.tajo.QueryTestCaseBase; import org.apache.tajo.exception.*; import org.apache.tajo.service.ServiceTracker; http://git-wip-us.apache.org/repos/asf/tajo/blob/4bed490d/tajo-core/src/main/java/org/apache/tajo/parser/sql/SQLAnalyzer.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/parser/sql/SQLAnalyzer.java b/tajo-core/src/main/java/org/apache/tajo/parser/sql/SQLAnalyzer.java index 34b9f59..7b49d05 100644 --- a/tajo-core/src/main/java/org/apache/tajo/parser/sql/SQLAnalyzer.java +++ b/tajo-core/src/main/java/org/apache/tajo/parser/sql/SQLAnalyzer.java @@ -18,10 +18,10 @@ package org.apache.tajo.parser.sql; -import com.facebook.presto.hive.shaded.com.google.common.base.Function; -import com.facebook.presto.hive.shaded.com.google.common.collect.Collections2; +import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; +import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.CommonTokenStream; http://git-wip-us.apache.org/repos/asf/tajo/blob/4bed490d/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/json/JsonLineDeserializer.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/json/JsonLineDeserializer.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/json/JsonLineDeserializer.java index 091fc8f..f3fdacb 100644 --- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/json/JsonLineDeserializer.java +++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/json/JsonLineDeserializer.java @@ -19,7 +19,7 @@ package org.apache.tajo.storage.json; -import com.facebook.presto.hive.shaded.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; import net.minidev.json.JSONObject;
