[hbase] branch branch-2 updated: HBASE-24937 table.rb use LocalDateTime to replace Instant (#2351)

[pankajkumar]

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

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


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 261405e  HBASE-24937 table.rb use LocalDateTime to replace Instant 
(#2351)
261405e is described below

commit 261405ec6d710cb499b3796438685aa1678ab846
Author: Bo Cui <cuibo0...@163.com>
AuthorDate: Fri Sep 4 22:50:39 2020 +0800

    HBASE-24937 table.rb use LocalDateTime to replace Instant (#2351)
    
    Signed-off-by: Pankaj Kumar<pankajku...@apache.org>
    (cherry picked from commit 1e8db480b349d6e90e6e2419455cad9e5eff7f35)
---
 hbase-shell/src/main/ruby/hbase/table.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/hbase-shell/src/main/ruby/hbase/table.rb 
b/hbase-shell/src/main/ruby/hbase/table.rb
index b874937..4e8a186 100644
--- a/hbase-shell/src/main/ruby/hbase/table.rb
+++ b/hbase-shell/src/main/ruby/hbase/table.rb
@@ -750,8 +750,9 @@ EOF
       [spec.family, spec.qualifier]
     end
 
-    def toISO8601(millis)
-      return java.time.Instant.ofEpochMilli(millis).toString
+    def toLocalDateTime(millis)
+      instant = java.time.Instant.ofEpochMilli(millis)
+      return java.time.LocalDateTime.ofInstant(instant, 
java.time.ZoneId.systemDefault()).toString
     end
 
     # Make a String of the passed kv
@@ -762,7 +763,7 @@ EOF
             column.start_with?('info:merge')
           hri = 
org.apache.hadoop.hbase.HRegionInfo.parseFromOrNull(kv.getValueArray,
             kv.getValueOffset, kv.getValueLength)
-          return format('timestamp=%s, value=%s', toISO8601(kv.getTimestamp),
+          return format('timestamp=%s, value=%s', 
toLocalDateTime(kv.getTimestamp),
             hri.nil? ? '' : hri.toString)
         end
         if column == 'info:serverstartcode'
@@ -773,14 +774,14 @@ EOF
             str_val = 
org.apache.hadoop.hbase.util.Bytes.toStringBinary(kv.getValueArray,
                                                                         
kv.getValueOffset, kv.getValueLength)
           end
-          return format('timestamp=%s, value=%s', toISO8601(kv.getTimestamp), 
str_val)
+          return format('timestamp=%s, value=%s', 
toLocalDateTime(kv.getTimestamp), str_val)
         end
       end
 
       if org.apache.hadoop.hbase.CellUtil.isDelete(kv)
-        val = "timestamp=#{toISO8601(kv.getTimestamp)}, 
type=#{org.apache.hadoop.hbase.KeyValue::Type.codeToType(kv.getTypeByte)}"
+        val = "timestamp=#{toLocalDateTime(kv.getTimestamp)}, 
type=#{org.apache.hadoop.hbase.KeyValue::Type.codeToType(kv.getTypeByte)}"
       else
-        val = "timestamp=#{toISO8601(kv.getTimestamp)}, 
value=#{convert(column, kv, converter_class, converter)}"
+        val = "timestamp=#{toLocalDateTime(kv.getTimestamp)}, 
value=#{convert(column, kv, converter_class, converter)}"
       end
       maxlength != -1 ? val[0, maxlength] : val
     end