svn commit: r1590092 - /hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java

[li...@apache.org]

Author: liyin
Date: Fri Apr 25 18:18:41 2014
New Revision: 1590092

URL: http://svn.apache.org/r1590092
Log:
[HBASE-9704] Revert the part increment table id in https://phabricator.fb.com/D1291992

Author: manukranthk

Summary: That change might cause unintended side effects as noted by adela in https://phabricator.fb.com/D1294255. So, reverting the same.

Test Plan: Run TestSimpleOperations

Reviewers: adela

Reviewed By: adela

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D1295273

Modified:
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java?rev=1590092&r1=1590091&r2=1590092&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java Fri Apr 25 18:18:41 2014
@@ -41,8 +41,7 @@ public class TestSimpleOperations {
   private static final int SLAVES = 1;
 
   static final String ROW_PREFIX = "row";
-  static int testCount = 0;
-  static byte[] TABLE = Bytes.toBytes("testTable" + testCount);
+  static byte[] TABLE = Bytes.toBytes("testTable");
   static final byte[] FAMILY = Bytes.toBytes("family");
   static final byte[][] FAMILIES = new byte[][] { FAMILY };
   static final byte[] QUALIFIER = Bytes.toBytes("qualifier");
@@ -71,7 +70,11 @@ public class TestSimpleOperations {
 
   @After
   public void cleanUp() throws IOException {
-    TABLE = Bytes.toBytes("testTable" + ++testCount);
+    final HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
+    if (admin.tableExists(TABLE)) {
+      admin.disableTable(TABLE);
+      admin.deleteTable(TABLE);
+    }
   }
 
   /**