You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/04/11 05:52:57 UTC

svn commit: r1466761 [21/41] - in /hbase/branches/0.95: ./ hbase-client/src/main/java/org/apache/hadoop/hbase/ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ hbase-p...

Modified: hbase/branches/0.95/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java?rev=1466761&r1=1466760&r2=1466761&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java (original)
+++ hbase/branches/0.95/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java Thu Apr 11 03:52:56 2013
@@ -10,228 +10,108 @@ public final class RPCProtos {
   }
   public interface UserInformationOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-
+    
     // required string effectiveUser = 1;
-    /**
-     * <code>required string effectiveUser = 1;</code>
-     */
     boolean hasEffectiveUser();
-    /**
-     * <code>required string effectiveUser = 1;</code>
-     */
-    java.lang.String getEffectiveUser();
-    /**
-     * <code>required string effectiveUser = 1;</code>
-     */
-    com.google.protobuf.ByteString
-        getEffectiveUserBytes();
-
+    String getEffectiveUser();
+    
     // optional string realUser = 2;
-    /**
-     * <code>optional string realUser = 2;</code>
-     */
     boolean hasRealUser();
-    /**
-     * <code>optional string realUser = 2;</code>
-     */
-    java.lang.String getRealUser();
-    /**
-     * <code>optional string realUser = 2;</code>
-     */
-    com.google.protobuf.ByteString
-        getRealUserBytes();
+    String getRealUser();
   }
