hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-15656 Fix unused protobuf warning in Admin.proto (Yi Liang)
Date Fri, 29 Jul 2016 21:59:29 GMT
Repository: hbase
Updated Branches:
  refs/heads/master ff7d0082b -> 26c042668


HBASE-15656 Fix unused protobuf warning in Admin.proto (Yi Liang)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/26c04266
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/26c04266
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/26c04266

Branch: refs/heads/master
Commit: 26c042668902d297011109d4b382ebfa7007399c
Parents: ff7d008
Author: stack <stack@apache.org>
Authored: Fri Jul 29 14:59:22 2016 -0700
Committer: stack <stack@apache.org>
Committed: Fri Jul 29 14:59:22 2016 -0700

----------------------------------------------------------------------
 .../hbase/protobuf/generated/AdminProtos.java   | 225 +++++++++----------
 .../hbase/protobuf/generated/HBaseProtos.java   | 126 +++++------
 .../generated/SecureBulkLoadProtos.java         |  35 ++-
 .../hbase/protobuf/generated/WALProtos.java     |  99 ++++----
 hbase-protocol/src/main/protobuf/Admin.proto    |   1 -
 hbase-protocol/src/main/protobuf/HBase.proto    |   1 -
 .../src/main/protobuf/SecureBulkLoad.proto      |   1 -
 hbase-protocol/src/main/protobuf/WAL.proto      |   1 -
 8 files changed, 240 insertions(+), 249 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/26c04266/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java
