svn commit: r599703 - in /lucene/hadoop/trunk/src/contrib/hbase: CHANGES.txt src/java/org/apache/hadoop/hbase/HTable.java

[stack]

Author: stack
Date: Thu Nov 29 22:35:47 2007
New Revision: 599703

URL: http://svn.apache.org/viewvc?rev=599703&view=rev
Log:
HADOOP-2296 hbase shell: phantom columns show up from select command

Modified:
    lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
    
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.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=599703&r1=599702&r2=599703&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Thu Nov 29 22:35:47 2007
@@ -65,6 +65,7 @@
    HADOOP-1608 Relational Algrebra Operators
                (Edward Yoon via Stack)
    HADOOP-2198 HTable should have method to return table metadata
+   HADOOP-2296 hbase shell: phantom columns show up from select command
 
 
 Release 0.15.1

Modified: 
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.java?rev=599703&r1=599702&r2=599703&view=diff
==============================================================================
--- 
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.java
 (original)
+++ 
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.java
 Thu Nov 29 22:35:47 2007
@@ -945,16 +945,17 @@
       }
       return true;
     }
-    
-    /**
-     * [EMAIL PROTECTED]
-     */
-    public boolean next(HStoreKey key, SortedMap<Text, byte[]> results) throws 
IOException {
+
+    public boolean next(HStoreKey key, SortedMap<Text, byte[]> results)
+    throws IOException {
       checkClosed();
       if (this.closed) {
         return false;
       }
       MapWritable values = null;
+      // Clear the results so we don't inherit any values from any previous
+      // calls to next.
+      results.clear();
       do {
         values = this.server.next(this.scannerId);
       } while (values != null && values.size() == 0 && nextScanner());