Bläddra i källkod

HADOOP-2322 getRow(row, TS) client interface not properly connected

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@600019 13f79535-47bb-0310-9956-ffa450edef68
Michael Stack 17 år sedan
förälder
incheckning
f6909cf982

+ 1 - 0
src/contrib/hbase/CHANGES.txt

@@ -46,6 +46,7 @@ Trunk (unreleased changes)
    HADOOP-2304 Abbreviated symbol parsing error of dir path in jar command
                (Edward Yoon via Stack)
    HADOOP-2320 Committed TestGet2 is managled (breaks build).
+   HADOOP-2322 getRow(row, TS) client interface not properly connected
 
   IMPROVEMENTS
    HADOOP-2401 Add convenience put method that takes writable

+ 2 - 18
src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java

@@ -1271,23 +1271,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
   /** {@inheritDoc} */
   public MapWritable getRow(final Text regionName, final Text row)
     throws IOException {
-
-    checkOpen();
-    requestCount.incrementAndGet();
-    try {
-      HRegion region = getRegion(regionName);
-      MapWritable result = new MapWritable();
-      Map<Text, byte[]> map = region.getFull(row);
-      for (Map.Entry<Text, byte []> es: map.entrySet()) {
-        result.put(new HStoreKey(row, es.getKey()),
-            new ImmutableBytesWritable(es.getValue()));
-      }
-      return result;
-      
-    } catch (IOException e) {
-      checkFileSystem();
-      throw e;
-    }
+    return getRow(regionName, row, HConstants.LATEST_TIMESTAMP);
   }
 
   /** {@inheritDoc} */
@@ -1299,7 +1283,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
     try {
       HRegion region = getRegion(regionName);
       MapWritable result = new MapWritable();
-      Map<Text, byte[]> map = region.getFull(row);
+      Map<Text, byte[]> map = region.getFull(row, ts);
       for (Map.Entry<Text, byte []> es: map.entrySet()) {
         result.put(new HStoreKey(row, es.getKey()),
             new ImmutableBytesWritable(es.getValue()));