svn commit: r675377 - in /hadoop/hbase/trunk: CHANGES.txt bin/HBase.rb bin/hirb.rb

[st...@apache.org]

Author: stack
Date: Wed Jul  9 15:54:44 2008
New Revision: 675377

URL: http://svn.apache.org/viewvc?rev=675377&view=rev
Log:
HBASE-734 scan '.META.', {LIMIT => 10} crashes

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/bin/HBase.rb
    hadoop/hbase/trunk/bin/hirb.rb

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=675377&r1=675376&r2=675377&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Wed Jul  9 15:54:44 2008
@@ -175,6 +175,7 @@
                (Izaak Rubin via Stack)
    HBASE-731   delete, deletefc in HBase shell do not work correctly
                (Izaak Rubin via Stack)
+   HBASE-734   scan '.META.', {LIMIT => 10} crashes (Izaak Rubin via Stack)
 
   IMPROVEMENTS
    HBASE-559   MR example job to count table rows

Modified: hadoop/hbase/trunk/bin/HBase.rb
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/HBase.rb?rev=675377&r1=675376&r2=675377&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/HBase.rb (original)
+++ hadoop/hbase/trunk/bin/HBase.rb Wed Jul  9 15:54:44 2008
@@ -209,6 +209,8 @@
       end
       if columns.class == String
         columns = [columns]
+      elsif columns.class != Array
+        raise ArgumentError.new("Must supply columns")
       end
       cs = columns.to_java(java.lang.String)
       limit = -1

Modified: hadoop/hbase/trunk/bin/hirb.rb
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/hirb.rb?rev=675377&r1=675376&r2=675377&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/hirb.rb (original)
+++ hadoop/hbase/trunk/bin/hirb.rb Wed Jul  9 15:54:44 2008
@@ -167,15 +167,21 @@
            hbase> put 't1', 'r1', 'c1', ts1
 
  scan      Scan a table; pass table name and optionally an array of column
-           names and a dictionary of scanner specification that may include
-           one or more of following: LIMIT, STARTROW, STOPROW, or TIMESTAMP.
-           To scan all members of a column family, leave the qualifier empty
-           as in 'col_family:'.  Examples:
+           names OR an array of column names and a dictionary of scanner 
+           specifications.  If you wish to include scanner specifications, 
+           you must also include an array of columns.  Scanner specifications 
+           may include one or more of following: LIMIT, STARTROW, STOPROW, or 
+           TIMESTAMP.  To scan all members of a column family, leave the 
+           qualifier empty as in 'col_family:'.  Examples:
            
+           Correct:
            hbase> scan '.META.'
            hbase> scan '.META.', ['info:regioninfo']
            hbase> scan 't1', ['c1', 'c2'], {LIMIT => 10, STARTROW => 'xyz'}
            
+           Incorrect:
+           hbase> scan 't1', {STARTROW => 'xyz'}
+           
  version   Output this HBase version
 
 GENERAL NOTES: