Author: stack
Date: Fri Nov 13 07:04:11 2009
New Revision: 835761
URL: http://svn.apache.org/viewvc?rev=835761&view=rev
Log:
HBASE-1977 Add ts and allow setting VERSIONS when scanning in shell
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/bin/HBase.rb
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=835761&r1=835760&r2=835761&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Nov 13 07:04:11 2009
@@ -110,6 +110,7 @@
HBASE-1841 If multiple of same key in an hfile and they span blocks, may
miss the earlier keys on a lookup
(Schubert Zhang via Stack)
+ HBASE-1977 Add ts and allow setting VERSIONS when scanning in shell
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified: hadoop/hbase/trunk/bin/HBase.rb
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/HBase.rb?rev=835761&r1=835760&r2=835761&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/HBase.rb (original)
+++ hadoop/hbase/trunk/bin/HBase.rb Fri Nov 13 07:04:11 2009
@@ -384,6 +384,7 @@
timestamp = args["TIMESTAMP"] || nil
columns = args["COLUMNS"] || getAllColumns()
cache = args["CACHE_BLOCKS"] || true
+ versions = args["VERSIONS"] || 1
if columns.class == String
columns = [columns]
@@ -410,6 +411,7 @@
scan.setTimeStamp(timestamp)
end
scan.setCacheBlocks(cache)
+ scan.setMaxVersions(versions) if versions > 1
else
scan = Scan.new()
end
@@ -429,7 +431,7 @@
qualifier = String.from_java_bytes kv.getQualifier()
column = family + ':' + qualifier
cell = toString(column, kv, maxlength)
- @formatter.row([row, "column=%s, %s" % [column, cell]])
+ @formatter.row([row, "column=%s, ts=%d, %s" % [column,
kv.getTimestamp(), cell]])
end
end
@formatter.footer(now, count)
