hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [4/7] hbase git commit: HBASE-16780 Since move to protobuf3.1, Cells are limited to 64MB where previous they had no limit Update internal pb to 3.2 from 3.1.; AMENDMENT -- FORGOT TO REBUILD PBs
Date Mon, 03 Apr 2017 22:30:05 GMT
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Option.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Option.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Option.java
index 86f8d4b..cfd28c9 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Option.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Option.java
@@ -94,10 +94,13 @@ public  final class Option extends
   private volatile java.lang.Object name_;
   /**
    * <pre>
-   * The option's name. For example, `"java_package"`.
+   * The option's name. For protobuf built-in options (options defined in
+   * descriptor.proto), this is the short name. For example, `"map_entry"`.
+   * For custom options, it should be the fully-qualified name. For example,
+   * `"google.api.http"`.
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   public java.lang.String getName() {
     java.lang.Object ref = name_;
@@ -113,10 +116,13 @@ public  final class Option extends
   }
   /**
    * <pre>
-   * The option's name. For example, `"java_package"`.
+   * The option's name. For protobuf built-in options (options defined in
+   * descriptor.proto), this is the short name. For example, `"map_entry"`.
+   * For custom options, it should be the fully-qualified name. For example,
+   * `"google.api.http"`.
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
       getNameBytes() {
@@ -136,30 +142,39 @@ public  final class Option extends
   private org.apache.hadoop.hbase.shaded.com.google.protobuf.Any value_;
   /**
    * <pre>
-   * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+   * The option's value packed in an Any message. If the value is a primitive,
+   * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+   * should be used. If the value is an enum, it should be stored as an int32
+   * value using the google.protobuf.Int32Value type.
    * </pre>
    *
-   * <code>optional .google.protobuf.Any value = 2;</code>
+   * <code>.google.protobuf.Any value = 2;</code>
    */
   public boolean hasValue() {
     return value_ != null;
   }
   /**
    * <pre>
-   * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+   * The option's value packed in an Any message. If the value is a primitive,
+   * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+   * should be used. If the value is an enum, it should be stored as an int32
+   * value using the google.protobuf.Int32Value type.
    * </pre>
    *
-   * <code>optional .google.protobuf.Any value = 2;</code>
+   * <code>.google.protobuf.Any value = 2;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.Any getValue() {
     return value_ == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.Any.getDefaultInstance() : value_;
   }
   /**
    * <pre>
-   * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+   * The option's value packed in an Any message. If the value is a primitive,
+   * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+   * should be used. If the value is an enum, it should be stored as an int32
+   * value using the google.protobuf.Int32Value type.
    * </pre>
    *
-   * <code>optional .google.protobuf.Any value = 2;</code>
+   * <code>.google.protobuf.Any value = 2;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.AnyOrBuilder getValueOrBuilder() {
     return getValue();
@@ -229,7 +244,7 @@ public  final class Option extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
     if (hasValue()) {
@@ -472,10 +487,13 @@ public  final class Option extends
     private java.lang.Object name_ = "";
     /**
      * <pre>
-     * The option's name. For example, `"java_package"`.
+     * The option's name. For protobuf built-in options (options defined in
+     * descriptor.proto), this is the short name. For example, `"map_entry"`.
+     * For custom options, it should be the fully-qualified name. For example,
+     * `"google.api.http"`.
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
@@ -491,10 +509,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's name. For example, `"java_package"`.
+     * The option's name. For protobuf built-in options (options defined in
+     * descriptor.proto), this is the short name. For example, `"map_entry"`.
+     * For custom options, it should be the fully-qualified name. For example,
+     * `"google.api.http"`.
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
         getNameBytes() {
@@ -511,10 +532,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's name. For example, `"java_package"`.
+     * The option's name. For protobuf built-in options (options defined in
+     * descriptor.proto), this is the short name. For example, `"map_entry"`.
+     * For custom options, it should be the fully-qualified name. For example,
+     * `"google.api.http"`.
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder setName(
         java.lang.String value) {
@@ -528,10 +552,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's name. For example, `"java_package"`.
+     * The option's name. For protobuf built-in options (options defined in
+     * descriptor.proto), this is the short name. For example, `"map_entry"`.
+     * For custom options, it should be the fully-qualified name. For example,
+     * `"google.api.http"`.
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder clearName() {
       
@@ -541,10 +568,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's name. For example, `"java_package"`.
+     * The option's name. For protobuf built-in options (options defined in
+     * descriptor.proto), this is the short name. For example, `"map_entry"`.
+     * For custom options, it should be the fully-qualified name. For example,
+     * `"google.api.http"`.
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder setNameBytes(
         org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -563,20 +593,26 @@ public  final class Option extends
         org.apache.hadoop.hbase.shaded.com.google.protobuf.Any, org.apache.hadoop.hbase.shaded.com.google.protobuf.Any.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.AnyOrBuilder> valueBuilder_;
     /**
      * <pre>
-     * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+     * The option's value packed in an Any message. If the value is a primitive,
+     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+     * should be used. If the value is an enum, it should be stored as an int32
+     * value using the google.protobuf.Int32Value type.
      * </pre>
      *
-     * <code>optional .google.protobuf.Any value = 2;</code>
+     * <code>.google.protobuf.Any value = 2;</code>
      */
     public boolean hasValue() {
       return valueBuilder_ != null || value_ != null;
     }
     /**
      * <pre>
-     * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+     * The option's value packed in an Any message. If the value is a primitive,
+     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+     * should be used. If the value is an enum, it should be stored as an int32
+     * value using the google.protobuf.Int32Value type.
      * </pre>
      *
-     * <code>optional .google.protobuf.Any value = 2;</code>
+     * <code>.google.protobuf.Any value = 2;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.Any getValue() {
       if (valueBuilder_ == null) {
@@ -587,10 +623,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+     * The option's value packed in an Any message. If the value is a primitive,
+     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+     * should be used. If the value is an enum, it should be stored as an int32
+     * value using the google.protobuf.Int32Value type.
      * </pre>
      *
-     * <code>optional .google.protobuf.Any value = 2;</code>
+     * <code>.google.protobuf.Any value = 2;</code>
      */
     public Builder setValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.Any value) {
       if (valueBuilder_ == null) {
@@ -607,10 +646,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+     * The option's value packed in an Any message. If the value is a primitive,
+     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+     * should be used. If the value is an enum, it should be stored as an int32
+     * value using the google.protobuf.Int32Value type.
      * </pre>
      *
-     * <code>optional .google.protobuf.Any value = 2;</code>
+     * <code>.google.protobuf.Any value = 2;</code>
      */
     public Builder setValue(
         org.apache.hadoop.hbase.shaded.com.google.protobuf.Any.Builder builderForValue) {
@@ -625,10 +667,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+     * The option's value packed in an Any message. If the value is a primitive,
+     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+     * should be used. If the value is an enum, it should be stored as an int32
+     * value using the google.protobuf.Int32Value type.
      * </pre>
      *
-     * <code>optional .google.protobuf.Any value = 2;</code>
+     * <code>.google.protobuf.Any value = 2;</code>
      */
     public Builder mergeValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.Any value) {
       if (valueBuilder_ == null) {
@@ -647,10 +692,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+     * The option's value packed in an Any message. If the value is a primitive,
+     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+     * should be used. If the value is an enum, it should be stored as an int32
+     * value using the google.protobuf.Int32Value type.
      * </pre>
      *
-     * <code>optional .google.protobuf.Any value = 2;</code>
+     * <code>.google.protobuf.Any value = 2;</code>
      */
     public Builder clearValue() {
       if (valueBuilder_ == null) {
@@ -665,10 +713,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+     * The option's value packed in an Any message. If the value is a primitive,
+     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+     * should be used. If the value is an enum, it should be stored as an int32
+     * value using the google.protobuf.Int32Value type.
      * </pre>
      *
-     * <code>optional .google.protobuf.Any value = 2;</code>
+     * <code>.google.protobuf.Any value = 2;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.Any.Builder getValueBuilder() {
       
@@ -677,10 +728,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+     * The option's value packed in an Any message. If the value is a primitive,
+     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+     * should be used. If the value is an enum, it should be stored as an int32
+     * value using the google.protobuf.Int32Value type.
      * </pre>
      *
-     * <code>optional .google.protobuf.Any value = 2;</code>
+     * <code>.google.protobuf.Any value = 2;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.AnyOrBuilder getValueOrBuilder() {
       if (valueBuilder_ != null) {
@@ -692,10 +746,13 @@ public  final class Option extends
     }
     /**
      * <pre>
-     * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+     * The option's value packed in an Any message. If the value is a primitive,
+     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+     * should be used. If the value is an enum, it should be stored as an int32
+     * value using the google.protobuf.Int32Value type.
      * </pre>
      *
-     * <code>optional .google.protobuf.Any value = 2;</code>
+     * <code>.google.protobuf.Any value = 2;</code>
      */
     private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
         org.apache.hadoop.hbase.shaded.com.google.protobuf.Any, org.apache.hadoop.hbase.shaded.com.google.protobuf.Any.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.AnyOrBuilder> 

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/OptionOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/OptionOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/OptionOrBuilder.java
index 20f2b8c..3fea10a 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/OptionOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/OptionOrBuilder.java
@@ -9,44 +9,59 @@ public interface OptionOrBuilder extends
 
   /**
    * <pre>
-   * The option's name. For example, `"java_package"`.
+   * The option's name. For protobuf built-in options (options defined in
+   * descriptor.proto), this is the short name. For example, `"map_entry"`.
+   * For custom options, it should be the fully-qualified name. For example,
+   * `"google.api.http"`.
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   java.lang.String getName();
   /**
    * <pre>
-   * The option's name. For example, `"java_package"`.
+   * The option's name. For protobuf built-in options (options defined in
+   * descriptor.proto), this is the short name. For example, `"map_entry"`.
+   * For custom options, it should be the fully-qualified name. For example,
+   * `"google.api.http"`.
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
       getNameBytes();
 
   /**
    * <pre>
-   * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+   * The option's value packed in an Any message. If the value is a primitive,
+   * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+   * should be used. If the value is an enum, it should be stored as an int32
+   * value using the google.protobuf.Int32Value type.
    * </pre>
    *
-   * <code>optional .google.protobuf.Any value = 2;</code>
+   * <code>.google.protobuf.Any value = 2;</code>
    */
   boolean hasValue();
   /**
    * <pre>
-   * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+   * The option's value packed in an Any message. If the value is a primitive,
+   * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+   * should be used. If the value is an enum, it should be stored as an int32
+   * value using the google.protobuf.Int32Value type.
    * </pre>
    *
-   * <code>optional .google.protobuf.Any value = 2;</code>
+   * <code>.google.protobuf.Any value = 2;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.Any getValue();
   /**
    * <pre>
-   * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+   * The option's value packed in an Any message. If the value is a primitive,
+   * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+   * should be used. If the value is an enum, it should be stored as an int32
+   * value using the google.protobuf.Int32Value type.
    * </pre>
    *
-   * <code>optional .google.protobuf.Any value = 2;</code>
+   * <code>.google.protobuf.Any value = 2;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.AnyOrBuilder getValueOrBuilder();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SmallSortedMap.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SmallSortedMap.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SmallSortedMap.java
index 2dfabd3..a24c2ce 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SmallSortedMap.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SmallSortedMap.java
@@ -197,6 +197,7 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
         overflowEntries.entrySet();
   }
 
+
   @Override
   public int size() {
     return entryList.size() + overflowEntries.size();
@@ -356,6 +357,7 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
     return lazyEntrySet;
   }
 
+
   /**
    * @throws UnsupportedOperationException if {@link #makeImmutable()} has
    *         has been called.
@@ -525,6 +527,7 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
     }
   }
 
+
   /**
    * Iterator implementation that switches from the entry array to the overflow
    * entries appropriately.
@@ -617,43 +620,43 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
       return (Iterable<T>) ITERABLE;
     }
   }
-  
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
-    
+
     if (!(o instanceof SmallSortedMap)) {
       return super.equals(o);
     }
-    
+
     SmallSortedMap<?, ?> other = (SmallSortedMap<?, ?>) o;
     final int size = size();
     if (size != other.size()) {
       return false;
     }
-    
+
     // Best effort try to avoid allocating an entry set.
     final int numArrayEntries = getNumArrayEntries();
     if (numArrayEntries != other.getNumArrayEntries()) {
       return entrySet().equals(other.entrySet());
     }
-    
+
     for (int i = 0; i < numArrayEntries; i++) {
       if (!getArrayEntryAt(i).equals(other.getArrayEntryAt(i))) {
         return false;
       }
     }
-    
+
     if (numArrayEntries != size) {
       return overflowEntries.equals(other.overflowEntries);
     }
-    
-    
+
+
     return true;
   }
-  
+
   @Override
   public int hashCode() {
     int h = 0;

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContext.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContext.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContext.java
index 720fd63..ab4938c 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContext.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContext.java
@@ -85,7 +85,7 @@ public  final class SourceContext extends
    * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
    * </pre>
    *
-   * <code>optional string file_name = 1;</code>
+   * <code>string file_name = 1;</code>
    */
   public java.lang.String getFileName() {
     java.lang.Object ref = fileName_;
@@ -105,7 +105,7 @@ public  final class SourceContext extends
    * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
    * </pre>
    *
-   * <code>optional string file_name = 1;</code>
+   * <code>string file_name = 1;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
       getFileNameBytes() {
@@ -173,7 +173,7 @@ public  final class SourceContext extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + FILE_NAME_FIELD_NUMBER;
     hash = (53 * hash) + getFileName().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
@@ -402,7 +402,7 @@ public  final class SourceContext extends
      * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
      * </pre>
      *
-     * <code>optional string file_name = 1;</code>
+     * <code>string file_name = 1;</code>
      */
     public java.lang.String getFileName() {
       java.lang.Object ref = fileName_;
@@ -422,7 +422,7 @@ public  final class SourceContext extends
      * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
      * </pre>
      *
-     * <code>optional string file_name = 1;</code>
+     * <code>string file_name = 1;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
         getFileNameBytes() {
@@ -443,7 +443,7 @@ public  final class SourceContext extends
      * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
      * </pre>
      *
-     * <code>optional string file_name = 1;</code>
+     * <code>string file_name = 1;</code>
      */
     public Builder setFileName(
         java.lang.String value) {
@@ -461,7 +461,7 @@ public  final class SourceContext extends
      * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
      * </pre>
      *
-     * <code>optional string file_name = 1;</code>
+     * <code>string file_name = 1;</code>
      */
     public Builder clearFileName() {
       
@@ -475,7 +475,7 @@ public  final class SourceContext extends
      * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
      * </pre>
      *
-     * <code>optional string file_name = 1;</code>
+     * <code>string file_name = 1;</code>
      */
     public Builder setFileNameBytes(
         org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextOrBuilder.java
index 4a59bb5..c35eceb 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextOrBuilder.java
@@ -13,7 +13,7 @@ public interface SourceContextOrBuilder extends
    * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
    * </pre>
    *
-   * <code>optional string file_name = 1;</code>
+   * <code>string file_name = 1;</code>
    */
   java.lang.String getFileName();
   /**
@@ -22,7 +22,7 @@ public interface SourceContextOrBuilder extends
    * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
    * </pre>
    *
-   * <code>optional string file_name = 1;</code>
+   * <code>string file_name = 1;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
       getFileNameBytes();

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextProto.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextProto.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextProto.java
index 6ee1bda..48f2e3f 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextProto.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextProto.java
@@ -30,9 +30,11 @@ public final class SourceContextProto {
     java.lang.String[] descriptorData = {
       "\n$google/protobuf/source_context.proto\022\017" +
       "google.protobuf\"\"\n\rSourceContext\022\021\n\tfile" +
-      "_name\030\001 \001(\tBR\n\023com.google.protobufB\022Sour" +
-      "ceContextProtoP\001\242\002\003GPB\252\002\036Google.Protobuf" +
-      ".WellKnownTypesb\006proto3"
+      "_name\030\001 \001(\tB\225\001\n\023com.google.protobufB\022Sou" +
+      "rceContextProtoP\001ZAgoogle.golang.org/gen" +
+      "proto/protobuf/source_context;source_con" +
+      "text\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTy" +
+      "pesb\006proto3"
     };
     org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValue.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValue.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValue.java
index 70f4acf..f3e2ef6 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValue.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValue.java
@@ -84,7 +84,7 @@ public  final class StringValue extends
    * The string value.
    * </pre>
    *
-   * <code>optional string value = 1;</code>
+   * <code>string value = 1;</code>
    */
   public java.lang.String getValue() {
     java.lang.Object ref = value_;
@@ -103,7 +103,7 @@ public  final class StringValue extends
    * The string value.
    * </pre>
    *
-   * <code>optional string value = 1;</code>
+   * <code>string value = 1;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
       getValueBytes() {
@@ -171,7 +171,7 @@ public  final class StringValue extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + VALUE_FIELD_NUMBER;
     hash = (53 * hash) + getValue().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
@@ -399,7 +399,7 @@ public  final class StringValue extends
      * The string value.
      * </pre>
      *
-     * <code>optional string value = 1;</code>
+     * <code>string value = 1;</code>
      */
     public java.lang.String getValue() {
       java.lang.Object ref = value_;
@@ -418,7 +418,7 @@ public  final class StringValue extends
      * The string value.
      * </pre>
      *
-     * <code>optional string value = 1;</code>
+     * <code>string value = 1;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
         getValueBytes() {
@@ -438,7 +438,7 @@ public  final class StringValue extends
      * The string value.
      * </pre>
      *
-     * <code>optional string value = 1;</code>
+     * <code>string value = 1;</code>
      */
     public Builder setValue(
         java.lang.String value) {
@@ -455,7 +455,7 @@ public  final class StringValue extends
      * The string value.
      * </pre>
      *
-     * <code>optional string value = 1;</code>
+     * <code>string value = 1;</code>
      */
     public Builder clearValue() {
       
@@ -468,7 +468,7 @@ public  final class StringValue extends
      * The string value.
      * </pre>
      *
-     * <code>optional string value = 1;</code>
+     * <code>string value = 1;</code>
      */
     public Builder setValueBytes(
         org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValueOrBuilder.java
index 81873cd..7ac0ee8 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface StringValueOrBuilder extends
    * The string value.
    * </pre>
    *
-   * <code>optional string value = 1;</code>
+   * <code>string value = 1;</code>
    */
   java.lang.String getValue();
   /**
@@ -20,7 +20,7 @@ public interface StringValueOrBuilder extends
    * The string value.
    * </pre>
    *
-   * <code>optional string value = 1;</code>
+   * <code>string value = 1;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
       getValueBytes();

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Struct.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Struct.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Struct.java
index ced7eea..2607900 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Struct.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Struct.java
@@ -253,7 +253,7 @@ public  final class Struct extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     if (!internalGetFields().getMap().isEmpty()) {
       hash = (37 * hash) + FIELDS_FIELD_NUMBER;
       hash = (53 * hash) + internalGetFields().hashCode();
@@ -597,7 +597,8 @@ public  final class Struct extends
     }
 
     public Builder clearFields() {
-      getMutableFields().clear();
+      internalGetMutableFields().getMutableMap()
+          .clear();
       return this;
     }
     /**
@@ -611,7 +612,8 @@ public  final class Struct extends
     public Builder removeFields(
         java.lang.String key) {
       if (key == null) { throw new java.lang.NullPointerException(); }
-      getMutableFields().remove(key);
+      internalGetMutableFields().getMutableMap()
+          .remove(key);
       return this;
     }
     /**
@@ -634,7 +636,8 @@ public  final class Struct extends
         org.apache.hadoop.hbase.shaded.com.google.protobuf.Value value) {
       if (key == null) { throw new java.lang.NullPointerException(); }
       if (value == null) { throw new java.lang.NullPointerException(); }
-      getMutableFields().put(key, value);
+      internalGetMutableFields().getMutableMap()
+          .put(key, value);
       return this;
     }
     /**
@@ -647,7 +650,8 @@ public  final class Struct extends
 
     public Builder putAllFields(
         java.util.Map<java.lang.String, org.apache.hadoop.hbase.shaded.com.google.protobuf.Value> values) {
-      getMutableFields().putAll(values);
+      internalGetMutableFields().getMutableMap()
+          .putAll(values);
       return this;
     }
     public final Builder setUnknownFields(

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Syntax.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Syntax.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Syntax.java
index 0e65a5d..f03d70b 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Syntax.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Syntax.java
@@ -95,8 +95,7 @@ public enum Syntax
   }
   public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
-    return org.apache.hadoop.hbase.shaded.com.google.protobuf.TypeProto.getDescriptor()
-        .getEnumTypes().get(0);
+    return org.apache.hadoop.hbase.shaded.com.google.protobuf.TypeProto.getDescriptor().getEnumTypes().get(0);
   }
 
   private static final Syntax[] VALUES = values();

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Timestamp.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Timestamp.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Timestamp.java
index 29c61c3..0023d50 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Timestamp.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Timestamp.java
@@ -126,7 +126,7 @@ public  final class Timestamp extends
    * 9999-12-31T23:59:59Z inclusive.
    * </pre>
    *
-   * <code>optional int64 seconds = 1;</code>
+   * <code>int64 seconds = 1;</code>
    */
   public long getSeconds() {
     return seconds_;
@@ -142,7 +142,7 @@ public  final class Timestamp extends
    * inclusive.
    * </pre>
    *
-   * <code>optional int32 nanos = 2;</code>
+   * <code>int32 nanos = 2;</code>
    */
   public int getNanos() {
     return nanos_;
@@ -210,7 +210,7 @@ public  final class Timestamp extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + SECONDS_FIELD_NUMBER;
     hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
         getSeconds());
@@ -483,7 +483,7 @@ public  final class Timestamp extends
      * 9999-12-31T23:59:59Z inclusive.
      * </pre>
      *
-     * <code>optional int64 seconds = 1;</code>
+     * <code>int64 seconds = 1;</code>
      */
     public long getSeconds() {
       return seconds_;
@@ -495,7 +495,7 @@ public  final class Timestamp extends
      * 9999-12-31T23:59:59Z inclusive.
      * </pre>
      *
-     * <code>optional int64 seconds = 1;</code>
+     * <code>int64 seconds = 1;</code>
      */
     public Builder setSeconds(long value) {
       
@@ -510,7 +510,7 @@ public  final class Timestamp extends
      * 9999-12-31T23:59:59Z inclusive.
      * </pre>
      *
-     * <code>optional int64 seconds = 1;</code>
+     * <code>int64 seconds = 1;</code>
      */
     public Builder clearSeconds() {
       
@@ -528,7 +528,7 @@ public  final class Timestamp extends
      * inclusive.
      * </pre>
      *
-     * <code>optional int32 nanos = 2;</code>
+     * <code>int32 nanos = 2;</code>
      */
     public int getNanos() {
       return nanos_;
@@ -541,7 +541,7 @@ public  final class Timestamp extends
      * inclusive.
      * </pre>
      *
-     * <code>optional int32 nanos = 2;</code>
+     * <code>int32 nanos = 2;</code>
      */
     public Builder setNanos(int value) {
       
@@ -557,7 +557,7 @@ public  final class Timestamp extends
      * inclusive.
      * </pre>
      *
-     * <code>optional int32 nanos = 2;</code>
+     * <code>int32 nanos = 2;</code>
      */
     public Builder clearNanos() {
       

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TimestampOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TimestampOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TimestampOrBuilder.java
index 6ec1b04..fca3c16 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TimestampOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TimestampOrBuilder.java
@@ -14,7 +14,7 @@ public interface TimestampOrBuilder extends
    * 9999-12-31T23:59:59Z inclusive.
    * </pre>
    *
-   * <code>optional int64 seconds = 1;</code>
+   * <code>int64 seconds = 1;</code>
    */
   long getSeconds();
 
@@ -26,7 +26,7 @@ public interface TimestampOrBuilder extends
    * inclusive.
    * </pre>
    *
-   * <code>optional int32 nanos = 2;</code>
+   * <code>int32 nanos = 2;</code>
    */
   int getNanos();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Type.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Type.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Type.java
index 3a0ea49..f46f351 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Type.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Type.java
@@ -143,7 +143,7 @@ public  final class Type extends
    * The fully qualified message name.
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   public java.lang.String getName() {
     java.lang.Object ref = name_;
@@ -162,7 +162,7 @@ public  final class Type extends
    * The fully qualified message name.
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
       getNameBytes() {
@@ -340,7 +340,7 @@ public  final class Type extends
    * The source context.
    * </pre>
    *
-   * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+   * <code>.google.protobuf.SourceContext source_context = 5;</code>
    */
   public boolean hasSourceContext() {
     return sourceContext_ != null;
@@ -350,7 +350,7 @@ public  final class Type extends
    * The source context.
    * </pre>
    *
-   * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+   * <code>.google.protobuf.SourceContext source_context = 5;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext() {
     return sourceContext_ == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.getDefaultInstance() : sourceContext_;
@@ -360,7 +360,7 @@ public  final class Type extends
    * The source context.
    * </pre>
    *
-   * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+   * <code>.google.protobuf.SourceContext source_context = 5;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder() {
     return getSourceContext();
@@ -373,7 +373,7 @@ public  final class Type extends
    * The source syntax.
    * </pre>
    *
-   * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+   * <code>.google.protobuf.Syntax syntax = 6;</code>
    */
   public int getSyntaxValue() {
     return syntax_;
@@ -383,7 +383,7 @@ public  final class Type extends
    * The source syntax.
    * </pre>
    *
-   * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+   * <code>.google.protobuf.Syntax syntax = 6;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax() {
     org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax.valueOf(syntax_);
@@ -493,7 +493,7 @@ public  final class Type extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
     if (getFieldsCount() > 0) {
@@ -863,7 +863,7 @@ public  final class Type extends
      * The fully qualified message name.
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
@@ -882,7 +882,7 @@ public  final class Type extends
      * The fully qualified message name.
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
         getNameBytes() {
@@ -902,7 +902,7 @@ public  final class Type extends
      * The fully qualified message name.
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder setName(
         java.lang.String value) {
@@ -919,7 +919,7 @@ public  final class Type extends
      * The fully qualified message name.
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder clearName() {
       
@@ -932,7 +932,7 @@ public  final class Type extends
      * The fully qualified message name.
      * </pre>
      *
-     * <code>optional string name = 1;</code>
+     * <code>string name = 1;</code>
      */
     public Builder setNameBytes(
         org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -1708,7 +1708,7 @@ public  final class Type extends
      * The source context.
      * </pre>
      *
-     * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+     * <code>.google.protobuf.SourceContext source_context = 5;</code>
      */
     public boolean hasSourceContext() {
       return sourceContextBuilder_ != null || sourceContext_ != null;
@@ -1718,7 +1718,7 @@ public  final class Type extends
      * The source context.
      * </pre>
      *
-     * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+     * <code>.google.protobuf.SourceContext source_context = 5;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext() {
       if (sourceContextBuilder_ == null) {
@@ -1732,7 +1732,7 @@ public  final class Type extends
      * The source context.
      * </pre>
      *
-     * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+     * <code>.google.protobuf.SourceContext source_context = 5;</code>
      */
     public Builder setSourceContext(org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext value) {
       if (sourceContextBuilder_ == null) {
@@ -1752,7 +1752,7 @@ public  final class Type extends
      * The source context.
      * </pre>
      *
-     * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+     * <code>.google.protobuf.SourceContext source_context = 5;</code>
      */
     public Builder setSourceContext(
         org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder builderForValue) {
@@ -1770,7 +1770,7 @@ public  final class Type extends
      * The source context.
      * </pre>
      *
-     * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+     * <code>.google.protobuf.SourceContext source_context = 5;</code>
      */
     public Builder mergeSourceContext(org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext value) {
       if (sourceContextBuilder_ == null) {
@@ -1792,7 +1792,7 @@ public  final class Type extends
      * The source context.
      * </pre>
      *
-     * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+     * <code>.google.protobuf.SourceContext source_context = 5;</code>
      */
     public Builder clearSourceContext() {
       if (sourceContextBuilder_ == null) {
@@ -1810,7 +1810,7 @@ public  final class Type extends
      * The source context.
      * </pre>
      *
-     * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+     * <code>.google.protobuf.SourceContext source_context = 5;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder getSourceContextBuilder() {
       
@@ -1822,7 +1822,7 @@ public  final class Type extends
      * The source context.
      * </pre>
      *
-     * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+     * <code>.google.protobuf.SourceContext source_context = 5;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder() {
       if (sourceContextBuilder_ != null) {
@@ -1837,7 +1837,7 @@ public  final class Type extends
      * The source context.
      * </pre>
      *
-     * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+     * <code>.google.protobuf.SourceContext source_context = 5;</code>
      */
     private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
         org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext, org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder> 
@@ -1859,7 +1859,7 @@ public  final class Type extends
      * The source syntax.
      * </pre>
      *
-     * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+     * <code>.google.protobuf.Syntax syntax = 6;</code>
      */
     public int getSyntaxValue() {
       return syntax_;
@@ -1869,7 +1869,7 @@ public  final class Type extends
      * The source syntax.
      * </pre>
      *
-     * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+     * <code>.google.protobuf.Syntax syntax = 6;</code>
      */
     public Builder setSyntaxValue(int value) {
       syntax_ = value;
@@ -1881,7 +1881,7 @@ public  final class Type extends
      * The source syntax.
      * </pre>
      *
-     * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+     * <code>.google.protobuf.Syntax syntax = 6;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax() {
       org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax.valueOf(syntax_);
@@ -1892,7 +1892,7 @@ public  final class Type extends
      * The source syntax.
      * </pre>
      *
-     * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+     * <code>.google.protobuf.Syntax syntax = 6;</code>
      */
     public Builder setSyntax(org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax value) {
       if (value == null) {
@@ -1908,7 +1908,7 @@ public  final class Type extends
      * The source syntax.
      * </pre>
      *
-     * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+     * <code>.google.protobuf.Syntax syntax = 6;</code>
      */
     public Builder clearSyntax() {
       

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeOrBuilder.java
index aa83b6f..fe845dd 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeOrBuilder.java
@@ -12,7 +12,7 @@ public interface TypeOrBuilder extends
    * The fully qualified message name.
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   java.lang.String getName();
   /**
@@ -20,7 +20,7 @@ public interface TypeOrBuilder extends
    * The fully qualified message name.
    * </pre>
    *
-   * <code>optional string name = 1;</code>
+   * <code>string name = 1;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
       getNameBytes();
@@ -153,7 +153,7 @@ public interface TypeOrBuilder extends
    * The source context.
    * </pre>
    *
-   * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+   * <code>.google.protobuf.SourceContext source_context = 5;</code>
    */
   boolean hasSourceContext();
   /**
@@ -161,7 +161,7 @@ public interface TypeOrBuilder extends
    * The source context.
    * </pre>
    *
-   * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+   * <code>.google.protobuf.SourceContext source_context = 5;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext();
   /**
@@ -169,7 +169,7 @@ public interface TypeOrBuilder extends
    * The source context.
    * </pre>
    *
-   * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+   * <code>.google.protobuf.SourceContext source_context = 5;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder();
 
@@ -178,7 +178,7 @@ public interface TypeOrBuilder extends
    * The source syntax.
    * </pre>
    *
-   * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+   * <code>.google.protobuf.Syntax syntax = 6;</code>
    */
   int getSyntaxValue();
   /**
@@ -186,7 +186,7 @@ public interface TypeOrBuilder extends
    * The source syntax.
    * </pre>
    *
-   * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+   * <code>.google.protobuf.Syntax syntax = 6;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeProto.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeProto.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeProto.java
index d5733df..e7c3094 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeProto.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeProto.java
@@ -84,9 +84,10 @@ public final class TypeProto {
       "\003 \003(\0132\027.google.protobuf.Option\";\n\006Option" +
       "\022\014\n\004name\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.google.p" +
       "rotobuf.Any*.\n\006Syntax\022\021\n\rSYNTAX_PROTO2\020\000" +
-      "\022\021\n\rSYNTAX_PROTO3\020\001BL\n\023com.google.protob" +
-      "ufB\tTypeProtoP\001\370\001\001\242\002\003GPB\252\002\036Google.Protob" +
-      "uf.WellKnownTypesb\006proto3"
+      "\022\021\n\rSYNTAX_PROTO3\020\001B}\n\023com.google.protob" +
+      "ufB\tTypeProtoP\001Z/google.golang.org/genpr" +
+      "oto/protobuf/ptype;ptype\370\001\001\242\002\003GPB\252\002\036Goog" +
+      "le.Protobuf.WellKnownTypesb\006proto3"
     };
     org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32Value.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32Value.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32Value.java
index 716cd7d..7b4dae9 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32Value.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32Value.java
@@ -83,7 +83,7 @@ public  final class UInt32Value extends
    * The uint32 value.
    * </pre>
    *
-   * <code>optional uint32 value = 1;</code>
+   * <code>uint32 value = 1;</code>
    */
   public int getValue() {
     return value_;
@@ -142,7 +142,7 @@ public  final class UInt32Value extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + VALUE_FIELD_NUMBER;
     hash = (53 * hash) + getValue();
     hash = (29 * hash) + unknownFields.hashCode();
@@ -369,7 +369,7 @@ public  final class UInt32Value extends
      * The uint32 value.
      * </pre>
      *
-     * <code>optional uint32 value = 1;</code>
+     * <code>uint32 value = 1;</code>
      */
     public int getValue() {
       return value_;
@@ -379,7 +379,7 @@ public  final class UInt32Value extends
      * The uint32 value.
      * </pre>
      *
-     * <code>optional uint32 value = 1;</code>
+     * <code>uint32 value = 1;</code>
      */
     public Builder setValue(int value) {
       
@@ -392,7 +392,7 @@ public  final class UInt32Value extends
      * The uint32 value.
      * </pre>
      *
-     * <code>optional uint32 value = 1;</code>
+     * <code>uint32 value = 1;</code>
      */
     public Builder clearValue() {
       

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32ValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32ValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32ValueOrBuilder.java
index d52f0e0..ad0d537 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32ValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32ValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface UInt32ValueOrBuilder extends
    * The uint32 value.
    * </pre>
    *
-   * <code>optional uint32 value = 1;</code>
+   * <code>uint32 value = 1;</code>
    */
   int getValue();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64Value.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64Value.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64Value.java
index 7ed4029..578a6ff 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64Value.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64Value.java
@@ -83,7 +83,7 @@ public  final class UInt64Value extends
    * The uint64 value.
    * </pre>
    *
-   * <code>optional uint64 value = 1;</code>
+   * <code>uint64 value = 1;</code>
    */
   public long getValue() {
     return value_;
@@ -142,7 +142,7 @@ public  final class UInt64Value extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + VALUE_FIELD_NUMBER;
     hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
         getValue());
@@ -370,7 +370,7 @@ public  final class UInt64Value extends
      * The uint64 value.
      * </pre>
      *
-     * <code>optional uint64 value = 1;</code>
+     * <code>uint64 value = 1;</code>
      */
     public long getValue() {
       return value_;
@@ -380,7 +380,7 @@ public  final class UInt64Value extends
      * The uint64 value.
      * </pre>
      *
-     * <code>optional uint64 value = 1;</code>
+     * <code>uint64 value = 1;</code>
      */
     public Builder setValue(long value) {
       
@@ -393,7 +393,7 @@ public  final class UInt64Value extends
      * The uint64 value.
      * </pre>
      *
-     * <code>optional uint64 value = 1;</code>
+     * <code>uint64 value = 1;</code>
      */
     public Builder clearValue() {
       

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64ValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64ValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64ValueOrBuilder.java
index bbdc59a..5f65674 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64ValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64ValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface UInt64ValueOrBuilder extends
    * The uint64 value.
    * </pre>
    *
-   * <code>optional uint64 value = 1;</code>
+   * <code>uint64 value = 1;</code>
    */
   long getValue();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSet.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSet.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSet.java
index 47b9e12..148a3dd 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSet.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSet.java
@@ -31,7 +31,6 @@
 package org.apache.hadoop.hbase.shaded.com.google.protobuf;
 
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractMessageLite.Builder.LimitedInputStream;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -39,6 +38,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -58,7 +58,9 @@ import java.util.TreeMap;
  */
 public final class UnknownFieldSet implements MessageLite {
 
-  private UnknownFieldSet() {}
+  private UnknownFieldSet() {
+    fields = null;
+  }
 
   /** Create a new {@link Builder}. */
   public static Builder newBuilder() {
@@ -82,16 +84,18 @@ public final class UnknownFieldSet implements MessageLite {
     return defaultInstance;
   }
   private static final UnknownFieldSet defaultInstance =
-    new UnknownFieldSet(Collections.<Integer, Field>emptyMap());
+    new UnknownFieldSet(Collections.<Integer, Field>emptyMap(),
+        Collections.<Integer, Field>emptyMap());
 
   /**
    * Construct an {@code UnknownFieldSet} around the given map.  The map is
    * expected to be immutable.
    */
-  private UnknownFieldSet(final Map<Integer, Field> fields) {
+  private UnknownFieldSet(final Map<Integer, Field> fields,
+      final Map<Integer, Field> fieldsDescending) {
     this.fields = fields;
   }
-  private Map<Integer, Field> fields;
+  private final Map<Integer, Field> fields;
 
 
   @Override
@@ -224,10 +228,8 @@ public final class UnknownFieldSet implements MessageLite {
     }
   }
 
-  /**
-   * Get the number of bytes required to encode this set using
-   * {@code MessageSet} wire format.
-   */
+
+  /** Get the number of bytes required to encode this set using {@code MessageSet} wire format. */
   public int getSerializedSizeAsMessageSet() {
     int result = 0;
     for (final Map.Entry<Integer, Field> entry : fields.entrySet()) {
@@ -343,12 +345,13 @@ public final class UnknownFieldSet implements MessageLite {
      */
     @Override
     public UnknownFieldSet build() {
-      getFieldBuilder(0);  // Force lastField to be built.
+      getFieldBuilder(0); // Force lastField to be built.
       final UnknownFieldSet result;
       if (fields.isEmpty()) {
         result = getDefaultInstance();
       } else {
-        result = new UnknownFieldSet(Collections.unmodifiableMap(fields));
+        Map<Integer, Field> descendingFields = null;
+        result = new UnknownFieldSet(Collections.unmodifiableMap(fields), descendingFields);
       }
       fields = null;
       return result;
@@ -363,8 +366,9 @@ public final class UnknownFieldSet implements MessageLite {
     @Override
     public Builder clone() {
       getFieldBuilder(0);  // Force lastField to be built.
+      Map<Integer, Field> descendingFields = null;
       return UnknownFieldSet.newBuilder().mergeFrom(
-          new UnknownFieldSet(fields));
+          new UnknownFieldSet(fields, descendingFields));
     }
 
     @Override
@@ -841,9 +845,10 @@ public final class UnknownFieldSet implements MessageLite {
       }
     }
 
+
     /**
-     * Get the number of bytes required to encode this field, including field
-     * number, using {@code MessageSet} wire format.
+     * Get the number of bytes required to encode this field, including field number, using {@code
+     * MessageSet} wire format.
      */
     public int getSerializedSizeAsMessageSetExtension(final int fieldNumber) {
       int result = 0;
@@ -1022,7 +1027,7 @@ public final class UnknownFieldSet implements MessageLite {
       } catch (InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(builder.buildPartial());
       } catch (IOException e) {
-        throw new InvalidProtocolBufferException(e.getMessage())
+        throw new InvalidProtocolBufferException(e)
             .setUnfinishedMessage(builder.buildPartial());
       }
       return builder.buildPartial();

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSetLite.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSetLite.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSetLite.java
index e622519..faa4c30 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSetLite.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSetLite.java
@@ -176,6 +176,42 @@ public final class UnknownFieldSetLite {
   }
 
   /**
+   * Serializes the set and writes it to {@code output} using {@code MessageSet} wire format.
+   *
+   * <p>For use by generated code only.
+   */
+  public void writeAsMessageSetTo(CodedOutputStream output) throws IOException {
+    for (int i = 0; i < count; i++) {
+      int fieldNumber = WireFormat.getTagFieldNumber(tags[i]);
+      output.writeRawMessageSetExtension(fieldNumber, (ByteString) objects[i]);
+    }
+  }
+
+
+  /**
+   * Get the number of bytes required to encode this field, including field number, using {@code
+   * MessageSet} wire format.
+   */
+  public int getSerializedSizeAsMessageSet() {
+    int size = memoizedSerializedSize;
+    if (size != -1) {
+      return size;
+    }
+    
+    size = 0;
+    for (int i = 0; i < count; i++) {
+      int tag = tags[i];
+      int fieldNumber = WireFormat.getTagFieldNumber(tag);
+      size += CodedOutputStream.computeRawMessageSetExtensionSize(
+          fieldNumber, (ByteString) objects[i]);
+    }
+    
+    memoizedSerializedSize = size;
+    
+    return size;
+  }
+
+  /**
    * Get the number of bytes required to encode this set.
    *
    * <p>For use by generated code only.
@@ -216,6 +252,24 @@ public final class UnknownFieldSetLite {
     
     return size;
   }
+  
+  private static boolean equals(int[] tags1, int[] tags2, int count) {
+    for (int i = 0; i < count; ++i) {
+      if (tags1[i] != tags2[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  private static boolean equals(Object[] objects1, Object[] objects2, int count) {
+    for (int i = 0; i < count; ++i) {
+      if (!objects1[i].equals(objects2[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
 
   @Override
   public boolean equals(Object obj) {
@@ -233,9 +287,8 @@ public final class UnknownFieldSetLite {
     
     UnknownFieldSetLite other = (UnknownFieldSetLite) obj;    
     if (count != other.count
-        // TODO(dweis): Only have to compare up to count but at worst 2x worse than we need to do.
-        || !Arrays.equals(tags, other.tags)
-        || !Arrays.deepEquals(objects, other.objects)) {
+        || !equals(tags, other.tags, count)
+        || !equals(objects, other.objects, count)) {
       return false;
     }
 
@@ -268,7 +321,8 @@ public final class UnknownFieldSetLite {
     }
   }
 
-  private void storeField(int tag, Object value) {
+  // Package private for unsafe experimental runtime.
+  void storeField(int tag, Object value) {
     ensureCapacity();
     
     tags[count] = tag;

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Value.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Value.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Value.java
index 72fd69f..593043b 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Value.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Value.java
@@ -175,7 +175,7 @@ public  final class Value extends
    * Represents a null value.
    * </pre>
    *
-   * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+   * <code>.google.protobuf.NullValue null_value = 1;</code>
    */
   public int getNullValueValue() {
     if (kindCase_ == 1) {
@@ -188,7 +188,7 @@ public  final class Value extends
    * Represents a null value.
    * </pre>
    *
-   * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+   * <code>.google.protobuf.NullValue null_value = 1;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.NullValue getNullValue() {
     if (kindCase_ == 1) {
@@ -205,7 +205,7 @@ public  final class Value extends
    * Represents a double value.
    * </pre>
    *
-   * <code>optional double number_value = 2;</code>
+   * <code>double number_value = 2;</code>
    */
   public double getNumberValue() {
     if (kindCase_ == 2) {
@@ -220,7 +220,7 @@ public  final class Value extends
    * Represents a string value.
    * </pre>
    *
-   * <code>optional string string_value = 3;</code>
+   * <code>string string_value = 3;</code>
    */
   public java.lang.String getStringValue() {
     java.lang.Object ref = "";
@@ -244,7 +244,7 @@ public  final class Value extends
    * Represents a string value.
    * </pre>
    *
-   * <code>optional string string_value = 3;</code>
+   * <code>string string_value = 3;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
       getStringValueBytes() {
@@ -271,7 +271,7 @@ public  final class Value extends
    * Represents a boolean value.
    * </pre>
    *
-   * <code>optional bool bool_value = 4;</code>
+   * <code>bool bool_value = 4;</code>
    */
   public boolean getBoolValue() {
     if (kindCase_ == 4) {
@@ -286,7 +286,7 @@ public  final class Value extends
    * Represents a structured value.
    * </pre>
    *
-   * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+   * <code>.google.protobuf.Struct struct_value = 5;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct getStructValue() {
     if (kindCase_ == 5) {
@@ -299,7 +299,7 @@ public  final class Value extends
    * Represents a structured value.
    * </pre>
    *
-   * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+   * <code>.google.protobuf.Struct struct_value = 5;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.StructOrBuilder getStructValueOrBuilder() {
     if (kindCase_ == 5) {
@@ -314,7 +314,7 @@ public  final class Value extends
    * Represents a repeated `Value`.
    * </pre>
    *
-   * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+   * <code>.google.protobuf.ListValue list_value = 6;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue getListValue() {
     if (kindCase_ == 6) {
@@ -327,7 +327,7 @@ public  final class Value extends
    * Represents a repeated `Value`.
    * </pre>
    *
-   * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+   * <code>.google.protobuf.ListValue list_value = 6;</code>
    */
   public org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValueOrBuilder getListValueOrBuilder() {
     if (kindCase_ == 6) {
@@ -458,7 +458,7 @@ public  final class Value extends
       return memoizedHashCode;
     }
     int hash = 41;
-    hash = (19 * hash) + getDescriptorForType().hashCode();
+    hash = (19 * hash) + getDescriptor().hashCode();
     switch (kindCase_) {
       case 1:
         hash = (37 * hash) + NULL_VALUE_FIELD_NUMBER;
@@ -784,7 +784,7 @@ public  final class Value extends
      * Represents a null value.
      * </pre>
      *
-     * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+     * <code>.google.protobuf.NullValue null_value = 1;</code>
      */
     public int getNullValueValue() {
       if (kindCase_ == 1) {
@@ -797,7 +797,7 @@ public  final class Value extends
      * Represents a null value.
      * </pre>
      *
-     * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+     * <code>.google.protobuf.NullValue null_value = 1;</code>
      */
     public Builder setNullValueValue(int value) {
       kindCase_ = 1;
@@ -810,7 +810,7 @@ public  final class Value extends
      * Represents a null value.
      * </pre>
      *
-     * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+     * <code>.google.protobuf.NullValue null_value = 1;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.NullValue getNullValue() {
       if (kindCase_ == 1) {
@@ -825,7 +825,7 @@ public  final class Value extends
      * Represents a null value.
      * </pre>
      *
-     * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+     * <code>.google.protobuf.NullValue null_value = 1;</code>
      */
     public Builder setNullValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.NullValue value) {
       if (value == null) {
@@ -841,7 +841,7 @@ public  final class Value extends
      * Represents a null value.
      * </pre>
      *
-     * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+     * <code>.google.protobuf.NullValue null_value = 1;</code>
      */
     public Builder clearNullValue() {
       if (kindCase_ == 1) {
@@ -857,7 +857,7 @@ public  final class Value extends
      * Represents a double value.
      * </pre>
      *
-     * <code>optional double number_value = 2;</code>
+     * <code>double number_value = 2;</code>
      */
     public double getNumberValue() {
       if (kindCase_ == 2) {
@@ -870,7 +870,7 @@ public  final class Value extends
      * Represents a double value.
      * </pre>
      *
-     * <code>optional double number_value = 2;</code>
+     * <code>double number_value = 2;</code>
      */
     public Builder setNumberValue(double value) {
       kindCase_ = 2;
@@ -883,7 +883,7 @@ public  final class Value extends
      * Represents a double value.
      * </pre>
      *
-     * <code>optional double number_value = 2;</code>
+     * <code>double number_value = 2;</code>
      */
     public Builder clearNumberValue() {
       if (kindCase_ == 2) {
@@ -899,7 +899,7 @@ public  final class Value extends
      * Represents a string value.
      * </pre>
      *
-     * <code>optional string string_value = 3;</code>
+     * <code>string string_value = 3;</code>
      */
     public java.lang.String getStringValue() {
       java.lang.Object ref = "";
@@ -923,7 +923,7 @@ public  final class Value extends
      * Represents a string value.
      * </pre>
      *
-     * <code>optional string string_value = 3;</code>
+     * <code>string string_value = 3;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
         getStringValueBytes() {
@@ -948,7 +948,7 @@ public  final class Value extends
      * Represents a string value.
      * </pre>
      *
-     * <code>optional string string_value = 3;</code>
+     * <code>string string_value = 3;</code>
      */
     public Builder setStringValue(
         java.lang.String value) {
@@ -965,7 +965,7 @@ public  final class Value extends
      * Represents a string value.
      * </pre>
      *
-     * <code>optional string string_value = 3;</code>
+     * <code>string string_value = 3;</code>
      */
     public Builder clearStringValue() {
       if (kindCase_ == 3) {
@@ -980,7 +980,7 @@ public  final class Value extends
      * Represents a string value.
      * </pre>
      *
-     * <code>optional string string_value = 3;</code>
+     * <code>string string_value = 3;</code>
      */
     public Builder setStringValueBytes(
         org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -999,7 +999,7 @@ public  final class Value extends
      * Represents a boolean value.
      * </pre>
      *
-     * <code>optional bool bool_value = 4;</code>
+     * <code>bool bool_value = 4;</code>
      */
     public boolean getBoolValue() {
       if (kindCase_ == 4) {
@@ -1012,7 +1012,7 @@ public  final class Value extends
      * Represents a boolean value.
      * </pre>
      *
-     * <code>optional bool bool_value = 4;</code>
+     * <code>bool bool_value = 4;</code>
      */
     public Builder setBoolValue(boolean value) {
       kindCase_ = 4;
@@ -1025,7 +1025,7 @@ public  final class Value extends
      * Represents a boolean value.
      * </pre>
      *
-     * <code>optional bool bool_value = 4;</code>
+     * <code>bool bool_value = 4;</code>
      */
     public Builder clearBoolValue() {
       if (kindCase_ == 4) {
@@ -1043,7 +1043,7 @@ public  final class Value extends
      * Represents a structured value.
      * </pre>
      *
-     * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+     * <code>.google.protobuf.Struct struct_value = 5;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct getStructValue() {
       if (structValueBuilder_ == null) {
@@ -1063,7 +1063,7 @@ public  final class Value extends
      * Represents a structured value.
      * </pre>
      *
-     * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+     * <code>.google.protobuf.Struct struct_value = 5;</code>
      */
     public Builder setStructValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct value) {
       if (structValueBuilder_ == null) {
@@ -1083,7 +1083,7 @@ public  final class Value extends
      * Represents a structured value.
      * </pre>
      *
-     * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+     * <code>.google.protobuf.Struct struct_value = 5;</code>
      */
     public Builder setStructValue(
         org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct.Builder builderForValue) {
@@ -1101,7 +1101,7 @@ public  final class Value extends
      * Represents a structured value.
      * </pre>
      *
-     * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+     * <code>.google.protobuf.Struct struct_value = 5;</code>
      */
     public Builder mergeStructValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct value) {
       if (structValueBuilder_ == null) {
@@ -1127,7 +1127,7 @@ public  final class Value extends
      * Represents a structured value.
      * </pre>
      *
-     * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+     * <code>.google.protobuf.Struct struct_value = 5;</code>
      */
     public Builder clearStructValue() {
       if (structValueBuilder_ == null) {
@@ -1150,7 +1150,7 @@ public  final class Value extends
      * Represents a structured value.
      * </pre>
      *
-     * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+     * <code>.google.protobuf.Struct struct_value = 5;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct.Builder getStructValueBuilder() {
       return getStructValueFieldBuilder().getBuilder();
@@ -1160,7 +1160,7 @@ public  final class Value extends
      * Represents a structured value.
      * </pre>
      *
-     * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+     * <code>.google.protobuf.Struct struct_value = 5;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.StructOrBuilder getStructValueOrBuilder() {
       if ((kindCase_ == 5) && (structValueBuilder_ != null)) {
@@ -1177,7 +1177,7 @@ public  final class Value extends
      * Represents a structured value.
      * </pre>
      *
-     * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+     * <code>.google.protobuf.Struct struct_value = 5;</code>
      */
     private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
         org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct, org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.StructOrBuilder> 
@@ -1205,7 +1205,7 @@ public  final class Value extends
      * Represents a repeated `Value`.
      * </pre>
      *
-     * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+     * <code>.google.protobuf.ListValue list_value = 6;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue getListValue() {
       if (listValueBuilder_ == null) {
@@ -1225,7 +1225,7 @@ public  final class Value extends
      * Represents a repeated `Value`.
      * </pre>
      *
-     * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+     * <code>.google.protobuf.ListValue list_value = 6;</code>
      */
     public Builder setListValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue value) {
       if (listValueBuilder_ == null) {
@@ -1245,7 +1245,7 @@ public  final class Value extends
      * Represents a repeated `Value`.
      * </pre>
      *
-     * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+     * <code>.google.protobuf.ListValue list_value = 6;</code>
      */
     public Builder setListValue(
         org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue.Builder builderForValue) {
@@ -1263,7 +1263,7 @@ public  final class Value extends
      * Represents a repeated `Value`.
      * </pre>
      *
-     * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+     * <code>.google.protobuf.ListValue list_value = 6;</code>
      */
     public Builder mergeListValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue value) {
       if (listValueBuilder_ == null) {
@@ -1289,7 +1289,7 @@ public  final class Value extends
      * Represents a repeated `Value`.
      * </pre>
      *
-     * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+     * <code>.google.protobuf.ListValue list_value = 6;</code>
      */
     public Builder clearListValue() {
       if (listValueBuilder_ == null) {
@@ -1312,7 +1312,7 @@ public  final class Value extends
      * Represents a repeated `Value`.
      * </pre>
      *
-     * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+     * <code>.google.protobuf.ListValue list_value = 6;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue.Builder getListValueBuilder() {
       return getListValueFieldBuilder().getBuilder();
@@ -1322,7 +1322,7 @@ public  final class Value extends
      * Represents a repeated `Value`.
      * </pre>
      *
-     * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+     * <code>.google.protobuf.ListValue list_value = 6;</code>
      */
     public org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValueOrBuilder getListValueOrBuilder() {
       if ((kindCase_ == 6) && (listValueBuilder_ != null)) {
@@ -1339,7 +1339,7 @@ public  final class Value extends
      * Represents a repeated `Value`.
      * </pre>
      *
-     * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+     * <code>.google.protobuf.ListValue list_value = 6;</code>
      */
     private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
         org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue, org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValueOrBuilder> 

http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ValueOrBuilder.java
index 630afb0..32d390f 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface ValueOrBuilder extends
    * Represents a null value.
    * </pre>
    *
-   * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+   * <code>.google.protobuf.NullValue null_value = 1;</code>
    */
   int getNullValueValue();
   /**
@@ -20,7 +20,7 @@ public interface ValueOrBuilder extends
    * Represents a null value.
    * </pre>
    *
-   * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+   * <code>.google.protobuf.NullValue null_value = 1;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.NullValue getNullValue();
 
@@ -29,7 +29,7 @@ public interface ValueOrBuilder extends
    * Represents a double value.
    * </pre>
    *
-   * <code>optional double number_value = 2;</code>
+   * <code>double number_value = 2;</code>
    */
   double getNumberValue();
 
@@ -38,7 +38,7 @@ public interface ValueOrBuilder extends
    * Represents a string value.
    * </pre>
    *
-   * <code>optional string string_value = 3;</code>
+   * <code>string string_value = 3;</code>
    */
   java.lang.String getStringValue();
   /**
@@ -46,7 +46,7 @@ public interface ValueOrBuilder extends
    * Represents a string value.
    * </pre>
    *
-   * <code>optional string string_value = 3;</code>
+   * <code>string string_value = 3;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
       getStringValueBytes();
@@ -56,7 +56,7 @@ public interface ValueOrBuilder extends
    * Represents a boolean value.
    * </pre>
    *
-   * <code>optional bool bool_value = 4;</code>
+   * <code>bool bool_value = 4;</code>
    */
   boolean getBoolValue();
 
@@ -65,7 +65,7 @@ public interface ValueOrBuilder extends
    * Represents a structured value.
    * </pre>
    *
-   * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+   * <code>.google.protobuf.Struct struct_value = 5;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct getStructValue();
   /**
@@ -73,7 +73,7 @@ public interface ValueOrBuilder extends
    * Represents a structured value.
    * </pre>
    *
-   * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+   * <code>.google.protobuf.Struct struct_value = 5;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.StructOrBuilder getStructValueOrBuilder();
 
@@ -82,7 +82,7 @@ public interface ValueOrBuilder extends
    * Represents a repeated `Value`.
    * </pre>
    *
-   * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+   * <code>.google.protobuf.ListValue list_value = 6;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue getListValue();
   /**
@@ -90,7 +90,7 @@ public interface ValueOrBuilder extends
    * Represents a repeated `Value`.
    * </pre>
    *
-   * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+   * <code>.google.protobuf.ListValue list_value = 6;</code>
    */
   org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValueOrBuilder getListValueOrBuilder();
 


Mime
View raw message