Author: stack
Date: Mon Apr 25 17:43:45 2011
New Revision: 1096539
URL: http://svn.apache.org/viewvc?rev=1096539&view=rev
Log:
HBASE-2470 Add Scan.setTimeRange() support in Shell
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/ruby/hbase/table.rb
hbase/branches/0.90/src/test/ruby/hbase/table_test.rb
Modified: hbase/branches/0.90/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1096539&r1=1096538&r2=1096539&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Mon Apr 25 17:43:45 2011
@@ -30,6 +30,7 @@ Release 0.90.3 - Unreleased
(Harsh J Chouraria)
HBASE-3539 Improve shell help to reflect all possible options
(Harsh J Chouraria)
+ HBASE-2470 Add Scan.setTimeRange() support in Shell (Harsh J Chouraria)
IMPROVEMENT
HBASE-3717 deprecate HTable isTableEnabled() methods in favor of HBaseAdmin
Modified: hbase/branches/0.90/src/main/ruby/hbase/table.rb
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/ruby/hbase/table.rb?rev=1096539&r1=1096538&r2=1096539&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/ruby/hbase/table.rb (original)
+++ hbase/branches/0.90/src/main/ruby/hbase/table.rb Mon Apr 25 17:43:45 2011
@@ -221,6 +221,7 @@ module Hbase
columns = args["COLUMNS"] || args["COLUMN"] || get_all_columns
cache = args["CACHE_BLOCKS"] || true
versions = args["VERSIONS"] || 1
+ timerange = args[TIMERANGE]
# Normalize column names
columns = [columns] if columns.class == String
@@ -239,6 +240,7 @@ module Hbase
scan.setTimeStamp(timestamp) if timestamp
scan.setCacheBlocks(cache)
scan.setMaxVersions(versions) if versions > 1
+ scan.setTimeRange(timerange[0], timerange[1]) if timerange
else
scan = org.apache.hadoop.hbase.client.Scan.new
end
Modified: hbase/branches/0.90/src/test/ruby/hbase/table_test.rb
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/ruby/hbase/table_test.rb?rev=1096539&r1=1096538&r2=1096539&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/ruby/hbase/table_test.rb (original)
+++ hbase/branches/0.90/src/test/ruby/hbase/table_test.rb Mon Apr 25 17:43:45
2011
@@ -369,6 +369,14 @@ module Hbase
assert_not_nil(res['2']['x:b'])
end
+ define_test "scan should support TIMERANGE parameter" do
+ res = @test_table.scan TIMERANGE => [0, 1]
+ assert_not_nil(res)
+ assert_kind_of(Hash, res)
+ assert_nil(res['1'])
+ assert_nil(res['2'])
+ end
+
define_test "scan should support COLUMNS parameter with an array of
columns" do
res = @test_table.scan COLUMNS => [ 'x:a', 'x:b' ]
assert_not_nil(res)
