This is an automated email from the ASF dual-hosted git repository. ibessonov pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push: new 8e11db74fa IGNITE-20817 Reimplement HybridTimestamp#toString to make it readable by humans (#2821) 8e11db74fa is described below commit 8e11db74fa6f10e6026194e69d858ee4735fc70f Author: Ivan Bessonov <bessonov...@gmail.com> AuthorDate: Fri Nov 10 16:48:08 2023 +0300 IGNITE-20817 Reimplement HybridTimestamp#toString to make it readable by humans (#2821) --- .../java/org/apache/ignite/internal/hlc/HybridTimestamp.java | 9 +++++++-- .../org/apache/ignite/internal/lang/JavaLoggerFormatter.java | 10 ++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/hlc/HybridTimestamp.java b/modules/core/src/main/java/org/apache/ignite/internal/hlc/HybridTimestamp.java index 4889133ffb..1b635adc81 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/hlc/HybridTimestamp.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/hlc/HybridTimestamp.java @@ -17,8 +17,11 @@ package org.apache.ignite.internal.hlc; +import static org.apache.ignite.internal.lang.JavaLoggerFormatter.DATE_FORMATTER; + import java.io.Serializable; -import org.apache.ignite.internal.tostring.S; +import java.time.Instant; +import java.time.ZoneId; import org.jetbrains.annotations.Nullable; /** @@ -230,7 +233,9 @@ public final class HybridTimestamp implements Comparable<HybridTimestamp>, Seria @Override public String toString() { - return S.toString(HybridTimestamp.class, this, "physical", getPhysical(), "logical", getLogical()); + String formattedTime = DATE_FORMATTER.format(Instant.ofEpochMilli(getPhysical()).atZone(ZoneId.systemDefault())); + + return String.format("HybridTimestamp [physical=%s, logical=%d, composite=%d]", formattedTime, getLogical(), time); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/lang/JavaLoggerFormatter.java b/modules/core/src/main/java/org/apache/ignite/internal/lang/JavaLoggerFormatter.java index 727fd8801e..d04d66b036 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/lang/JavaLoggerFormatter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/lang/JavaLoggerFormatter.java @@ -67,13 +67,7 @@ public class JavaLoggerFormatter extends Formatter { public static final String ANONYMOUS_LOGGER_NAME = "UNKNOWN"; /** Date formatter. */ - private static final ThreadLocal<DateTimeFormatter> DATE_FORMATTER = new ThreadLocal<>() { - /** {@inheritDoc} */ - @Override - protected DateTimeFormatter initialValue() { - return DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss:SSS Z"); - } - }; + public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss:SSS Z"); /** {@inheritDoc} */ @Override @@ -100,7 +94,7 @@ public class JavaLoggerFormatter extends Formatter { ex = "\n" + stackTrace; } - return DATE_FORMATTER.get().format(Instant.ofEpochMilli(record.getMillis()).atZone(ZoneId.systemDefault())) + return DATE_FORMATTER.format(Instant.ofEpochMilli(record.getMillis()).atZone(ZoneId.systemDefault())) + " [" + toLevel(record.getLevel().intValue()) + "][" + threadName + "][" + logName + "] "