b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java
index 1c59ea6..9deba2e 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java
@@ -23977,118 +23977,118 @@ public final class AdminProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\013Admin.proto\022\010hbase.pb\032\014Client.proto\032\013H" +
-      "Base.proto\032\tWAL.proto\"[\n\024GetRegionInfoRe" +
-      "quest\022)\n\006region\030\001 \002(\0132\031.hbase.pb.RegionS" +
-      "pecifier\022\030\n\020compaction_state\030\002 \001(\010\"\353\001\n\025G" +
-      "etRegionInfoResponse\022)\n\013region_info\030\001 \002(" +
-      "\0132\024.hbase.pb.RegionInfo\022I\n\020compaction_st" +
-      "ate\030\002 \001(\0162/.hbase.pb.GetRegionInfoRespon" +
-      "se.CompactionState\022\024\n\014isRecovering\030\003 \001(\010" +
-      "\"F\n\017CompactionState\022\010\n\004NONE\020\000\022\t\n\005MINOR\020\001" +
-      "\022\t\n\005MAJOR\020\002\022\023\n\017MAJOR_AND_MINOR\020\003\"P\n\023GetS",
-      "toreFileRequest\022)\n\006region\030\001 \002(\0132\031.hbase." +
-      "pb.RegionSpecifier\022\016\n\006family\030\002 \003(\014\"*\n\024Ge" +
-      "tStoreFileResponse\022\022\n\nstore_file\030\001 \003(\t\"\030" +
-      "\n\026GetOnlineRegionRequest\"D\n\027GetOnlineReg" +
-      "ionResponse\022)\n\013region_info\030\001 \003(\0132\024.hbase" +
-      ".pb.RegionInfo\"\263\002\n\021OpenRegionRequest\022=\n\t" +
-      "open_info\030\001 \003(\0132*.hbase.pb.OpenRegionReq" +
-      "uest.RegionOpenInfo\022\027\n\017serverStartCode\030\002" +
-      " \001(\004\022\032\n\022master_system_time\030\005 \001(\004\032\251\001\n\016Reg"
+
-      "ionOpenInfo\022$\n\006region\030\001 \002(\0132\024.hbase.pb.R",
-      "egionInfo\022\037\n\027version_of_offline_node\030\002 \001" +
-      "(\r\022+\n\rfavored_nodes\030\003 \003(\0132\024.hbase.pb.Ser" +
-      "verName\022#\n\033openForDistributedLogReplay\030\004" +
-      " \001(\010\"\246\001\n\022OpenRegionResponse\022F\n\ropening_s" +
-      "tate\030\001 \003(\0162/.hbase.pb.OpenRegionResponse" +
-      ".RegionOpeningState\"H\n\022RegionOpeningStat" +
-      "e\022\n\n\006OPENED\020\000\022\022\n\016ALREADY_OPENED\020\001\022\022\n\016FAI"
+
-      "LED_OPENING\020\002\"?\n\023WarmupRegionRequest\022(\n\n" +
-      "regionInfo\030\001 \002(\0132\024.hbase.pb.RegionInfo\"\026" +
-      "\n\024WarmupRegionResponse\"\313\001\n\022CloseRegionRe",
-      "quest\022)\n\006region\030\001 \002(\0132\031.hbase.pb.RegionS" +
-      "pecifier\022\037\n\027version_of_closing_node\030\002 \001(" +
-      "\r\022\036\n\020transition_in_ZK\030\003 \001(\010:\004true\0220\n\022des" +
-      "tination_server\030\004 \001(\0132\024.hbase.pb.ServerN" +
-      "ame\022\027\n\017serverStartCode\030\005 \001(\004\"%\n\023CloseReg" +
-      "ionResponse\022\016\n\006closed\030\001 \002(\010\"y\n\022FlushRegi" +
-      "onRequest\022)\n\006region\030\001 \002(\0132\031.hbase.pb.Reg" +
-      "ionSpecifier\022\030\n\020if_older_than_ts\030\002 \001(\004\022\036" +
-      "\n\026write_flush_wal_marker\030\003 \001(\010\"_\n\023FlushR" +
-      "egionResponse\022\027\n\017last_flush_time\030\001 \002(\004\022\017",
-      "\n\007flushed\030\002 \001(\010\022\036\n\026wrote_flush_wal_marke" +
-      "r\030\003 \001(\010\"T\n\022SplitRegionRequest\022)\n\006region\030" +
-      "\001 \002(\0132\031.hbase.pb.RegionSpecifier\022\023\n\013spli" +
-      "t_point\030\002 \001(\014\"\025\n\023SplitRegionResponse\"`\n\024" +
-      "CompactRegionRequest\022)\n\006region\030\001 \002(\0132\031.h" +
-      "base.pb.RegionSpecifier\022\r\n\005major\030\002 \001(\010\022\016" +
-      "\n\006family\030\003 \001(\014\"\027\n\025CompactRegionResponse\"" +
-      "\315\001\n\031UpdateFavoredNodesRequest\022I\n\013update_" +
-      "info\030\001 \003(\01324.hbase.pb.UpdateFavoredNodes" +
-      "Request.RegionUpdateInfo\032e\n\020RegionUpdate",
-      "Info\022$\n\006region\030\001 \002(\0132\024.hbase.pb.RegionIn" +
-      "fo\022+\n\rfavored_nodes\030\002 \003(\0132\024.hbase.pb.Ser" +
-      "verName\".\n\032UpdateFavoredNodesResponse\022\020\n" +
-      "\010response\030\001 \001(\r\"\244\001\n\023MergeRegionsRequest\022" +
-      "+\n\010region_a\030\001 \002(\0132\031.hbase.pb.RegionSpeci" +
-      "fier\022+\n\010region_b\030\002 \002(\0132\031.hbase.pb.Region" +
-      "Specifier\022\027\n\010forcible\030\003 \001(\010:\005false\022\032\n\022ma" +
-      "ster_system_time\030\004 \001(\004\"\026\n\024MergeRegionsRe" +
-      "sponse\"a\n\010WALEntry\022\035\n\003key\030\001 \002(\0132\020.hbase." +
-      "pb.WALKey\022\027\n\017key_value_bytes\030\002 \003(\014\022\035\n\025as",
-      "sociated_cell_count\030\003 \001(\005\"\242\001\n\030ReplicateW" +
-      "ALEntryRequest\022!\n\005entry\030\001 \003(\0132\022.hbase.pb" +
-      ".WALEntry\022\034\n\024replicationClusterId\030\002 \001(\t\022" +
-      "\"\n\032sourceBaseNamespaceDirPath\030\003 \001(\t\022!\n\031s" +
-      "ourceHFileArchiveDirPath\030\004 \001(\t\"\033\n\031Replic" +
-      "ateWALEntryResponse\"\026\n\024RollWALWriterRequ" +
-      "est\"0\n\025RollWALWriterResponse\022\027\n\017region_t" +
-      "o_flush\030\001 \003(\014\"#\n\021StopServerRequest\022\016\n\006re" +
-      "ason\030\001 \002(\t\"\024\n\022StopServerResponse\"\026\n\024GetS" +
-      "erverInfoRequest\"K\n\nServerInfo\022)\n\013server",
-      "_name\030\001 \002(\0132\024.hbase.pb.ServerName\022\022\n\nweb" +
-      "ui_port\030\002 \001(\r\"B\n\025GetServerInfoResponse\022)" +
-      "\n\013server_info\030\001 \002(\0132\024.hbase.pb.ServerInf" +
-      "o\"\034\n\032UpdateConfigurationRequest\"\035\n\033Updat" +
-      "eConfigurationResponse2\207\013\n\014AdminService\022" +
-      "P\n\rGetRegionInfo\022\036.hbase.pb.GetRegionInf" +
-      "oRequest\032\037.hbase.pb.GetRegionInfoRespons" +
-      "e\022M\n\014GetStoreFile\022\035.hbase.pb.GetStoreFil" +
-      "eRequest\032\036.hbase.pb.GetStoreFileResponse" +
-      "\022V\n\017GetOnlineRegion\022 .hbase.pb.GetOnline",
-      "RegionRequest\032!.hbase.pb.GetOnlineRegion" +
-      "Response\022G\n\nOpenRegion\022\033.hbase.pb.OpenRe" +
-      "gionRequest\032\034.hbase.pb.OpenRegionRespons" +
-      "e\022M\n\014WarmupRegion\022\035.hbase.pb.WarmupRegio" +
-      "nRequest\032\036.hbase.pb.WarmupRegionResponse" +
-      "\022J\n\013CloseRegion\022\034.hbase.pb.CloseRegionRe" +
-      "quest\032\035.hbase.pb.CloseRegionResponse\022J\n\013" +
-      "FlushRegion\022\034.hbase.pb.FlushRegionReques" +
-      "t\032\035.hbase.pb.FlushRegionResponse\022J\n\013Spli" +
-      "tRegion\022\034.hbase.pb.SplitRegionRequest\032\035.",
-      "hbase.pb.SplitRegionResponse\022P\n\rCompactR" +
-      "egion\022\036.hbase.pb.CompactRegionRequest\032\037." +
-      "hbase.pb.CompactRegionResponse\022M\n\014MergeR" +
-      "egions\022\035.hbase.pb.MergeRegionsRequest\032\036." +
-      "hbase.pb.MergeRegionsResponse\022\\\n\021Replica" +
-      "teWALEntry\022\".hbase.pb.ReplicateWALEntryR" +
-      "equest\032#.hbase.pb.ReplicateWALEntryRespo" +
-      "nse\022Q\n\006Replay\022\".hbase.pb.ReplicateWALEnt" +
-      "ryRequest\032#.hbase.pb.ReplicateWALEntryRe" +
-      "sponse\022P\n\rRollWALWriter\022\036.hbase.pb.RollW",
-      "ALWriterRequest\032\037.hbase.pb.RollWALWriter" +
-      "Response\022P\n\rGetServerInfo\022\036.hbase.pb.Get" +
-      "ServerInfoRequest\032\037.hbase.pb.GetServerIn" +
-      "foResponse\022G\n\nStopServer\022\033.hbase.pb.Stop" +
-      "ServerRequest\032\034.hbase.pb.StopServerRespo" +
-      "nse\022_\n\022UpdateFavoredNodes\022#.hbase.pb.Upd" +
-      "ateFavoredNodesRequest\032$.hbase.pb.Update" +
-      "FavoredNodesResponse\022b\n\023UpdateConfigurat" +
-      "ion\022$.hbase.pb.UpdateConfigurationReques" +
-      "t\032%.hbase.pb.UpdateConfigurationResponse",
-      "BA\n*org.apache.hadoop.hbase.protobuf.gen" +
-      "eratedB\013AdminProtosH\001\210\001\001\240\001\001"
+      "\n\013Admin.proto\022\010hbase.pb\032\013HBase.proto\032\tWA" +
+      "L.proto\"[\n\024GetRegionInfoRequest\022)\n\006regio" +
+      "n\030\001 \002(\0132\031.hbase.pb.RegionSpecifier\022\030\n\020co" +
+      "mpaction_state\030\002 \001(\010\"\353\001\n\025GetRegionInfoRe" +
+      "sponse\022)\n\013region_info\030\001 \002(\0132\024.hbase.pb.R" +
+      "egionInfo\022I\n\020compaction_state\030\002 \001(\0162/.hb" +
+      "ase.pb.GetRegionInfoResponse.CompactionS" +
+      "tate\022\024\n\014isRecovering\030\003 \001(\010\"F\n\017Compaction" +
+      "State\022\010\n\004NONE\020\000\022\t\n\005MINOR\020\001\022\t\n\005MAJOR\020\002\022\023\n"
+
+      "\017MAJOR_AND_MINOR\020\003\"P\n\023GetStoreFileReques",
+      "t\022)\n\006region\030\001 \002(\0132\031.hbase.pb.RegionSpeci" +
+      "fier\022\016\n\006family\030\002 \003(\014\"*\n\024GetStoreFileResp" +
+      "onse\022\022\n\nstore_file\030\001 \003(\t\"\030\n\026GetOnlineReg" +
+      "ionRequest\"D\n\027GetOnlineRegionResponse\022)\n" +
+      "\013region_info\030\001 \003(\0132\024.hbase.pb.RegionInfo" +
+      "\"\263\002\n\021OpenRegionRequest\022=\n\topen_info\030\001 \003(" +
+      "\0132*.hbase.pb.OpenRegionRequest.RegionOpe" +
+      "nInfo\022\027\n\017serverStartCode\030\002 \001(\004\022\032\n\022master" +
+      "_system_time\030\005 \001(\004\032\251\001\n\016RegionOpenInfo\022$\n" +
+      "\006region\030\001 \002(\0132\024.hbase.pb.RegionInfo\022\037\n\027v",
+      "ersion_of_offline_node\030\002 \001(\r\022+\n\rfavored_" +
+      "nodes\030\003 \003(\0132\024.hbase.pb.ServerName\022#\n\033ope" +
+      "nForDistributedLogReplay\030\004 \001(\010\"\246\001\n\022OpenR" +
+      "egionResponse\022F\n\ropening_state\030\001 \003(\0162/.h" +
+      "base.pb.OpenRegionResponse.RegionOpening" +
+      "State\"H\n\022RegionOpeningState\022\n\n\006OPENED\020\000\022" +
+      "\022\n\016ALREADY_OPENED\020\001\022\022\n\016FAILED_OPENING\020\002\"" +
+      "?\n\023WarmupRegionRequest\022(\n\nregionInfo\030\001 \002" +
+      "(\0132\024.hbase.pb.RegionInfo\"\026\n\024WarmupRegion" +
+      "Response\"\313\001\n\022CloseRegionRequest\022)\n\006regio",
+      "n\030\001 \002(\0132\031.hbase.pb.RegionSpecifier\022\037\n\027ve" +
+      "rsion_of_closing_node\030\002 \001(\r\022\036\n\020transitio" +
+      "n_in_ZK\030\003 \001(\010:\004true\0220\n\022destination_serve" +
+      "r\030\004 \001(\0132\024.hbase.pb.ServerName\022\027\n\017serverS" +
+      "tartCode\030\005 \001(\004\"%\n\023CloseRegionResponse\022\016\n" +
+      "\006closed\030\001 \002(\010\"y\n\022FlushRegionRequest\022)\n\006r" +
+      "egion\030\001 \002(\0132\031.hbase.pb.RegionSpecifier\022\030" +
+      "\n\020if_older_than_ts\030\002 \001(\004\022\036\n\026write_flush_" +
+      "wal_marker\030\003 \001(\010\"_\n\023FlushRegionResponse\022" +
+      "\027\n\017last_flush_time\030\001 \002(\004\022\017\n\007flushed\030\002 \001(",
+      "\010\022\036\n\026wrote_flush_wal_marker\030\003 \001(\010\"T\n\022Spl" +
+      "itRegionRequest\022)\n\006region\030\001 \002(\0132\031.hbase." +
+      "pb.RegionSpecifier\022\023\n\013split_point\030\002 \001(\014\"" +
+      "\025\n\023SplitRegionResponse\"`\n\024CompactRegionR" +
+      "equest\022)\n\006region\030\001 \002(\0132\031.hbase.pb.Region" +
+      "Specifier\022\r\n\005major\030\002 \001(\010\022\016\n\006family\030\003 \001(\014"
+
+      "\"\027\n\025CompactRegionResponse\"\315\001\n\031UpdateFavo" +
+      "redNodesRequest\022I\n\013update_info\030\001 \003(\01324.h" +
+      "base.pb.UpdateFavoredNodesRequest.Region" +
+      "UpdateInfo\032e\n\020RegionUpdateInfo\022$\n\006region",
+      "\030\001 \002(\0132\024.hbase.pb.RegionInfo\022+\n\rfavored_" +
+      "nodes\030\002 \003(\0132\024.hbase.pb.ServerName\".\n\032Upd" +
+      "ateFavoredNodesResponse\022\020\n\010response\030\001 \001(" +
+      "\r\"\244\001\n\023MergeRegionsRequest\022+\n\010region_a\030\001 " +
+      "\002(\0132\031.hbase.pb.RegionSpecifier\022+\n\010region" +
+      "_b\030\002 \002(\0132\031.hbase.pb.RegionSpecifier\022\027\n\010f" +
+      "orcible\030\003 \001(\010:\005false\022\032\n\022master_system_ti" +
+      "me\030\004 \001(\004\"\026\n\024MergeRegionsResponse\"a\n\010WALE" +
+      "ntry\022\035\n\003key\030\001 \002(\0132\020.hbase.pb.WALKey\022\027\n\017k" +
+      "ey_value_bytes\030\002 \003(\014\022\035\n\025associated_cell_",
+      "count\030\003 \001(\005\"\242\001\n\030ReplicateWALEntryRequest" +
+      "\022!\n\005entry\030\001 \003(\0132\022.hbase.pb.WALEntry\022\034\n\024r" +
+      "eplicationClusterId\030\002 \001(\t\022\"\n\032sourceBaseN" +
+      "amespaceDirPath\030\003 \001(\t\022!\n\031sourceHFileArch" +
+      "iveDirPath\030\004 \001(\t\"\033\n\031ReplicateWALEntryRes" +
+      "ponse\"\026\n\024RollWALWriterRequest\"0\n\025RollWAL" +
+      "WriterResponse\022\027\n\017region_to_flush\030\001 \003(\014\"" +
+      "#\n\021StopServerRequest\022\016\n\006reason\030\001 \002(\t\"\024\n\022" +
+      "StopServerResponse\"\026\n\024GetServerInfoReque" +
+      "st\"K\n\nServerInfo\022)\n\013server_name\030\001 \002(\0132\024.",
+      "hbase.pb.ServerName\022\022\n\nwebui_port\030\002 \001(\r\"" +
+      "B\n\025GetServerInfoResponse\022)\n\013server_info\030" +
+      "\001 \002(\0132\024.hbase.pb.ServerInfo\"\034\n\032UpdateCon" +
+      "figurationRequest\"\035\n\033UpdateConfiguration" +
+      "Response2\207\013\n\014AdminService\022P\n\rGetRegionIn" +
+      "fo\022\036.hbase.pb.GetRegionInfoRequest\032\037.hba" +
+      "se.pb.GetRegionInfoResponse\022M\n\014GetStoreF" +
+      "ile\022\035.hbase.pb.GetStoreFileRequest\032\036.hba" +
+      "se.pb.GetStoreFileResponse\022V\n\017GetOnlineR" +
+      "egion\022 .hbase.pb.GetOnlineRegionRequest\032",
+      "!.hbase.pb.GetOnlineRegionResponse\022G\n\nOp" +
+      "enRegion\022\033.hbase.pb.OpenRegionRequest\032\034." +
+      "hbase.pb.OpenRegionResponse\022M\n\014WarmupReg" +
+      "ion\022\035.hbase.pb.WarmupRegionRequest\032\036.hba" +
+      "se.pb.WarmupRegionResponse\022J\n\013CloseRegio" +
+      "n\022\034.hbase.pb.CloseRegionRequest\032\035.hbase." +
+      "pb.CloseRegionResponse\022J\n\013FlushRegion\022\034." +
+      "hbase.pb.FlushRegionRequest\032\035.hbase.pb.F" +
+      "lushRegionResponse\022J\n\013SplitRegion\022\034.hbas" +
+      "e.pb.SplitRegionRequest\032\035.hbase.pb.Split",
+      "RegionResponse\022P\n\rCompactRegion\022\036.hbase." +
+      "pb.CompactRegionRequest\032\037.hbase.pb.Compa" +
+      "ctRegionResponse\022M\n\014MergeRegions\022\035.hbase" +
+      ".pb.MergeRegionsRequest\032\036.hbase.pb.Merge" +
+      "RegionsResponse\022\\\n\021ReplicateWALEntry\022\".h" +
+      "base.pb.ReplicateWALEntryRequest\032#.hbase" +
+      ".pb.ReplicateWALEntryResponse\022Q\n\006Replay\022" +
+      "\".hbase.pb.ReplicateWALEntryRequest\032#.hb" +
+      "ase.pb.ReplicateWALEntryResponse\022P\n\rRoll" +
+      "WALWriter\022\036.hbase.pb.RollWALWriterReques",
+      "t\032\037.hbase.pb.RollWALWriterResponse\022P\n\rGe" +
+      "tServerInfo\022\036.hbase.pb.GetServerInfoRequ" +
+      "est\032\037.hbase.pb.GetServerInfoResponse\022G\n\n" +
+      "StopServer\022\033.hbase.pb.StopServerRequest\032" +
+      "\034.hbase.pb.StopServerResponse\022_\n\022UpdateF" +
+      "avoredNodes\022#.hbase.pb.UpdateFavoredNode" +
+      "sRequest\032$.hbase.pb.UpdateFavoredNodesRe" +
+      "sponse\022b\n\023UpdateConfiguration\022$.hbase.pb" +
+      ".UpdateConfigurationRequest\032%.hbase.pb.U" +
+      "pdateConfigurationResponseBA\n*org.apache",
+      ".hadoop.hbase.protobuf.generatedB\013AdminP" +
+      "rotosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -24317,7 +24317,6 @@ public final class AdminProtos {
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          org.apache.hadoop.hbase.protobuf.generated.ClientProtos.getDescriptor(),
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.getDescriptor(),
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.getDescriptor(),
         }, assigner);

