PHOENIX-4946 Switch from HC's annotations (since removed) to JCIP annotations
Avoids an old httpclient artifact conflicting with Hadoop3 implementation. Signed-off-by: Sergey Soldatov <s...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/02995aa3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/02995aa3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/02995aa3 Branch: refs/heads/4.x-cdh5.15 Commit: 02995aa3b439f6f137f6f11ce48cb52a2941785f Parents: a6c1aa4 Author: Josh Elser <els...@apache.org> Authored: Wed Oct 3 22:43:05 2018 +0100 Committer: Pedro Boado <pbo...@apache.org> Committed: Wed Oct 17 22:49:38 2018 +0100 ---------------------------------------------------------------------- phoenix-core/pom.xml | 6 ------ .../src/main/java/org/apache/phoenix/cache/HashCache.java | 3 ++- .../main/java/org/apache/phoenix/compile/GroupByCompiler.java | 3 ++- .../java/org/apache/phoenix/memory/ChildMemoryManager.java | 5 +++-- .../java/org/apache/phoenix/memory/GlobalMemoryManager.java | 4 +++- .../main/java/org/apache/phoenix/parse/FunctionParseNode.java | 3 ++- .../src/main/java/org/apache/phoenix/query/QueryServices.java | 3 ++- .../src/main/java/org/apache/phoenix/schema/ColumnRef.java | 3 ++- .../main/java/org/apache/phoenix/schema/KeyValueSchema.java | 3 ++- .../src/main/java/org/apache/phoenix/schema/PNameImpl.java | 5 +++-- 10 files changed, 21 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/02995aa3/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index c20c89c..57fc81b 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -283,12 +283,6 @@ <artifactId>protobuf-java</artifactId> <version>${protobuf-java.version}</version> </dependency> - <!-- Intentionally avoid an dependencyManagement entry because of conflict with thin-client --> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.0.1</version> - </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/02995aa3/phoenix-core/src/main/java/org/apache/phoenix/cache/HashCache.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/cache/HashCache.java b/phoenix-core/src/main/java/org/apache/phoenix/cache/HashCache.java index 764fd17..80e37ce 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/cache/HashCache.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/HashCache.java @@ -21,7 +21,8 @@ import java.io.Closeable; import java.io.IOException; import java.util.List; -import org.apache.http.annotation.Immutable; +import net.jcip.annotations.Immutable; + import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.schema.tuple.Tuple; http://git-wip-us.apache.org/repos/asf/phoenix/blob/02995aa3/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java index 0a9e1bc..4777c29 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java @@ -23,8 +23,9 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import net.jcip.annotations.Immutable; + import org.apache.hadoop.hbase.util.Pair; -import org.apache.http.annotation.Immutable; import org.apache.phoenix.compile.OrderPreservingTracker.Ordering; import org.apache.phoenix.coprocessor.BaseScannerRegionObserver; import org.apache.phoenix.exception.SQLExceptionCode; http://git-wip-us.apache.org/repos/asf/phoenix/blob/02995aa3/phoenix-core/src/main/java/org/apache/phoenix/memory/ChildMemoryManager.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/memory/ChildMemoryManager.java b/phoenix-core/src/main/java/org/apache/phoenix/memory/ChildMemoryManager.java index da009fb..f5ad5dd 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/memory/ChildMemoryManager.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/memory/ChildMemoryManager.java @@ -17,8 +17,9 @@ */ package org.apache.phoenix.memory; -import org.apache.http.annotation.GuardedBy; -import org.apache.http.annotation.ThreadSafe; +import net.jcip.annotations.GuardedBy; +import net.jcip.annotations.ThreadSafe; + import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; http://git-wip-us.apache.org/repos/asf/phoenix/blob/02995aa3/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java b/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java index fe0d6d7..f557089 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java @@ -17,11 +17,13 @@ */ package org.apache.phoenix.memory; -import org.apache.http.annotation.GuardedBy; +import net.jcip.annotations.GuardedBy; + import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + /** * * Global memory manager to track course grained memory usage across all requests. http://git-wip-us.apache.org/repos/asf/phoenix/blob/02995aa3/phoenix-core/src/main/java/org/apache/phoenix/parse/FunctionParseNode.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/parse/FunctionParseNode.java b/phoenix-core/src/main/java/org/apache/phoenix/parse/FunctionParseNode.java index fc16156..1236dde 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/parse/FunctionParseNode.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/parse/FunctionParseNode.java @@ -30,7 +30,8 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.apache.http.annotation.Immutable; +import net.jcip.annotations.Immutable; + import org.apache.phoenix.compile.ColumnResolver; import org.apache.phoenix.compile.StatementContext; import org.apache.phoenix.expression.Determinism; http://git-wip-us.apache.org/repos/asf/phoenix/blob/02995aa3/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java index d1b277a..d3c8dc0 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java @@ -19,7 +19,8 @@ package org.apache.phoenix.query; import java.util.concurrent.ThreadPoolExecutor; -import org.apache.http.annotation.Immutable; +import net.jcip.annotations.Immutable; + import org.apache.phoenix.iterate.SpoolTooBigToDiskException; import org.apache.phoenix.memory.MemoryManager; import org.apache.phoenix.optimize.QueryOptimizer; http://git-wip-us.apache.org/repos/asf/phoenix/blob/02995aa3/phoenix-core/src/main/java/org/apache/phoenix/schema/ColumnRef.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/ColumnRef.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/ColumnRef.java index fa3156d..c7fdbf6 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/ColumnRef.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/ColumnRef.java @@ -21,8 +21,9 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.Arrays; +import net.jcip.annotations.Immutable; + import org.apache.hadoop.hbase.io.ImmutableBytesWritable; -import org.apache.http.annotation.Immutable; import org.apache.phoenix.compile.ExpressionCompiler; import org.apache.phoenix.compile.StatementContext; import org.apache.phoenix.expression.Expression; http://git-wip-us.apache.org/repos/asf/phoenix/blob/02995aa3/phoenix-core/src/main/java/org/apache/phoenix/schema/KeyValueSchema.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/KeyValueSchema.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/KeyValueSchema.java index 1ab8c86..1090691 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/KeyValueSchema.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/KeyValueSchema.java @@ -19,9 +19,10 @@ package org.apache.phoenix.schema; import java.util.List; +import net.jcip.annotations.Immutable; + import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.io.WritableUtils; -import org.apache.http.annotation.Immutable; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.expression.Expression; http://git-wip-us.apache.org/repos/asf/phoenix/blob/02995aa3/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java index 3f19a6e..dd1f6ec 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java @@ -17,8 +17,9 @@ */ package org.apache.phoenix.schema; +import net.jcip.annotations.Immutable; + import org.apache.hadoop.hbase.util.Bytes; -import org.apache.http.annotation.Immutable; import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.util.SizedUtil; @@ -106,4 +107,4 @@ public class PNameImpl implements PName { public String toString() { return data.stringName; } -} \ No newline at end of file +}
