From 9269b8199e472ea8c849d3d3e66c08e7edbbffb2 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Tue, 17 May 2016 09:32:55 -0700 Subject: [PATCH] HBASE-15840 WAL.proto compilation broken for cpp --- .../hadoop/hbase/protobuf/ProtobufUtil.java | 2 +- .../hbase/protobuf/generated/WALProtos.java | 180 +++++++++--------- hbase-protocol/src/main/protobuf/WAL.proto | 6 +- .../regionserver/ReplicationSource.java | 2 +- 4 files changed, 95 insertions(+), 95 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java index 9c0dd6a54ab..bbc13abd1d4 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java @@ -3092,7 +3092,7 @@ public final class ProtobufUtil { String name = path.getName(); builder.addStoreFile(name); Long size = storeFilesSize.get(name) == null ? (Long) 0L : storeFilesSize.get(name); - builder.setStoreFileSize(size); + builder.setStoreFileSizeBytes(size); } desc.addStores(builder); } diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java index 6252d5168a5..4da6fa220ce 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java @@ -1086,9 +1086,9 @@ public final class WALProtos { * * 
      *
-     *This parameter is deprecated in favor of clusters which 
+     *This parameter is deprecated in favor of clusters which
      *contains the list of clusters that have consumed the change.
-     *It is retained so that the log created by earlier releases (0.94) 
+     *It is retained so that the log created by earlier releases (0.94)
      *can be read by the newer releases.
      *
*/ @@ -1098,9 +1098,9 @@ public final class WALProtos { * * 
      *
-     *This parameter is deprecated in favor of clusters which 
+     *This parameter is deprecated in favor of clusters which
      *contains the list of clusters that have consumed the change.
-     *It is retained so that the log created by earlier releases (0.94) 
+     *It is retained so that the log created by earlier releases (0.94)
      *can be read by the newer releases.
      *
*/ @@ -1110,9 +1110,9 @@ public final class WALProtos { * * 
      *
-     *This parameter is deprecated in favor of clusters which 
+     *This parameter is deprecated in favor of clusters which
      *contains the list of clusters that have consumed the change.
-     *It is retained so that the log created by earlier releases (0.94) 
+     *It is retained so that the log created by earlier releases (0.94)
      *can be read by the newer releases.
      *
*/ @@ -1482,9 +1482,9 @@ public final class WALProtos { * * 
      *
-     *This parameter is deprecated in favor of clusters which 
+     *This parameter is deprecated in favor of clusters which
      *contains the list of clusters that have consumed the change.
-     *It is retained so that the log created by earlier releases (0.94) 
+     *It is retained so that the log created by earlier releases (0.94)
      *can be read by the newer releases.
      *
*/ @@ -1496,9 +1496,9 @@ public final class WALProtos { * * 
      *
-     *This parameter is deprecated in favor of clusters which 
+     *This parameter is deprecated in favor of clusters which
      *contains the list of clusters that have consumed the change.
-     *It is retained so that the log created by earlier releases (0.94) 
+     *It is retained so that the log created by earlier releases (0.94)
      *can be read by the newer releases.
      *
*/ @@ -1510,9 +1510,9 @@ public final class WALProtos { * * 
      *
-     *This parameter is deprecated in favor of clusters which 
+     *This parameter is deprecated in favor of clusters which
      *contains the list of clusters that have consumed the change.
-     *It is retained so that the log created by earlier releases (0.94) 
+     *It is retained so that the log created by earlier releases (0.94)
      *can be read by the newer releases.
      *
*/ @@ -2501,9 +2501,9 @@ public final class WALProtos { * * 
        *
-       *This parameter is deprecated in favor of clusters which 
+       *This parameter is deprecated in favor of clusters which
        *contains the list of clusters that have consumed the change.
-       *It is retained so that the log created by earlier releases (0.94) 
+       *It is retained so that the log created by earlier releases (0.94)
        *can be read by the newer releases.
        *
*/ @@ -2515,9 +2515,9 @@ public final class WALProtos { * * 
        *
-       *This parameter is deprecated in favor of clusters which 
+       *This parameter is deprecated in favor of clusters which
        *contains the list of clusters that have consumed the change.
-       *It is retained so that the log created by earlier releases (0.94) 
+       *It is retained so that the log created by earlier releases (0.94)
        *can be read by the newer releases.
        *
*/ @@ -2533,9 +2533,9 @@ public final class WALProtos { * * 
        *
-       *This parameter is deprecated in favor of clusters which 
+       *This parameter is deprecated in favor of clusters which
        *contains the list of clusters that have consumed the change.
-       *It is retained so that the log created by earlier releases (0.94) 
+       *It is retained so that the log created by earlier releases (0.94)
        *can be read by the newer releases.
        *
*/ @@ -2557,9 +2557,9 @@ public final class WALProtos { * * 
        *
-       *This parameter is deprecated in favor of clusters which 
+       *This parameter is deprecated in favor of clusters which
        *contains the list of clusters that have consumed the change.
-       *It is retained so that the log created by earlier releases (0.94) 
+       *It is retained so that the log created by earlier releases (0.94)
        *can be read by the newer releases.
        *
*/ @@ -2579,9 +2579,9 @@ public final class WALProtos { * * 
        *
-       *This parameter is deprecated in favor of clusters which 
+       *This parameter is deprecated in favor of clusters which
        *contains the list of clusters that have consumed the change.
-       *It is retained so that the log created by earlier releases (0.94) 
+       *It is retained so that the log created by earlier releases (0.94)
        *can be read by the newer releases.
        *
*/ @@ -2606,9 +2606,9 @@ public final class WALProtos { * * 
        *
-       *This parameter is deprecated in favor of clusters which 
+       *This parameter is deprecated in favor of clusters which
        *contains the list of clusters that have consumed the change.
-       *It is retained so that the log created by earlier releases (0.94) 
+       *It is retained so that the log created by earlier releases (0.94)
        *can be read by the newer releases.
        *
*/ @@ -2627,9 +2627,9 @@ public final class WALProtos { * * 
        *
-       *This parameter is deprecated in favor of clusters which 
+       *This parameter is deprecated in favor of clusters which
        *contains the list of clusters that have consumed the change.
-       *It is retained so that the log created by earlier releases (0.94) 
+       *It is retained so that the log created by earlier releases (0.94)
        *can be read by the newer releases.
        *
*/ @@ -2643,9 +2643,9 @@ public final class WALProtos { * * 
        *
-       *This parameter is deprecated in favor of clusters which 
+       *This parameter is deprecated in favor of clusters which
        *contains the list of clusters that have consumed the change.
-       *It is retained so that the log created by earlier releases (0.94) 
+       *It is retained so that the log created by earlier releases (0.94)
        *can be read by the newer releases.
        *
*/ @@ -2661,9 +2661,9 @@ public final class WALProtos { * * 
        *
-       *This parameter is deprecated in favor of clusters which 
+       *This parameter is deprecated in favor of clusters which
        *contains the list of clusters that have consumed the change.
-       *It is retained so that the log created by earlier releases (0.94) 
+       *It is retained so that the log created by earlier releases (0.94)
        *can be read by the newer releases.
        *
*/ @@ -7822,23 +7822,23 @@ public final class WALProtos { com.google.protobuf.ByteString getStoreFileBytes(int index); - // optional uint64 store_file_size = 4; + // optional uint64 store_file_size_bytes = 4; /** - * optional uint64 store_file_size = 4; + * optional uint64 store_file_size_bytes = 4; * * 
      * size of store file
      *
*/ - boolean hasStoreFileSize(); + boolean hasStoreFileSizeBytes(); /** - * optional uint64 store_file_size = 4; + * optional uint64 store_file_size_bytes = 4; * * 
      * size of store file
      *
*/ - long getStoreFileSize(); + long getStoreFileSizeBytes(); } /** * Protobuf type {@code hbase.pb.StoreDescriptor} @@ -7911,7 +7911,7 @@ public final class WALProtos { } case 32: { bitField0_ |= 0x00000004; - storeFileSize_ = input.readUInt64(); + storeFileSizeBytes_ = input.readUInt64(); break; } } @@ -8074,35 +8074,35 @@ public final class WALProtos { return storeFile_.getByteString(index); } - // optional uint64 store_file_size = 4; - public static final int STORE_FILE_SIZE_FIELD_NUMBER = 4; - private long storeFileSize_; + // optional uint64 store_file_size_bytes = 4; + public static final int STORE_FILE_SIZE_BYTES_FIELD_NUMBER = 4; + private long storeFileSizeBytes_; /** - * optional uint64 store_file_size = 4; + * optional uint64 store_file_size_bytes = 4; * * 
      * size of store file
      *
*/ - public boolean hasStoreFileSize() { + public boolean hasStoreFileSizeBytes() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional uint64 store_file_size = 4; + * optional uint64 store_file_size_bytes = 4; * * 
      * size of store file
      *
*/ - public long getStoreFileSize() { - return storeFileSize_; + public long getStoreFileSizeBytes() { + return storeFileSizeBytes_; } private void initFields() { familyName_ = com.google.protobuf.ByteString.EMPTY; storeHomeDir_ = ""; storeFile_ = com.google.protobuf.LazyStringArrayList.EMPTY; - storeFileSize_ = 0L; + storeFileSizeBytes_ = 0L; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -8134,7 +8134,7 @@ public final class WALProtos { output.writeBytes(3, storeFile_.getByteString(i)); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeUInt64(4, storeFileSize_); + output.writeUInt64(4, storeFileSizeBytes_); } getUnknownFields().writeTo(output); } @@ -8164,7 +8164,7 @@ public final class WALProtos { } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(4, storeFileSize_); + .computeUInt64Size(4, storeFileSizeBytes_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -8201,10 +8201,10 @@ public final class WALProtos { } result = result && getStoreFileList() .equals(other.getStoreFileList()); - result = result && (hasStoreFileSize() == other.hasStoreFileSize()); - if (hasStoreFileSize()) { - result = result && (getStoreFileSize() - == other.getStoreFileSize()); + result = result && (hasStoreFileSizeBytes() == other.hasStoreFileSizeBytes()); + if (hasStoreFileSizeBytes()) { + result = result && (getStoreFileSizeBytes() + == other.getStoreFileSizeBytes()); } result = result && getUnknownFields().equals(other.getUnknownFields()); @@ -8231,9 +8231,9 @@ public final class WALProtos { hash = (37 * hash) + STORE_FILE_FIELD_NUMBER; hash = (53 * hash) + getStoreFileList().hashCode(); } - if (hasStoreFileSize()) { - hash = (37 * hash) + STORE_FILE_SIZE_FIELD_NUMBER; - hash = (53 * hash) + hashLong(getStoreFileSize()); + if (hasStoreFileSizeBytes()) { + hash = (37 * hash) + STORE_FILE_SIZE_BYTES_FIELD_NUMBER; + hash = (53 * hash) + hashLong(getStoreFileSizeBytes()); } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; @@ -8350,7 +8350,7 @@ public final class WALProtos { bitField0_ = (bitField0_ & ~0x00000002); storeFile_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000004); - storeFileSize_ = 0L; + storeFileSizeBytes_ = 0L; bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -8397,7 +8397,7 @@ public final class WALProtos { if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000004; } - result.storeFileSize_ = storeFileSize_; + result.storeFileSizeBytes_ = storeFileSizeBytes_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -8432,8 +8432,8 @@ public final class WALProtos { } onChanged(); } - if (other.hasStoreFileSize()) { - setStoreFileSize(other.getStoreFileSize()); + if (other.hasStoreFileSizeBytes()) { + setStoreFileSizeBytes(other.getStoreFileSizeBytes()); } this.mergeUnknownFields(other.getUnknownFields()); return this; @@ -8733,51 +8733,51 @@ public final class WALProtos { return this; } - // optional uint64 store_file_size = 4; - private long storeFileSize_ ; + // optional uint64 store_file_size_bytes = 4; + private long storeFileSizeBytes_ ; /** - * optional uint64 store_file_size = 4; + * optional uint64 store_file_size_bytes = 4; * * 
        * size of store file
        *
*/ - public boolean hasStoreFileSize() { + public boolean hasStoreFileSizeBytes() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional uint64 store_file_size = 4; + * optional uint64 store_file_size_bytes = 4; * * 
        * size of store file
        *
*/ - public long getStoreFileSize() { - return storeFileSize_; + public long getStoreFileSizeBytes() { + return storeFileSizeBytes_; } /** - * optional uint64 store_file_size = 4; + * optional uint64 store_file_size_bytes = 4; * * 
        * size of store file
        *
*/ - public Builder setStoreFileSize(long value) { + public Builder setStoreFileSizeBytes(long value) { bitField0_ |= 0x00000008; - storeFileSize_ = value; + storeFileSizeBytes_ = value; onChanged(); return this; } /** - * optional uint64 store_file_size = 4; + * optional uint64 store_file_size_bytes = 4; * * 
        * size of store file
        *
*/ - public Builder clearStoreFileSize() { + public Builder clearStoreFileSizeBytes() { bitField0_ = (bitField0_ & ~0x00000008); - storeFileSize_ = 0L; + storeFileSizeBytes_ = 0L; onChanged(); return this; } @@ -11999,25 +11999,25 @@ public final class WALProtos { "ome_dir\030\002 \002(\t\022\024\n\014flush_output\030\003 \003(\t\"S\n\013F" + "lushAction\022\017\n\013START_FLUSH\020\000\022\020\n\014COMMIT_FL" + "USH\020\001\022\017\n\013ABORT_FLUSH\020\002\022\020\n\014CANNOT_FLUSH\020\003", - "\"k\n\017StoreDescriptor\022\023\n\013family_name\030\001 \002(\014" + + "\"q\n\017StoreDescriptor\022\023\n\013family_name\030\001 \002(\014" + "\022\026\n\016store_home_dir\030\002 \002(\t\022\022\n\nstore_file\030\003" + - " \003(\t\022\027\n\017store_file_size\030\004 \001(\004\"\237\001\n\022BulkLo" + - "adDescriptor\022\'\n\ntable_name\030\001 \002(\0132\023.hbase" + - ".pb.TableName\022\033\n\023encoded_region_name\030\002 \002" + - "(\014\022)\n\006stores\030\003 \003(\0132\031.hbase.pb.StoreDescr" + - "iptor\022\030\n\020bulkload_seq_num\030\004 \002(\003\"\272\002\n\025Regi" + - "onEventDescriptor\022=\n\nevent_type\030\001 \002(\0162)." + - "hbase.pb.RegionEventDescriptor.EventType" + - "\022\022\n\ntable_name\030\002 \002(\014\022\033\n\023encoded_region_n", - "ame\030\003 \002(\014\022\033\n\023log_sequence_number\030\004 \001(\004\022)" + - "\n\006stores\030\005 \003(\0132\031.hbase.pb.StoreDescripto" + - "r\022$\n\006server\030\006 \001(\0132\024.hbase.pb.ServerName\022" + - "\023\n\013region_name\030\007 \001(\014\".\n\tEventType\022\017\n\013REG" + - "ION_OPEN\020\000\022\020\n\014REGION_CLOSE\020\001\"\014\n\nWALTrail" + - "er*F\n\tScopeType\022\033\n\027REPLICATION_SCOPE_LOC" + - "AL\020\000\022\034\n\030REPLICATION_SCOPE_GLOBAL\020\001B?\n*or" + - "g.apache.hadoop.hbase.protobuf.generated" + - "B\tWALProtosH\001\210\001\000\240\001\001" + " \003(\t\022\035\n\025store_file_size_bytes\030\004 \001(\004\"\237\001\n\022" + + "BulkLoadDescriptor\022\'\n\ntable_name\030\001 \002(\0132\023" + + ".hbase.pb.TableName\022\033\n\023encoded_region_na" + + "me\030\002 \002(\014\022)\n\006stores\030\003 \003(\0132\031.hbase.pb.Stor" + + "eDescriptor\022\030\n\020bulkload_seq_num\030\004 \002(\003\"\272\002" + + "\n\025RegionEventDescriptor\022=\n\nevent_type\030\001 " + + "\002(\0162).hbase.pb.RegionEventDescriptor.Eve" + + "ntType\022\022\n\ntable_name\030\002 \002(\014\022\033\n\023encoded_re", + "gion_name\030\003 \002(\014\022\033\n\023log_sequence_number\030\004" + + " \001(\004\022)\n\006stores\030\005 \003(\0132\031.hbase.pb.StoreDes" + + "criptor\022$\n\006server\030\006 \001(\0132\024.hbase.pb.Serve" + + "rName\022\023\n\013region_name\030\007 \001(\014\".\n\tEventType\022" + + "\017\n\013REGION_OPEN\020\000\022\020\n\014REGION_CLOSE\020\001\"\014\n\nWA" + + "LTrailer*F\n\tScopeType\022\033\n\027REPLICATION_SCO" + + "PE_LOCAL\020\000\022\034\n\030REPLICATION_SCOPE_GLOBAL\020\001" + + "B?\n*org.apache.hadoop.hbase.protobuf.gen" + + "eratedB\tWALProtosH\001\210\001\000\240\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -12065,7 +12065,7 @@ public final class WALProtos { internal_static_hbase_pb_StoreDescriptor_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_StoreDescriptor_descriptor, - new java.lang.String[] { "FamilyName", "StoreHomeDir", "StoreFile", "StoreFileSize", }); + new java.lang.String[] { "FamilyName", "StoreHomeDir", "StoreFile", "StoreFileSizeBytes", }); internal_static_hbase_pb_BulkLoadDescriptor_descriptor = getDescriptor().getMessageTypes().get(6); internal_static_hbase_pb_BulkLoadDescriptor_fieldAccessorTable = new diff --git a/hbase-protocol/src/main/protobuf/WAL.proto b/hbase-protocol/src/main/protobuf/WAL.proto index aeb8a163149..2061b22bdb9 100644 --- a/hbase-protocol/src/main/protobuf/WAL.proto +++ b/hbase-protocol/src/main/protobuf/WAL.proto @@ -44,9 +44,9 @@ message WALKey { required uint64 log_sequence_number = 3; required uint64 write_time = 4; /* - This parameter is deprecated in favor of clusters which + This parameter is deprecated in favor of clusters which contains the list of clusters that have consumed the change. - It is retained so that the log created by earlier releases (0.94) + It is retained so that the log created by earlier releases (0.94) can be read by the newer releases. */ optional UUID cluster_id = 5 [deprecated=true]; @@ -132,7 +132,7 @@ message StoreDescriptor { required bytes family_name = 1; required string store_home_dir = 2; //relative to region dir repeated string store_file = 3; // relative to store dir - optional uint64 store_file_size = 4; // size of store file + optional uint64 store_file_size_bytes = 4; // size of store file } /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java index a4f1c9ba3ed..84e07873170 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java @@ -756,7 +756,7 @@ public class ReplicationSource extends Thread List stores = bld.getStoresList(); int totalStores = stores.size(); for (int j = 0; j < totalStores; j++) { - totalStoreFilesSize += stores.get(j).getStoreFileSize(); + totalStoreFilesSize += stores.get(j).getStoreFileSizeBytes(); } } catch (IOException e) { LOG.error("Failed to deserialize bulk load entry from wal edit. "