http://git-wip-us.apache.org/repos/asf/hbase/blob/26c04266/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java
b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java
index f08ba8f..72fc7b7 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java
@@ -19662,69 +19662,68 @@ public final class HBaseProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\013HBase.proto\022\010hbase.pb\032\nCell.proto\"1\n\tT" +
-      "ableName\022\021\n\tnamespace\030\001 \002(\014\022\021\n\tqualifier" +
-      "\030\002 \002(\014\"\314\001\n\013TableSchema\022\'\n\ntable_name\030\001 \001" +
-      "(\0132\023.hbase.pb.TableName\022,\n\nattributes\030\002 " +
-      "\003(\0132\030.hbase.pb.BytesBytesPair\0225\n\017column_" +
-      "families\030\003 \003(\0132\034.hbase.pb.ColumnFamilySc" +
-      "hema\022/\n\rconfiguration\030\004 \003(\0132\030.hbase.pb.N" +
-      "ameStringPair\"x\n\nTableState\022)\n\005state\030\001 \002" +
-      "(\0162\032.hbase.pb.TableState.State\"?\n\005State\022" +
-      "\013\n\007ENABLED\020\000\022\014\n\010DISABLED\020\001\022\r\n\tDISABLING\020",
-      "\002\022\014\n\010ENABLING\020\003\"\201\001\n\022ColumnFamilySchema\022\014" +
-      "\n\004name\030\001 \002(\014\022,\n\nattributes\030\002 \003(\0132\030.hbase" +
-      ".pb.BytesBytesPair\022/\n\rconfiguration\030\003 \003(" +
-      "\0132\030.hbase.pb.NameStringPair\"\243\001\n\nRegionIn" +
-      "fo\022\021\n\tregion_id\030\001 \002(\004\022\'\n\ntable_name\030\002 \002(" +
-      "\0132\023.hbase.pb.TableName\022\021\n\tstart_key\030\003 \001(" +
-      "\014\022\017\n\007end_key\030\004 \001(\014\022\017\n\007offline\030\005 \001(\010\022\r\n\005s"
+
-      "plit\030\006 \001(\010\022\025\n\nreplica_id\030\007 \001(\005:\0010\":\n\014Fav"
+
-      "oredNodes\022*\n\014favored_node\030\001 \003(\0132\024.hbase." +
-      "pb.ServerName\"\236\001\n\017RegionSpecifier\022;\n\004typ",
-      "e\030\001 \002(\0162-.hbase.pb.RegionSpecifier.Regio" +
-      "nSpecifierType\022\r\n\005value\030\002 \002(\014\"?\n\023RegionS" +
-      "pecifierType\022\017\n\013REGION_NAME\020\001\022\027\n\023ENCODED" +
-      "_REGION_NAME\020\002\"%\n\tTimeRange\022\014\n\004from\030\001 \001(" +
-      "\004\022\n\n\002to\030\002 \001(\004\"W\n\025ColumnFamilyTimeRange\022\025" +
-      "\n\rcolumn_family\030\001 \002(\014\022\'\n\ntime_range\030\002 \002(" +
-      "\0132\023.hbase.pb.TimeRange\"A\n\nServerName\022\021\n\t" +
-      "host_name\030\001 \002(\t\022\014\n\004port\030\002 \001(\r\022\022\n\nstart_c" +
-      "ode\030\003 \001(\004\"\033\n\013Coprocessor\022\014\n\004name\030\001 \002(\t\"-"
+
-      "\n\016NameStringPair\022\014\n\004name\030\001 \002(\t\022\r\n\005value\030",
-      "\002 \002(\t\",\n\rNameBytesPair\022\014\n\004name\030\001 \002(\t\022\r\n\005" +
-      "value\030\002 \001(\014\"/\n\016BytesBytesPair\022\r\n\005first\030\001" +
-      " \002(\014\022\016\n\006second\030\002 \002(\014\",\n\rNameInt64Pair\022\014\n" +
-      "\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\003\"\325\001\n\023SnapshotD"
+
-      "escription\022\014\n\004name\030\001 \002(\t\022\r\n\005table\030\002 \001(\t\022"
+
-      "\030\n\rcreation_time\030\003 \001(\003:\0010\0227\n\004type\030\004 \001(\0162" +
-      "\".hbase.pb.SnapshotDescription.Type:\005FLU" +
-      "SH\022\017\n\007version\030\005 \001(\005\022\r\n\005owner\030\006 \001(\t\".\n\004Ty"
+
-      "pe\022\014\n\010DISABLED\020\000\022\t\n\005FLUSH\020\001\022\r\n\tSKIPFLUSH" +
-      "\020\002\"\206\001\n\024ProcedureDescription\022\021\n\tsignature",
-      "\030\001 \002(\t\022\020\n\010instance\030\002 \001(\t\022\030\n\rcreation_tim" +
-      "e\030\003 \001(\003:\0010\022/\n\rconfiguration\030\004 \003(\0132\030.hbas" +
-      "e.pb.NameStringPair\"\n\n\010EmptyMsg\"\033\n\007LongM" +
-      "sg\022\020\n\010long_msg\030\001 \002(\003\"\037\n\tDoubleMsg\022\022\n\ndou" +
-      "ble_msg\030\001 \002(\001\"\'\n\rBigDecimalMsg\022\026\n\016bigdec" +
-      "imal_msg\030\001 \002(\014\"5\n\004UUID\022\026\n\016least_sig_bits" +
-      "\030\001 \002(\004\022\025\n\rmost_sig_bits\030\002 \002(\004\"T\n\023Namespa" +
-      "ceDescriptor\022\014\n\004name\030\001 \002(\014\022/\n\rconfigurat" +
-      "ion\030\002 \003(\0132\030.hbase.pb.NameStringPair\"\235\001\n\013" +
-      "VersionInfo\022\017\n\007version\030\001 \002(\t\022\013\n\003url\030\002 \002(",
-      "\t\022\020\n\010revision\030\003 \002(\t\022\014\n\004user\030\004 \002(\t\022\014\n\004dat"
+
-      "e\030\005 \002(\t\022\024\n\014src_checksum\030\006 \002(\t\022\025\n\rversion" +
-      "_major\030\007 \001(\r\022\025\n\rversion_minor\030\010 \001(\r\"Q\n\020R" +
-      "egionServerInfo\022\020\n\010infoPort\030\001 \001(\005\022+\n\014ver" +
-      "sion_info\030\002 \001(\0132\025.hbase.pb.VersionInfo*r" +
-      "\n\013CompareType\022\010\n\004LESS\020\000\022\021\n\rLESS_OR_EQUAL" +
-      "\020\001\022\t\n\005EQUAL\020\002\022\r\n\tNOT_EQUAL\020\003\022\024\n\020GREATER_"
+
-      "OR_EQUAL\020\004\022\013\n\007GREATER\020\005\022\t\n\005NO_OP\020\006*n\n\010Ti"
+
-      "meUnit\022\017\n\013NANOSECONDS\020\001\022\020\n\014MICROSECONDS\020" +
-      "\002\022\020\n\014MILLISECONDS\020\003\022\013\n\007SECONDS\020\004\022\013\n\007MINU",
-      "TES\020\005\022\t\n\005HOURS\020\006\022\010\n\004DAYS\020\007B>\n*org.apache"
+
-      ".hadoop.hbase.protobuf.generatedB\013HBaseP" +
-      "rotosH\001\240\001\001"
+      "\n\013HBase.proto\022\010hbase.pb\"1\n\tTableName\022\021\n\t" +
+      "namespace\030\001 \002(\014\022\021\n\tqualifier\030\002 \002(\014\"\314\001\n\013T"
+
+      "ableSchema\022\'\n\ntable_name\030\001 \001(\0132\023.hbase.p" +
+      "b.TableName\022,\n\nattributes\030\002 \003(\0132\030.hbase." +
+      "pb.BytesBytesPair\0225\n\017column_families\030\003 \003" +
+      "(\0132\034.hbase.pb.ColumnFamilySchema\022/\n\rconf" +
+      "iguration\030\004 \003(\0132\030.hbase.pb.NameStringPai" +
+      "r\"x\n\nTableState\022)\n\005state\030\001 \002(\0162\032.hbase.p" +
+      "b.TableState.State\"?\n\005State\022\013\n\007ENABLED\020\000" +
+      "\022\014\n\010DISABLED\020\001\022\r\n\tDISABLING\020\002\022\014\n\010ENABLIN",
+      "G\020\003\"\201\001\n\022ColumnFamilySchema\022\014\n\004name\030\001 \002(\014" +
+      "\022,\n\nattributes\030\002 \003(\0132\030.hbase.pb.BytesByt" +
+      "esPair\022/\n\rconfiguration\030\003 \003(\0132\030.hbase.pb" +
+      ".NameStringPair\"\243\001\n\nRegionInfo\022\021\n\tregion" +
+      "_id\030\001 \002(\004\022\'\n\ntable_name\030\002 \002(\0132\023.hbase.pb" +
+      ".TableName\022\021\n\tstart_key\030\003 \001(\014\022\017\n\007end_key" +
+      "\030\004 \001(\014\022\017\n\007offline\030\005 \001(\010\022\r\n\005split\030\006
\001(\010\022\025" +
+      "\n\nreplica_id\030\007 \001(\005:\0010\":\n\014FavoredNodes\022*\n" +
+      "\014favored_node\030\001 \003(\0132\024.hbase.pb.ServerNam" +
+      "e\"\236\001\n\017RegionSpecifier\022;\n\004type\030\001 \002(\0162-.hb",
+      "ase.pb.RegionSpecifier.RegionSpecifierTy" +
+      "pe\022\r\n\005value\030\002 \002(\014\"?\n\023RegionSpecifierType" +
+      "\022\017\n\013REGION_NAME\020\001\022\027\n\023ENCODED_REGION_NAME" +
+      "\020\002\"%\n\tTimeRange\022\014\n\004from\030\001 \001(\004\022\n\n\002to\030\002
\001(" +
+      "\004\"W\n\025ColumnFamilyTimeRange\022\025\n\rcolumn_fam" +
+      "ily\030\001 \002(\014\022\'\n\ntime_range\030\002 \002(\0132\023.hbase.pb" +
+      ".TimeRange\"A\n\nServerName\022\021\n\thost_name\030\001 " +
+      "\002(\t\022\014\n\004port\030\002 \001(\r\022\022\n\nstart_code\030\003 \001(\004\"\033\n"
+
+      "\013Coprocessor\022\014\n\004name\030\001 \002(\t\"-\n\016NameString" +
+      "Pair\022\014\n\004name\030\001 \002(\t\022\r\n\005value\030\002 \002(\t\",\n\rNam",
+      "eBytesPair\022\014\n\004name\030\001 \002(\t\022\r\n\005value\030\002 \001(\014\""
+
+      "/\n\016BytesBytesPair\022\r\n\005first\030\001 \002(\014\022\016\n\006seco" +
+      "nd\030\002 \002(\014\",\n\rNameInt64Pair\022\014\n\004name\030\001 \001(\t\022" +
+      "\r\n\005value\030\002 \001(\003\"\325\001\n\023SnapshotDescription\022\014" +
+      "\n\004name\030\001 \002(\t\022\r\n\005table\030\002 \001(\t\022\030\n\rcreation_"
+
+      "time\030\003 \001(\003:\0010\0227\n\004type\030\004 \001(\0162\".hbase.pb.S" +
+      "napshotDescription.Type:\005FLUSH\022\017\n\007versio" +
+      "n\030\005 \001(\005\022\r\n\005owner\030\006 \001(\t\".\n\004Type\022\014\n\010DISABL"
+
+      "ED\020\000\022\t\n\005FLUSH\020\001\022\r\n\tSKIPFLUSH\020\002\"\206\001\n\024Proce"
+
+      "dureDescription\022\021\n\tsignature\030\001 \002(\t\022\020\n\010in",
+      "stance\030\002 \001(\t\022\030\n\rcreation_time\030\003 \001(\003:\0010\022/" +
+      "\n\rconfiguration\030\004 \003(\0132\030.hbase.pb.NameStr" +
+      "ingPair\"\n\n\010EmptyMsg\"\033\n\007LongMsg\022\020\n\010long_m" +
+      "sg\030\001 \002(\003\"\037\n\tDoubleMsg\022\022\n\ndouble_msg\030\001 \002(" +
+      "\001\"\'\n\rBigDecimalMsg\022\026\n\016bigdecimal_msg\030\001 \002" +
+      "(\014\"5\n\004UUID\022\026\n\016least_sig_bits\030\001 \002(\004\022\025\n\rmo" +
+      "st_sig_bits\030\002 \002(\004\"T\n\023NamespaceDescriptor" +
+      "\022\014\n\004name\030\001 \002(\014\022/\n\rconfiguration\030\002 \003(\0132\030."
+
+      "hbase.pb.NameStringPair\"\235\001\n\013VersionInfo\022" +
+      "\017\n\007version\030\001 \002(\t\022\013\n\003url\030\002 \002(\t\022\020\n\010revisio",
+      "n\030\003 \002(\t\022\014\n\004user\030\004 \002(\t\022\014\n\004date\030\005 \002(\t\022\024\n\014s"
+
+      "rc_checksum\030\006 \002(\t\022\025\n\rversion_major\030\007 \001(\r" +
+      "\022\025\n\rversion_minor\030\010 \001(\r\"Q\n\020RegionServerI" +
+      "nfo\022\020\n\010infoPort\030\001 \001(\005\022+\n\014version_info\030\002 " +
+      "\001(\0132\025.hbase.pb.VersionInfo*r\n\013CompareTyp" +
+      "e\022\010\n\004LESS\020\000\022\021\n\rLESS_OR_EQUAL\020\001\022\t\n\005EQUAL\020"
+
+      "\002\022\r\n\tNOT_EQUAL\020\003\022\024\n\020GREATER_OR_EQUAL\020\004\022\013" +
+      "\n\007GREATER\020\005\022\t\n\005NO_OP\020\006*n\n\010TimeUnit\022\017\n\013NA" +
+      "NOSECONDS\020\001\022\020\n\014MICROSECONDS\020\002\022\020\n\014MILLISE" +
+      "CONDS\020\003\022\013\n\007SECONDS\020\004\022\013\n\007MINUTES\020\005\022\t\n\005HOU",
+      "RS\020\006\022\010\n\004DAYS\020\007B>\n*org.apache.hadoop.hbas" +
+      "e.protobuf.generatedB\013HBaseProtosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -19887,7 +19886,6 @@ public final class HBaseProtos {
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          org.apache.hadoop.hbase.protobuf.generated.CellProtos.getDescriptor(),
         }, assigner);
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/26c04266/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java
b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java
index 528f6e6..86c88c6 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java
@@ -2039,23 +2039,23 @@ public final class SecureBulkLoadProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\024SecureBulkLoad.proto\022\010hbase.pb\032\013HBase." +
-      "proto\032\014Client.proto\"\266\001\n\033SecureBulkLoadHF" +
-      "ilesRequest\022>\n\013family_path\030\001 \003(\0132).hbase" +
-      ".pb.BulkLoadHFileRequest.FamilyPath\022\026\n\016a" +
-      "ssign_seq_num\030\002 \001(\010\022+\n\010fs_token\030\003 \002(\0132\031." +
-      "hbase.pb.DelegationToken\022\022\n\nbulk_token\030\004" +
-      " \002(\t\".\n\034SecureBulkLoadHFilesResponse\022\016\n\006" +
-      "loaded\030\001 \002(\0102\256\002\n\025SecureBulkLoadService\022V" +
-      "\n\017PrepareBulkLoad\022 .hbase.pb.PrepareBulk" +
-      "LoadRequest\032!.hbase.pb.PrepareBulkLoadRe",
-      "sponse\022e\n\024SecureBulkLoadHFiles\022%.hbase.p" +
-      "b.SecureBulkLoadHFilesRequest\032&.hbase.pb" +
-      ".SecureBulkLoadHFilesResponse\022V\n\017Cleanup" +
-      "BulkLoad\022 .hbase.pb.CleanupBulkLoadReque" +
-      "st\032!.hbase.pb.CleanupBulkLoadResponseBJ\n" +
-      "*org.apache.hadoop.hbase.protobuf.genera" +
-      "tedB\024SecureBulkLoadProtosH\001\210\001\001\240\001\001"
+      "\n\024SecureBulkLoad.proto\022\010hbase.pb\032\014Client" +
+      ".proto\"\266\001\n\033SecureBulkLoadHFilesRequest\022>" +
+      "\n\013family_path\030\001 \003(\0132).hbase.pb.BulkLoadH" +
+      "FileRequest.FamilyPath\022\026\n\016assign_seq_num" +
+      "\030\002 \001(\010\022+\n\010fs_token\030\003 \002(\0132\031.hbase.pb.Dele" +
+      "gationToken\022\022\n\nbulk_token\030\004 \002(\t\".\n\034Secur" +
+      "eBulkLoadHFilesResponse\022\016\n\006loaded\030\001 \002(\0102" +
+      "\256\002\n\025SecureBulkLoadService\022V\n\017PrepareBulk" +
+      "Load\022 .hbase.pb.PrepareBulkLoadRequest\032!" +
+      ".hbase.pb.PrepareBulkLoadResponse\022e\n\024Sec",
+      "ureBulkLoadHFiles\022%.hbase.pb.SecureBulkL" +
+      "oadHFilesRequest\032&.hbase.pb.SecureBulkLo" +
+      "adHFilesResponse\022V\n\017CleanupBulkLoad\022 .hb" +
+      "ase.pb.CleanupBulkLoadRequest\032!.hbase.pb" +
+      ".CleanupBulkLoadResponseBJ\n*org.apache.h" +
+      "adoop.hbase.protobuf.generatedB\024SecureBu" +
+      "lkLoadProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -2080,7 +2080,6 @@ public final class SecureBulkLoadProtos {
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.getDescriptor(),
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.getDescriptor(),
         }, assigner);
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/26c04266/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java
----------------------------------------------------------------------
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 4da6fa2..28f4d4b 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
@@ -11969,55 +11969,55 @@ public final class WALProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\tWAL.proto\022\010hbase.pb\032\013HBase.proto\032\014Clie" +
-      "nt.proto\"\217\001\n\tWALHeader\022\027\n\017has_compressio" +
-      "n\030\001 \001(\010\022\026\n\016encryption_key\030\002 \001(\014\022\033\n\023has_t"
+
-      "ag_compression\030\003 \001(\010\022\027\n\017writer_cls_name\030" +
-      "\004 \001(\t\022\033\n\023cell_codec_cls_name\030\005 \001(\t\"\273\002\n\006W" +
-      "ALKey\022\033\n\023encoded_region_name\030\001 \002(\014\022\022\n\nta" +
-      "ble_name\030\002 \002(\014\022\033\n\023log_sequence_number\030\003 " +
-      "\002(\004\022\022\n\nwrite_time\030\004 \002(\004\022&\n\ncluster_id\030\005 "
+
-      "\001(\0132\016.hbase.pb.UUIDB\002\030\001\022%\n\006scopes\030\006 \003(\0132" +
-      "\025.hbase.pb.FamilyScope\022\032\n\022following_kv_c",
-      "ount\030\007 \001(\r\022#\n\013cluster_ids\030\010 \003(\0132\016.hbase." +
-      "pb.UUID\022\022\n\nnonceGroup\030\t \001(\004\022\r\n\005nonce\030\n \001" +
-      "(\004\022\034\n\024orig_sequence_number\030\013 \001(\004\"F\n\013Fami" +
-      "lyScope\022\016\n\006family\030\001 \002(\014\022\'\n\nscope_type\030\002 " +
-      "\002(\0162\023.hbase.pb.ScopeType\"\276\001\n\024CompactionD" +
-      "escriptor\022\022\n\ntable_name\030\001 \002(\014\022\033\n\023encoded" +
-      "_region_name\030\002 \002(\014\022\023\n\013family_name\030\003 \002(\014\022" +
-      "\030\n\020compaction_input\030\004 \003(\t\022\031\n\021compaction_" +
-      "output\030\005 \003(\t\022\026\n\016store_home_dir\030\006 \002(\t\022\023\n\013"
+
-      "region_name\030\007 \001(\014\"\244\003\n\017FlushDescriptor\0225\n",
-      "\006action\030\001 \002(\0162%.hbase.pb.FlushDescriptor" +
-      ".FlushAction\022\022\n\ntable_name\030\002 \002(\014\022\033\n\023enco" +
-      "ded_region_name\030\003 \002(\014\022\035\n\025flush_sequence_" +
-      "number\030\004 \001(\004\022E\n\rstore_flushes\030\005 \003(\0132..hb" +
-      "ase.pb.FlushDescriptor.StoreFlushDescrip" +
-      "tor\022\023\n\013region_name\030\006 \001(\014\032Y\n\024StoreFlushDe" +
-      "scriptor\022\023\n\013family_name\030\001 \002(\014\022\026\n\016store_h" +
-      "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",
-      "\"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\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"
+      "\n\tWAL.proto\022\010hbase.pb\032\013HBase.proto\"\217\001\n\tW" +
+      "ALHeader\022\027\n\017has_compression\030\001 \001(\010\022\026\n\016enc" +
+      "ryption_key\030\002 \001(\014\022\033\n\023has_tag_compression" +
+      "\030\003 \001(\010\022\027\n\017writer_cls_name\030\004 \001(\t\022\033\n\023cell_"
+
+      "codec_cls_name\030\005 \001(\t\"\273\002\n\006WALKey\022\033\n\023encod" +
+      "ed_region_name\030\001 \002(\014\022\022\n\ntable_name\030\002 \002(\014" +
+      "\022\033\n\023log_sequence_number\030\003 \002(\004\022\022\n\nwrite_t" +
+      "ime\030\004 \002(\004\022&\n\ncluster_id\030\005 \001(\0132\016.hbase.pb" +
+      ".UUIDB\002\030\001\022%\n\006scopes\030\006 \003(\0132\025.hbase.pb.Fam" +
+      "ilyScope\022\032\n\022following_kv_count\030\007 \001(\r\022#\n\013",
+      "cluster_ids\030\010 \003(\0132\016.hbase.pb.UUID\022\022\n\nnon" +
+      "ceGroup\030\t \001(\004\022\r\n\005nonce\030\n \001(\004\022\034\n\024orig_seq" +
+      "uence_number\030\013 \001(\004\"F\n\013FamilyScope\022\016\n\006fam" +
+      "ily\030\001 \002(\014\022\'\n\nscope_type\030\002 \002(\0162\023.hbase.pb" +
+      ".ScopeType\"\276\001\n\024CompactionDescriptor\022\022\n\nt" +
+      "able_name\030\001 \002(\014\022\033\n\023encoded_region_name\030\002" +
+      " \002(\014\022\023\n\013family_name\030\003 \002(\014\022\030\n\020compaction_" +
+      "input\030\004 \003(\t\022\031\n\021compaction_output\030\005 \003(\t\022\026" +
+      "\n\016store_home_dir\030\006 \002(\t\022\023\n\013region_name\030\007 " +
+      "\001(\014\"\244\003\n\017FlushDescriptor\0225\n\006action\030\001 \002(\0162",
+      "%.hbase.pb.FlushDescriptor.FlushAction\022\022" +
+      "\n\ntable_name\030\002 \002(\014\022\033\n\023encoded_region_nam" +
+      "e\030\003 \002(\014\022\035\n\025flush_sequence_number\030\004 \001(\004\022E" +
+      "\n\rstore_flushes\030\005 \003(\0132..hbase.pb.FlushDe" +
+      "scriptor.StoreFlushDescriptor\022\023\n\013region_" +
+      "name\030\006 \001(\014\032Y\n\024StoreFlushDescriptor\022\023\n\013fa" +
+      "mily_name\030\001 \002(\014\022\026\n\016store_home_dir\030\002 \002(\t\022" +
+      "\024\n\014flush_output\030\003 \003(\t\"S\n\013FlushAction\022\017\n\013" +
+      "START_FLUSH\020\000\022\020\n\014COMMIT_FLUSH\020\001\022\017\n\013ABORT" +
+      "_FLUSH\020\002\022\020\n\014CANNOT_FLUSH\020\003\"q\n\017StoreDescr",
+      "iptor\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\035\n\025store_" +
+      "file_size_bytes\030\004 \001(\004\"\237\001\n\022BulkLoadDescri" +
+      "ptor\022\'\n\ntable_name\030\001 \002(\0132\023.hbase.pb.Tabl" +
+      "eName\022\033\n\023encoded_region_name\030\002 \002(\014\022)\n\006st" +
+      "ores\030\003 \003(\0132\031.hbase.pb.StoreDescriptor\022\030\n" +
+      "\020bulkload_seq_num\030\004 \002(\003\"\272\002\n\025RegionEventD" +
+      "escriptor\022=\n\nevent_type\030\001 \002(\0162).hbase.pb" +
+      ".RegionEventDescriptor.EventType\022\022\n\ntabl" +
+      "e_name\030\002 \002(\014\022\033\n\023encoded_region_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.StoreDescriptor\022$\n\006ser" +
+      "ver\030\006 \001(\0132\024.hbase.pb.ServerName\022\023\n\013regio" +
+      "n_name\030\007 \001(\014\".\n\tEventType\022\017\n\013REGION_OPEN" +
+      "\020\000\022\020\n\014REGION_CLOSE\020\001\"\014\n\nWALTrailer*F\n\tSc" +
+      "opeType\022\033\n\027REPLICATION_SCOPE_LOCAL\020\000\022\034\n\030" +
+      "REPLICATION_SCOPE_GLOBAL\020\001B?\n*org.apache" +
+      ".hadoop.hbase.protobuf.generatedB\tWALPro" +
+      "tosH\001\210\001\000\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -12091,7 +12091,6 @@ public final class WALProtos {
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.getDescriptor(),
-          org.apache.hadoop.hbase.protobuf.generated.ClientProtos.getDescriptor(),
         }, assigner);
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/26c04266/hbase-protocol/src/main/protobuf/Admin.proto
----------------------------------------------------------------------
diff --git a/hbase-protocol/src/main/protobuf/Admin.proto b/hbase-protocol/src/main/protobuf/Admin.proto
index a1905a4..e905340 100644
--- a/hbase-protocol/src/main/protobuf/Admin.proto
+++ b/hbase-protocol/src/main/protobuf/Admin.proto
@@ -25,7 +25,6 @@ option java_generic_services = true;
 option java_generate_equals_and_hash = true;
 option optimize_for = SPEED;
 
