hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1466761 [27/41] - in /hbase/branches/0.95: ./ hbase-client/src/main/java/org/apache/hadoop/hbase/ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ hbase-p...
Date Thu, 11 Apr 2013 03:52:57 GMT
Modified: hbase/branches/0.95/hbase-protocol/src/main/protobuf/MasterAdmin.proto
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-protocol/src/main/protobuf/MasterAdmin.proto?rev=1466761&r1=1466760&r2=1466761&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-protocol/src/main/protobuf/MasterAdmin.proto (original)
+++ hbase/branches/0.95/hbase-protocol/src/main/protobuf/MasterAdmin.proto Thu Apr 11 03:52:56
2013
@@ -348,17 +348,19 @@ service MasterAdminService {
 
   /** 
    * Create a snapshot for the given table.
+   * @param snapshot description of the snapshot to take
    */
   rpc snapshot(TakeSnapshotRequest) returns(TakeSnapshotResponse);
 
   /**
    * List completed snapshots.
-   * Return a list of snapshot descriptors for completed snapshots
+   * @return a list of snapshot descriptors for completed snapshots
    */
   rpc getCompletedSnapshots(ListSnapshotRequest) returns(ListSnapshotResponse);
 
   /**
    * Delete an existing snapshot. This method can also be used to clean up an aborted snapshot.
+   * @param snapshotName snapshot to delete
    */
   rpc deleteSnapshot(DeleteSnapshotRequest) returns(DeleteSnapshotResponse);
 
@@ -369,6 +371,7 @@ service MasterAdminService {
 
   /**
    * Restore a snapshot
+   * @param snapshot description of the snapshot to restore
    */
   rpc restoreSnapshot(RestoreSnapshotRequest) returns(RestoreSnapshotResponse);
 

Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java?rev=1466761&r1=1466760&r2=1466761&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java
(original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java
Thu Apr 11 03:52:56 2013
@@ -119,7 +119,7 @@ import com.google.common.base.Function;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.protobuf.CodedInputStream;
 import com.google.protobuf.Message;
-import com.google.protobuf.Parser;
+import com.google.protobuf.Message.Builder;
 import com.google.protobuf.TextFormat;
 // Uses Writables doing sasl
 
@@ -1673,7 +1673,8 @@ public abstract class HBaseServer implem
       CodedInputStream cis = CodedInputStream.newInstance(buf, offset, buf.length);
       int headerSize = cis.readRawVarint32();
       offset = cis.getTotalBytesRead();
-      RequestHeader header = RequestHeader.PARSER.parseFrom(buf, offset, headerSize);
+      RequestHeader header =
+        RequestHeader.newBuilder().mergeFrom(buf, offset, headerSize).build();
       offset += headerSize;
       int id = header.getCallId();
       if (LOG.isDebugEnabled()) {
@@ -1700,13 +1701,15 @@ public abstract class HBaseServer implem
           Message m = methodCache.getMethodArgType(method);
           // Check that there is a param to deserialize.
           if (m != null) {
-            Parser<? extends Message> parser = m.getParserForType();
+            Builder builder = null;
+            builder = m.newBuilderForType();
             // To read the varint, I need an inputstream; might as well be a CIS.
             cis = CodedInputStream.newInstance(buf, offset, buf.length);
             int paramSize = cis.readRawVarint32();
             offset += cis.getTotalBytesRead();
-            if (parser != null) {
-              param = parser.parseFrom(buf, offset, paramSize);
+            if (builder != null) {
+              builder.mergeFrom(buf, offset, paramSize);
+              param = builder.build();
             }
             offset += paramSize;
           }

Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1466761&r1=1466760&r2=1466761&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Thu Apr 11 03:52:56 2013
@@ -184,6 +184,7 @@ import com.google.protobuf.Service;
 @InterfaceAudience.Private
 public class HRegion implements HeapSize { // , Writable{
   public static final Log LOG = LogFactory.getLog(HRegion.class);
+  private static final String MERGEDIR = ".merges";
 
   public static final String LOAD_CFS_ON_DEMAND_CONFIG_KEY =
       "hbase.hregion.scan.loadColumnFamiliesOnDemand";

Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellMessage.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellMessage.java?rev=1466761&r1=1466760&r2=1466761&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellMessage.java
(original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellMessage.java
Thu Apr 11 03:52:56 2013
@@ -10,238 +10,92 @@ public final class CellMessage {
   }
   public interface CellOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-
+    
     // optional bytes row = 1;
-    /**
-     * <code>optional bytes row = 1;</code>
-     *
-     * <pre>
-     * unused if Cell is in a CellSet
-     * </pre>
-     */
     boolean hasRow();
-    /**
-     * <code>optional bytes row = 1;</code>
-     *
-     * <pre>
-     * unused if Cell is in a CellSet
-     * </pre>
-     */
     com.google.protobuf.ByteString getRow();
-
+    
     // optional bytes column = 2;
-    /**
-     * <code>optional bytes column = 2;</code>
-     */
     boolean hasColumn();
-    /**
-     * <code>optional bytes column = 2;</code>
-     */
     com.google.protobuf.ByteString getColumn();
-
+    
     // optional int64 timestamp = 3;
-    /**
-     * <code>optional int64 timestamp = 3;</code>
-     */
     boolean hasTimestamp();
-    /**
-     * <code>optional int64 timestamp = 3;</code>
-     */
     long getTimestamp();
-
+    
     // optional bytes data = 4;
-    /**
-     * <code>optional bytes data = 4;</code>
-     */
     boolean hasData();
-    /**
-     * <code>optional bytes data = 4;</code>
-     */
     com.google.protobuf.ByteString getData();
   }
-  /**
-   * Protobuf type {@code org.apache.hadoop.hbase.rest.protobuf.generated.Cell}
-   */
   public static final class Cell extends
       com.google.protobuf.GeneratedMessage
       implements CellOrBuilder {
     // Use Cell.newBuilder() to construct.
-    private Cell(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Cell(Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private Cell(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance();
}
-
+    private Cell(boolean noInit) {}
+    
     private static final Cell defaultInstance;
     public static Cell getDefaultInstance() {
       return defaultInstance;
     }
-
+    
     public Cell getDefaultInstanceForType() {
       return defaultInstance;
     }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Cell(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              row_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              column_ = input.readBytes();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              timestamp_ = input.readInt64();
-              break;
-            }
-            case 34: {
-              bitField0_ |= 0x00000008;
-              data_ = input.readBytes();
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+    
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_descriptor;
     }
-
+    
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell.class, org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<Cell> PARSER =
-        new com.google.protobuf.AbstractParser<Cell>() {
-      public Cell parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Cell(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Cell> getParserForType() {
-      return PARSER;
+      return org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_fieldAccessorTable;
     }
-
+    
     private int bitField0_;
     // optional bytes row = 1;
     public static final int ROW_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString row_;
-    /**
-     * <code>optional bytes row = 1;</code>
-     *
-     * <pre>
-     * unused if Cell is in a CellSet
-     * </pre>
-     */
     public boolean hasRow() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    /**
-     * <code>optional bytes row = 1;</code>
-     *
-     * <pre>
-     * unused if Cell is in a CellSet
-     * </pre>
-     */
     public com.google.protobuf.ByteString getRow() {
       return row_;
     }
-
+    
     // optional bytes column = 2;
     public static final int COLUMN_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString column_;
-    /**
-     * <code>optional bytes column = 2;</code>
-     */
     public boolean hasColumn() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    /**
-     * <code>optional bytes column = 2;</code>
-     */
     public com.google.protobuf.ByteString getColumn() {
       return column_;
     }
-
+    
     // optional int64 timestamp = 3;
     public static final int TIMESTAMP_FIELD_NUMBER = 3;
     private long timestamp_;
-    /**
-     * <code>optional int64 timestamp = 3;</code>
-     */
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
-    /**
-     * <code>optional int64 timestamp = 3;</code>
-     */
     public long getTimestamp() {
       return timestamp_;
     }
-
+    
     // optional bytes data = 4;
     public static final int DATA_FIELD_NUMBER = 4;
     private com.google.protobuf.ByteString data_;
-    /**
-     * <code>optional bytes data = 4;</code>
-     */
     public boolean hasData() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
-    /**
-     * <code>optional bytes data = 4;</code>
-     */
     public com.google.protobuf.ByteString getData() {
       return data_;
     }
-
+    
     private void initFields() {
       row_ = com.google.protobuf.ByteString.EMPTY;
       column_ = com.google.protobuf.ByteString.EMPTY;
@@ -252,11 +106,11 @@ public final class CellMessage {
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-
+      
       memoizedIsInitialized = 1;
       return true;
     }
-
+    
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -274,12 +128,12 @@ public final class CellMessage {
       }
       getUnknownFields().writeTo(output);
     }
-
+    
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-
+    
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -301,83 +155,94 @@ public final class CellMessage {
       memoizedSerializedSize = size;
       return size;
     }
-
+    
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-
+    
     public static org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parseFrom(byte[]
data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parseFrom(java.io.InputStream
input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parseDelimitedFrom(java.io.InputStream
input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
-
+    
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell
prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-
+    
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-    /**
-     * Protobuf type {@code org.apache.hadoop.hbase.rest.protobuf.generated.Cell}
-     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.CellOrBuilder
{
@@ -385,21 +250,18 @@ public final class CellMessage {
           getDescriptor() {
         return org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_descriptor;
       }
-
+      
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell.class, org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell.Builder.class);
+        return org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_fieldAccessorTable;
       }
-
+      
       // Construct using org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -410,7 +272,7 @@ public final class CellMessage {
       private static Builder create() {
         return new Builder();
       }
-
+      
       public Builder clear() {
         super.clear();
         row_ = com.google.protobuf.ByteString.EMPTY;
@@ -423,20 +285,20 @@ public final class CellMessage {
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
-
+      
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-
+      
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_descriptor;
+        return org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell.getDescriptor();
       }
-
+      
       public org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell getDefaultInstanceForType()
{
         return org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell.getDefaultInstance();
       }
-
+      
       public org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell build() {
         org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell result = buildPartial();
         if (!result.isInitialized()) {
@@ -444,7 +306,17 @@ public final class CellMessage {
         }
         return result;
       }
-
+      
+      private org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell buildParsed()
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(
+            result).asInvalidProtocolBufferException();
+        }
+        return result;
+      }
+      
       public org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell buildPartial()
{
         org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell result = new org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell(this);
         int from_bitField0_ = bitField0_;
@@ -469,7 +341,7 @@ public final class CellMessage {
         onBuilt();
         return result;
       }
-
+      
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell)
{
           return mergeFrom((org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell)other);
@@ -478,7 +350,7 @@ public final class CellMessage {
           return this;
         }
       }
-
+      
       public Builder mergeFrom(org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell
other) {
         if (other == org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell.getDefaultInstance())
return this;
         if (other.hasRow()) {
@@ -496,59 +368,68 @@ public final class CellMessage {
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-
+      
       public final boolean isInitialized() {
         return true;
       }
-
+      
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell parsedMessage =
null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell)
e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder(
+            this.getUnknownFields());
+        while (true) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              this.setUnknownFields(unknownFields.build());
+              onChanged();
+              return this;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                this.setUnknownFields(unknownFields.build());
+                onChanged();
+                return this;
+              }
+              break;
+            }
+            case 10: {
+              bitField0_ |= 0x00000001;
+              row_ = input.readBytes();
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              column_ = input.readBytes();
+              break;
+            }
+            case 24: {
+              bitField0_ |= 0x00000004;
+              timestamp_ = input.readInt64();
+              break;
+            }
+            case 34: {
+              bitField0_ |= 0x00000008;
+              data_ = input.readBytes();
+              break;
+            }
           }
         }
-        return this;
       }
+      
       private int bitField0_;
-
+      
       // optional bytes row = 1;
       private com.google.protobuf.ByteString row_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>optional bytes row = 1;</code>
-       *
-       * <pre>
-       * unused if Cell is in a CellSet
-       * </pre>
-       */
       public boolean hasRow() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      /**
-       * <code>optional bytes row = 1;</code>
-       *
-       * <pre>
-       * unused if Cell is in a CellSet
-       * </pre>
-       */
       public com.google.protobuf.ByteString getRow() {
         return row_;
       }
-      /**
-       * <code>optional bytes row = 1;</code>
-       *
-       * <pre>
-       * unused if Cell is in a CellSet
-       * </pre>
-       */
       public Builder setRow(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -558,37 +439,21 @@ public final class CellMessage {
         onChanged();
         return this;
       }
-      /**
-       * <code>optional bytes row = 1;</code>
-       *
-       * <pre>
-       * unused if Cell is in a CellSet
-       * </pre>
-       */
       public Builder clearRow() {
         bitField0_ = (bitField0_ & ~0x00000001);
         row_ = getDefaultInstance().getRow();
         onChanged();
         return this;
       }
-
+      
       // optional bytes column = 2;
       private com.google.protobuf.ByteString column_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>optional bytes column = 2;</code>
-       */
       public boolean hasColumn() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      /**
-       * <code>optional bytes column = 2;</code>
-       */
       public com.google.protobuf.ByteString getColumn() {
         return column_;
       }
-      /**
-       * <code>optional bytes column = 2;</code>
-       */
       public Builder setColumn(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -598,66 +463,42 @@ public final class CellMessage {
         onChanged();
         return this;
       }
-      /**
-       * <code>optional bytes column = 2;</code>
-       */
       public Builder clearColumn() {
         bitField0_ = (bitField0_ & ~0x00000002);
         column_ = getDefaultInstance().getColumn();
         onChanged();
         return this;
       }
-
+      
       // optional int64 timestamp = 3;
       private long timestamp_ ;
-      /**
-       * <code>optional int64 timestamp = 3;</code>
-       */
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
-      /**
-       * <code>optional int64 timestamp = 3;</code>
-       */
       public long getTimestamp() {
         return timestamp_;
       }
-      /**
-       * <code>optional int64 timestamp = 3;</code>
-       */
       public Builder setTimestamp(long value) {
         bitField0_ |= 0x00000004;
         timestamp_ = value;
         onChanged();
         return this;
       }
-      /**
-       * <code>optional int64 timestamp = 3;</code>
-       */
       public Builder clearTimestamp() {
         bitField0_ = (bitField0_ & ~0x00000004);
         timestamp_ = 0L;
         onChanged();
         return this;
       }
-
+      
       // optional bytes data = 4;
       private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>optional bytes data = 4;</code>
-       */
       public boolean hasData() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
-      /**
-       * <code>optional bytes data = 4;</code>
-       */
       public com.google.protobuf.ByteString getData() {
         return data_;
       }
-      /**
-       * <code>optional bytes data = 4;</code>
-       */
       public Builder setData(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -667,33 +508,30 @@ public final class CellMessage {
         onChanged();
         return this;
       }
-      /**
-       * <code>optional bytes data = 4;</code>
-       */
       public Builder clearData() {
         bitField0_ = (bitField0_ & ~0x00000008);
         data_ = getDefaultInstance().getData();
         onChanged();
         return this;
       }
-
+      
       // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hbase.rest.protobuf.generated.Cell)
     }
-
+    
     static {
       defaultInstance = new Cell(true);
       defaultInstance.initFields();
     }
-
+    
     // @@protoc_insertion_point(class_scope:org.apache.hadoop.hbase.rest.protobuf.generated.Cell)
   }
-
+  
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_fieldAccessorTable;
-
+  
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
@@ -717,7 +555,9 @@ public final class CellMessage {
           internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_fieldAccessorTable
= new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_org_apache_hadoop_hbase_rest_protobuf_generated_Cell_descriptor,
-              new java.lang.String[] { "Row", "Column", "Timestamp", "Data", });
+              new java.lang.String[] { "Row", "Column", "Timestamp", "Data", },
+              org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell.class,
+              org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell.Builder.class);
           return null;
         }
       };
@@ -726,6 +566,6 @@ public final class CellMessage {
         new com.google.protobuf.Descriptors.FileDescriptor[] {
         }, assigner);
   }
-
+  
   // @@protoc_insertion_point(outer_class_scope)
 }



Mime
View raw message