You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2014/07/12 18:33:13 UTC
git commit: HBASE-11118 non environment variable solution for
"IllegalAccessError: class com.google.protobuf.ZeroCopyLiteralByteString
cannot access its superclass com.google.protobuf.LiteralByteString".
-Addendum
Repository: hbase
Updated Branches:
refs/heads/master 5a408af65 -> f5e13c746
HBASE-11118 non environment variable solution for "IllegalAccessError: class com.google.protobuf.ZeroCopyLiteralByteString cannot access its superclass com.google.protobuf.LiteralByteString". -Addendum
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f5e13c74
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f5e13c74
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f5e13c74
Branch: refs/heads/master
Commit: f5e13c7460dabd6909146e79f511af5bf7f5f977
Parents: 5a408af
Author: anoopsjohn <an...@gmail.com>
Authored: Sat Jul 12 22:02:26 2014 +0530
Committer: anoopsjohn <an...@gmail.com>
Committed: Sat Jul 12 22:02:26 2014 +0530
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java | 3 +--
.../org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 4 ++--
.../org/apache/hadoop/hbase/snapshot/SnapshotManifestV1.java | 5 ++---
.../org/apache/hadoop/hbase/snapshot/SnapshotManifestV2.java | 5 ++---
4 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f5e13c74/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
index 827ec79..a70b639 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
@@ -137,7 +137,6 @@ import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
import com.google.protobuf.ByteString;
-import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.Message;
import com.google.protobuf.Parser;
@@ -2496,7 +2495,7 @@ public final class ProtobufUtil {
for (Path outputPath : outputPaths) {
builder.addCompactionOutput(outputPath.getName());
}
- builder.setRegionName(HBaseZeroCopyByteString.wrap(info.getRegionName()));
+ builder.setRegionName(ByteStringer.wrap(info.getRegionName()));
return builder.build();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/f5e13c74/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index e1b8e3f..e974de6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -152,6 +152,7 @@ import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
import org.apache.hadoop.hbase.regionserver.wal.HLogSplitter;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
+import org.apache.hadoop.hbase.util.ByteStringer;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Counter;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@@ -161,7 +162,6 @@ import org.apache.hadoop.net.DNS;
import org.apache.zookeeper.KeeperException;
import com.google.protobuf.ByteString;
-import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.Message;
import com.google.protobuf.RpcController;
import com.google.protobuf.ServiceException;
@@ -1443,7 +1443,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
RollWALWriterResponse.Builder builder = RollWALWriterResponse.newBuilder();
if (regionsToFlush != null) {
for (byte[] region: regionsToFlush) {
- builder.addRegionToFlush(HBaseZeroCopyByteString.wrap(region));
+ builder.addRegionToFlush(ByteStringer.wrap(region));
}
}
return builder.build();
http://git-wip-us.apache.org/repos/asf/hbase/blob/f5e13c74/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifestV1.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifestV1.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifestV1.java
index 0da0367..8ecee6b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifestV1.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifestV1.java
@@ -40,11 +40,10 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptio
import org.apache.hadoop.hbase.protobuf.generated.SnapshotProtos.SnapshotRegionManifest;
import org.apache.hadoop.hbase.regionserver.HRegionFileSystem;
import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
+import org.apache.hadoop.hbase.util.ByteStringer;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.FSUtils;
-import com.google.protobuf.HBaseZeroCopyByteString;
-
/**
* DO NOT USE DIRECTLY. USE {@link SnapshotManifest}.
*
@@ -185,7 +184,7 @@ public class SnapshotManifestV1 {
// 2.1. build the snapshot reference for the store
SnapshotRegionManifest.FamilyFiles.Builder family =
SnapshotRegionManifest.FamilyFiles.newBuilder();
- family.setFamilyName(HBaseZeroCopyByteString.wrap(Bytes.toBytes(familyName)));
+ family.setFamilyName(ByteStringer.wrap(Bytes.toBytes(familyName)));
if (LOG.isDebugEnabled()) {
LOG.debug("Adding snapshot references for " + storeFiles + " hfiles");
http://git-wip-us.apache.org/repos/asf/hbase/blob/f5e13c74/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifestV2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifestV2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifestV2.java
index 585c454..96b9654 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifestV2.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifestV2.java
@@ -41,10 +41,9 @@ import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
import org.apache.hadoop.hbase.protobuf.generated.SnapshotProtos.SnapshotRegionManifest;
import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
+import org.apache.hadoop.hbase.util.ByteStringer;
import org.apache.hadoop.hbase.util.FSUtils;
-import com.google.protobuf.HBaseZeroCopyByteString;
-
/**
* DO NOT USE DIRECTLY. USE {@link SnapshotManifest}.
*
@@ -93,7 +92,7 @@ public class SnapshotManifestV2 {
final SnapshotRegionManifest.Builder region, final byte[] familyName) {
SnapshotRegionManifest.FamilyFiles.Builder family =
SnapshotRegionManifest.FamilyFiles.newBuilder();
- family.setFamilyName(HBaseZeroCopyByteString.wrap(familyName));
+ family.setFamilyName(ByteStringer.wrap(familyName));
return family;
}