-import "Client.proto";
 import "HBase.proto";
 import "WAL.proto";
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/26c04266/hbase-protocol/src/main/protobuf/HBase.proto
----------------------------------------------------------------------
diff --git a/hbase-protocol/src/main/protobuf/HBase.proto b/hbase-protocol/src/main/protobuf/HBase.proto
index c36b214..7d064f3 100644
--- a/hbase-protocol/src/main/protobuf/HBase.proto
+++ b/hbase-protocol/src/main/protobuf/HBase.proto
@@ -24,7 +24,6 @@ option java_outer_classname = "HBaseProtos";
 option java_generate_equals_and_hash = true;
 option optimize_for = SPEED;
 
-import "Cell.proto";
 
 /**
  * Table Name

http://git-wip-us.apache.org/repos/asf/hbase/blob/26c04266/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto
----------------------------------------------------------------------
diff --git a/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto b/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto
index 290355e..d86d162 100644
--- a/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto
+++ b/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto
@@ -23,7 +23,6 @@ option java_generic_services = true;
 option java_generate_equals_and_hash = true;
 option optimize_for = SPEED;
 
-import 'HBase.proto';
 import 'Client.proto';
 
 message SecureBulkLoadHFilesRequest {

http://git-wip-us.apache.org/repos/asf/hbase/blob/26c04266/hbase-protocol/src/main/protobuf/WAL.proto
----------------------------------------------------------------------
diff --git a/hbase-protocol/src/main/protobuf/WAL.proto b/hbase-protocol/src/main/protobuf/WAL.proto
index 2061b22..c1d465a 100644
--- a/hbase-protocol/src/main/protobuf/WAL.proto
+++ b/hbase-protocol/src/main/protobuf/WAL.proto
@@ -24,7 +24,6 @@ option java_generate_equals_and_hash = true;
 option optimize_for = SPEED;
 
 import "HBase.proto";
-import "Client.proto";
 
 message WALHeader {
   optional bool has_compression = 1;


Mime
View raw message