You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/10/11 20:33:30 UTC
[3/3] git commit: HBASE-12228 Backport HBASE-11373 (hbase-protocol
compile failed for name conflict of RegionTransition) to 0.98
HBASE-12228 Backport HBASE-11373 (hbase-protocol compile failed for name conflict of RegionTransition) to 0.98
Includes a regeneration of protobuf classes via mvn -Pcompile-protobuf ...
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f5f81cc7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f5f81cc7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f5f81cc7
Branch: refs/heads/0.98
Commit: f5f81cc791c7770b3e797c33eedc93bdaac211e7
Parents: 884b049
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Oct 10 14:05:07 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Sat Oct 11 11:26:35 2014 -0700
----------------------------------------------------------------------
.../protobuf/generated/MapReduceProtos.java | 6 +-
.../generated/RegionServerStatusProtos.java | 645 ++++++++++---------
.../src/main/protobuf/RegionServerStatus.proto | 12 +-
.../hadoop/hbase/master/AssignmentManager.java | 8 +-
.../org/apache/hadoop/hbase/master/HMaster.java | 16 +-
.../hbase/regionserver/HRegionServer.java | 24 +-
.../regionserver/RegionMergeTransaction.java | 10 +-
.../regionserver/RegionServerServices.java | 6 +-
.../hbase/regionserver/SplitTransaction.java | 10 +-
.../handler/CloseRegionHandler.java | 4 +-
.../regionserver/handler/OpenRegionHandler.java | 6 +-
.../hadoop/hbase/MockRegionServerServices.java | 6 +-
.../hadoop/hbase/master/MockRegionServer.java | 6 +-
.../master/TestAssignmentManagerOnCluster.java | 10 +-
14 files changed, 384 insertions(+), 385 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f5f81cc7/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java
index f1243c0..eeab45c 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java
@@ -1308,7 +1308,7 @@ public final class MapReduceProtos {
public final boolean isInitialized() {
if (hasTable()) {
if (!getTable().isInitialized()) {
-
+
return false;
}
}
@@ -1537,7 +1537,7 @@ public final class MapReduceProtos {
* <code>optional .TableSchema table = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder>
+ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder>
getTableFieldBuilder() {
if (tableBuilder_ == null) {
tableBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -1654,7 +1654,7 @@ public final class MapReduceProtos {
* <code>optional .RegionInfo region = 4;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder>
+ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder>
getRegionFieldBuilder() {
if (regionBuilder_ == null) {
regionBuilder_ = new com.google.protobuf.SingleFieldBuilder<