Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1451846 - in /hbase/branches/0.94/src:
 main/java/org/apache/hadoop/hbase/HConstants.java
 main/java/org/apache/hadoop/hbase/client/HTable.java
 test/java/org/apache/hadoop/hbase/client/TestAdmin.java
Date: Sat, 02 Mar 2013 07:56:48 -0000
To: commits@hbase.apache.org
From: ramkrishna@apache.org
Message-Id: <20130302075649.0A0F32388847@eris.apache.org>

Author: ramkrishna
Date: Sat Mar  2 07:56:48 2013
New Revision: 1451846

URL: http://svn.apache.org/r1451846
Log:
HBASE-7928-Scanning .META. with startRow and/or stopRow is not giving proper results - Revert(Ram).  Affects TestMetaMigrationRemovingHTD 


Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HConstants.java
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HTable.java
    hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HConstants.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1451846&r1=1451845&r2=1451846&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HConstants.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HConstants.java Sat Mar  2 07:56:48 2013
@@ -305,8 +305,6 @@ public final class HConstants {
 
   /** delimiter used between portions of a region name */
   public static final int META_ROW_DELIMITER = ',';
-  
-  public static final byte[] META_ROW_DELIMITER_BYTES = Bytes.toBytes(",,");
 
   /** The catalog family as a string*/
   public static final String CATALOG_FAMILY_STR = "info";

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HTable.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HTable.java?rev=1451846&r1=1451845&r2=1451846&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HTable.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HTable.java Sat Mar  2 07:56:48 2013
@@ -625,33 +625,11 @@ public class HTable implements HTableInt
     if (scan.getCaching() <= 0) {
       scan.setCaching(getScannerCaching());
     }
-    if (Bytes.equals(this.getTableName(), HConstants.META_TABLE_NAME)) {
-      changeStartAndStopRowIfMeta(scan);
-    }
-
-    return new ClientScanner(getConfiguration(), scan, getTableName(), this.connection);
-  }
-
-  private void changeStartAndStopRowIfMeta(final Scan scan) {
-    if (scan.getStartRow() != null && scan.getStartRow().length != 0
-        && !isValidMetaTableRow(scan.getStartRow())) {
-      scan.setStartRow(Bytes.add(scan.getStartRow(), HConstants.META_ROW_DELIMITER_BYTES,
-          Bytes.toBytes(HConstants.ZEROES)));
-    }
-    if (scan.getStopRow() != null && scan.getStopRow().length != 0
-        && !isValidMetaTableRow(scan.getStopRow())) {
-      scan.setStopRow(Bytes.add(scan.getStopRow(), HConstants.META_ROW_DELIMITER_BYTES,
-          Bytes.toBytes(HConstants.NINES)));
-    }
-  }
-
-  private boolean isValidMetaTableRow(byte[] metaRow) {
-    return (com.google.common.primitives.Bytes
-        .indexOf(metaRow, HConstants.META_ROW_DELIMITER_BYTES) != -1);
+    return new ClientScanner(getConfiguration(), scan, getTableName(),
+        this.connection);
   }
 
-
-/**
+  /**
    * {@inheritDoc}
    */
   @Override

Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1451846&r1=1451845&r2=1451846&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java Sat Mar  2 07:56:48 2013
@@ -345,39 +345,6 @@ public class TestAdmin {
            assertTrue(exceptionThrown);
        }
    }
-
-  @Test
-  public void testHBASE7928() throws Exception {
-    final byte[] tableName = Bytes.toBytes("a");
-    final byte[] tableName1 = Bytes.toBytes("b");
-    final byte[] tableName2 = Bytes.toBytes("c");
-    try {
-
-      TEST_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY).close();
-
-      TEST_UTIL.createTable(tableName1, HConstants.CATALOG_FAMILY).close();
-
-      TEST_UTIL.createTable(tableName2, HConstants.CATALOG_FAMILY).close();
-      while (!admin.isTableAvailable(tableName2)) {
-        Thread.sleep(1);
-      }
-      Scan s = new Scan();
-      s.setStartRow(Bytes.toBytes("a1"));
-      s.setStopRow(Bytes.toBytes("b1"));
-      HTable table = new HTable(admin.getConfiguration(), HConstants.META_TABLE_NAME);
-      ResultScanner scanner = table.getScanner(s);
-      Result[] result = scanner.next(5);
-      assertEquals("Only one row should be selected", 1, result.length);
-    } finally {
-      admin.disableTable(tableName);
-      admin.deleteTable(tableName);
-      admin.disableTable(tableName1);
-      admin.deleteTable(tableName1);
-      admin.disableTable(tableName2);
-      admin.deleteTable(tableName2);
-    }
-  }
-  
   /**
    * Verify schema modification takes.
    * @throws IOException