Repository: hive Updated Branches: refs/heads/master f18842e73 -> 294665acf
HIVE-20539 : Remove dependency on com.metamx.java-util (Nishant Bangarwa via Ashutosh Chauhan) Signed-off-by: Ashutosh Chauhan <hashut...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/294665ac Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/294665ac Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/294665ac Branch: refs/heads/master Commit: 294665acf77c02d27a7a1b5a84a6b21b1e013701 Parents: f18842e Author: Nishant Bangarwa <nishant.mon...@gmail.com> Authored: Wed Sep 12 08:07:42 2018 -0700 Committer: Ashutosh Chauhan <hashut...@apache.org> Committed: Wed Sep 12 08:07:42 2018 -0700 ---------------------------------------------------------------------- druid-handler/pom.xml | 26 -------------------- .../hadoop/hive/druid/DruidStorageHandler.java | 16 ++++++------ .../hive/druid/DruidStorageHandlerUtils.java | 20 +++++++-------- .../druid/io/DruidQueryBasedInputFormat.java | 2 +- .../hive/druid/security/KerberosHttpClient.java | 8 +++--- .../druid/security/ResponseCookieHandler.java | 4 +-- .../RetryIfUnauthorizedResponseHandler.java | 4 +-- .../serde/DruidGroupByQueryRecordReader.java | 2 +- .../druid/serde/DruidQueryRecordReader.java | 6 ++--- .../hadoop/hive/druid/serde/TestDruidSerDe.java | 4 +-- 10 files changed, 33 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/294665ac/druid-handler/pom.xml ---------------------------------------------------------------------- diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index ef1231f..5b8a601 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -29,7 +29,6 @@ <properties> <hive.path.to.root>..</hive.path.to.root> - <druid.metamx.util.version>1.3.2</druid.metamx.util.version> <druid.guava.version>16.0.1</druid.guava.version> </properties> @@ -87,26 +86,6 @@ <version>${druid.guava.version}</version> </dependency> <dependency> - <groupId>com.metamx</groupId> - <artifactId>java-util</artifactId> - <version>${druid.metamx.util.version}</version> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - </exclusions> - <optional>true</optional> - </dependency> - <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> <version>${joda.version}</version> @@ -316,10 +295,6 @@ <shadedPattern>org.apache.hive.druid.io.druid</shadedPattern> </relocation> <relocation> - <pattern>com.metamx</pattern> - <shadedPattern>org.apache.hive.druid.com.metamx</shadedPattern> - </relocation> - <relocation> <pattern>io.netty</pattern> <shadedPattern>org.apache.hive.druid.io.netty</shadedPattern> </relocation> @@ -348,7 +323,6 @@ <includes> <include>io.druid:*</include> <include>io.druid.extensions:*</include> - <include>com.metamx:*</include> <include>io.netty:*</include> <include>org.apache.calcite:*</include> <include>com.fasterxml.jackson.core:*</include> http://git-wip-us.apache.org/repos/asf/hive/blob/294665ac/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java index 9f34b7b..f21bbee 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java @@ -27,14 +27,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.metamx.common.RetryUtils; -import com.metamx.common.lifecycle.Lifecycle; -import com.metamx.http.client.HttpClient; -import com.metamx.http.client.HttpClientConfig; -import com.metamx.http.client.HttpClientInit; -import com.metamx.http.client.Request; -import com.metamx.http.client.response.FullResponseHandler; -import com.metamx.http.client.response.FullResponseHolder; import io.druid.data.input.impl.DimensionSchema; import io.druid.data.input.impl.DimensionsSpec; import io.druid.data.input.impl.InputRowParser; @@ -42,6 +34,14 @@ import io.druid.data.input.impl.JSONParseSpec; import io.druid.data.input.impl.StringInputRowParser; import io.druid.data.input.impl.TimestampSpec; import io.druid.java.util.common.Pair; +import io.druid.java.util.common.RetryUtils; +import io.druid.java.util.common.lifecycle.Lifecycle; +import io.druid.java.util.http.client.HttpClient; +import io.druid.java.util.http.client.HttpClientConfig; +import io.druid.java.util.http.client.HttpClientInit; +import io.druid.java.util.http.client.Request; +import io.druid.java.util.http.client.response.FullResponseHandler; +import io.druid.java.util.http.client.response.FullResponseHolder; import io.druid.metadata.MetadataStorageConnectorConfig; import io.druid.metadata.MetadataStorageTablesConfig; import io.druid.metadata.SQLMetadataConnector; http://git-wip-us.apache.org/repos/asf/hive/blob/294665ac/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java index 9da46df..b9eb367 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java @@ -31,21 +31,21 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.google.common.io.CharStreams; -import com.metamx.common.JodaUtils; -import com.metamx.common.MapUtils; -import com.metamx.emitter.EmittingLogger; -import com.metamx.emitter.core.NoopEmitter; -import com.metamx.emitter.service.ServiceEmitter; -import com.metamx.http.client.HttpClient; -import com.metamx.http.client.Request; -import com.metamx.http.client.response.FullResponseHandler; -import com.metamx.http.client.response.FullResponseHolder; -import com.metamx.http.client.response.InputStreamResponseHandler; import io.druid.data.input.impl.DimensionSchema; import io.druid.data.input.impl.StringDimensionSchema; import io.druid.jackson.DefaultObjectMapper; +import io.druid.java.util.common.JodaUtils; +import io.druid.java.util.common.MapUtils; import io.druid.java.util.common.Pair; import io.druid.java.util.common.granularity.Granularity; +import io.druid.java.util.emitter.EmittingLogger; +import io.druid.java.util.emitter.core.NoopEmitter; +import io.druid.java.util.emitter.service.ServiceEmitter; +import io.druid.java.util.http.client.HttpClient; +import io.druid.java.util.http.client.Request; +import io.druid.java.util.http.client.response.FullResponseHandler; +import io.druid.java.util.http.client.response.FullResponseHolder; +import io.druid.java.util.http.client.response.InputStreamResponseHandler; import io.druid.math.expr.ExprMacroTable; import io.druid.metadata.MetadataStorageTablesConfig; import io.druid.metadata.SQLMetadataConnector; http://git-wip-us.apache.org/repos/asf/hive/blob/294665ac/druid-handler/src/java/org/apache/hadoop/hive/druid/io/DruidQueryBasedInputFormat.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/io/DruidQueryBasedInputFormat.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/io/DruidQueryBasedInputFormat.java index 4abe4b6..0125c24 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/io/DruidQueryBasedInputFormat.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/io/DruidQueryBasedInputFormat.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonMappingException; import com.google.common.collect.Lists; -import com.metamx.http.client.Request; +import io.druid.java.util.http.client.Request; import io.druid.query.BaseQuery; import io.druid.query.LocatedSegmentDescriptor; import io.druid.query.Query; http://git-wip-us.apache.org/repos/asf/hive/blob/294665ac/druid-handler/src/java/org/apache/hadoop/hive/druid/security/KerberosHttpClient.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/security/KerberosHttpClient.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/security/KerberosHttpClient.java index 2855bea..4644df1 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/security/KerberosHttpClient.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/security/KerberosHttpClient.java @@ -21,10 +21,10 @@ package org.apache.hadoop.hive.druid.security; import com.google.common.base.Throwables; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import com.metamx.http.client.AbstractHttpClient; -import com.metamx.http.client.HttpClient; -import com.metamx.http.client.Request; -import com.metamx.http.client.response.HttpResponseHandler; +import io.druid.java.util.http.client.AbstractHttpClient; +import io.druid.java.util.http.client.HttpClient; +import io.druid.java.util.http.client.Request; +import io.druid.java.util.http.client.response.HttpResponseHandler; import org.apache.hadoop.security.UserGroupInformation; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.joda.time.Duration; http://git-wip-us.apache.org/repos/asf/hive/blob/294665ac/druid-handler/src/java/org/apache/hadoop/hive/druid/security/ResponseCookieHandler.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/security/ResponseCookieHandler.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/security/ResponseCookieHandler.java index 9d3798f..221081a 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/security/ResponseCookieHandler.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/security/ResponseCookieHandler.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hive.druid.security; import com.google.common.collect.Maps; -import com.metamx.http.client.response.ClientResponse; -import com.metamx.http.client.response.HttpResponseHandler; +import io.druid.java.util.http.client.response.ClientResponse; +import io.druid.java.util.http.client.response.HttpResponseHandler; import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpResponse; http://git-wip-us.apache.org/repos/asf/hive/blob/294665ac/druid-handler/src/java/org/apache/hadoop/hive/druid/security/RetryIfUnauthorizedResponseHandler.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/security/RetryIfUnauthorizedResponseHandler.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/security/RetryIfUnauthorizedResponseHandler.java index acdebd7..ff169e8 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/security/RetryIfUnauthorizedResponseHandler.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/security/RetryIfUnauthorizedResponseHandler.java @@ -18,8 +18,8 @@ package org.apache.hadoop.hive.druid.security; -import com.metamx.http.client.response.ClientResponse; -import com.metamx.http.client.response.HttpResponseHandler; +import io.druid.java.util.http.client.response.ClientResponse; +import io.druid.java.util.http.client.response.HttpResponseHandler; import org.jboss.netty.handler.codec.http.HttpChunk; import org.jboss.netty.handler.codec.http.HttpResponse; import org.jboss.netty.handler.codec.http.HttpResponseStatus; http://git-wip-us.apache.org/repos/asf/hive/blob/294665ac/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java index 48850d0..611cad3 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hive.druid.serde; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; -import com.metamx.http.client.HttpClient; +import io.druid.java.util.http.client.HttpClient; import io.druid.data.input.MapBasedRow; import io.druid.data.input.Row; import io.druid.query.groupby.GroupByQuery; http://git-wip-us.apache.org/repos/asf/hive/blob/294665ac/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidQueryRecordReader.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidQueryRecordReader.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidQueryRecordReader.java index 78406bd..6b6fa3d 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidQueryRecordReader.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidQueryRecordReader.java @@ -24,12 +24,12 @@ import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import com.metamx.http.client.HttpClient; -import com.metamx.http.client.Request; -import com.metamx.http.client.response.InputStreamResponseHandler; import io.druid.java.util.common.IAE; import io.druid.java.util.common.RE; import io.druid.java.util.common.guava.CloseQuietly; +import io.druid.java.util.http.client.HttpClient; +import io.druid.java.util.http.client.Request; +import io.druid.java.util.http.client.response.InputStreamResponseHandler; import io.druid.query.BaseQuery; import io.druid.query.Query; import io.druid.query.QueryInterruptedException; http://git-wip-us.apache.org/repos/asf/hive/blob/294665ac/druid-handler/src/test/org/apache/hadoop/hive/druid/serde/TestDruidSerDe.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/test/org/apache/hadoop/hive/druid/serde/TestDruidSerDe.java b/druid-handler/src/test/org/apache/hadoop/hive/druid/serde/TestDruidSerDe.java index 0fdd40b..8b6c890 100644 --- a/druid-handler/src/test/org/apache/hadoop/hive/druid/serde/TestDruidSerDe.java +++ b/druid-handler/src/test/org/apache/hadoop/hive/druid/serde/TestDruidSerDe.java @@ -34,6 +34,8 @@ import java.util.List; import java.util.Map.Entry; import java.util.Properties; +import io.druid.java.util.http.client.HttpClient; +import io.druid.java.util.http.client.response.HttpResponseHandler; import io.druid.query.scan.ScanResultValue; import io.druid.query.select.EventHolder; import org.apache.hadoop.conf.Configuration; @@ -81,8 +83,6 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.util.concurrent.SettableFuture; -import com.metamx.http.client.HttpClient; -import com.metamx.http.client.response.HttpResponseHandler; import io.druid.data.input.Row; import io.druid.query.Query;
