Skip to content

Commit

Permalink
PHOENIX-4946 Switch from HC's annotations (since removed) to JCIP ann…
Browse files Browse the repository at this point in the history
…otations

Avoids an old httpclient artifact conflicting with Hadoop3 implementation.

Signed-off-by: Sergey Soldatov <[email protected]>
  • Loading branch information
joshelser committed Oct 5, 2018
1 parent 612163c commit 84a5ac3
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 17 deletions.
6 changes: 0 additions & 6 deletions phoenix-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@

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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@

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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -106,4 +107,4 @@ public boolean equals(Object obj) {
public String toString() {
return data.stringName;
}
}
}

0 comments on commit 84a5ac3

Please sign in to comment.