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/08/19 18:28:06 UTC
[1/3] git commit: HBASE-11773 Wrong field used for protobuf
construction in RegionStates (Andrey Stepachev)
Repository: hbase
Updated Branches:
refs/heads/0.98 3f38af605 -> dbda5c38f
refs/heads/branch-1 d502bafad -> 4901e649b
refs/heads/master 3c13e8f3c -> 393a2a381
HBASE-11773 Wrong field used for protobuf construction in RegionStates (Andrey Stepachev)
Amending-Author: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dbda5c38
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dbda5c38
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dbda5c38
Branch: refs/heads/0.98
Commit: dbda5c38feb28aef2ee3829264cbe39af54c958d
Parents: 3f38af6
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Aug 19 09:23:20 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Aug 19 09:23:20 2014 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/master/RegionState.java | 17 +++++++-
.../hadoop/hbase/master/TestRegionState.java | 44 ++++++++++++++++++++
2 files changed, 60 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/dbda5c38/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
index 1170387..5b07e88 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
@@ -263,7 +263,7 @@ public class RegionState implements org.apache.hadoop.io.Writable {
public ClusterStatusProtos.RegionState convert() {
ClusterStatusProtos.RegionState.Builder regionState = ClusterStatusProtos.RegionState.newBuilder();
ClusterStatusProtos.RegionState.State rs;
- switch (regionState.getState()) {
+ switch (this.state) {
case OFFLINE:
rs = ClusterStatusProtos.RegionState.State.OFFLINE;
break;
@@ -383,6 +383,21 @@ public class RegionState implements org.apache.hadoop.io.Writable {
}
/**
+ * Check if two states are the same, except timestamp
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ RegionState tmp = (RegionState)obj;
+ return tmp.hri.equals(hri) && tmp.state == state
+ && ((serverName != null && serverName.equals(tmp.serverName))
+ || (tmp.serverName == null && serverName == null));
+ }
+
+ /**
* @deprecated Writables are going away
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/hbase/blob/dbda5c38/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java
new file mode 100644
index 0000000..4c4df39
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.master;
+
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+@Category(SmallTests.class)
+public class TestRegionState {
+ @Test
+ public void test() {
+ RegionState state1 = new RegionState(
+ new HRegionInfo(TableName.valueOf("table")), RegionState.State.OPENING);
+ ClusterStatusProtos.RegionState protobuf1 = state1.convert();
+ RegionState state2 = RegionState.convert(protobuf1);
+ ClusterStatusProtos.RegionState protobuf2 = state1.convert();
+
+ assertEquals(state1, state2);
+ assertEquals(protobuf1, protobuf2);
+ }
+}
[2/3] git commit: HBASE-11773 Wrong field used for protobuf
construction in RegionStates (Andrey Stepachev)
Posted by ap...@apache.org.
HBASE-11773 Wrong field used for protobuf construction in RegionStates (Andrey Stepachev)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4901e649
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4901e649
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4901e649
Branch: refs/heads/branch-1
Commit: 4901e649b64700e6796c2ba2da24ac2b906273ec
Parents: d502baf
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Aug 19 09:23:21 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Aug 19 09:23:21 2014 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/master/RegionState.java | 2 +-
.../hadoop/hbase/master/TestRegionState.java | 44 ++++++++++++++++++++
2 files changed, 45 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4901e649/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
index 3289ac1..e6aa279 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
@@ -265,7 +265,7 @@ public class RegionState {
public ClusterStatusProtos.RegionState convert() {
ClusterStatusProtos.RegionState.Builder regionState = ClusterStatusProtos.RegionState.newBuilder();
ClusterStatusProtos.RegionState.State rs;
- switch (regionState.getState()) {
+ switch (this.state) {
case OFFLINE:
rs = ClusterStatusProtos.RegionState.State.OFFLINE;
break;
http://git-wip-us.apache.org/repos/asf/hbase/blob/4901e649/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java
new file mode 100644
index 0000000..4c4df39
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.master;
+
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+@Category(SmallTests.class)
+public class TestRegionState {
+ @Test
+ public void test() {
+ RegionState state1 = new RegionState(
+ new HRegionInfo(TableName.valueOf("table")), RegionState.State.OPENING);
+ ClusterStatusProtos.RegionState protobuf1 = state1.convert();
+ RegionState state2 = RegionState.convert(protobuf1);
+ ClusterStatusProtos.RegionState protobuf2 = state1.convert();
+
+ assertEquals(state1, state2);
+ assertEquals(protobuf1, protobuf2);
+ }
+}
[3/3] git commit: HBASE-11773 Wrong field used for protobuf
construction in RegionStates (Andrey Stepachev)
Posted by ap...@apache.org.
HBASE-11773 Wrong field used for protobuf construction in RegionStates (Andrey Stepachev)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/393a2a38
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/393a2a38
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/393a2a38
Branch: refs/heads/master
Commit: 393a2a3814a85e4b985aba89243101b23220eed1
Parents: 3c13e8f
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Aug 19 09:23:21 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Aug 19 09:24:45 2014 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/master/RegionState.java | 2 +-
.../hadoop/hbase/master/TestRegionState.java | 44 ++++++++++++++++++++
2 files changed, 45 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/393a2a38/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
index 3830f93..d660db7 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/master/RegionState.java
@@ -251,7 +251,7 @@ public class RegionState {
public ClusterStatusProtos.RegionState convert() {
ClusterStatusProtos.RegionState.Builder regionState = ClusterStatusProtos.RegionState.newBuilder();
ClusterStatusProtos.RegionState.State rs;
- switch (regionState.getState()) {
+ switch (this.state) {
case OFFLINE:
rs = ClusterStatusProtos.RegionState.State.OFFLINE;
break;
http://git-wip-us.apache.org/repos/asf/hbase/blob/393a2a38/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java
new file mode 100644
index 0000000..4c4df39
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.master;
+
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+@Category(SmallTests.class)
+public class TestRegionState {
+ @Test
+ public void test() {
+ RegionState state1 = new RegionState(
+ new HRegionInfo(TableName.valueOf("table")), RegionState.State.OPENING);
+ ClusterStatusProtos.RegionState protobuf1 = state1.convert();
+ RegionState state2 = RegionState.convert(protobuf1);
+ ClusterStatusProtos.RegionState protobuf2 = state1.convert();
+
+ assertEquals(state1, state2);
+ assertEquals(protobuf1, protobuf2);
+ }
+}