You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by el...@apache.org on 2021/12/01 19:16:38 UTC
[hbase] branch master updated: HBASE-26512 Make timestamp format configurable in HBase shell scan output
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 7845d00 HBASE-26512 Make timestamp format configurable in HBase shell scan output
7845d00 is described below
commit 7845d006e6a4bf92e769bc3eec67b763f01fc491
Author: Istvan Toth <st...@stoty.hu>
AuthorDate: Mon Nov 29 11:34:24 2021 +0100
HBASE-26512 Make timestamp format configurable in HBase shell scan output
Signed-off-by: Josh Elser <elserj@apache.org
Signed-off-by: Peter Somogyi <ps...@apache.org>
---
.../src/main/java/org/apache/hadoop/hbase/HConstants.java | 5 +++++
hbase-shell/src/main/ruby/hbase/table.rb | 11 +++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
index 6464158..4aacff1 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
@@ -1602,6 +1602,11 @@ public final class HConstants {
"hbase.regionserver.slowlog.systable.enabled";
public static final boolean DEFAULT_SLOW_LOG_SYS_TABLE_ENABLED_KEY = false;
+ public static final String SHELL_TIMESTAMP_FORMAT_EPOCH_KEY =
+ "hbase.shell.timestamp.format.epoch";
+
+ public static final boolean DEFAULT_SHELL_TIMESTAMP_FORMAT_EPOCH = false;
+
/**
* Number of rows in a batch operation above which a warning will be logged.
*/
diff --git a/hbase-shell/src/main/ruby/hbase/table.rb b/hbase-shell/src/main/ruby/hbase/table.rb
index d55e516..0cd917e 100644
--- a/hbase-shell/src/main/ruby/hbase/table.rb
+++ b/hbase-shell/src/main/ruby/hbase/table.rb
@@ -119,6 +119,9 @@ EOF
@name = @table.getName.getNameAsString
@shell = shell
@converters = {}
+ @timestamp_format_epoch = table.getConfiguration.getBoolean(
+ HConstants::SHELL_TIMESTAMP_FORMAT_EPOCH_KEY,
+ HConstants::DEFAULT_SHELL_TIMESTAMP_FORMAT_EPOCH)
end
def close
@@ -751,8 +754,12 @@ EOF
end
def toLocalDateTime(millis)
- instant = java.time.Instant.ofEpochMilli(millis)
- return java.time.LocalDateTime.ofInstant(instant, java.time.ZoneId.systemDefault()).toString
+ if @timestamp_format_epoch
+ return millis
+ else
+ instant = java.time.Instant.ofEpochMilli(millis)
+ return java.time.LocalDateTime.ofInstant(instant, java.time.ZoneId.systemDefault()).toString
+ end
end
# Make a String of the passed kv