-  /**
-   * Protobuf type {@code UserInformation}
-   *
-   * <pre>
-   * User Information proto.  Included in ConnectionHeader on connection setup
-   * </pre>
-   */
   public static final class UserInformation extends
       com.google.protobuf.GeneratedMessage
       implements UserInformationOrBuilder {
     // Use UserInformation.newBuilder() to construct.
-    private UserInformation(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private UserInformation(Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private UserInformation(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
+    private UserInformation(boolean noInit) {}
+    
     private static final UserInformation defaultInstance;
     public static UserInformation getDefaultInstance() {
       return defaultInstance;
     }
-
+    
     public UserInformation getDefaultInstanceForType() {
       return defaultInstance;
     }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private UserInformation(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              effectiveUser_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              realUser_ = input.readBytes();
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+    
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_descriptor;
     }
-
+    
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<UserInformation> PARSER =
-        new com.google.protobuf.AbstractParser<UserInformation>() {
-      public UserInformation parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new UserInformation(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<UserInformation> getParserForType() {
-      return PARSER;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_fieldAccessorTable;
     }
-
+    
     private int bitField0_;
     // required string effectiveUser = 1;
     public static final int EFFECTIVEUSER_FIELD_NUMBER = 1;
     private java.lang.Object effectiveUser_;
-    /**
-     * <code>required string effectiveUser = 1;</code>
-     */
     public boolean hasEffectiveUser() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    /**
-     * <code>required string effectiveUser = 1;</code>
-     */
-    public java.lang.String getEffectiveUser() {
+    public String getEffectiveUser() {
       java.lang.Object ref = effectiveUser_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
+        String s = bs.toStringUtf8();
+        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
           effectiveUser_ = s;
         }
         return s;
       }
     }
-    /**
-     * <code>required string effectiveUser = 1;</code>
-     */
-    public com.google.protobuf.ByteString
-        getEffectiveUserBytes() {
+    private com.google.protobuf.ByteString getEffectiveUserBytes() {
       java.lang.Object ref = effectiveUser_;
-      if (ref instanceof java.lang.String) {
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         effectiveUser_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-
+    
     // optional string realUser = 2;
     public static final int REALUSER_FIELD_NUMBER = 2;
     private java.lang.Object realUser_;
-    /**
-     * <code>optional string realUser = 2;</code>
-     */
     public boolean hasRealUser() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    /**
-     * <code>optional string realUser = 2;</code>
-     */
-    public java.lang.String getRealUser() {
+    public String getRealUser() {
       java.lang.Object ref = realUser_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
+        String s = bs.toStringUtf8();
+        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
           realUser_ = s;
         }
         return s;
       }
     }
-    /**
-     * <code>optional string realUser = 2;</code>
-     */
-    public com.google.protobuf.ByteString
-        getRealUserBytes() {
+    private com.google.protobuf.ByteString getRealUserBytes() {
       java.lang.Object ref = realUser_;
-      if (ref instanceof java.lang.String) {
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         realUser_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-
+    
     private void initFields() {
       effectiveUser_ = "";
       realUser_ = "";
@@ -240,7 +120,7 @@ public final class RPCProtos {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-
+      
       if (!hasEffectiveUser()) {
         memoizedIsInitialized = 0;
         return false;
@@ -248,7 +128,7 @@ public final class RPCProtos {
       memoizedIsInitialized = 1;
       return true;
     }
-
+    
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -260,12 +140,12 @@ public final class RPCProtos {
       }
       getUnknownFields().writeTo(output);
     }
-
+    
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-
+    
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -279,14 +159,14 @@ public final class RPCProtos {
       memoizedSerializedSize = size;
       return size;
     }
-
+    
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-
+    
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -296,7 +176,7 @@ public final class RPCProtos {
         return super.equals(obj);
       }
       org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation other = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation) obj;
-
+      
       boolean result = true;
       result = result && (hasEffectiveUser() == other.hasEffectiveUser());
       if (hasEffectiveUser()) {
@@ -312,13 +192,9 @@ public final class RPCProtos {
           getUnknownFields().equals(other.getUnknownFields());
       return result;
     }
-
-    private int memoizedHashCode = 0;
+    
     @java.lang.Override
     public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
       int hash = 41;
       hash = (19 * hash) + getDescriptorForType().hashCode();
       if (hasEffectiveUser()) {
@@ -330,83 +206,89 @@ public final class RPCProtos {
         hash = (53 * hash) + getRealUser().hashCode();
       }
       hash = (29 * hash) + getUnknownFields().hashCode();
-      memoizedHashCode = hash;
       return hash;
     }
-
+    
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
-
+    
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-
+    
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-    /**
-     * Protobuf type {@code UserInformation}
-     *
-     * <pre>
-     * User Information proto.  Included in ConnectionHeader on connection setup
-     * </pre>
-     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder {
@@ -414,21 +296,18 @@ public final class RPCProtos {
           getDescriptor() {
         return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_descriptor;
       }
-
+      
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder.class);
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_fieldAccessorTable;
       }
-
+      
       // Construct using org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -439,7 +318,7 @@ public final class RPCProtos {
       private static Builder create() {
         return new Builder();
       }
-
+      
       public Builder clear() {
         super.clear();
         effectiveUser_ = "";
@@ -448,20 +327,20 @@ public final class RPCProtos {
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
-
+      
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-
+      
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDescriptor();
       }
-
+      
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getDefaultInstanceForType() {
         return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       }
-
+      
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation build() {
         org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation result = buildPartial();
         if (!result.isInitialized()) {
@@ -469,7 +348,17 @@ public final class RPCProtos {
         }
         return result;
       }
-
+      
+      private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation buildParsed()
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(
+            result).asInvalidProtocolBufferException();
+        }
+        return result;
+      }
+      
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation buildPartial() {
         org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation result = new org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation(this);
         int from_bitField0_ = bitField0_;
@@ -486,7 +375,7 @@ public final class RPCProtos {
         onBuilt();
         return result;
       }
-
+      
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation) {
           return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation)other);
@@ -495,23 +384,19 @@ public final class RPCProtos {
           return this;
         }
       }
-
+      
       public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation other) {
         if (other == org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance()) return this;
         if (other.hasEffectiveUser()) {
-          bitField0_ |= 0x00000001;
-          effectiveUser_ = other.effectiveUser_;
-          onChanged();
+          setEffectiveUser(other.getEffectiveUser());
         }
         if (other.hasRealUser()) {
-          bitField0_ |= 0x00000002;
-          realUser_ = other.realUser_;
-          onChanged();
+          setRealUser(other.getRealUser());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-
+      
       public final boolean isInitialized() {
         if (!hasEffectiveUser()) {
           
@@ -519,69 +404,62 @@ public final class RPCProtos {
         }
         return true;
       }
-
+      
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder(
+            this.getUnknownFields());
+        while (true) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              this.setUnknownFields(unknownFields.build());
+              onChanged();
+              return this;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                this.setUnknownFields(unknownFields.build());
+                onChanged();
+                return this;
+              }
+              break;
+            }
+            case 10: {
+              bitField0_ |= 0x00000001;
+              effectiveUser_ = input.readBytes();
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              realUser_ = input.readBytes();
+              break;
+            }
           }
         }
-        return this;
       }
+      
       private int bitField0_;
-
+      
       // required string effectiveUser = 1;
       private java.lang.Object effectiveUser_ = "";
-      /**
-       * <code>required string effectiveUser = 1;</code>
-       */
       public boolean hasEffectiveUser() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      /**
-       * <code>required string effectiveUser = 1;</code>
-       */
-      public java.lang.String getEffectiveUser() {
+      public String getEffectiveUser() {
         java.lang.Object ref = effectiveUser_;
-        if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
+        if (!(ref instanceof String)) {
+          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
           effectiveUser_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
+          return (String) ref;
         }
       }
-      /**
-       * <code>required string effectiveUser = 1;</code>
-       */
-      public com.google.protobuf.ByteString
-          getEffectiveUserBytes() {
-        java.lang.Object ref = effectiveUser_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          effectiveUser_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>required string effectiveUser = 1;</code>
-       */
-      public Builder setEffectiveUser(
-          java.lang.String value) {
+      public Builder setEffectiveUser(String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -590,72 +468,34 @@ public final class RPCProtos {
         onChanged();
         return this;
       }
-      /**
-       * <code>required string effectiveUser = 1;</code>
-       */
       public Builder clearEffectiveUser() {
         bitField0_ = (bitField0_ & ~0x00000001);
         effectiveUser_ = getDefaultInstance().getEffectiveUser();
         onChanged();
         return this;
       }
-      /**
-       * <code>required string effectiveUser = 1;</code>
-       */
-      public Builder setEffectiveUserBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+      void setEffectiveUser(com.google.protobuf.ByteString value) {
+        bitField0_ |= 0x00000001;
         effectiveUser_ = value;
         onChanged();
-        return this;
       }
-
+      
       // optional string realUser = 2;
       private java.lang.Object realUser_ = "";
-      /**
-       * <code>optional string realUser = 2;</code>
-       */
       public boolean hasRealUser() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      /**
-       * <code>optional string realUser = 2;</code>
-       */
-      public java.lang.String getRealUser() {
+      public String getRealUser() {
         java.lang.Object ref = realUser_;
-        if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
+        if (!(ref instanceof String)) {
+          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
           realUser_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
+          return (String) ref;
         }
       }
-      /**
-       * <code>optional string realUser = 2;</code>
-       */
-      public com.google.protobuf.ByteString
-          getRealUserBytes() {
-        java.lang.Object ref = realUser_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          realUser_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>optional string realUser = 2;</code>
-       */
-      public Builder setRealUser(
-          java.lang.String value) {
+      public Builder setRealUser(String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -664,436 +504,187 @@ public final class RPCProtos {
         onChanged();
         return this;
       }
-      /**
-       * <code>optional string realUser = 2;</code>
-       */
       public Builder clearRealUser() {
         bitField0_ = (bitField0_ & ~0x00000002);
         realUser_ = getDefaultInstance().getRealUser();
         onChanged();
         return this;
       }
-      /**
-       * <code>optional string realUser = 2;</code>
-       */
-      public Builder setRealUserBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+      void setRealUser(com.google.protobuf.ByteString value) {
+        bitField0_ |= 0x00000002;
         realUser_ = value;
         onChanged();
-        return this;
       }
-
+      
       // @@protoc_insertion_point(builder_scope:UserInformation)
     }
-
+    
     static {
       defaultInstance = new UserInformation(true);
       defaultInstance.initFields();
     }
-
+    
     // @@protoc_insertion_point(class_scope:UserInformation)
   }
-
+  
   public interface ConnectionHeaderOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-
+    
     // optional .UserInformation userInfo = 1;
-    /**
-     * <code>optional .UserInformation userInfo = 1;</code>
-     */
     boolean hasUserInfo();
-    /**
-     * <code>optional .UserInformation userInfo = 1;</code>
-     */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
-    /**
-     * <code>optional .UserInformation userInfo = 1;</code>
-     */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
-
+    
     // optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];
-    /**
-     * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-     */
     boolean hasProtocol();
-    /**
-     * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-     */
-    java.lang.String getProtocol();
-    /**
-     * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-     */
-    com.google.protobuf.ByteString
-        getProtocolBytes();
-
+    String getProtocol();
+    
     // optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];
-    /**
-     * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-     *
-     * <pre>
-     * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-     * if cannot deal.
-     * </pre>
-     */
     boolean hasCellBlockCodecClass();
-    /**
-     * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-     *
-     * <pre>
-     * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-     * if cannot deal.
-     * </pre>
-     */
-    java.lang.String getCellBlockCodecClass();
-    /**
-     * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-     *
-     * <pre>
-     * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-     * if cannot deal.
-     * </pre>
-     */
-    com.google.protobuf.ByteString
-        getCellBlockCodecClassBytes();
-
+    String getCellBlockCodecClass();
+    
     // optional string cellBlockCompressorClass = 4;
-    /**
-     * <code>optional string cellBlockCompressorClass = 4;</code>
-     *
-     * <pre>
-     * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-     * Class must implement hadoop's CompressionCodec Interface
-     * </pre>
-     */
     boolean hasCellBlockCompressorClass();
-    /**
-     * <code>optional string cellBlockCompressorClass = 4;</code>
-     *
-     * <pre>
-     * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-     * Class must implement hadoop's CompressionCodec Interface
-     * </pre>
-     */
-    java.lang.String getCellBlockCompressorClass();
-    /**
-     * <code>optional string cellBlockCompressorClass = 4;</code>
-     *
-     * <pre>
-     * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-     * Class must implement hadoop's CompressionCodec Interface
-     * </pre>
-     */
-    com.google.protobuf.ByteString
-        getCellBlockCompressorClassBytes();
+    String getCellBlockCompressorClass();
   }
-  /**
-   * Protobuf type {@code ConnectionHeader}
-   *
-   * <pre>
-   * This is sent on connection setup after the connection preamble is sent.
-   * </pre>
-   */
   public static final class ConnectionHeader extends
       com.google.protobuf.GeneratedMessage
       implements ConnectionHeaderOrBuilder {
     // Use ConnectionHeader.newBuilder() to construct.
-    private ConnectionHeader(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ConnectionHeader(Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private ConnectionHeader(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
+    private ConnectionHeader(boolean noInit) {}
+    
     private static final ConnectionHeader defaultInstance;
     public static ConnectionHeader getDefaultInstance() {
       return defaultInstance;
     }
-
+    
     public ConnectionHeader getDefaultInstanceForType() {
       return defaultInstance;
     }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ConnectionHeader(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) == 0x00000001)) {
-                subBuilder = userInfo_.toBuilder();
-              }
-              userInfo_ = input.readMessage(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(userInfo_);
-                userInfo_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              protocol_ = input.readBytes();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              cellBlockCodecClass_ = input.readBytes();
-              break;
-            }
-            case 34: {
-              bitField0_ |= 0x00000008;
-              cellBlockCompressorClass_ = input.readBytes();
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+    
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_descriptor;
     }
-
+    
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<ConnectionHeader> PARSER =
-        new com.google.protobuf.AbstractParser<ConnectionHeader>() {
-      public ConnectionHeader parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ConnectionHeader(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ConnectionHeader> getParserForType() {
-      return PARSER;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_fieldAccessorTable;
     }
-
+    
     private int bitField0_;
     // optional .UserInformation userInfo = 1;
     public static final int USERINFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
-    /**
-     * <code>optional .UserInformation userInfo = 1;</code>
-     */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    /**
-     * <code>optional .UserInformation userInfo = 1;</code>
-     */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
-    /**
-     * <code>optional .UserInformation userInfo = 1;</code>
-     */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
     }
-
+    
     // optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];
     public static final int PROTOCOL_FIELD_NUMBER = 2;
     private java.lang.Object protocol_;
-    /**
-     * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-     */
     public boolean hasProtocol() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    /**
-     * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-     */
-    public java.lang.String getProtocol() {
+    public String getProtocol() {
       java.lang.Object ref = protocol_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
+        String s = bs.toStringUtf8();
+        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
           protocol_ = s;
         }
         return s;
       }
     }
-    /**
-     * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-     */
-    public com.google.protobuf.ByteString
-        getProtocolBytes() {
+    private com.google.protobuf.ByteString getProtocolBytes() {
       java.lang.Object ref = protocol_;
-      if (ref instanceof java.lang.String) {
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         protocol_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-
+    
     // optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];
     public static final int CELLBLOCKCODECCLASS_FIELD_NUMBER = 3;
     private java.lang.Object cellBlockCodecClass_;
-    /**
-     * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-     *
-     * <pre>
-     * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-     * if cannot deal.
-     * </pre>
-     */
     public boolean hasCellBlockCodecClass() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
-    /**
-     * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-     *
-     * <pre>
-     * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-     * if cannot deal.
-     * </pre>
-     */
-    public java.lang.String getCellBlockCodecClass() {
+    public String getCellBlockCodecClass() {
       java.lang.Object ref = cellBlockCodecClass_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
+        String s = bs.toStringUtf8();
+        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
           cellBlockCodecClass_ = s;
         }
         return s;
       }
     }
-    /**
-     * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-     *
-     * <pre>
-     * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-     * if cannot deal.
-     * </pre>
-     */
-    public com.google.protobuf.ByteString
-        getCellBlockCodecClassBytes() {
+    private com.google.protobuf.ByteString getCellBlockCodecClassBytes() {
       java.lang.Object ref = cellBlockCodecClass_;
-      if (ref instanceof java.lang.String) {
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         cellBlockCodecClass_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-
+    
     // optional string cellBlockCompressorClass = 4;
     public static final int CELLBLOCKCOMPRESSORCLASS_FIELD_NUMBER = 4;
     private java.lang.Object cellBlockCompressorClass_;
-    /**
-     * <code>optional string cellBlockCompressorClass = 4;</code>
-     *
-     * <pre>
-     * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-     * Class must implement hadoop's CompressionCodec Interface
-     * </pre>
-     */
     public boolean hasCellBlockCompressorClass() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
-    /**
-     * <code>optional string cellBlockCompressorClass = 4;</code>
-     *
-     * <pre>
-     * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-     * Class must implement hadoop's CompressionCodec Interface
-     * </pre>
-     */
-    public java.lang.String getCellBlockCompressorClass() {
+    public String getCellBlockCompressorClass() {
       java.lang.Object ref = cellBlockCompressorClass_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
+      if (ref instanceof String) {
+        return (String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
+        String s = bs.toStringUtf8();
+        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
           cellBlockCompressorClass_ = s;
         }
         return s;
       }
     }
-    /**
-     * <code>optional string cellBlockCompressorClass = 4;</code>
-     *
-     * <pre>
-     * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-     * Class must implement hadoop's CompressionCodec Interface
-     * </pre>
-     */
-    public com.google.protobuf.ByteString
-        getCellBlockCompressorClassBytes() {
+    private com.google.protobuf.ByteString getCellBlockCompressorClassBytes() {
       java.lang.Object ref = cellBlockCompressorClass_;
-      if (ref instanceof java.lang.String) {
+      if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
         cellBlockCompressorClass_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
-
+    
     private void initFields() {
       userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       protocol_ = "org.apache.hadoop.hbase.client.ClientProtocol";
@@ -1104,7 +695,7 @@ public final class RPCProtos {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-
+      
       if (hasUserInfo()) {
         if (!getUserInfo().isInitialized()) {
           memoizedIsInitialized = 0;
@@ -1114,7 +705,7 @@ public final class RPCProtos {
       memoizedIsInitialized = 1;
       return true;
     }
-
+    
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -1132,12 +723,12 @@ public final class RPCProtos {
       }
       getUnknownFields().writeTo(output);
     }
-
+    
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-
+    
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -1159,14 +750,14 @@ public final class RPCProtos {
       memoizedSerializedSize = size;
       return size;
     }
-
+    
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-
+    
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1176,7 +767,7 @@ public final class RPCProtos {
         return super.equals(obj);
       }
       org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader other = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader) obj;
-
+      
       boolean result = true;
       result = result && (hasUserInfo() == other.hasUserInfo());
       if (hasUserInfo()) {
@@ -1202,13 +793,9 @@ public final class RPCProtos {
           getUnknownFields().equals(other.getUnknownFields());
       return result;
     }
-
-    private int memoizedHashCode = 0;
+    
     @java.lang.Override
     public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
       int hash = 41;
       hash = (19 * hash) + getDescriptorForType().hashCode();
       if (hasUserInfo()) {
@@ -1228,83 +815,89 @@ public final class RPCProtos {
         hash = (53 * hash) + getCellBlockCompressorClass().hashCode();
       }
       hash = (29 * hash) + getUnknownFields().hashCode();
-      memoizedHashCode = hash;
       return hash;
     }
-
+    
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
-
+    
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-
+    
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-    /**
-     * Protobuf type {@code ConnectionHeader}
-     *
-     * <pre>
-     * This is sent on connection setup after the connection preamble is sent.
-     * </pre>
-     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeaderOrBuilder {
@@ -1312,21 +905,18 @@ public final class RPCProtos {
           getDescriptor() {
         return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_descriptor;
       }
-
+      
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.Builder.class);
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_fieldAccessorTable;
       }
-
+      
       // Construct using org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -1338,7 +928,7 @@ public final class RPCProtos {
       private static Builder create() {
         return new Builder();
       }
-
+      
       public Builder clear() {
         super.clear();
         if (userInfoBuilder_ == null) {
@@ -1355,20 +945,20 @@ public final class RPCProtos {
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
-
+      
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-
+      
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.getDescriptor();
       }
-
+      
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader getDefaultInstanceForType() {
         return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.getDefaultInstance();
       }
-
+      
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader build() {
         org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader result = buildPartial();
         if (!result.isInitialized()) {
@@ -1376,7 +966,17 @@ public final class RPCProtos {
         }
         return result;
       }
-
+      
+      private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader buildParsed()
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(
+            result).asInvalidProtocolBufferException();
+        }
+        return result;
+      }
+      
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader buildPartial() {
         org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader result = new org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader(this);
         int from_bitField0_ = bitField0_;
@@ -1405,7 +1005,7 @@ public final class RPCProtos {
         onBuilt();
         return result;
       }
-
+      
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader) {
           return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader)other);
@@ -1414,31 +1014,25 @@ public final class RPCProtos {
           return this;
         }
       }
-
+      
       public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader other) {
         if (other == org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.getDefaultInstance()) return this;
         if (other.hasUserInfo()) {
           mergeUserInfo(other.getUserInfo());
         }
         if (other.hasProtocol()) {
-          bitField0_ |= 0x00000002;
-          protocol_ = other.protocol_;
-          onChanged();
+          setProtocol(other.getProtocol());
         }
         if (other.hasCellBlockCodecClass()) {
-          bitField0_ |= 0x00000004;
-          cellBlockCodecClass_ = other.cellBlockCodecClass_;
-          onChanged();
+          setCellBlockCodecClass(other.getCellBlockCodecClass());
         }
         if (other.hasCellBlockCompressorClass()) {
-          bitField0_ |= 0x00000008;
-          cellBlockCompressorClass_ = other.cellBlockCompressorClass_;
-          onChanged();
+          setCellBlockCompressorClass(other.getCellBlockCompressorClass());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-
+      
       public final boolean isInitialized() {
         if (hasUserInfo()) {
           if (!getUserInfo().isInitialized()) {
@@ -1448,39 +1042,67 @@ public final class RPCProtos {
         }
         return true;
       }
-
+      
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder(
+            this.getUnknownFields());
+        while (true) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              this.setUnknownFields(unknownFields.build());
+              onChanged();
+              return this;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                this.setUnknownFields(unknownFields.build());
+                onChanged();
+                return this;
+              }
+              break;
+            }
+            case 10: {
+              org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder subBuilder = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.newBuilder();
+              if (hasUserInfo()) {
+                subBuilder.mergeFrom(getUserInfo());
+              }
+              input.readMessage(subBuilder, extensionRegistry);
+              setUserInfo(subBuilder.buildPartial());
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              protocol_ = input.readBytes();
+              break;
+            }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              cellBlockCodecClass_ = input.readBytes();
+              break;
+            }
+            case 34: {
+              bitField0_ |= 0x00000008;
+              cellBlockCompressorClass_ = input.readBytes();
+              break;
+            }
           }
         }
-        return this;
       }
+      
       private int bitField0_;
-
+      
       // optional .UserInformation userInfo = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
-      /**
-       * <code>optional .UserInformation userInfo = 1;</code>
-       */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      /**
-       * <code>optional .UserInformation userInfo = 1;</code>
-       */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
           return userInfo_;
@@ -1488,9 +1110,6 @@ public final class RPCProtos {
           return userInfoBuilder_.getMessage();
         }
       }
-      /**
-       * <code>optional .UserInformation userInfo = 1;</code>
-       */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
           if (value == null) {
@@ -1504,9 +1123,6 @@ public final class RPCProtos {
         bitField0_ |= 0x00000001;
         return this;
       }
-      /**
-       * <code>optional .UserInformation userInfo = 1;</code>
-       */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
         if (userInfoBuilder_ == null) {
@@ -1518,9 +1134,6 @@ public final class RPCProtos {
         bitField0_ |= 0x00000001;
         return this;
       }
-      /**
-       * <code>optional .UserInformation userInfo = 1;</code>
-       */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
@@ -1537,9 +1150,6 @@ public final class RPCProtos {
         bitField0_ |= 0x00000001;
         return this;
       }
-      /**
-       * <code>optional .UserInformation userInfo = 1;</code>
-       */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
           userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
@@ -1550,17 +1160,11 @@ public final class RPCProtos {
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
-      /**
-       * <code>optional .UserInformation userInfo = 1;</code>
-       */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getUserInfoFieldBuilder().getBuilder();
       }
-      /**
-       * <code>optional .UserInformation userInfo = 1;</code>
-       */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
           return userInfoBuilder_.getMessageOrBuilder();
@@ -1568,9 +1172,6 @@ public final class RPCProtos {
           return userInfo_;
         }
       }
-      /**
-       * <code>optional .UserInformation userInfo = 1;</code>
-       */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
           getUserInfoFieldBuilder() {
@@ -1584,50 +1185,23 @@ public final class RPCProtos {
         }
         return userInfoBuilder_;
       }
-
+      
       // optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];
       private java.lang.Object protocol_ = "org.apache.hadoop.hbase.client.ClientProtocol";
-      /**
-       * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-       */
       public boolean hasProtocol() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      /**
-       * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-       */
-      public java.lang.String getProtocol() {
+      public String getProtocol() {
         java.lang.Object ref = protocol_;
-        if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
+        if (!(ref instanceof String)) {
+          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
           protocol_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-       */
-      public com.google.protobuf.ByteString
-          getProtocolBytes() {
-        java.lang.Object ref = protocol_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          protocol_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
+          return (String) ref;
         }
       }
-      /**
-       * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-       */
-      public Builder setProtocol(
-          java.lang.String value) {
+      public Builder setProtocol(String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1636,92 +1210,34 @@ public final class RPCProtos {
         onChanged();
         return this;
       }
-      /**
-       * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-       */
       public Builder clearProtocol() {
         bitField0_ = (bitField0_ & ~0x00000002);
         protocol_ = getDefaultInstance().getProtocol();
         onChanged();
         return this;
       }
-      /**
-       * <code>optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];</code>
-       */
-      public Builder setProtocolBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+      void setProtocol(com.google.protobuf.ByteString value) {
+        bitField0_ |= 0x00000002;
         protocol_ = value;
         onChanged();
-        return this;
       }
-
+      
       // optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];
       private java.lang.Object cellBlockCodecClass_ = "org.apache.hadoop.hbase.codec.KeyValueCodec";
-      /**
-       * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-       *
-       * <pre>
-       * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-       * if cannot deal.
-       * </pre>
-       */
       public boolean hasCellBlockCodecClass() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
-      /**
-       * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-       *
-       * <pre>
-       * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-       * if cannot deal.
-       * </pre>
-       */
-      public java.lang.String getCellBlockCodecClass() {
+      public String getCellBlockCodecClass() {
         java.lang.Object ref = cellBlockCodecClass_;
-        if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
+        if (!(ref instanceof String)) {
+          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
           cellBlockCodecClass_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
+          return (String) ref;
         }
       }
-      /**
-       * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-       *
-       * <pre>
-       * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-       * if cannot deal.
-       * </pre>
-       */
-      public com.google.protobuf.ByteString
-          getCellBlockCodecClassBytes() {
-        java.lang.Object ref = cellBlockCodecClass_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          cellBlockCodecClass_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-       *
-       * <pre>
-       * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-       * if cannot deal.
-       * </pre>
-       */
-      public Builder setCellBlockCodecClass(
-          java.lang.String value) {
+      public Builder setCellBlockCodecClass(String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1730,102 +1246,34 @@ public final class RPCProtos {
         onChanged();
         return this;
       }
-      /**
-       * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-       *
-       * <pre>
-       * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-       * if cannot deal.
-       * </pre>
-       */
       public Builder clearCellBlockCodecClass() {
         bitField0_ = (bitField0_ & ~0x00000004);
         cellBlockCodecClass_ = getDefaultInstance().getCellBlockCodecClass();
         onChanged();
         return this;
       }
-      /**
-       * <code>optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];</code>
-       *
-       * <pre>
-       * Cell block codec we will use sending over optional cell blocks.  Server throws exception
-       * if cannot deal.
-       * </pre>
-       */
-      public Builder setCellBlockCodecClassBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
+      void setCellBlockCodecClass(com.google.protobuf.ByteString value) {
+        bitField0_ |= 0x00000004;
         cellBlockCodecClass_ = value;
         onChanged();
-        return this;
       }
-
+      
       // optional string cellBlockCompressorClass = 4;
       private java.lang.Object cellBlockCompressorClass_ = "";
-      /**
-       * <code>optional string cellBlockCompressorClass = 4;</code>
-       *
-       * <pre>
-       * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-       * Class must implement hadoop's CompressionCodec Interface
-       * </pre>
-       */
       public boolean hasCellBlockCompressorClass() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
-      /**
-       * <code>optional string cellBlockCompressorClass = 4;</code>
-       *
-       * <pre>
-       * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-       * Class must implement hadoop's CompressionCodec Interface
-       * </pre>
-       */
-      public java.lang.String getCellBlockCompressorClass() {
+      public String getCellBlockCompressorClass() {
         java.lang.Object ref = cellBlockCompressorClass_;
-        if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
+        if (!(ref instanceof String)) {
+          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
           cellBlockCompressorClass_ = s;
           return s;
         } else {
-          return (java.lang.String) ref;
+          return (String) ref;
         }
       }
-      /**
-       * <code>optional string cellBlockCompressorClass = 4;</code>
-       *
-       * <pre>
-       * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-       * Class must implement hadoop's CompressionCodec Interface
-       * </pre>
-       */
-      public com.google.protobuf.ByteString
-          getCellBlockCompressorClassBytes() {
-        java.lang.Object ref = cellBlockCompressorClass_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          cellBlockCompressorClass_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>optional string cellBlockCompressorClass = 4;</code>
-       *
-       * <pre>
-       * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-       * Class must implement hadoop's CompressionCodec Interface
-       * </pre>
-       */
-      public Builder setCellBlockCompressorClass(
-          java.lang.String value) {
+      public Builder setCellBlockCompressorClass(String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1834,195 +1282,75 @@ public final class RPCProtos {
         onChanged();
         return this;
       }
-      /**
-       * <code>optional string cellBlockCompressorClass = 4;</code>
-       *
-       * <pre>
-       * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-       * Class must implement hadoop's CompressionCodec Interface
-       * </pre>
-       */
       public Builder clearCellBlockCompressorClass() {
         bitField0_ = (bitField0_ & ~0x00000008);
         cellBlockCompressorClass_ = getDefaultInstance().getCellBlockCompressorClass();
         onChanged();
         return this;
       }
-      /**
-       * <code>optional string cellBlockCompressorClass = 4;</code>
-       *
-       * <pre>
-       * Compressor we will use if cell block is compressed.  Server will throw exception if not supported.
-       * Class must implement hadoop's CompressionCodec Interface
-       * </pre>
-       */
-      public Builder setCellBlockCompressorClassBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+      void setCellBlockCompressorClass(com.google.protobuf.ByteString value) {
+        bitField0_ |= 0x00000008;
         cellBlockCompressorClass_ = value;
         onChanged();
-        return this;
       }
-
+      
       // @@protoc_insertion_point(builder_scope:ConnectionHeader)
     }
-
+    
     static {
       defaultInstance = new ConnectionHeader(true);
       defaultInstance.initFields();
     }
-
+    
     // @@protoc_insertion_point(class_scope:ConnectionHeader)
   }
-
+  
   public interface CellBlockMetaOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-
+    
     // optional uint32 length = 1;
-    /**
-     * <code>optional uint32 length = 1;</code>
-     *
-     * <pre>
-     * Length of the following cell block.  Could calculate it but convenient having it too hand.
-     * </pre>
-     */
     boolean hasLength();
-    /**
-     * <code>optional uint32 length = 1;</code>
-     *
-     * <pre>
-     * Length of the following cell block.  Could calculate it but convenient having it too hand.
-     * </pre>
-     */
     int getLength();
   }
-  /**
-   * Protobuf type {@code CellBlockMeta}
-   *
-   * <pre>
-   * Optional Cell block Message.  Included in client RequestHeader
-   * </pre>
-   */
   public static final class CellBlockMeta extends
       com.google.protobuf.GeneratedMessage
       implements CellBlockMetaOrBuilder {
     // Use CellBlockMeta.newBuilder() to construct.
-    private CellBlockMeta(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private CellBlockMeta(Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private CellBlockMeta(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
+    private CellBlockMeta(boolean noInit) {}
+    
     private static final CellBlockMeta defaultInstance;
     public static CellBlockMeta getDefaultInstance() {
       return defaultInstance;
     }
-
+    
     public CellBlockMeta getDefaultInstanceForType() {
       return defaultInstance;
     }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CellBlockMeta(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              length_ = input.readUInt32();
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+    
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_descriptor;
     }
-
+    
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<CellBlockMeta> PARSER =
-        new com.google.protobuf.AbstractParser<CellBlockMeta>() {
-      public CellBlockMeta parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CellBlockMeta(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<CellBlockMeta> getParserForType() {
-      return PARSER;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_fieldAccessorTable;
     }
-
+    
     private int bitField0_;
     // optional uint32 length = 1;
     public static final int LENGTH_FIELD_NUMBER = 1;
     private int length_;
-    /**
-     * <code>optional uint32 length = 1;</code>
-     *
-     * <pre>
-     * Length of the following cell block.  Could calculate it but convenient having it too hand.
-     * </pre>
-     */
     public boolean hasLength() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    /**
-     * <code>optional uint32 length = 1;</code>
-     *
-     * <pre>
-     * Length of the following cell block.  Could calculate it but convenient having it too hand.
-     * </pre>
-     */
     public int getLength() {
       return length_;
     }
-
+    
     private void initFields() {
       length_ = 0;
     }
@@ -2030,11 +1358,11 @@ public final class RPCProtos {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-
+      
       memoizedIsInitialized = 1;
       return true;
     }
-
+    
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -2043,12 +1371,12 @@ public final class RPCProtos {
       }
       getUnknownFields().writeTo(output);
     }
-
+    
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-
+    
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -2058,14 +1386,14 @@ public final class RPCProtos {
       memoizedSerializedSize = size;
       return size;
     }
-
+    
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-
+    
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -2075,7 +1403,7 @@ public final class RPCProtos {
         return super.equals(obj);
       }
       org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta other = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta) obj;
-
+      
       boolean result = true;
       result = result && (hasLength() == other.hasLength());
       if (hasLength()) {
@@ -2086,13 +1414,9 @@ public final class RPCProtos {
           getUnknownFields().equals(other.getUnknownFields());
       return result;
     }
-
-    private int memoizedHashCode = 0;
+    
     @java.lang.Override
     public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
       int hash = 41;
       hash = (19 * hash) + getDescriptorForType().hashCode();
       if (hasLength()) {
@@ -2100,83 +1424,89 @@ public final class RPCProtos {
         hash = (53 * hash) + getLength();
       }
       hash = (29 * hash) + getUnknownFields().hashCode();
-      memoizedHashCode = hash;
       return hash;
     }
-
+    
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
-
+    
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-
+    
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-    /**
-     * Protobuf type {@code CellBlockMeta}
-     *
-     * <pre>
-     * Optional Cell block Message.  Included in client RequestHeader
-     * </pre>
-     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMetaOrBuilder {
@@ -2184,21 +1514,18 @@ public final class RPCProtos {
           getDescriptor() {
         return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_descriptor;
       }
-
+      
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.Builder.class);

[... 3703 lines stripped ...]