PHOENIX-2887 Uberjar application fail with 'IllegalAccessError: class com.google.protobuf.ZeroCopyLiteralByteString cannot access its superclass com.google.protobuf.LiteralByteString'
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4837f1ff Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4837f1ff Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4837f1ff Branch: refs/heads/4.x-HBase-0.98 Commit: 4837f1ff9d5a6265a07eecfc9d5d3ee55a56653f Parents: d45938c Author: Ankit Singhal <ankitsingha...@gmail.com> Authored: Mon May 16 12:46:43 2016 +0530 Committer: Ankit Singhal <ankitsingha...@gmail.com> Committed: Mon May 16 12:46:43 2016 +0530 ---------------------------------------------------------------------- .../java/org/apache/phoenix/cache/ServerCacheClient.java | 3 +-- .../src/main/java/org/apache/phoenix/schema/PTableImpl.java | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4837f1ff/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java index 424482a..aea15c2 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java @@ -71,7 +71,6 @@ import org.apache.phoenix.util.SQLCloseables; import org.apache.phoenix.util.ScanUtil; import com.google.common.collect.ImmutableSet; -import com.google.protobuf.HBaseZeroCopyByteString; /** * @@ -214,7 +213,7 @@ public class ServerCacheClient { ServerCacheFactoryProtos.ServerCacheFactory.Builder svrCacheFactoryBuider = ServerCacheFactoryProtos.ServerCacheFactory.newBuilder(); svrCacheFactoryBuider.setClassName(cacheFactory.getClass().getName()); builder.setCacheFactory(svrCacheFactoryBuider.build()); - builder.setTxState(HBaseZeroCopyByteString.wrap(txState)); + builder.setTxState(ByteStringer.wrap(txState)); instance.addServerCache(controller, builder.build(), rpcCallback); if(controller.getFailedOn() != null) { throw controller.getFailedOn(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/4837f1ff/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java index 70414d5..bd23ab8 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java @@ -66,8 +66,6 @@ import org.apache.phoenix.util.SizedUtil; import org.apache.phoenix.util.StringUtil; import org.apache.phoenix.util.TrustedByteArrayOutputStream; -import co.cask.tephra.TxConstants; - import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; @@ -77,9 +75,10 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.protobuf.HBaseZeroCopyByteString; import com.sun.istack.NotNull; +import co.cask.tephra.TxConstants; + /** * * Base class for PTable implementors. Provides abstraction for @@ -1069,8 +1068,7 @@ public class PTableImpl implements PTable { int maxLength = pGuidePosts.getMaxLength(); int guidePostsCount = pGuidePosts.getEncodedGuidePostsCount(); GuidePostsInfo info = new GuidePostsInfo(pGuidePosts.getByteCountsList(), - new ImmutableBytesWritable( - HBaseZeroCopyByteString.zeroCopyGetBytes(pGuidePosts.getEncodedGuidePosts())), + new ImmutableBytesWritable(pGuidePosts.getEncodedGuidePosts().toByteArray()), pGuidePosts.getRowCountsList(), maxLength, guidePostsCount); tableGuidePosts.put(pTableStatsProto.getKey().toByteArray(), info); }
