diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/TableInfoMissingException.java hbase-client/src/main/java/org/apache/hadoop/hbase/TableInfoMissingException.java index fa1f970..7357aba 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/TableInfoMissingException.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/TableInfoMissingException.java @@ -21,7 +21,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; /** - * + * * Failed to find .tableinfo file under table dir * */ diff --git hbase-protocol-shaded/pom.xml hbase-protocol-shaded/pom.xml index 2b221d5..dda15ea 100644 --- hbase-protocol-shaded/pom.xml +++ hbase-protocol-shaded/pom.xml @@ -191,6 +191,32 @@ + maven-resources-plugin + + + copy-shaded-code + generate-resources + + copy-resources + + + true + ${sources.dir} + + + src/main/java/ + true + + **/protobuf/generated/*.java + **/com/google/protobuf/*.java + + + + + + + + maven-clean-plugin diff --git hbase-protocol-shaded/src/main/protobuf/Client.proto hbase-protocol-shaded/src/main/protobuf/Client.proto index 2feaa26..93d4c14 100644 --- hbase-protocol-shaded/src/main/protobuf/Client.proto +++ hbase-protocol-shaded/src/main/protobuf/Client.proto @@ -17,6 +17,7 @@ */ // This file contains protocol buffers that are used for Client service. +// Add a nothing change package hbase.pb; option java_package = "org.apache.hadoop.hbase.shaded.protobuf.generated"; @@ -102,7 +103,7 @@ message Result { // in the query. optional bool exists = 3; - // Whether or not the results are coming from possibly stale data + // Whether or not the results are coming from possibly stale data optional bool stale = 4 [default = false]; // Whether or not the entire result could be returned. Results will be split when @@ -317,15 +318,15 @@ message ScanResponse { // reasons such as the size in bytes or quantity of results accumulated. This field // will true when more results exist in the current region. optional bool more_results_in_region = 8; - + // This field is filled in if the server is sending back a heartbeat message. // Heartbeat messages are sent back to the client to prevent the scanner from // timing out. Seeing a heartbeat message communicates to the Client that the // server would have continued to scan had the time limit not been reached. optional bool heartbeat_message = 9; - + // This field is filled in if the client has requested that scan metrics be tracked. - // The metrics tracked here are sent back to the client to be tracked together with + // The metrics tracked here are sent back to the client to be tracked together with // the existing client side metrics. optional ScanMetrics scan_metrics = 10; } @@ -503,7 +504,7 @@ service ClientService { rpc ExecService(CoprocessorServiceRequest) returns(CoprocessorServiceResponse); - + rpc ExecRegionServerService(CoprocessorServiceRequest) returns(CoprocessorServiceResponse); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogTask.java hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogTask.java index 66493e1..03d5108 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogTask.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/SplitLogTask.java @@ -72,7 +72,7 @@ public class SplitLogTask { SplitLogTask(final ZooKeeperProtos.SplitLogTask slt) { this.originServer = ProtobufUtil.toServerName(slt.getServerName()); this.state = slt.getState(); - this.mode = (slt.hasMode()) ? slt.getMode() : + this.mode = (slt.hasMode()) ? slt.getMode() : ZooKeeperProtos.SplitLogTask.RecoveryMode.UNKNOWN; }