hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1459013 [3/8] - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ hbase-client/src/test/java/org...
Date Wed, 20 Mar 2013 19:36:47 GMT
Modified: hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java?rev=1459013&r1=1459012&r2=1459013&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java (original)
+++ hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java Wed Mar 20 19:36:46 2013
@@ -2048,15 +2048,19 @@ public final class ClientProtos {
   public interface ResultOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
-    // repeated .KeyValue keyValue = 1;
-    java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue> 
-        getKeyValueList();
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue getKeyValue(int index);
-    int getKeyValueCount();
-    java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValueOrBuilder> 
-        getKeyValueOrBuilderList();
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValueOrBuilder getKeyValueOrBuilder(
+    // repeated .Cell cell = 1;
+    java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell> 
+        getCellList();
+    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell getCell(int index);
+    int getCellCount();
+    java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CellOrBuilder> 
+        getCellOrBuilderList();
+    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CellOrBuilder getCellOrBuilder(
         int index);
+    
+    // optional int32 associatedCellCount = 2;
+    boolean hasAssociatedCellCount();
+    int getAssociatedCellCount();
   }
   public static final class Result extends
       com.google.protobuf.GeneratedMessage
@@ -2086,41 +2090,47 @@ public final class ClientProtos {
       return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Result_fieldAccessorTable;
     }
     
-    // repeated .KeyValue keyValue = 1;
-    public static final int KEYVALUE_FIELD_NUMBER = 1;
-    private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue> keyValue_;
-    public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue> getKeyValueList() {
-      return keyValue_;
-    }
-    public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValueOrBuilder> 
-        getKeyValueOrBuilderList() {
-      return keyValue_;
+    private int bitField0_;
+    // repeated .Cell cell = 1;
+    public static final int CELL_FIELD_NUMBER = 1;
+    private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell> cell_;
+    public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell> getCellList() {
+      return cell_;
+    }
+    public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CellOrBuilder> 
+        getCellOrBuilderList() {
+      return cell_;
     }
-    public int getKeyValueCount() {
-      return keyValue_.size();
+    public int getCellCount() {
+      return cell_.size();
     }
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue getKeyValue(int index) {
-      return keyValue_.get(index);
+    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell getCell(int index) {
+      return cell_.get(index);
     }
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValueOrBuilder getKeyValueOrBuilder(
+    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CellOrBuilder getCellOrBuilder(
         int index) {
-      return keyValue_.get(index);
+      return cell_.get(index);
+    }
+    
+    // optional int32 associatedCellCount = 2;
+    public static final int ASSOCIATEDCELLCOUNT_FIELD_NUMBER = 2;
+    private int associatedCellCount_;
+    public boolean hasAssociatedCellCount() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    public int getAssociatedCellCount() {
+      return associatedCellCount_;
     }
     
     private void initFields() {
-      keyValue_ = java.util.Collections.emptyList();
+      cell_ = java.util.Collections.emptyList();
+      associatedCellCount_ = 0;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
       
-      for (int i = 0; i < getKeyValueCount(); i++) {
-        if (!getKeyValue(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -2128,8 +2138,11 @@ public final class ClientProtos {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      for (int i = 0; i < keyValue_.size(); i++) {
-        output.writeMessage(1, keyValue_.get(i));
+      for (int i = 0; i < cell_.size(); i++) {
+        output.writeMessage(1, cell_.get(i));
+      }
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeInt32(2, associatedCellCount_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -2140,9 +2153,13 @@ public final class ClientProtos {
       if (size != -1) return size;
     
       size = 0;
-      for (int i = 0; i < keyValue_.size(); i++) {
+      for (int i = 0; i < cell_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, cell_.get(i));
+      }
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, keyValue_.get(i));
+          .computeInt32Size(2, associatedCellCount_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -2167,8 +2184,13 @@ public final class ClientProtos {
       org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result other = (org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result) obj;
       
       boolean result = true;
-      result = result && getKeyValueList()
-          .equals(other.getKeyValueList());
+      result = result && getCellList()
+          .equals(other.getCellList());
+      result = result && (hasAssociatedCellCount() == other.hasAssociatedCellCount());
+      if (hasAssociatedCellCount()) {
+        result = result && (getAssociatedCellCount()
+            == other.getAssociatedCellCount());
+      }
       result = result &&
           getUnknownFields().equals(other.getUnknownFields());
       return result;
@@ -2178,9 +2200,13 @@ public final class ClientProtos {
     public int hashCode() {
       int hash = 41;
       hash = (19 * hash) + getDescriptorForType().hashCode();
-      if (getKeyValueCount() > 0) {
-        hash = (37 * hash) + KEYVALUE_FIELD_NUMBER;
-        hash = (53 * hash) + getKeyValueList().hashCode();
+      if (getCellCount() > 0) {
+        hash = (37 * hash) + CELL_FIELD_NUMBER;
+        hash = (53 * hash) + getCellList().hashCode();
+      }
+      if (hasAssociatedCellCount()) {
+        hash = (37 * hash) + ASSOCIATEDCELLCOUNT_FIELD_NUMBER;
+        hash = (53 * hash) + getAssociatedCellCount();
       }
       hash = (29 * hash) + getUnknownFields().hashCode();
       return hash;
@@ -2290,7 +2316,7 @@ public final class ClientProtos {
       }
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getKeyValueFieldBuilder();
+          getCellFieldBuilder();
         }
       }
       private static Builder create() {
@@ -2299,12 +2325,14 @@ public final class ClientProtos {
       
       public Builder clear() {
         super.clear();
-        if (keyValueBuilder_ == null) {
-          keyValue_ = java.util.Collections.emptyList();
+        if (cellBuilder_ == null) {
+          cell_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          keyValueBuilder_.clear();
+          cellBuilder_.clear();
         }
+        associatedCellCount_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
       
@@ -2342,15 +2370,21 @@ public final class ClientProtos {
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result buildPartial() {
         org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result result = new org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result(this);
         int from_bitField0_ = bitField0_;
-        if (keyValueBuilder_ == null) {
+        int to_bitField0_ = 0;
+        if (cellBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            keyValue_ = java.util.Collections.unmodifiableList(keyValue_);
+            cell_ = java.util.Collections.unmodifiableList(cell_);
             bitField0_ = (bitField0_ & ~0x00000001);
           }
-          result.keyValue_ = keyValue_;
+          result.cell_ = cell_;
         } else {
-          result.keyValue_ = keyValueBuilder_.build();
+          result.cell_ = cellBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000001;
         }
+        result.associatedCellCount_ = associatedCellCount_;
+        result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
@@ -2366,43 +2400,40 @@ public final class ClientProtos {
       
       public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result other) {
         if (other == org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.getDefaultInstance()) return this;
-        if (keyValueBuilder_ == null) {
-          if (!other.keyValue_.isEmpty()) {
-            if (keyValue_.isEmpty()) {
-              keyValue_ = other.keyValue_;
+        if (cellBuilder_ == null) {
+          if (!other.cell_.isEmpty()) {
+            if (cell_.isEmpty()) {
+              cell_ = other.cell_;
               bitField0_ = (bitField0_ & ~0x00000001);
             } else {
-              ensureKeyValueIsMutable();
-              keyValue_.addAll(other.keyValue_);
+              ensureCellIsMutable();
+              cell_.addAll(other.cell_);
             }
             onChanged();
           }
         } else {
-          if (!other.keyValue_.isEmpty()) {
-            if (keyValueBuilder_.isEmpty()) {
-              keyValueBuilder_.dispose();
-              keyValueBuilder_ = null;
-              keyValue_ = other.keyValue_;
+          if (!other.cell_.isEmpty()) {
+            if (cellBuilder_.isEmpty()) {
+              cellBuilder_.dispose();
+              cellBuilder_ = null;
+              cell_ = other.cell_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              keyValueBuilder_ = 
+              cellBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getKeyValueFieldBuilder() : null;
+                   getCellFieldBuilder() : null;
             } else {
-              keyValueBuilder_.addAllMessages(other.keyValue_);
+              cellBuilder_.addAllMessages(other.cell_);
             }
           }
         }
+        if (other.hasAssociatedCellCount()) {
+          setAssociatedCellCount(other.getAssociatedCellCount());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
       
       public final boolean isInitialized() {
-        for (int i = 0; i < getKeyValueCount(); i++) {
-          if (!getKeyValue(i).isInitialized()) {
-            
-            return false;
-          }
-        }
         return true;
       }
       
@@ -2430,9 +2461,14 @@ public final class ClientProtos {
               break;
             }
             case 10: {
-              org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder subBuilder = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.newBuilder();
+              org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder subBuilder = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.newBuilder();
               input.readMessage(subBuilder, extensionRegistry);
-              addKeyValue(subBuilder.buildPartial());
+              addCell(subBuilder.buildPartial());
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              associatedCellCount_ = input.readInt32();
               break;
             }
           }
@@ -2441,190 +2477,211 @@ public final class ClientProtos {
       
       private int bitField0_;
       
-      // repeated .KeyValue keyValue = 1;
-      private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue> keyValue_ =
+      // repeated .Cell cell = 1;
+      private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell> cell_ =
         java.util.Collections.emptyList();
-      private void ensureKeyValueIsMutable() {
+      private void ensureCellIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          keyValue_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue>(keyValue_);
+          cell_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell>(cell_);
           bitField0_ |= 0x00000001;
          }
       }
       
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValueOrBuilder> keyValueBuilder_;
+          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CellOrBuilder> cellBuilder_;
       
-      public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue> getKeyValueList() {
-        if (keyValueBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(keyValue_);
+      public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell> getCellList() {
+        if (cellBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(cell_);
         } else {
-          return keyValueBuilder_.getMessageList();
+          return cellBuilder_.getMessageList();
         }
       }
-      public int getKeyValueCount() {
-        if (keyValueBuilder_ == null) {
-          return keyValue_.size();
+      public int getCellCount() {
+        if (cellBuilder_ == null) {
+          return cell_.size();
         } else {
-          return keyValueBuilder_.getCount();
+          return cellBuilder_.getCount();
         }
       }
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue getKeyValue(int index) {
-        if (keyValueBuilder_ == null) {
-          return keyValue_.get(index);
+      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell getCell(int index) {
+        if (cellBuilder_ == null) {
+          return cell_.get(index);
         } else {
-          return keyValueBuilder_.getMessage(index);
+          return cellBuilder_.getMessage(index);
         }
       }
-      public Builder setKeyValue(
-          int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue value) {
-        if (keyValueBuilder_ == null) {
+      public Builder setCell(
+          int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell value) {
+        if (cellBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureKeyValueIsMutable();
-          keyValue_.set(index, value);
+          ensureCellIsMutable();
+          cell_.set(index, value);
           onChanged();
         } else {
-          keyValueBuilder_.setMessage(index, value);
+          cellBuilder_.setMessage(index, value);
         }
         return this;
       }
-      public Builder setKeyValue(
-          int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder builderForValue) {
-        if (keyValueBuilder_ == null) {
-          ensureKeyValueIsMutable();
-          keyValue_.set(index, builderForValue.build());
+      public Builder setCell(
+          int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder builderForValue) {
+        if (cellBuilder_ == null) {
+          ensureCellIsMutable();
+          cell_.set(index, builderForValue.build());
           onChanged();
         } else {
-          keyValueBuilder_.setMessage(index, builderForValue.build());
+          cellBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
-      public Builder addKeyValue(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue value) {
-        if (keyValueBuilder_ == null) {
+      public Builder addCell(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell value) {
+        if (cellBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureKeyValueIsMutable();
-          keyValue_.add(value);
+          ensureCellIsMutable();
+          cell_.add(value);
           onChanged();
         } else {
-          keyValueBuilder_.addMessage(value);
+          cellBuilder_.addMessage(value);
         }
         return this;
       }
-      public Builder addKeyValue(
-          int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue value) {
-        if (keyValueBuilder_ == null) {
+      public Builder addCell(
+          int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell value) {
+        if (cellBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureKeyValueIsMutable();
-          keyValue_.add(index, value);
+          ensureCellIsMutable();
+          cell_.add(index, value);
           onChanged();
         } else {
-          keyValueBuilder_.addMessage(index, value);
+          cellBuilder_.addMessage(index, value);
         }
         return this;
       }
-      public Builder addKeyValue(
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder builderForValue) {
-        if (keyValueBuilder_ == null) {
-          ensureKeyValueIsMutable();
-          keyValue_.add(builderForValue.build());
+      public Builder addCell(
+          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder builderForValue) {
+        if (cellBuilder_ == null) {
+          ensureCellIsMutable();
+          cell_.add(builderForValue.build());
           onChanged();
         } else {
-          keyValueBuilder_.addMessage(builderForValue.build());
+          cellBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
-      public Builder addKeyValue(
-          int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder builderForValue) {
-        if (keyValueBuilder_ == null) {
-          ensureKeyValueIsMutable();
-          keyValue_.add(index, builderForValue.build());
+      public Builder addCell(
+          int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder builderForValue) {
+        if (cellBuilder_ == null) {
+          ensureCellIsMutable();
+          cell_.add(index, builderForValue.build());
           onChanged();
         } else {
-          keyValueBuilder_.addMessage(index, builderForValue.build());
+          cellBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
-      public Builder addAllKeyValue(
-          java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue> values) {
-        if (keyValueBuilder_ == null) {
-          ensureKeyValueIsMutable();
-          super.addAll(values, keyValue_);
+      public Builder addAllCell(
+          java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell> values) {
+        if (cellBuilder_ == null) {
+          ensureCellIsMutable();
+          super.addAll(values, cell_);
           onChanged();
         } else {
-          keyValueBuilder_.addAllMessages(values);
+          cellBuilder_.addAllMessages(values);
         }
         return this;
       }
-      public Builder clearKeyValue() {
-        if (keyValueBuilder_ == null) {
-          keyValue_ = java.util.Collections.emptyList();
+      public Builder clearCell() {
+        if (cellBuilder_ == null) {
+          cell_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
-          keyValueBuilder_.clear();
+          cellBuilder_.clear();
         }
         return this;
       }
-      public Builder removeKeyValue(int index) {
-        if (keyValueBuilder_ == null) {
-          ensureKeyValueIsMutable();
-          keyValue_.remove(index);
+      public Builder removeCell(int index) {
+        if (cellBuilder_ == null) {
+          ensureCellIsMutable();
+          cell_.remove(index);
           onChanged();
         } else {
-          keyValueBuilder_.remove(index);
+          cellBuilder_.remove(index);
         }
         return this;
       }
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder getKeyValueBuilder(
+      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder getCellBuilder(
           int index) {
-        return getKeyValueFieldBuilder().getBuilder(index);
+        return getCellFieldBuilder().getBuilder(index);
       }
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValueOrBuilder getKeyValueOrBuilder(
+      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CellOrBuilder getCellOrBuilder(
           int index) {
-        if (keyValueBuilder_ == null) {
-          return keyValue_.get(index);  } else {
-          return keyValueBuilder_.getMessageOrBuilder(index);
+        if (cellBuilder_ == null) {
+          return cell_.get(index);  } else {
+          return cellBuilder_.getMessageOrBuilder(index);
         }
       }
-      public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValueOrBuilder> 
-           getKeyValueOrBuilderList() {
-        if (keyValueBuilder_ != null) {
-          return keyValueBuilder_.getMessageOrBuilderList();
+      public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CellOrBuilder> 
+           getCellOrBuilderList() {
+        if (cellBuilder_ != null) {
+          return cellBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(keyValue_);
+          return java.util.Collections.unmodifiableList(cell_);
         }
       }
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder addKeyValueBuilder() {
-        return getKeyValueFieldBuilder().addBuilder(
-            org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.getDefaultInstance());
+      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder addCellBuilder() {
+        return getCellFieldBuilder().addBuilder(
+            org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.getDefaultInstance());
       }
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder addKeyValueBuilder(
+      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder addCellBuilder(
           int index) {
-        return getKeyValueFieldBuilder().addBuilder(
-            index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.getDefaultInstance());
+        return getCellFieldBuilder().addBuilder(
+            index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.getDefaultInstance());
       }
-      public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder> 
-           getKeyValueBuilderList() {
-        return getKeyValueFieldBuilder().getBuilderList();
+      public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder> 
+           getCellBuilderList() {
+        return getCellFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValueOrBuilder> 
-          getKeyValueFieldBuilder() {
-        if (keyValueBuilder_ == null) {
-          keyValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValue.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.KeyValueOrBuilder>(
-                  keyValue_,
+          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CellOrBuilder> 
+          getCellFieldBuilder() {
+        if (cellBuilder_ == null) {
+          cellBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Cell.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CellOrBuilder>(
+                  cell_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
                   isClean());
-          keyValue_ = null;
+          cell_ = null;
         }
-        return keyValueBuilder_;
+        return cellBuilder_;
+      }
+      
+      // optional int32 associatedCellCount = 2;
+      private int associatedCellCount_ ;
+      public boolean hasAssociatedCellCount() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      public int getAssociatedCellCount() {
+        return associatedCellCount_;
+      }
+      public Builder setAssociatedCellCount(int value) {
+        bitField0_ |= 0x00000002;
+        associatedCellCount_ = value;
+        onChanged();
+        return this;
+      }
+      public Builder clearAssociatedCellCount() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        associatedCellCount_ = 0;
+        onChanged();
+        return this;
       }
       
       // @@protoc_insertion_point(builder_scope:Result)
@@ -4380,12 +4437,6 @@ public final class ClientProtos {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
       
-      if (hasResult()) {
-        if (!getResult().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -4668,12 +4719,6 @@ public final class ClientProtos {
       }
       
       public final boolean isInitialized() {
-        if (hasResult()) {
-          if (!getResult().isInitialized()) {
-            
-            return false;
-          }
-        }
         return true;
       }
       
@@ -4932,12 +4977,6 @@ public final class ClientProtos {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
       
-      for (int i = 0; i < getResultCount(); i++) {
-        if (!getResult(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -5246,12 +5285,6 @@ public final class ClientProtos {
       }
       
       public final boolean isInitialized() {
-        for (int i = 0; i < getResultCount(); i++) {
-          if (!getResult(i).isInitialized()) {
-            
-            return false;
-          }
-        }
         return true;
       }
       
@@ -6333,28 +6366,32 @@ public final class ClientProtos {
     // @@protoc_insertion_point(class_scope:Condition)
   }
   
-  public interface MutateOrBuilder
+  public interface MutationProtoOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
-    // required bytes row = 1;
+    // optional bytes row = 1;
     boolean hasRow();
     com.google.protobuf.ByteString getRow();
     
-    // required .Mutate.MutateType mutateType = 2;
+    // optional .MutationProto.MutationType mutateType = 2;
     boolean hasMutateType();
-    org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.MutateType getMutateType();
+    org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType getMutateType();
     
-    // repeated .Mutate.ColumnValue columnValue = 3;
-    java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue> 
+    // repeated .MutationProto.ColumnValue columnValue = 3;
+    java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue> 
         getColumnValueList();
-    org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue getColumnValue(int index);
+    org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue getColumnValue(int index);
     int getColumnValueCount();
-    java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValueOrBuilder> 
+    java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValueOrBuilder> 
         getColumnValueOrBuilderList();
-    org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValueOrBuilder getColumnValueOrBuilder(
+    org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValueOrBuilder getColumnValueOrBuilder(
         int index);
     
-    // repeated .NameBytesPair attribute = 4;
+    // optional uint64 timestamp = 4;
+    boolean hasTimestamp();
+    long getTimestamp();
+    
+    // repeated .NameBytesPair attribute = 5;
     java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair> 
         getAttributeList();
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getAttribute(int index);
@@ -6364,48 +6401,48 @@ public final class ClientProtos {
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getAttributeOrBuilder(
         int index);
     
-    // optional uint64 timestamp = 5;
-    boolean hasTimestamp();
-    long getTimestamp();
-    
     // optional bool writeToWAL = 6 [default = true];
     boolean hasWriteToWAL();
     boolean getWriteToWAL();
     
-    // optional .TimeRange timeRange = 10;
+    // optional .TimeRange timeRange = 7;
     boolean hasTimeRange();
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange getTimeRange();
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder getTimeRangeOrBuilder();
+    
+    // optional int32 associatedCellCount = 8;
+    boolean hasAssociatedCellCount();
+    int getAssociatedCellCount();
   }
-  public static final class Mutate extends
+  public static final class MutationProto extends
       com.google.protobuf.GeneratedMessage
-      implements MutateOrBuilder {
-    // Use Mutate.newBuilder() to construct.
-    private Mutate(Builder builder) {
+      implements MutationProtoOrBuilder {
+    // Use MutationProto.newBuilder() to construct.
+    private MutationProto(Builder builder) {
       super(builder);
     }
-    private Mutate(boolean noInit) {}
+    private MutationProto(boolean noInit) {}
     
-    private static final Mutate defaultInstance;
-    public static Mutate getDefaultInstance() {
+    private static final MutationProto defaultInstance;
+    public static MutationProto getDefaultInstance() {
       return defaultInstance;
     }
     
-    public Mutate getDefaultInstanceForType() {
+    public MutationProto getDefaultInstanceForType() {
       return defaultInstance;
     }
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Mutate_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Mutate_fieldAccessorTable;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_fieldAccessorTable;
     }
     
-    public enum MutateType
+    public enum MutationType
         implements com.google.protobuf.ProtocolMessageEnum {
       APPEND(0, 0),
       INCREMENT(1, 1),
@@ -6421,7 +6458,7 @@ public final class ClientProtos {
       
       public final int getNumber() { return value; }
       
-      public static MutateType valueOf(int value) {
+      public static MutationType valueOf(int value) {
         switch (value) {
           case 0: return APPEND;
           case 1: return INCREMENT;
@@ -6431,15 +6468,15 @@ public final class ClientProtos {
         }
       }
       
-      public static com.google.protobuf.Internal.EnumLiteMap<MutateType>
+      public static com.google.protobuf.Internal.EnumLiteMap<MutationType>
           internalGetValueMap() {
         return internalValueMap;
       }
-      private static com.google.protobuf.Internal.EnumLiteMap<MutateType>
+      private static com.google.protobuf.Internal.EnumLiteMap<MutationType>
           internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<MutateType>() {
-              public MutateType findValueByNumber(int number) {
-                return MutateType.valueOf(number);
+            new com.google.protobuf.Internal.EnumLiteMap<MutationType>() {
+              public MutationType findValueByNumber(int number) {
+                return MutationType.valueOf(number);
               }
             };
       
@@ -6453,14 +6490,14 @@ public final class ClientProtos {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.getDescriptor().getEnumTypes().get(0);
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.getDescriptor().getEnumTypes().get(0);
       }
       
-      private static final MutateType[] VALUES = {
+      private static final MutationType[] VALUES = {
         APPEND, INCREMENT, PUT, DELETE, 
       };
       
-      public static MutateType valueOf(
+      public static MutationType valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
           throw new java.lang.IllegalArgumentException(
@@ -6472,12 +6509,12 @@ public final class ClientProtos {
       private final int index;
       private final int value;
       
-      private MutateType(int index, int value) {
+      private MutationType(int index, int value) {
         this.index = index;
         this.value = value;
       }
       
-      // @@protoc_insertion_point(enum_scope:Mutate.MutateType)
+      // @@protoc_insertion_point(enum_scope:MutationProto.MutationType)
     }
     
     public enum DeleteType
@@ -6525,7 +6562,7 @@ public final class ClientProtos {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.getDescriptor().getEnumTypes().get(1);
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.getDescriptor().getEnumTypes().get(1);
       }
       
       private static final DeleteType[] VALUES = {
@@ -6549,7 +6586,7 @@ public final class ClientProtos {
         this.value = value;
       }
       
-      // @@protoc_insertion_point(enum_scope:Mutate.DeleteType)
+      // @@protoc_insertion_point(enum_scope:MutationProto.DeleteType)
     }
     
     public interface ColumnValueOrBuilder
@@ -6559,14 +6596,14 @@ public final class ClientProtos {
       boolean hasFamily();
       com.google.protobuf.ByteString getFamily();
       
-      // repeated .Mutate.ColumnValue.QualifierValue qualifierValue = 2;
-      java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue> 
+      // repeated .MutationProto.ColumnValue.QualifierValue qualifierValue = 2;
+      java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue> 
           getQualifierValueList();
-      org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue getQualifierValue(int index);
+      org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue getQualifierValue(int index);
       int getQualifierValueCount();
-      java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValueOrBuilder> 
+      java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder> 
           getQualifierValueOrBuilderList();
-      org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValueOrBuilder getQualifierValueOrBuilder(
+      org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder getQualifierValueOrBuilder(
           int index);
     }
     public static final class ColumnValue extends
@@ -6589,12 +6626,12 @@ public final class ClientProtos {
       
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Mutate_ColumnValue_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Mutate_ColumnValue_fieldAccessorTable;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_fieldAccessorTable;
       }
       
       public interface QualifierValueOrBuilder
@@ -6612,9 +6649,9 @@ public final class ClientProtos {
         boolean hasTimestamp();
         long getTimestamp();
         
-        // optional .Mutate.DeleteType deleteType = 4;
+        // optional .MutationProto.DeleteType deleteType = 4;
         boolean hasDeleteType();
-        org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType getDeleteType();
+        org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType getDeleteType();
       }
       public static final class QualifierValue extends
           com.google.protobuf.GeneratedMessage
@@ -6636,12 +6673,12 @@ public final class ClientProtos {
         
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Mutate_ColumnValue_QualifierValue_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_QualifierValue_descriptor;
         }
         
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Mutate_ColumnValue_QualifierValue_fieldAccessorTable;
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_QualifierValue_fieldAccessorTable;
         }
         
         private int bitField0_;
@@ -6675,13 +6712,13 @@ public final class ClientProtos {
           return timestamp_;
         }
         
-        // optional .Mutate.DeleteType deleteType = 4;
+        // optional .MutationProto.DeleteType deleteType = 4;
         public static final int DELETETYPE_FIELD_NUMBER = 4;
-        private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType deleteType_;
+        private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType deleteType_;
         public boolean hasDeleteType() {
           return ((bitField0_ & 0x00000008) == 0x00000008);
         }
-        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType getDeleteType() {
+        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType getDeleteType() {
           return deleteType_;
         }
         
@@ -6689,7 +6726,7 @@ public final class ClientProtos {
           qualifier_ = com.google.protobuf.ByteString.EMPTY;
           value_ = com.google.protobuf.ByteString.EMPTY;
           timestamp_ = 0L;
-          deleteType_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType.DELETE_ONE_VERSION;
+          deleteType_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType.DELETE_ONE_VERSION;
         }
         private byte memoizedIsInitialized = -1;
         public final boolean isInitialized() {
@@ -6757,10 +6794,10 @@ public final class ClientProtos {
           if (obj == this) {
            return true;
           }
-          if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue)) {
+          if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue)) {
             return super.equals(obj);
           }
-          org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue other = (org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue) obj;
+          org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue other = (org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue) obj;
           
           boolean result = true;
           result = result && (hasQualifier() == other.hasQualifier());
@@ -6812,41 +6849,41 @@ public final class ClientProtos {
           return hash;
         }
         
-        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue parseFrom(
+        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue parseFrom(
             com.google.protobuf.ByteString data)
             throws com.google.protobuf.InvalidProtocolBufferException {
           return newBuilder().mergeFrom(data).buildParsed();
         }
-        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue parseFrom(
+        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue parseFrom(
             com.google.protobuf.ByteString data,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           return newBuilder().mergeFrom(data, extensionRegistry)
                    .buildParsed();
         }
-        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue parseFrom(byte[] data)
+        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue parseFrom(byte[] data)
             throws com.google.protobuf.InvalidProtocolBufferException {
           return newBuilder().mergeFrom(data).buildParsed();
         }
-        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue parseFrom(
+        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue parseFrom(
             byte[] data,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           return newBuilder().mergeFrom(data, extensionRegistry)
                    .buildParsed();
         }
-        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue parseFrom(java.io.InputStream input)
+        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue parseFrom(java.io.InputStream input)
             throws java.io.IOException {
           return newBuilder().mergeFrom(input).buildParsed();
         }
-        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue parseFrom(
+        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue parseFrom(
             java.io.InputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
           return newBuilder().mergeFrom(input, extensionRegistry)
                    .buildParsed();
         }
-        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue parseDelimitedFrom(java.io.InputStream input)
+        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue parseDelimitedFrom(java.io.InputStream input)
             throws java.io.IOException {
           Builder builder = newBuilder();
           if (builder.mergeDelimitedFrom(input)) {
@@ -6855,7 +6892,7 @@ public final class ClientProtos {
             return null;
           }
         }
-        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue parseDelimitedFrom(
+        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue parseDelimitedFrom(
             java.io.InputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
@@ -6866,12 +6903,12 @@ public final class ClientProtos {
             return null;
           }
         }
-        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue parseFrom(
+        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue parseFrom(
             com.google.protobuf.CodedInputStream input)
             throws java.io.IOException {
           return newBuilder().mergeFrom(input).buildParsed();
         }
-        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue parseFrom(
+        public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue parseFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
@@ -6881,7 +6918,7 @@ public final class ClientProtos {
         
         public static Builder newBuilder() { return Builder.create(); }
         public Builder newBuilderForType() { return newBuilder(); }
-        public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue prototype) {
+        public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue prototype) {
           return newBuilder().mergeFrom(prototype);
         }
         public Builder toBuilder() { return newBuilder(this); }
@@ -6894,18 +6931,18 @@ public final class ClientProtos {
         }
         public static final class Builder extends
             com.google.protobuf.GeneratedMessage.Builder<Builder>
-           implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValueOrBuilder {
+           implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder {
           public static final com.google.protobuf.Descriptors.Descriptor
               getDescriptor() {
-            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Mutate_ColumnValue_QualifierValue_descriptor;
+            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_QualifierValue_descriptor;
           }
           
           protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
               internalGetFieldAccessorTable() {
-            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Mutate_ColumnValue_QualifierValue_fieldAccessorTable;
+            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_QualifierValue_fieldAccessorTable;
           }
           
-          // Construct using org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.newBuilder()
+          // Construct using org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.newBuilder()
           private Builder() {
             maybeForceBuilderInitialization();
           }
@@ -6930,7 +6967,7 @@ public final class ClientProtos {
             bitField0_ = (bitField0_ & ~0x00000002);
             timestamp_ = 0L;
             bitField0_ = (bitField0_ & ~0x00000004);
-            deleteType_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType.DELETE_ONE_VERSION;
+            deleteType_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType.DELETE_ONE_VERSION;
             bitField0_ = (bitField0_ & ~0x00000008);
             return this;
           }
@@ -6941,24 +6978,24 @@ public final class ClientProtos {
           
           public com.google.protobuf.Descriptors.Descriptor
               getDescriptorForType() {
-            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.getDescriptor();
+            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.getDescriptor();
           }
           
-          public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue getDefaultInstanceForType() {
-            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.getDefaultInstance();
+          public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue getDefaultInstanceForType() {
+            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.getDefaultInstance();
           }
           
-          public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue build() {
-            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue result = buildPartial();
+          public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue build() {
+            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue result = buildPartial();
             if (!result.isInitialized()) {
               throw newUninitializedMessageException(result);
             }
             return result;
           }
           
-          private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue buildParsed()
+          private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue buildParsed()
               throws com.google.protobuf.InvalidProtocolBufferException {
-            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue result = buildPartial();
+            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue result = buildPartial();
             if (!result.isInitialized()) {
               throw newUninitializedMessageException(
                 result).asInvalidProtocolBufferException();
@@ -6966,8 +7003,8 @@ public final class ClientProtos {
             return result;
           }
           
-          public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue buildPartial() {
-            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue result = new org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue(this);
+          public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue buildPartial() {
+            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue result = new org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue(this);
             int from_bitField0_ = bitField0_;
             int to_bitField0_ = 0;
             if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -6992,16 +7029,16 @@ public final class ClientProtos {
           }
           
           public Builder mergeFrom(com.google.protobuf.Message other) {
-            if (other instanceof org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue) {
-              return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue)other);
+            if (other instanceof org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue) {
+              return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue)other);
             } else {
               super.mergeFrom(other);
               return this;
             }
           }
           
-          public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue other) {
-            if (other == org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.getDefaultInstance()) return this;
+          public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue other) {
+            if (other == org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.getDefaultInstance()) return this;
             if (other.hasQualifier()) {
               setQualifier(other.getQualifier());
             }
@@ -7062,7 +7099,7 @@ public final class ClientProtos {
                 }
                 case 32: {
                   int rawValue = input.readEnum();
-                  org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType value = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType.valueOf(rawValue);
+                  org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType value = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType.valueOf(rawValue);
                   if (value == null) {
                     unknownFields.mergeVarintField(4, rawValue);
                   } else {
@@ -7146,15 +7183,15 @@ public final class ClientProtos {
             return this;
           }
           
-          // optional .Mutate.DeleteType deleteType = 4;
-          private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType deleteType_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType.DELETE_ONE_VERSION;
+          // optional .MutationProto.DeleteType deleteType = 4;
+          private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType deleteType_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType.DELETE_ONE_VERSION;
           public boolean hasDeleteType() {
             return ((bitField0_ & 0x00000008) == 0x00000008);
           }
-          public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType getDeleteType() {
+          public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType getDeleteType() {
             return deleteType_;
           }
-          public Builder setDeleteType(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType value) {
+          public Builder setDeleteType(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -7165,12 +7202,12 @@ public final class ClientProtos {
           }
           public Builder clearDeleteType() {
             bitField0_ = (bitField0_ & ~0x00000008);
-            deleteType_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.DeleteType.DELETE_ONE_VERSION;
+            deleteType_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType.DELETE_ONE_VERSION;
             onChanged();
             return this;
           }
           
-          // @@protoc_insertion_point(builder_scope:Mutate.ColumnValue.QualifierValue)
+          // @@protoc_insertion_point(builder_scope:MutationProto.ColumnValue.QualifierValue)
         }
         
         static {
@@ -7178,7 +7215,7 @@ public final class ClientProtos {
           defaultInstance.initFields();
         }
         
-        // @@protoc_insertion_point(class_scope:Mutate.ColumnValue.QualifierValue)
+        // @@protoc_insertion_point(class_scope:MutationProto.ColumnValue.QualifierValue)
       }
       
       private int bitField0_;
@@ -7192,23 +7229,23 @@ public final class ClientProtos {
         return family_;
       }
       
-      // repeated .Mutate.ColumnValue.QualifierValue qualifierValue = 2;
+      // repeated .MutationProto.ColumnValue.QualifierValue qualifierValue = 2;
       public static final int QUALIFIERVALUE_FIELD_NUMBER = 2;
-      private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue> qualifierValue_;
-      public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue> getQualifierValueList() {
+      private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue> qualifierValue_;
+      public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue> getQualifierValueList() {
         return qualifierValue_;
       }
-      public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValueOrBuilder> 
+      public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder> 
           getQualifierValueOrBuilderList() {
         return qualifierValue_;
       }
       public int getQualifierValueCount() {
         return qualifierValue_.size();
       }
-      public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue getQualifierValue(int index) {
+      public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue getQualifierValue(int index) {
         return qualifierValue_.get(index);
       }
-      public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValueOrBuilder getQualifierValueOrBuilder(
+      public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder getQualifierValueOrBuilder(
           int index) {
         return qualifierValue_.get(index);
       }
@@ -7273,10 +7310,10 @@ public final class ClientProtos {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue)) {
+        if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue)) {
           return super.equals(obj);
         }
-        org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue other = (org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue) obj;
+        org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue other = (org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue) obj;
         
         boolean result = true;
         result = result && (hasFamily() == other.hasFamily());
@@ -7307,41 +7344,41 @@ public final class ClientProtos {
         return hash;
       }
       
-      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue parseFrom(
+      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return newBuilder().mergeFrom(data).buildParsed();
       }
-      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue parseFrom(
+      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue parseFrom(
           com.google.protobuf.ByteString data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return newBuilder().mergeFrom(data, extensionRegistry)
                  .buildParsed();
       }
-      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue parseFrom(byte[] data)
+      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return newBuilder().mergeFrom(data).buildParsed();
       }
-      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue parseFrom(
+      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue parseFrom(
           byte[] data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return newBuilder().mergeFrom(data, extensionRegistry)
                  .buildParsed();
       }
-      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue parseFrom(java.io.InputStream input)
+      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return newBuilder().mergeFrom(input).buildParsed();
       }
-      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue parseFrom(
+      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue parseFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return newBuilder().mergeFrom(input, extensionRegistry)
                  .buildParsed();
       }
-      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         Builder builder = newBuilder();
         if (builder.mergeDelimitedFrom(input)) {
@@ -7350,7 +7387,7 @@ public final class ClientProtos {
           return null;
         }
       }
-      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue parseDelimitedFrom(
+      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue parseDelimitedFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -7361,12 +7398,12 @@ public final class ClientProtos {
           return null;
         }
       }
-      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue parseFrom(
+      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return newBuilder().mergeFrom(input).buildParsed();
       }
-      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue parseFrom(
+      public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -7376,7 +7413,7 @@ public final class ClientProtos {
       
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue prototype) {
+      public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
@@ -7389,18 +7426,18 @@ public final class ClientProtos {
       }
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder<Builder>
-         implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValueOrBuilder {
+         implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValueOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Mutate_ColumnValue_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_descriptor;
         }
         
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Mutate_ColumnValue_fieldAccessorTable;
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_fieldAccessorTable;
         }
         
-        // Construct using org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.newBuilder()
+        // Construct using org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -7437,24 +7474,24 @@ public final class ClientProtos {
         
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.getDescriptor();
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.getDescriptor();
         }
         
-        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue getDefaultInstanceForType() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.getDefaultInstance();
+        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue getDefaultInstanceForType() {
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.getDefaultInstance();
         }
         
-        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue build() {
-          org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue result = buildPartial();
+        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue build() {
+          org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
         
-        private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue buildParsed()
+        private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue buildParsed()
             throws com.google.protobuf.InvalidProtocolBufferException {
-          org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue result = buildPartial();
+          org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(
               result).asInvalidProtocolBufferException();
@@ -7462,8 +7499,8 @@ public final class ClientProtos {
           return result;
         }
         
-        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue buildPartial() {
-          org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue result = new org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue(this);
+        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue buildPartial() {
+          org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue result = new org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -7485,16 +7522,16 @@ public final class ClientProtos {
         }
         
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue) {
-            return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue)other);
+          if (other instanceof org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue) {
+            return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
         
-        public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue other) {
-          if (other == org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue other) {
+          if (other == org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.getDefaultInstance()) return this;
           if (other.hasFamily()) {
             setFamily(other.getFamily());
           }
@@ -7565,7 +7602,7 @@ public final class ClientProtos {
                 break;
               }
               case 18: {
-                org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder subBuilder = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.newBuilder();
+                org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder subBuilder = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.newBuilder();
                 input.readMessage(subBuilder, extensionRegistry);
                 addQualifierValue(subBuilder.buildPartial());
                 break;
@@ -7600,20 +7637,20 @@ public final class ClientProtos {
           return this;
         }
         
-        // repeated .Mutate.ColumnValue.QualifierValue qualifierValue = 2;
-        private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue> qualifierValue_ =
+        // repeated .MutationProto.ColumnValue.QualifierValue qualifierValue = 2;
+        private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue> qualifierValue_ =
           java.util.Collections.emptyList();
         private void ensureQualifierValueIsMutable() {
           if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-            qualifierValue_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue>(qualifierValue_);
+            qualifierValue_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue>(qualifierValue_);
             bitField0_ |= 0x00000002;
            }
         }
         
         private com.google.protobuf.RepeatedFieldBuilder<
-            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValueOrBuilder> qualifierValueBuilder_;
+            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder> qualifierValueBuilder_;
         
-        public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue> getQualifierValueList() {
+        public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue> getQualifierValueList() {
           if (qualifierValueBuilder_ == null) {
             return java.util.Collections.unmodifiableList(qualifierValue_);
           } else {
@@ -7627,7 +7664,7 @@ public final class ClientProtos {
             return qualifierValueBuilder_.getCount();
           }
         }
-        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue getQualifierValue(int index) {
+        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue getQualifierValue(int index) {
           if (qualifierValueBuilder_ == null) {
             return qualifierValue_.get(index);
           } else {
@@ -7635,7 +7672,7 @@ public final class ClientProtos {
           }
         }
         public Builder setQualifierValue(
-            int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue value) {
+            int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue value) {
           if (qualifierValueBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -7649,7 +7686,7 @@ public final class ClientProtos {
           return this;
         }
         public Builder setQualifierValue(
-            int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder builderForValue) {
+            int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder builderForValue) {
           if (qualifierValueBuilder_ == null) {
             ensureQualifierValueIsMutable();
             qualifierValue_.set(index, builderForValue.build());
@@ -7659,7 +7696,7 @@ public final class ClientProtos {
           }
           return this;
         }
-        public Builder addQualifierValue(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue value) {
+        public Builder addQualifierValue(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue value) {
           if (qualifierValueBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -7673,7 +7710,7 @@ public final class ClientProtos {
           return this;
         }
         public Builder addQualifierValue(
-            int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue value) {
+            int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue value) {
           if (qualifierValueBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -7687,7 +7724,7 @@ public final class ClientProtos {
           return this;
         }
         public Builder addQualifierValue(
-            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder builderForValue) {
+            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder builderForValue) {
           if (qualifierValueBuilder_ == null) {
             ensureQualifierValueIsMutable();
             qualifierValue_.add(builderForValue.build());
@@ -7698,7 +7735,7 @@ public final class ClientProtos {
           return this;
         }
         public Builder addQualifierValue(
-            int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder builderForValue) {
+            int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder builderForValue) {
           if (qualifierValueBuilder_ == null) {
             ensureQualifierValueIsMutable();
             qualifierValue_.add(index, builderForValue.build());
@@ -7709,7 +7746,7 @@ public final class ClientProtos {
           return this;
         }
         public Builder addAllQualifierValue(
-            java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue> values) {
+            java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue> values) {
           if (qualifierValueBuilder_ == null) {
             ensureQualifierValueIsMutable();
             super.addAll(values, qualifierValue_);
@@ -7739,18 +7776,18 @@ public final class ClientProtos {
           }
           return this;
         }
-        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder getQualifierValueBuilder(
+        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder getQualifierValueBuilder(
             int index) {
           return getQualifierValueFieldBuilder().getBuilder(index);
         }
-        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValueOrBuilder getQualifierValueOrBuilder(
+        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder getQualifierValueOrBuilder(
             int index) {
           if (qualifierValueBuilder_ == null) {
             return qualifierValue_.get(index);  } else {
             return qualifierValueBuilder_.getMessageOrBuilder(index);
           }
         }
-        public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValueOrBuilder> 
+        public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder> 
              getQualifierValueOrBuilderList() {
           if (qualifierValueBuilder_ != null) {
             return qualifierValueBuilder_.getMessageOrBuilderList();
@@ -7758,25 +7795,25 @@ public final class ClientProtos {
             return java.util.Collections.unmodifiableList(qualifierValue_);
           }
         }
-        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder addQualifierValueBuilder() {
+        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder addQualifierValueBuilder() {
           return getQualifierValueFieldBuilder().addBuilder(
-              org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.getDefaultInstance());
+              org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.getDefaultInstance());
         }
-        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder addQualifierValueBuilder(
+        public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder addQualifierValueBuilder(
             int index) {
           return getQualifierValueFieldBuilder().addBuilder(
-              index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.getDefaultInstance());
+              index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.getDefaultInstance());
         }
-        public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder> 
+        public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder> 
              getQualifierValueBuilderList() {
           return getQualifierValueFieldBuilder().getBuilderList();
         }
         private com.google.protobuf.RepeatedFieldBuilder<
-            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValueOrBuilder> 
+            org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder> 
             getQualifierValueFieldBuilder() {
           if (qualifierValueBuilder_ == null) {
             qualifierValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-                org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValue.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue.QualifierValueOrBuilder>(
+                org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder>(
                     qualifierValue_,
                     ((bitField0_ & 0x00000002) == 0x00000002),
                     getParentForChildren(),
@@ -7786,7 +7823,7 @@ public final class ClientProtos {
           return qualifierValueBuilder_;
         }
         
-        // @@protoc_insertion_point(builder_scope:Mutate.ColumnValue)
+        // @@protoc_insertion_point(builder_scope:MutationProto.ColumnValue)
       }
       
       static {
@@ -7794,11 +7831,11 @@ public final class ClientProtos {
         defaultInstance.initFields();
       }
       
-      // @@protoc_insertion_point(class_scope:Mutate.ColumnValue)
+      // @@protoc_insertion_point(class_scope:MutationProto.ColumnValue)
     }
     
     private int bitField0_;
-    // required bytes row = 1;
+    // optional bytes row = 1;
     public static final int ROW_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString row_;
     public boolean hasRow() {
@@ -7808,39 +7845,49 @@ public final class ClientProtos {
       return row_;
     }
     
-    // required .Mutate.MutateType mutateType = 2;
+    // optional .MutationProto.MutationType mutateType = 2;
     public static final int MUTATETYPE_FIELD_NUMBER = 2;
-    private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.MutateType mutateType_;
+    private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType mutateType_;
     public boolean hasMutateType() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.MutateType getMutateType() {
+    public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType getMutateType() {
       return mutateType_;
     }
     
-    // repeated .Mutate.ColumnValue columnValue = 3;
+    // repeated .MutationProto.ColumnValue columnValue = 3;
     public static final int COLUMNVALUE_FIELD_NUMBER = 3;
-    private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue> columnValue_;
-    public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue> getColumnValueList() {
+    private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue> columnValue_;
+    public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue> getColumnValueList() {
       return columnValue_;
     }
-    public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValueOrBuilder> 
+    public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValueOrBuilder> 
         getColumnValueOrBuilderList() {
       return columnValue_;
     }
     public int getColumnValueCount() {
       return columnValue_.size();
     }
-    public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValue getColumnValue(int index) {
+    public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue getColumnValue(int index) {
       return columnValue_.get(index);
     }
-    public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.ColumnValueOrBuilder getColumnValueOrBuilder(
+    public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValueOrBuilder getColumnValueOrBuilder(
         int index) {
       return columnValue_.get(index);
     }
     
-    // repeated .NameBytesPair attribute = 4;
-    public static final int ATTRIBUTE_FIELD_NUMBER = 4;
+    // optional uint64 timestamp = 4;
+    public static final int TIMESTAMP_FIELD_NUMBER = 4;
+    private long timestamp_;
+    public boolean hasTimestamp() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    public long getTimestamp() {
+      return timestamp_;
+    }
+    
+    // repeated .NameBytesPair attribute = 5;
+    public static final int ATTRIBUTE_FIELD_NUMBER = 5;
     private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair> attribute_;
     public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair> getAttributeList() {
       return attribute_;
@@ -7860,16 +7907,6 @@ public final class ClientProtos {
       return attribute_.get(index);
     }
     

[... 1865 lines stripped ...]


Mime
View raw message