Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 7835 invoked from network); 1 Dec 2007 00:00:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Dec 2007 00:00:21 -0000 Received: (qmail 93176 invoked by uid 500); 1 Dec 2007 00:00:08 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 93158 invoked by uid 500); 1 Dec 2007 00:00:08 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 93147 invoked by uid 99); 1 Dec 2007 00:00:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2007 16:00:08 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2007 23:59:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AA5761A9832; Fri, 30 Nov 2007 15:59:59 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600019 - in /lucene/hadoop/trunk/src/contrib/hbase: CHANGES.txt src/java/org/apache/hadoop/hbase/HRegionServer.java Date: Fri, 30 Nov 2007 23:59:59 -0000 To: hadoop-commits@lucene.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071130235959.AA5761A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 map = region.getFull(row); - for (Map.Entry 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 map = region.getFull(row); + Map map = region.getFull(row, ts); for (Map.Entry es: map.entrySet()) { result.put(new HStoreKey(row, es.getKey()), new ImmutableBytesWritable(es.getValue()));