You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2007/12/01 00:59:59 UTC
svn commit: r600019 - in /lucene/hadoop/trunk/src/contrib/hbase: CHANGES.txt
src/java/org/apache/hadoop/hbase/HRegionServer.java
Author: stack
Date: Fri Nov 30 15:59:56 2007
New Revision: 600019
URL: http://svn.apache.org/viewvc?rev=600019&view=rev
Log:
HADOOP-2322 getRow(row, TS) client interface not properly connected
Modified:
lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java
Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=600019&r1=600018&r2=600019&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Fri Nov 30 15:59:56 2007
@@ -46,6 +46,7 @@
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
Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java?rev=600019&r1=600018&r2=600019&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java Fri Nov 30 15:59:56 2007
@@ -1271,23 +1271,7 @@
/** {@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 @@
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()));