hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1501834 [8/8] - in /hbase/trunk: hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ hbase-protocol/src/main/protobuf/ hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/ hbase-server/src/test/java/org/a...
Date Wed, 10 Jul 2013 16:30:34 GMT
Modified: hbase/trunk/hbase-protocol/src/main/protobuf/HFile.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/HFile.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/HFile.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/HFile.proto Wed Jul 10 16:30:32 2013
@@ -25,21 +25,21 @@ import "hbase.proto";
 
 // Map of name/values
 message FileInfoProto {
-  repeated BytesBytesPair mapEntry = 1;
+  repeated BytesBytesPair map_entry = 1;
 }
 
 // HFile file trailer
 message FileTrailerProto {
-  optional uint64 fileInfoOffset = 1;
-  optional uint64 loadOnOpenDataOffset = 2;
-  optional uint64 uncompressedDataIndexSize = 3;
-  optional uint64 totalUncompressedBytes = 4;
-  optional uint32 dataIndexCount = 5;
-  optional uint32 metaIndexCount = 6;
-  optional uint64 entryCount = 7;
-  optional uint32 numDataIndexLevels = 8;
-  optional uint64 firstDataBlockOffset = 9;
-  optional uint64 lastDataBlockOffset = 10;
-  optional string comparatorClassName = 11;
-  optional uint32 compressionCodec = 12;
+  optional uint64 file_info_offset = 1;
+  optional uint64 load_on_open_data_offset = 2;
+  optional uint64 uncompressed_data_index_size = 3;
+  optional uint64 total_uncompressed_bytes = 4;
+  optional uint32 data_index_count = 5;
+  optional uint32 meta_index_count = 6;
+  optional uint64 entry_count = 7;
+  optional uint32 num_data_index_levels = 8;
+  optional uint64 first_data_block_offset = 9;
+  optional uint64 last_data_block_offset = 10;
+  optional string comparator_class_name = 11;
+  optional uint32 compression_codec = 12;
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/LoadBalancer.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/LoadBalancer.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/LoadBalancer.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/LoadBalancer.proto Wed Jul 10 16:30:32 2013
@@ -24,5 +24,5 @@ option java_generate_equals_and_hash = t
 option optimize_for = SPEED;
 
 message LoadBalancerState {
-  optional bool balancerOn = 1;
+  optional bool balancer_on = 1;
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/Master.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/Master.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/Master.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/Master.proto Wed Jul 10 16:30:32 2013
@@ -28,11 +28,11 @@ message IsMasterRunningRequest {
 }
 
 message IsMasterRunningResponse {
-  required bool isMasterRunning = 1;
+  required bool is_master_running = 1;
 }
 
 service MasterService {
   /** return true if master is available */
-  rpc isMasterRunning(IsMasterRunningRequest)
+  rpc IsMasterRunning(IsMasterRunningRequest)
     returns(IsMasterRunningResponse);
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/MasterAdmin.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/MasterAdmin.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/MasterAdmin.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/MasterAdmin.proto Wed Jul 10 16:30:32 2013
@@ -32,24 +32,24 @@ import "Client.proto";
 /* Column-level protobufs */
 
 message AddColumnRequest {
-  required bytes tableName = 1;
-  required ColumnFamilySchema columnFamilies = 2;
+  required bytes table_name = 1;
+  required ColumnFamilySchema column_families = 2;
 }
 
 message AddColumnResponse {
 }
 
 message DeleteColumnRequest {
-  required bytes tableName = 1;
-  required bytes columnName = 2;
+  required bytes table_name = 1;
+  required bytes column_name = 2;
 }
 
 message DeleteColumnResponse {
 }
 
 message ModifyColumnRequest {
-  required bytes tableName = 1;
-  required ColumnFamilySchema columnFamilies = 2;
+  required bytes table_name = 1;
+  required ColumnFamilySchema column_families = 2;
 }
 
 message ModifyColumnResponse {
@@ -59,7 +59,7 @@ message ModifyColumnResponse {
 
 message MoveRegionRequest {
   required RegionSpecifier region = 1;
-  optional ServerName destServerName = 2;
+  optional ServerName dest_server_name = 2;
 }
 
 message MoveRegionResponse {
@@ -69,8 +69,8 @@ message MoveRegionResponse {
  * Dispatch merging the specified regions.
  */
 message DispatchMergingRegionsRequest {
-  required RegionSpecifier regionA = 1;
-  required RegionSpecifier regionB = 2;
+  required RegionSpecifier region_a = 1;
+  required RegionSpecifier region_b = 2;
   optional bool forcible = 3 [default = false];
 }
 
@@ -102,37 +102,37 @@ message OfflineRegionResponse {
 /* Table-level protobufs */
 
 message CreateTableRequest {
-  required TableSchema tableSchema = 1;
-  repeated bytes splitKeys = 2;
+  required TableSchema table_schema = 1;
+  repeated bytes split_keys = 2;
 }
 
 message CreateTableResponse {
 }
 
 message DeleteTableRequest {
-  required bytes tableName = 1;
+  required bytes table_name = 1;
 }
 
 message DeleteTableResponse {
 }
 
 message EnableTableRequest {
-  required bytes tableName = 1;
+  required bytes table_name = 1;
 }
 
 message EnableTableResponse {
 }
 
 message DisableTableRequest {
-  required bytes tableName = 1;
+  required bytes table_name = 1;
 }
 
 message DisableTableResponse {
 }
 
 message ModifyTableRequest {
-  required bytes tableName = 1;
-  required TableSchema tableSchema = 2;
+  required bytes table_name = 1;
+  required TableSchema table_schema = 2;
 }
 
 message ModifyTableResponse {
@@ -157,7 +157,7 @@ message BalanceRequest {
 }
 
 message BalanceResponse {
-  required bool balancerRan = 1;
+  required bool balancer_ran = 1;
 }
 
 message SetBalancerRunningRequest {
@@ -166,14 +166,14 @@ message SetBalancerRunningRequest {
 }
 
 message SetBalancerRunningResponse {
-  optional bool prevBalanceValue = 1;
+  optional bool prev_balance_value = 1;
 }
 
 message CatalogScanRequest {
 }
 
 message CatalogScanResponse {
-  optional int32 scanResult = 1;
+  optional int32 scan_result = 1;
 }
 
 message EnableCatalogJanitorRequest {
@@ -181,7 +181,7 @@ message EnableCatalogJanitorRequest {
 }
 
 message EnableCatalogJanitorResponse {
-  optional bool prevValue = 1;
+  optional bool prev_value = 1;
 }
 
 message IsCatalogJanitorEnabledRequest {
@@ -196,7 +196,7 @@ message TakeSnapshotRequest{
 }
 
 message TakeSnapshotResponse{
-	required int64 expectedTimeout = 1;
+	required int64 expected_timeout = 1;
 }
 
 message ListSnapshotRequest{
@@ -242,36 +242,36 @@ message IsRestoreSnapshotDoneResponse {
 
 service MasterAdminService {
   /** Adds a column to the specified table. */
-  rpc addColumn(AddColumnRequest)
+  rpc AddColumn(AddColumnRequest)
     returns(AddColumnResponse);
 
   /** Deletes a column from the specified table. Table must be disabled. */
-  rpc deleteColumn(DeleteColumnRequest)
+  rpc DeleteColumn(DeleteColumnRequest)
     returns(DeleteColumnResponse);
 
   /** Modifies an existing column on the specified table. */
-  rpc modifyColumn(ModifyColumnRequest)
+  rpc ModifyColumn(ModifyColumnRequest)
     returns(ModifyColumnResponse);
 
   /** Move the region region to the destination server. */
-  rpc moveRegion(MoveRegionRequest)
+  rpc MoveRegion(MoveRegionRequest)
     returns(MoveRegionResponse);
 
  /** Master dispatch merging the regions */
-  rpc dispatchMergingRegions(DispatchMergingRegionsRequest)
+  rpc DispatchMergingRegions(DispatchMergingRegionsRequest)
     returns(DispatchMergingRegionsResponse);    
 
   /** Assign a region to a server chosen at random. */
-  rpc assignRegion(AssignRegionRequest)
+  rpc AssignRegion(AssignRegionRequest)
     returns(AssignRegionResponse);
 
   /**
    * Unassign a region from current hosting regionserver.  Region will then be
    * assigned to a regionserver chosen at random.  Region could be reassigned
-   * back to the same server.  Use moveRegion if you want
+   * back to the same server.  Use MoveRegion if you want
    * to control the region movement.
    */
-  rpc unassignRegion(UnassignRegionRequest)
+  rpc UnassignRegion(UnassignRegionRequest)
     returns(UnassignRegionResponse);
 
   /**
@@ -280,35 +280,35 @@ service MasterAdminService {
    * automatically reassign the region as in unassign.   This is a special
    * method, and should only be used by experts or hbck.
    */
-  rpc offlineRegion(OfflineRegionRequest)
+  rpc OfflineRegion(OfflineRegionRequest)
     returns(OfflineRegionResponse);
 
   /** Deletes a table */
-  rpc deleteTable(DeleteTableRequest)
+  rpc DeleteTable(DeleteTableRequest)
     returns(DeleteTableResponse);
 
   /** Puts the table on-line (only needed if table has been previously taken offline) */
-  rpc enableTable(EnableTableRequest)
+  rpc EnableTable(EnableTableRequest)
     returns(EnableTableResponse);
 
   /** Take table offline */
-  rpc disableTable(DisableTableRequest)
+  rpc DisableTable(DisableTableRequest)
     returns(DisableTableResponse);
 
   /** Modify a table's metadata */
-  rpc modifyTable(ModifyTableRequest)
+  rpc ModifyTable(ModifyTableRequest)
     returns(ModifyTableResponse);
 
   /** Creates a new table asynchronously */
-  rpc createTable(CreateTableRequest)
+  rpc CreateTable(CreateTableRequest)
     returns(CreateTableResponse);
 
     /** Shutdown an HBase cluster. */
-  rpc shutdown(ShutdownRequest)
+  rpc Shutdown(ShutdownRequest)
     returns(ShutdownResponse);
 
   /** Stop HBase Master only.  Does not shutdown the cluster. */
-  rpc stopMaster(StopMasterRequest)
+  rpc StopMaster(StopMasterRequest)
     returns(StopMasterResponse);
 
   /**
@@ -316,72 +316,72 @@ service MasterAdminService {
    * go ahead and do the reassignments.  Can NOT run for various reasons.
    * Check logs.
    */
-  rpc balance(BalanceRequest)
+  rpc Balance(BalanceRequest)
     returns(BalanceResponse);
 
   /**
    * Turn the load balancer on or off.
    * If synchronous is true, it waits until current balance() call, if outstanding, to return.
    */
-  rpc setBalancerRunning(SetBalancerRunningRequest)
+  rpc SetBalancerRunning(SetBalancerRunningRequest)
     returns(SetBalancerRunningResponse);
 
   /** Get a run of the catalog janitor */
-  rpc runCatalogScan(CatalogScanRequest)
+  rpc RunCatalogScan(CatalogScanRequest)
      returns(CatalogScanResponse);
 
   /**
    * Enable the catalog janitor on or off.
    */
-  rpc enableCatalogJanitor(EnableCatalogJanitorRequest)
+  rpc EnableCatalogJanitor(EnableCatalogJanitorRequest)
      returns(EnableCatalogJanitorResponse);
 
   /**
    * Query whether the catalog janitor is enabled.
    */
-  rpc isCatalogJanitorEnabled(IsCatalogJanitorEnabledRequest)
+  rpc IsCatalogJanitorEnabled(IsCatalogJanitorEnabledRequest)
      returns(IsCatalogJanitorEnabledResponse);
 
   /**
    * Call a master coprocessor endpoint
    */
-  rpc execMasterService(CoprocessorServiceRequest)
+  rpc ExecMasterService(CoprocessorServiceRequest)
     returns(CoprocessorServiceResponse);
 
   /** 
    * Create a snapshot for the given table.
    * @param snapshot description of the snapshot to take
    */
-  rpc snapshot(TakeSnapshotRequest) returns(TakeSnapshotResponse);
+  rpc Snapshot(TakeSnapshotRequest) returns(TakeSnapshotResponse);
 
   /**
    * List completed snapshots.
    * Returns a list of snapshot descriptors for completed snapshots
    */
-  rpc getCompletedSnapshots(ListSnapshotRequest) returns(ListSnapshotResponse);
+  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);
+  rpc DeleteSnapshot(DeleteSnapshotRequest) returns(DeleteSnapshotResponse);
 
   /**
    * Determine if the snapshot is done yet.
    */
-  rpc isSnapshotDone(IsSnapshotDoneRequest) returns(IsSnapshotDoneResponse);
+  rpc IsSnapshotDone(IsSnapshotDoneRequest) returns(IsSnapshotDoneResponse);
 
   /**
    * Restore a snapshot
    * @param snapshot description of the snapshot to restore
    */
-  rpc restoreSnapshot(RestoreSnapshotRequest) returns(RestoreSnapshotResponse);
+  rpc RestoreSnapshot(RestoreSnapshotRequest) returns(RestoreSnapshotResponse);
 
   /**
    * Determine if the snapshot restore is done yet.
    */
-  rpc isRestoreSnapshotDone(IsRestoreSnapshotDoneRequest) returns(IsRestoreSnapshotDoneResponse);
+  rpc IsRestoreSnapshotDone(IsRestoreSnapshotDoneRequest) returns(IsRestoreSnapshotDoneResponse);
 
   /** return true if master is available */
-  rpc isMasterRunning(IsMasterRunningRequest) returns(IsMasterRunningResponse);
+  rpc IsMasterRunning(IsMasterRunningRequest) returns(IsMasterRunningResponse);
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/MasterMonitor.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/MasterMonitor.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/MasterMonitor.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/MasterMonitor.proto Wed Jul 10 16:30:32 2013
@@ -29,42 +29,42 @@ import "hbase.proto";
 import "ClusterStatus.proto";
 
 message GetSchemaAlterStatusRequest {
-  required bytes tableName = 1;
+  required bytes table_name = 1;
 }
 
 message GetSchemaAlterStatusResponse {
-  optional uint32 yetToUpdateRegions = 1;
-  optional uint32 totalRegions = 2;
+  optional uint32 yet_to_update_regions = 1;
+  optional uint32 total_regions = 2;
 }
 
 message GetTableDescriptorsRequest {
-  repeated string tableNames = 1;
+  repeated string table_names = 1;
 }
 
 message GetTableDescriptorsResponse {
-  repeated TableSchema tableSchema = 1;
+  repeated TableSchema table_schema = 1;
 }
 
 message GetClusterStatusRequest {
 }
 
 message GetClusterStatusResponse {
-  required ClusterStatus clusterStatus = 1;
+  required ClusterStatus cluster_status = 1;
 }
 
 service MasterMonitorService {
   /** Used by the client to get the number of regions that have received the updated schema
*/
-  rpc getSchemaAlterStatus(GetSchemaAlterStatusRequest)
+  rpc GetSchemaAlterStatus(GetSchemaAlterStatusRequest)
     returns(GetSchemaAlterStatusResponse);
 
   /** Get list of TableDescriptors for requested tables. */
-  rpc getTableDescriptors(GetTableDescriptorsRequest)
+  rpc GetTableDescriptors(GetTableDescriptorsRequest)
     returns(GetTableDescriptorsResponse);
 
   /** Return cluster status. */
-  rpc getClusterStatus(GetClusterStatusRequest)
+  rpc GetClusterStatus(GetClusterStatusRequest)
     returns(GetClusterStatusResponse);
 
   /** return true if master is available */
-  rpc isMasterRunning(IsMasterRunningRequest) returns(IsMasterRunningResponse);
+  rpc IsMasterRunning(IsMasterRunningRequest) returns(IsMasterRunningResponse);
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/MultiRowMutation.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/MultiRowMutation.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/MultiRowMutation.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/MultiRowMutation.proto Wed Jul 10 16:30:32
2013
@@ -23,13 +23,13 @@ option java_generic_services = true;
 option optimize_for = SPEED;
 
 message MultiMutateRequest {
-  repeated MutationProto mutationRequest = 1;
+  repeated MutationProto mutation_request = 1;
 }
 
 message MultiMutateResponse {
 }
 
 service MultiRowMutationService {
-  rpc mutateRows(MultiMutateRequest) 
+  rpc MutateRows(MultiMutateRequest)
       returns(MultiMutateResponse);
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/RPC.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/RPC.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/RPC.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/RPC.proto Wed Jul 10 16:30:32 2013
@@ -72,20 +72,20 @@ option optimize_for = SPEED;
 
 // User Information proto.  Included in ConnectionHeader on connection setup
 message UserInformation {
-  required string effectiveUser = 1;
-  optional string realUser = 2;
+  required string effective_user = 1;
+  optional string real_user = 2;
 }
 
 // This is sent on connection setup after the connection preamble is sent.
 message ConnectionHeader {
-  optional UserInformation userInfo = 1;
-  optional string serviceName = 2;
+  optional UserInformation user_info = 1;
+  optional string service_name = 2;
   // Cell block codec we will use sending over optional cell blocks.  Server throws exception
   // if cannot deal.
-  optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];
+  optional string cell_block_codec_class = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];
   // Compressor we will use if cell block is compressed.  Server will throw exception if
not supported.
   // Class must implement hadoop's CompressionCodec Interface
-  optional string cellBlockCompressorClass = 4;
+  optional string cell_block_compressor_class = 4;
 }
 
 // Optional Cell block Message.  Included in client RequestHeader
@@ -98,34 +98,34 @@ message CellBlockMeta {
 // the server side exception to the RPC client.
 message ExceptionResponse {
   // Class name of the exception thrown from the server
-  optional string exceptionClassName = 1;
+  optional string exception_class_name = 1;
   // Exception stack trace from the server side
-  optional string stackTrace = 2;
+  optional string stack_trace = 2;
   // Optional hostname.  Filled in for some exceptions such as region moved
   // where exception gives clue on where the region may have moved.
   optional string hostname = 3;
   optional int32 port = 4;
   // Set if we are NOT to retry on receipt of this exception
-  optional bool doNotRetry = 5;
+  optional bool do_not_retry = 5;
 }
 
 // Header sent making a request.
 message RequestHeader {
-  // Monotonically increasing callId to keep track of RPC requests and their response
-  optional uint32 callId = 1;
-  optional RPCTInfo traceInfo = 2;
-  optional string methodName = 3;
+  // Monotonically increasing call_id to keep track of RPC requests and their response
+  optional uint32 call_id = 1;
+  optional RPCTInfo trace_info = 2;
+  optional string method_name = 3;
   // If true, then a pb Message param follows.
-  optional bool requestParam = 4;
+  optional bool request_param = 4;
   // If present, then an encoded data block follows.
-  optional CellBlockMeta cellBlockMeta = 5; 
+  optional CellBlockMeta cell_block_meta = 5;
   // TODO: Have client specify priority
 }
 
 message ResponseHeader {
-  optional uint32 callId = 1;
+  optional uint32 call_id = 1;
   // If present, then request threw an exception and no response message (else we presume
one)
   optional ExceptionResponse exception = 2;
   // If present, then an encoded data block follows.
-  optional CellBlockMeta cellBlockMeta = 3; 
+  optional CellBlockMeta cell_block_meta = 3;
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/RegionServerStatus.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/RegionServerStatus.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/RegionServerStatus.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/RegionServerStatus.proto Wed Jul 10 16:30:32
2013
@@ -32,10 +32,10 @@ message RegionServerStartupRequest {
   required uint32 port = 1;
 
   /** This servers' startcode */
-  required uint64 serverStartCode = 2;
+  required uint64 server_start_code = 2;
 
   /** Current time of the region server in ms */
-  required uint64 serverCurrentTime = 3;
+  required uint64 server_current_time = 3;
 }
 
 message RegionServerStartupResponse {
@@ -44,7 +44,7 @@ message RegionServerStartupResponse {
    * hbase rootdir, the hostname to use creating the RegionServer ServerName,
    * etc
    */
-  repeated NameStringPair mapEntries = 1;
+  repeated NameStringPair map_entries = 1;
 }
 
 message RegionServerReportRequest {
@@ -62,7 +62,7 @@ message ReportRSFatalErrorRequest {
   required ServerName server = 1;
 
   /** informative text to expose in the master logs and UI */
-  required string errorMessage = 2;
+  required string error_message = 2;
 }
 
 message ReportRSFatalErrorResponse {
@@ -70,33 +70,33 @@ message ReportRSFatalErrorResponse {
 
 message GetLastFlushedSequenceIdRequest {
   /** region name */
-  required bytes regionName = 1;
+  required bytes region_name = 1;
 }
 
 message GetLastFlushedSequenceIdResponse {
   /** the last HLog sequence id flushed from MemStore to HFile for the region */
-  required uint64 lastFlushedSequenceId = 1;
+  required uint64 last_flushed_sequence_id = 1;
 }
 
 service RegionServerStatusService {
   /** Called when a region server first starts. */
-  rpc regionServerStartup(RegionServerStartupRequest)
+  rpc RegionServerStartup(RegionServerStartupRequest)
     returns(RegionServerStartupResponse);
 
   /** Called to report the load the RegionServer is under. */
-  rpc regionServerReport(RegionServerReportRequest)
+  rpc RegionServerReport(RegionServerReportRequest)
     returns(RegionServerReportResponse);
 
   /**
    * Called by a region server to report a fatal error that is causing it to
    * abort.
    */
-  rpc reportRSFatalError(ReportRSFatalErrorRequest)
+  rpc ReportRSFatalError(ReportRSFatalErrorRequest)
     returns(ReportRSFatalErrorResponse);
 
   /** Called to get the sequence id of the last MemStore entry flushed to an
    * HFile for a specified region. Used by the region server to speed up
    * log splitting. */
-  rpc getLastFlushedSequenceId(GetLastFlushedSequenceIdRequest)
+  rpc GetLastFlushedSequenceId(GetLastFlushedSequenceIdRequest)
     returns(GetLastFlushedSequenceIdResponse);
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/RowProcessor.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/RowProcessor.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/RowProcessor.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/RowProcessor.proto Wed Jul 10 16:30:32 2013
@@ -27,15 +27,15 @@ option java_generate_equals_and_hash = t
 option optimize_for = SPEED;
 
 message RowProcessorRequest {
-  required string rowProcessorClassName = 1;
-  optional string rowProcessorInitializerMessageName = 2;
-  optional bytes  rowProcessorInitializerMessage = 3;
+  required string row_processor_class_name = 1;
+  optional string row_processor_initializer_message_name = 2;
+  optional bytes  row_processor_initializer_message = 3;
 }
 
 message RowProcessorResult {
-  required bytes rowProcessorResult = 1;
+  required bytes row_processor_result = 1;
 }
 
 service RowProcessorService {
-  rpc process (RowProcessorRequest) returns (RowProcessorResult);
-}
\ No newline at end of file
+  rpc Process (RowProcessorRequest) returns (RowProcessorResult);
+}

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto Wed Jul 10 16:30:32
2013
@@ -26,10 +26,10 @@ import 'hbase.proto';
 import 'Client.proto';
 
 message SecureBulkLoadHFilesRequest {
-  repeated BulkLoadHFileRequest.FamilyPath familyPath = 1;
-  optional bool assignSeqNum = 2;
-  required DelegationTokenProto fsToken = 3;
-  required string bulkToken = 4;
+  repeated BulkLoadHFileRequest.FamilyPath family_path = 1;
+  optional bool assign_seq_num = 2;
+  required DelegationTokenProto fs_token = 3;
+  required string bulk_token = 4;
 }
 
 message SecureBulkLoadHFilesResponse {
@@ -44,15 +44,15 @@ message DelegationTokenProto {
 }
 
 message PrepareBulkLoadRequest {
-  required bytes tableName = 1;
+  required bytes table_name = 1;
 }
 
 message PrepareBulkLoadResponse {
-  required string bulkToken = 1;
+  required string bulk_token = 1;
 }
 
 message CleanupBulkLoadRequest {
-  required string bulkToken = 1;
+  required string bulk_token = 1;
 
 }
 
@@ -60,12 +60,12 @@ message CleanupBulkLoadResponse {
 }
 
 service SecureBulkLoadService {
-    rpc prepareBulkLoad(PrepareBulkLoadRequest)
+    rpc PrepareBulkLoad(PrepareBulkLoadRequest)
       returns (PrepareBulkLoadResponse);
 
-    rpc secureBulkLoadHFiles(SecureBulkLoadHFilesRequest)
+    rpc SecureBulkLoadHFiles(SecureBulkLoadHFilesRequest)
       returns (SecureBulkLoadHFilesResponse);
 
-    rpc cleanupBulkLoad(CleanupBulkLoadRequest)
+    rpc CleanupBulkLoad(CleanupBulkLoadRequest)
       returns (CleanupBulkLoadResponse);
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/Tracing.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/Tracing.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/Tracing.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/Tracing.proto Wed Jul 10 16:30:32 2013
@@ -26,6 +26,6 @@ option optimize_for = SPEED;
 //the id of the current span when this message was sent, so we know 
 //what span caused the new span we will create when this message is received.
 message RPCTInfo {
-  optional int64 traceId = 1;
-  optional int64 parentId = 2;
+  optional int64 trace_id = 1;
+  optional int64 parent_id = 2;
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/WAL.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/WAL.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/WAL.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/WAL.proto Wed Jul 10 16:30:32 2013
@@ -24,21 +24,21 @@ option optimize_for = SPEED;
 import "hbase.proto";
 
 message WALHeader {
-  optional bool hasCompression = 1;
+  optional bool has_compression = 1;
 }
 
 // Protocol buffer version of HLogKey; see HLogKey comment, not really a key but WALEdit
header for some KVs
 message WALKey {
-  required bytes encodedRegionName = 1;
-  required bytes tableName = 2;
-  required uint64 logSequenceNumber = 3;
-  required uint64 writeTime = 4;
-  optional UUID clusterId = 5;
+  required bytes encoded_region_name = 1;
+  required bytes table_name = 2;
+  required uint64 log_sequence_number = 3;
+  required uint64 write_time = 4;
+  optional UUID cluster_id = 5;
   
   repeated FamilyScope scopes = 6;
-  optional uint32 followingKvCount = 7;
+  optional uint32 following_kv_count = 7;
 /*
-  optional CustomEntryType customEntryType = 8;
+  optional CustomEntryType custom_entry_type = 8;
 
   enum CustomEntryType {
     COMPACTION = 0;
@@ -53,7 +53,7 @@ enum ScopeType {
 
 message FamilyScope {
   required bytes family = 1;
-  required ScopeType scopeType = 2;
+  required ScopeType scope_type = 2;
 }
 
 /**
@@ -67,12 +67,12 @@ message FamilyScope {
  * the * compaction should we fail the WAL write.
  */
 message CompactionDescriptor {
-  required bytes tableName = 1; // TODO: WALKey already stores these, might remove
-  required bytes encodedRegionName = 2;
-  required bytes familyName = 3;
-  repeated string compactionInput = 4;
-  repeated string compactionOutput = 5;
-  required string storeHomeDir = 6;
+  required bytes table_name = 1; // TODO: WALKey already stores these, might remove
+  required bytes encoded_region_name = 2;
+  required bytes family_name = 3;
+  repeated string compaction_input = 4;
+  repeated string compaction_output = 5;
+  required string store_home_dir = 6;
 }
 
 /**

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/ZooKeeper.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/ZooKeeper.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/ZooKeeper.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/ZooKeeper.proto Wed Jul 10 16:30:32 2013
@@ -36,7 +36,7 @@ message MetaRegionServer {
   // The major version of the rpc the server speaks.  This is used so that
   // clients connecting to the cluster can have prior knowledge of what version
   // to send to a RegionServer.  AsyncHBase will use this to detect versions.
-  optional uint32 rpcVersion = 2;
+  optional uint32 rpc_version = 2;
 }
 
 /**
@@ -46,7 +46,7 @@ message Master {
   // The ServerName of the current Master
   required ServerName master = 1;
   // Major RPC version so that clients can know what version the master can accept.
-  optional uint32 rpcVersion = 2;
+  optional uint32 rpc_version = 2;
 }
 
 /**
@@ -54,8 +54,8 @@ message Master {
  */
 message ClusterUp {
   // If this znode is present, cluster is up.  Currently
-  // the data is cluster startDate.
-  required string startDate = 1;
+  // the data is cluster start_date.
+  required string start_date = 1;
 }
 
 /**
@@ -64,12 +64,12 @@ message ClusterUp {
  */
 message RegionTransition {
   // Code for EventType gotten by doing o.a.h.h.EventHandler.EventType.getCode()
-  required uint32 eventTypeCode = 1;
+  required uint32 event_type_code = 1;
   // Full regionname in bytes
-  required bytes regionName = 2;
-  required uint64 createTime = 3;
+  required bytes region_name = 2;
+  required uint64 create_time = 3;
   // The region server where the transition will happen or is happening
-  required ServerName serverName = 4;
+  required ServerName server_name = 4;
   optional bytes payload = 5;
 }
 
@@ -86,7 +86,7 @@ message SplitLogTask {
     ERR = 4;
   }
   required State state = 1;
-  required ServerName serverName = 2;
+  required ServerName server_name = 2;
 }
 
 /**
@@ -110,7 +110,7 @@ message Table {
  * Used by replication. Holds a replication peer key.
  */
 message ReplicationPeer {
-  // clusterKey is the concatenation of the slave cluster's
+  // clusterkey is the concatenation of the slave cluster's
   // hbase.zookeeper.quorum:hbase.zookeeper.property.clientPort:zookeeper.znode.parent
   required string clusterkey = 1;
 }
@@ -137,27 +137,27 @@ message ReplicationHLogPosition {
  * Used by replication. Used to lock a region server during failover.
  */
 message ReplicationLock {
-  required string lockOwner = 1;
+  required string lock_owner = 1;
 }
 
 /**
  * Metadata associated with a table lock in zookeeper
  */
 message TableLock {
-  optional bytes tableName = 1;
-  optional ServerName lockOwner = 2;
-  optional int64 threadId = 3;
-  optional bool isShared = 4;
+  optional bytes table_name = 1;
+  optional ServerName lock_owner = 2;
+  optional int64 thread_id = 3;
+  optional bool is_shared = 4;
   optional string purpose = 5;
-  optional int64 createTime = 6;
+  optional int64 create_time = 6;
 }
 
 /**
  * sequence Id of a store
  */
 message StoreSequenceId {
-  required bytes familyName = 1;
-  required uint64 sequenceId = 2;
+  required bytes family_name = 1;
+  required uint64 sequence_id = 2;
 }
 
 /**
@@ -165,6 +165,6 @@ message StoreSequenceId {
  * list sequence ids of the region's stores
  */
 message RegionStoreSequenceIds {
-  required uint64 lastFlushedSequenceId = 1;
-  repeated StoreSequenceId storeSequenceId = 2;
+  required uint64 last_flushed_sequence_id = 1;
+  repeated StoreSequenceId store_sequence_id = 2;
 }

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/hbase.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/hbase.proto?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/hbase.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/hbase.proto Wed Jul 10 16:30:32 2013
@@ -32,7 +32,7 @@ import "Cell.proto";
 message TableSchema {
   optional bytes name = 1;
   repeated BytesBytesPair attributes = 2;
-  repeated ColumnFamilySchema columnFamilies = 3;
+  repeated ColumnFamilySchema column_families = 3;
   repeated NameStringPair configuration = 4;
 }
 
@@ -50,10 +50,10 @@ message ColumnFamilySchema {
  * Protocol buffer version of HRegionInfo.
  */
 message RegionInfo {
-  required uint64 regionId = 1;
-  required bytes tableName = 2;
-  optional bytes startKey = 3;
-  optional bytes endKey = 4;
+  required uint64 region_id = 1;
+  required bytes table_name = 2;
+  optional bytes start_key = 3;
+  optional bytes end_key = 4;
   optional bool offline = 5;
   optional bool split = 6;
   optional bool recovering = 7;
@@ -63,7 +63,7 @@ message RegionInfo {
  * Protocol buffer for favored nodes
  */
 message FavoredNodes {
-  repeated ServerName favoredNode = 1;
+  repeated ServerName favored_node = 1;
 }
 
 /**
@@ -111,9 +111,9 @@ enum CompareType {
  * Protocol buffer version of ServerName
  */
 message ServerName {
-  required string hostName = 1;
+  required string host_name = 1;
   optional uint32 port = 2;
-  optional uint64 startCode = 3;
+  optional uint64 start_code = 3;
 }
 
 // Comment data structures
@@ -148,7 +148,7 @@ message NameInt64Pair {
 message SnapshotDescription {
   required string name = 1;
   optional string table = 2; // not needed for delete, but checked for in taking snapshot
-  optional int64 creationTime = 3 [default = 0];
+  optional int64 creation_time = 3 [default = 0];
   enum Type {
     DISABLED = 0;
     FLUSH = 1;
@@ -161,15 +161,15 @@ message EmptyMsg {
 }
 
 message LongMsg {
-  required int64 longMsg = 1;
+  required int64 long_msg = 1;
 
 }
 
 message BigDecimalMsg {
-  required bytes bigdecimalMsg = 1;
+  required bytes bigdecimal_msg = 1;
 }
 
 message UUID {
-  required uint64 leastSigBits = 1;
-  required uint64 mostSigBits = 2;
+  required uint64 least_sig_bits = 1;
+  required uint64 most_sig_bits = 2;
 }

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenProvider.java
Wed Jul 10 16:30:32 2013
@@ -133,7 +133,7 @@ public class TokenProvider implements Au
   }
 
   @Override
-  public void whoami(RpcController controller, AuthenticationProtos.WhoAmIRequest request,
+  public void whoAmI(RpcController controller, AuthenticationProtos.WhoAmIRequest request,
                      RpcCallback<AuthenticationProtos.WhoAmIResponse> done) {
     User requestUser = RequestContext.getRequestUser();
     AuthenticationProtos.WhoAmIResponse.Builder response =

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java?rev=1501834&r1=1501833&r2=1501834&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java
(original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java
Wed Jul 10 16:30:32 2013
@@ -274,15 +274,15 @@ public class TestTokenAuthentication {
     }
 
     @Override
-    public AuthenticationProtos.WhoAmIResponse whoami(
+    public AuthenticationProtos.WhoAmIResponse whoAmI(
         RpcController controller, AuthenticationProtos.WhoAmIRequest request)
       throws ServiceException {
-      LOG.debug("whoami() request from "+RequestContext.getRequestUserName());
+      LOG.debug("whoAmI() request from "+RequestContext.getRequestUserName());
       // ignore passed in controller -- it's always null
       ServerRpcController serverController = new ServerRpcController();
       BlockingRpcCallback<AuthenticationProtos.WhoAmIResponse> callback =
           new BlockingRpcCallback<AuthenticationProtos.WhoAmIResponse>();
-      whoami(serverController, request, callback);
+      whoAmI(serverController, request, callback);
       try {
         serverController.checkFailed();
         return callback.get();
@@ -383,7 +383,7 @@ public class TestTokenAuthentication {
           AuthenticationProtos.AuthenticationService.BlockingInterface stub =
             AuthenticationProtos.AuthenticationService.newBlockingStub(channel);
           AuthenticationProtos.WhoAmIResponse response =
-            stub.whoami(null, AuthenticationProtos.WhoAmIRequest.getDefaultInstance());
+            stub.whoAmI(null, AuthenticationProtos.WhoAmIRequest.getDefaultInstance());
           String myname = response.getUsername();
           assertEquals("testuser", myname);
           String authMethod = response.getAuthMethod();



Mime
View raw message