[hbase] branch branch-2.4 updated: HBASE-26312 Shell scan fails with timestamp (#3734)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.4 by this push:
     new db7c35e  HBASE-26312 Shell scan fails with timestamp (#3734)
db7c35e is described below

commit db7c35e23ec8bce7b0ecec4dabe32a9056528654
Author: xicm <36...@users.noreply.github.com>
AuthorDate: Sat Oct 9 10:28:25 2021 +0800

    HBASE-26312 Shell scan fails with timestamp (#3734)
    
    Signed-off-by: Duo Zhang <zh...@apache.org>
---
 hbase-shell/src/main/ruby/hbase/table.rb                                | 2 +-
 .../src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-shell/src/main/ruby/hbase/table.rb b/hbase-shell/src/main/ruby/hbase/table.rb
index d779261..7351676 100644
--- a/hbase-shell/src/main/ruby/hbase/table.rb
+++ b/hbase-shell/src/main/ruby/hbase/table.rb
@@ -556,7 +556,7 @@ EOF
         end
 
         scan.setScanMetricsEnabled(enablemetrics) if enablemetrics
-        scan.setTimeStamp(timestamp) if timestamp
+        scan.setTimestamp(timestamp) if timestamp
         scan.setCacheBlocks(cache_blocks)
         scan.setReversed(reversed)
         scan.setCaching(cache) if cache > 0
diff --git a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
index 2636934..4e67a74 100644
--- a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
+++ b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
@@ -35,6 +35,6 @@ public class TestTableShell extends AbstractTestShell {
 
   @Override
   protected String getIncludeList() {
-    return "test_table.rb";
+    return "table_test.rb";
   }
 }