You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2016/06/09 05:51:35 UTC
[1/6] hbase git commit: HBASE-15975 logic in
TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Repository: hbase
Updated Branches:
refs/heads/0.98 9624f3a9e -> c8208994b
refs/heads/branch-1 867150333 -> 13d06a2cc
refs/heads/branch-1.1 4418ba2f8 -> bccedc607
refs/heads/branch-1.2 da52e0cdf -> 8dc366878
refs/heads/branch-1.3 2bba03cf5 -> ba9c11ef1
refs/heads/master 031b74500 -> 41cc21554
HBASE-15975 logic in TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/41cc2155
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/41cc2155
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/41cc2155
Branch: refs/heads/master
Commit: 41cc215544deb5f1f6cf522efd19229da0c99dd2
Parents: 031b745
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Wed Jun 8 22:42:07 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Wed Jun 8 22:42:50 2016 -0700
----------------------------------------------------------------------
.../hadoop/hbase/TestHTableDescriptor.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/41cc2155/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
index 680f2c1..70380e6 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
@@ -55,35 +55,36 @@ public class TestHTableDescriptor {
public void testAddCoprocessorWithSpecStr() throws IOException {
HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME);
String cpName = "a.b.c.d";
- boolean expected = false;
try {
htd.addCoprocessorWithSpec(cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = true;
+ // Expected as cpName is invalid
}
- if (!expected) fail();
+
// Try minimal spec.
try {
htd.addCoprocessorWithSpec("file:///some/path" + "|" + cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = false;
+ // Expected to be invalid
}
- if (expected) fail();
+
// Try more spec.
String spec = "hdfs:///foo.jar|com.foo.FooRegionObserver|1001|arg1=1,arg2=2";
try {
htd.addCoprocessorWithSpec(spec);
} catch (IllegalArgumentException iae) {
- expected = false;
+ fail();
}
- if (expected) fail();
+
// Try double add of same coprocessor
try {
htd.addCoprocessorWithSpec(spec);
+ fail();
} catch (IOException ioe) {
- expected = true;
+ // Expect that the coprocessor already exists
}
- if (!expected) fail();
}
@Test
[5/6] hbase git commit: HBASE-15975 logic in
TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Posted by mb...@apache.org.
HBASE-15975 logic in TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bccedc60
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bccedc60
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bccedc60
Branch: refs/heads/branch-1.1
Commit: bccedc6072281760816261735773475fb91ca7b9
Parents: 4418ba2
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Wed Jun 8 22:42:07 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Wed Jun 8 22:47:40 2016 -0700
----------------------------------------------------------------------
.../hadoop/hbase/TestHTableDescriptor.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/bccedc60/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
index ccb3c68..0b0e188 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
@@ -54,35 +54,36 @@ public class TestHTableDescriptor {
public void testAddCoprocessorWithSpecStr() throws IOException {
HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME);
String cpName = "a.b.c.d";
- boolean expected = false;
try {
htd.addCoprocessorWithSpec(cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = true;
+ // Expected as cpName is invalid
}
- if (!expected) fail();
+
// Try minimal spec.
try {
htd.addCoprocessorWithSpec("file:///some/path" + "|" + cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = false;
+ // Expected to be invalid
}
- if (expected) fail();
+
// Try more spec.
String spec = "hdfs:///foo.jar|com.foo.FooRegionObserver|1001|arg1=1,arg2=2";
try {
htd.addCoprocessorWithSpec(spec);
} catch (IllegalArgumentException iae) {
- expected = false;
+ fail();
}
- if (expected) fail();
+
// Try double add of same coprocessor
try {
htd.addCoprocessorWithSpec(spec);
+ fail();
} catch (IOException ioe) {
- expected = true;
+ // Expect that the coprocessor already exists
}
- if (!expected) fail();
}
@Test
[2/6] hbase git commit: HBASE-15975 logic in
TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Posted by mb...@apache.org.
HBASE-15975 logic in TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/13d06a2c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/13d06a2c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/13d06a2c
Branch: refs/heads/branch-1
Commit: 13d06a2cc838835b8010804a931e3629cf76bc3a
Parents: 8671503
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Wed Jun 8 22:42:07 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Wed Jun 8 22:44:16 2016 -0700
----------------------------------------------------------------------
.../hadoop/hbase/TestHTableDescriptor.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/13d06a2c/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
index 4d9caae..c09e41b 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
@@ -54,35 +54,36 @@ public class TestHTableDescriptor {
public void testAddCoprocessorWithSpecStr() throws IOException {
HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME);
String cpName = "a.b.c.d";
- boolean expected = false;
try {
htd.addCoprocessorWithSpec(cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = true;
+ // Expected as cpName is invalid
}
- if (!expected) fail();
+
// Try minimal spec.
try {
htd.addCoprocessorWithSpec("file:///some/path" + "|" + cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = false;
+ // Expected to be invalid
}
- if (expected) fail();
+
// Try more spec.
String spec = "hdfs:///foo.jar|com.foo.FooRegionObserver|1001|arg1=1,arg2=2";
try {
htd.addCoprocessorWithSpec(spec);
} catch (IllegalArgumentException iae) {
- expected = false;
+ fail();
}
- if (expected) fail();
+
// Try double add of same coprocessor
try {
htd.addCoprocessorWithSpec(spec);
+ fail();
} catch (IOException ioe) {
- expected = true;
+ // Expect that the coprocessor already exists
}
- if (!expected) fail();
}
@Test
[3/6] hbase git commit: HBASE-15975 logic in
TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Posted by mb...@apache.org.
HBASE-15975 logic in TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ba9c11ef
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ba9c11ef
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ba9c11ef
Branch: refs/heads/branch-1.3
Commit: ba9c11ef1f47f8b7bd1372b63fd9b6a3d868f466
Parents: 2bba03c
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Wed Jun 8 22:42:07 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Wed Jun 8 22:45:26 2016 -0700
----------------------------------------------------------------------
.../hadoop/hbase/TestHTableDescriptor.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ba9c11ef/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
index 4d9caae..c09e41b 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
@@ -54,35 +54,36 @@ public class TestHTableDescriptor {
public void testAddCoprocessorWithSpecStr() throws IOException {
HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME);
String cpName = "a.b.c.d";
- boolean expected = false;
try {
htd.addCoprocessorWithSpec(cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = true;
+ // Expected as cpName is invalid
}
- if (!expected) fail();
+
// Try minimal spec.
try {
htd.addCoprocessorWithSpec("file:///some/path" + "|" + cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = false;
+ // Expected to be invalid
}
- if (expected) fail();
+
// Try more spec.
String spec = "hdfs:///foo.jar|com.foo.FooRegionObserver|1001|arg1=1,arg2=2";
try {
htd.addCoprocessorWithSpec(spec);
} catch (IllegalArgumentException iae) {
- expected = false;
+ fail();
}
- if (expected) fail();
+
// Try double add of same coprocessor
try {
htd.addCoprocessorWithSpec(spec);
+ fail();
} catch (IOException ioe) {
- expected = true;
+ // Expect that the coprocessor already exists
}
- if (!expected) fail();
}
@Test
[6/6] hbase git commit: HBASE-15975 logic in
TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Posted by mb...@apache.org.
HBASE-15975 logic in TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c8208994
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c8208994
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c8208994
Branch: refs/heads/0.98
Commit: c8208994b3d796f70ed05d43187994ed98e61ac3
Parents: 9624f3a
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Wed Jun 8 22:42:07 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Wed Jun 8 22:50:23 2016 -0700
----------------------------------------------------------------------
.../hadoop/hbase/TestHTableDescriptor.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c8208994/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
index 80b34b5..778b28e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
@@ -55,35 +55,36 @@ public class TestHTableDescriptor {
public void testAddCoprocessorWithSpecStr() throws IOException {
HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME);
String cpName = "a.b.c.d";
- boolean expected = false;
try {
htd.addCoprocessorWithSpec(cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = true;
+ // Expected as cpName is invalid
}
- if (!expected) fail();
+
// Try minimal spec.
try {
htd.addCoprocessorWithSpec("file:///some/path" + "|" + cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = false;
+ // Expected to be invalid
}
- if (expected) fail();
+
// Try more spec.
String spec = "hdfs:///foo.jar|com.foo.FooRegionObserver|1001|arg1=1,arg2=2";
try {
htd.addCoprocessorWithSpec(spec);
} catch (IllegalArgumentException iae) {
- expected = false;
+ fail();
}
- if (expected) fail();
+
// Try double add of same coprocessor
try {
htd.addCoprocessorWithSpec(spec);
+ fail();
} catch (IOException ioe) {
- expected = true;
+ // Expect that the coprocessor already exists
}
- if (!expected) fail();
}
@Test
[4/6] hbase git commit: HBASE-15975 logic in
TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Posted by mb...@apache.org.
HBASE-15975 logic in TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong (Huaxiang Sun)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8dc36687
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8dc36687
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8dc36687
Branch: refs/heads/branch-1.2
Commit: 8dc3668788bd978d9dd7e5c776d796ce604c5edb
Parents: da52e0c
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Wed Jun 8 22:42:07 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Wed Jun 8 22:46:31 2016 -0700
----------------------------------------------------------------------
.../hadoop/hbase/TestHTableDescriptor.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8dc36687/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
index 4d9caae..c09e41b 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
@@ -54,35 +54,36 @@ public class TestHTableDescriptor {
public void testAddCoprocessorWithSpecStr() throws IOException {
HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME);
String cpName = "a.b.c.d";
- boolean expected = false;
try {
htd.addCoprocessorWithSpec(cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = true;
+ // Expected as cpName is invalid
}
- if (!expected) fail();
+
// Try minimal spec.
try {
htd.addCoprocessorWithSpec("file:///some/path" + "|" + cpName);
+ fail();
} catch (IllegalArgumentException iae) {
- expected = false;
+ // Expected to be invalid
}
- if (expected) fail();
+
// Try more spec.
String spec = "hdfs:///foo.jar|com.foo.FooRegionObserver|1001|arg1=1,arg2=2";
try {
htd.addCoprocessorWithSpec(spec);
} catch (IllegalArgumentException iae) {
- expected = false;
+ fail();
}
- if (expected) fail();
+
// Try double add of same coprocessor
try {
htd.addCoprocessorWithSpec(spec);
+ fail();
} catch (IOException ioe) {
- expected = true;
+ // Expect that the coprocessor already exists
}
- if (!expected) fail();
}
@Test