This is an automated email from the ASF dual-hosted git repository. vpyatkov pushed a commit to branch ignite-15926 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 2c2d90b08df863bc9bb71612a2f1de6da295ff38 Author: Vladislav Pyatkov <[email protected]> AuthorDate: Wed Dec 22 18:38:06 2021 +0300 Renamed string formatter. --- .../ignite/lang/ColumnAlreadyExistsException.java | 2 +- .../ignite/lang/ColumnNotFoundException.java | 2 +- .../ignite/lang/IndexAlreadyExistsException.java | 2 +- .../apache/ignite/lang/IndexNotFoundException.java | 2 +- .../ignite/lang/TableAlreadyExistsException.java | 2 +- .../apache/ignite/lang/TableNotFoundException.java | 2 +- .../query/calcite/exec/ddl/DdlCommandHandler.java | 4 +- .../org/apache/ignite/internal/util/ByteUtils.java | 4 +- .../apache/ignite/internal/util/IgniteUtils.java | 4 +- .../java/org/apache/ignite/lang/IgniteLogger.java | 6 +- ...ssageHelper.java => IgniteStringFormatter.java} | 2 +- .../internal/testframework/IgniteTestUtils.java | 4 +- .../org/apache/ignite/lang/LoggerHelperTest.java | 106 ++++++++++----------- .../java/org/apache/ignite/internal/raft/Loza.java | 6 +- .../internal/raft/server/impl/JraftServerImpl.java | 4 +- .../raft/jraft/disruptor/StripedDisruptor.java | 2 +- .../ignite/disruptor/StripedDisruptorTest.java | 6 +- .../internal/raft/server/impl/RaftServerImpl.java | 4 +- .../calcite/AbstractBasicIntegrationTest.java | 4 +- .../ignite/internal/calcite/ItFunctionsTest.java | 4 +- .../apache/ignite/internal/app/IgnitionImpl.java | 4 +- .../apache/ignite/internal/schema/SchemaUtils.java | 4 +- .../internal/table/distributed/TableManager.java | 10 +- .../table/distributed/raft/PartitionListener.java | 2 +- .../distributed/storage/InternalTableImpl.java | 6 +- .../ignite/internal/tx/impl/TxManagerImpl.java | 2 +- 26 files changed, 100 insertions(+), 100 deletions(-) diff --git a/modules/api/src/main/java/org/apache/ignite/lang/ColumnAlreadyExistsException.java b/modules/api/src/main/java/org/apache/ignite/lang/ColumnAlreadyExistsException.java index fd61796..89f0282 100644 --- a/modules/api/src/main/java/org/apache/ignite/lang/ColumnAlreadyExistsException.java +++ b/modules/api/src/main/java/org/apache/ignite/lang/ColumnAlreadyExistsException.java @@ -27,6 +27,6 @@ public class ColumnAlreadyExistsException extends IgniteException { * @param name Column name. */ public ColumnAlreadyExistsException(String name) { - super(LoggerMessageHelper.format("Column already exists [name={}]", name)); + super(IgniteStringFormatter.format("Column already exists [name={}]", name)); } } diff --git a/modules/api/src/main/java/org/apache/ignite/lang/ColumnNotFoundException.java b/modules/api/src/main/java/org/apache/ignite/lang/ColumnNotFoundException.java index 6747d3a..c0f578d 100644 --- a/modules/api/src/main/java/org/apache/ignite/lang/ColumnNotFoundException.java +++ b/modules/api/src/main/java/org/apache/ignite/lang/ColumnNotFoundException.java @@ -28,6 +28,6 @@ public class ColumnNotFoundException extends IgniteException { * @param fullName Table canonical name. */ public ColumnNotFoundException(String columnName, String fullName) { - super(LoggerMessageHelper.format("Column '{}' does not exist in table '{}'", columnName, fullName)); + super(IgniteStringFormatter.format("Column '{}' does not exist in table '{}'", columnName, fullName)); } } diff --git a/modules/api/src/main/java/org/apache/ignite/lang/IndexAlreadyExistsException.java b/modules/api/src/main/java/org/apache/ignite/lang/IndexAlreadyExistsException.java index 910009a..ce3b48a 100644 --- a/modules/api/src/main/java/org/apache/ignite/lang/IndexAlreadyExistsException.java +++ b/modules/api/src/main/java/org/apache/ignite/lang/IndexAlreadyExistsException.java @@ -27,6 +27,6 @@ public class IndexAlreadyExistsException extends IgniteException { * @param name Index name. */ public IndexAlreadyExistsException(String name) { - super(LoggerMessageHelper.format("Index already exists [name={}]", name)); + super(IgniteStringFormatter.format("Index already exists [name={}]", name)); } } diff --git a/modules/api/src/main/java/org/apache/ignite/lang/IndexNotFoundException.java b/modules/api/src/main/java/org/apache/ignite/lang/IndexNotFoundException.java index c119fac..1e89aee 100644 --- a/modules/api/src/main/java/org/apache/ignite/lang/IndexNotFoundException.java +++ b/modules/api/src/main/java/org/apache/ignite/lang/IndexNotFoundException.java @@ -27,6 +27,6 @@ public class IndexNotFoundException extends IgniteException { * @param indexName Index canonical name. */ public IndexNotFoundException(String indexName) { - super(LoggerMessageHelper.format("Index '{}' does not exist.", indexName)); + super(IgniteStringFormatter.format("Index '{}' does not exist.", indexName)); } } diff --git a/modules/api/src/main/java/org/apache/ignite/lang/TableAlreadyExistsException.java b/modules/api/src/main/java/org/apache/ignite/lang/TableAlreadyExistsException.java index b9b3477..058d0fc 100644 --- a/modules/api/src/main/java/org/apache/ignite/lang/TableAlreadyExistsException.java +++ b/modules/api/src/main/java/org/apache/ignite/lang/TableAlreadyExistsException.java @@ -27,6 +27,6 @@ public class TableAlreadyExistsException extends IgniteException { * @param name Table name. */ public TableAlreadyExistsException(String name) { - super(LoggerMessageHelper.format("Table already exists [name={}]", name)); + super(IgniteStringFormatter.format("Table already exists [name={}]", name)); } } diff --git a/modules/api/src/main/java/org/apache/ignite/lang/TableNotFoundException.java b/modules/api/src/main/java/org/apache/ignite/lang/TableNotFoundException.java index 6e4342e..c066c9d 100644 --- a/modules/api/src/main/java/org/apache/ignite/lang/TableNotFoundException.java +++ b/modules/api/src/main/java/org/apache/ignite/lang/TableNotFoundException.java @@ -27,6 +27,6 @@ public class TableNotFoundException extends IgniteException { * @param name Table name. */ public TableNotFoundException(String name) { - super(LoggerMessageHelper.format("Table does not exist [name={}]", name)); + super(IgniteStringFormatter.format("Table does not exist [name={}]", name)); } } diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ddl/DdlCommandHandler.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ddl/DdlCommandHandler.java index 99e0a47..9f70c39 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ddl/DdlCommandHandler.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ddl/DdlCommandHandler.java @@ -52,7 +52,7 @@ import org.apache.ignite.lang.ColumnNotFoundException; import org.apache.ignite.lang.IgniteException; import org.apache.ignite.lang.IgniteInternalCheckedException; import org.apache.ignite.lang.IndexAlreadyExistsException; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.lang.TableAlreadyExistsException; import org.apache.ignite.lang.TableNotFoundException; import org.apache.ignite.schema.SchemaBuilders; @@ -300,7 +300,7 @@ public class DdlCommandHandler { } if (primaryCols.contains(colName)) { - throw new IgniteException(LoggerMessageHelper + throw new IgniteException(IgniteStringFormatter .format("Can`t delete column, belongs to primary key: [name={}]", colName)); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ByteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ByteUtils.java index fba94d1..bc478f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ByteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ByteUtils.java @@ -22,7 +22,7 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import org.apache.ignite.lang.IgniteLogger; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; /** * Utility class provides various method for manipulating with bytes. @@ -120,7 +120,7 @@ public class ByteUtils { } } catch (Exception e) { LOG.warn(() -> - LoggerMessageHelper.format("Could not serialize a class [cls={}]", obj.getClass().getName()), + IgniteStringFormatter.format("Could not serialize a class [cls={}]", obj.getClass().getName()), e); return null; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index e21f081..aea480e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; import java.util.stream.Stream; import org.apache.ignite.lang.IgniteLogger; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.jetbrains.annotations.Nullable; /** @@ -522,7 +522,7 @@ public class IgniteUtils { public static void dumpStack(IgniteLogger log, String msg, Object... params) { String reason = "Dumping stack."; - var err = new Exception(LoggerMessageHelper.format(msg, params)); + var err = new Exception(IgniteStringFormatter.format(msg, params)); if (log != null) { log.error(reason, err); diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteLogger.java index eaa60c9..8fa7a85 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteLogger.java @@ -257,7 +257,7 @@ public class IgniteLogger { * Logs a message with an optional list of parameters. * * @param level One of the log message level identifiers. - * @param msg The string message format in {@link LoggerMessageHelper} format. + * @param msg The string message format in {@link IgniteStringFormatter} format. * @param th The {@code Throwable} associated with the log message. * @param params An optional list of parameters to the message (may be none). * @throws NullPointerException If {@code level} is {@code null}. @@ -270,9 +270,9 @@ public class IgniteLogger { } if (th != null) { - log.log(level, LoggerMessageHelper.arrayFormat(msg, params), th); + log.log(level, IgniteStringFormatter.arrayFormat(msg, params), th); } else { - log.log(level, LoggerMessageHelper.arrayFormat(msg, params)); + log.log(level, IgniteStringFormatter.arrayFormat(msg, params)); } } diff --git a/modules/core/src/main/java/org/apache/ignite/lang/LoggerMessageHelper.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteStringFormatter.java similarity index 99% rename from modules/core/src/main/java/org/apache/ignite/lang/LoggerMessageHelper.java rename to modules/core/src/main/java/org/apache/ignite/lang/IgniteStringFormatter.java index 4992f4d..c65f28b 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/LoggerMessageHelper.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteStringFormatter.java @@ -60,7 +60,7 @@ import java.util.HashSet; * * <p>will return the string "File name is C:\file.zip". */ -public final class LoggerMessageHelper { +public final class IgniteStringFormatter { /** Left brace. */ private static final char DELIM_START = '{'; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/testframework/IgniteTestUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/testframework/IgniteTestUtils.java index cee117a..0d58dcf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/testframework/IgniteTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/testframework/IgniteTestUtils.java @@ -30,7 +30,7 @@ import java.util.concurrent.CompletableFuture; import java.util.function.BooleanSupplier; import org.apache.ignite.internal.thread.NamedThreadFactory; import org.apache.ignite.lang.IgniteInternalException; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.TestInfo; @@ -346,7 +346,7 @@ public final class IgniteTestUtils { * @return Node name. */ public static String testNodeName(TestInfo testInfo, int idx) { - return LoggerMessageHelper.format("{}_{}_{}", + return IgniteStringFormatter.format("{}_{}_{}", testInfo.getTestClass().map(Class::getSimpleName).orElseGet(() -> "null"), testInfo.getTestMethod().map(Method::getName).orElseGet(() -> "null"), idx); diff --git a/modules/core/src/test/java/org/apache/ignite/lang/LoggerHelperTest.java b/modules/core/src/test/java/org/apache/ignite/lang/LoggerHelperTest.java index 2acbe88..b04c931 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/LoggerHelperTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/LoggerHelperTest.java @@ -48,7 +48,7 @@ public class LoggerHelperTest { */ @Test public void testNull() { - result = LoggerMessageHelper.format(null, i1); + result = IgniteStringFormatter.format(null, i1); assertEquals(null, result); } @@ -57,25 +57,25 @@ public class LoggerHelperTest { */ @Test public void nullParametersShouldBeHandledWithoutBarfing() { - result = LoggerMessageHelper.format("Value is {}.", new Object[]{null}); + result = IgniteStringFormatter.format("Value is {}.", new Object[]{null}); assertEquals("Value is null.", result); - result = LoggerMessageHelper.format("Val1 is {}, val2 is {}.", null, null); + result = IgniteStringFormatter.format("Val1 is {}, val2 is {}.", null, null); assertEquals("Val1 is null, val2 is null.", result); - result = LoggerMessageHelper.format("Val1 is {}, val2 is {}.", i1, null); + result = IgniteStringFormatter.format("Val1 is {}, val2 is {}.", i1, null); assertEquals("Val1 is 1, val2 is null.", result); - result = LoggerMessageHelper.format("Val1 is {}, val2 is {}.", null, i2); + result = IgniteStringFormatter.format("Val1 is {}, val2 is {}.", null, i2); assertEquals("Val1 is null, val2 is 2.", result); - result = LoggerMessageHelper.format("Val1 is {}, val2 is {}, val3 is {}", new Integer[]{null, null, null}); + result = IgniteStringFormatter.format("Val1 is {}, val2 is {}, val3 is {}", new Integer[]{null, null, null}); assertEquals("Val1 is null, val2 is null, val3 is null", result); - result = LoggerMessageHelper.format("Val1 is {}, val2 is {}, val3 is {}", new Integer[]{null, i2, i3}); + result = IgniteStringFormatter.format("Val1 is {}, val2 is {}, val3 is {}", new Integer[]{null, i2, i3}); assertEquals("Val1 is null, val2 is 2, val3 is 3", result); - result = LoggerMessageHelper.format("Val1 is {}, val2 is {}, val3 is {}", new Integer[]{null, null, i3}); + result = IgniteStringFormatter.format("Val1 is {}, val2 is {}, val3 is {}", new Integer[]{null, null, i3}); assertEquals("Val1 is null, val2 is null, val3 is 3", result); } @@ -84,38 +84,38 @@ public class LoggerHelperTest { */ @Test public void verifyOneParameterIsHandledCorrectly() { - result = LoggerMessageHelper.format("Value is {}.", i3); + result = IgniteStringFormatter.format("Value is {}.", i3); assertEquals("Value is 3.", result); - result = LoggerMessageHelper.format("Value is {", i3); + result = IgniteStringFormatter.format("Value is {", i3); assertEquals("Value is {", result); - result = LoggerMessageHelper.format("{} is larger than 2.", i3); + result = IgniteStringFormatter.format("{} is larger than 2.", i3); assertEquals("3 is larger than 2.", result); - result = LoggerMessageHelper.format("No subst", i3); + result = IgniteStringFormatter.format("No subst", i3); assertEquals("No subst", result); - result = LoggerMessageHelper.format("Incorrect {subst", i3); + result = IgniteStringFormatter.format("Incorrect {subst", i3); assertEquals("Incorrect {subst", result); - result = LoggerMessageHelper.format("Value is {bla} {}", i3); + result = IgniteStringFormatter.format("Value is {bla} {}", i3); assertEquals("Value is {bla} 3", result); - result = LoggerMessageHelper.format("Escaped \\{} subst", i3); + result = IgniteStringFormatter.format("Escaped \\{} subst", i3); assertEquals("Escaped {} subst", result); - result = LoggerMessageHelper.format("{Escaped", i3); + result = IgniteStringFormatter.format("{Escaped", i3); assertEquals("{Escaped", result); - result = LoggerMessageHelper.format("\\{}Escaped", i3); + result = IgniteStringFormatter.format("\\{}Escaped", i3); assertEquals("{}Escaped", result); - result = LoggerMessageHelper.format("File name is {{}}.", "App folder.zip"); + result = IgniteStringFormatter.format("File name is {{}}.", "App folder.zip"); assertEquals("File name is {App folder.zip}.", result); // escaping the escape character - result = LoggerMessageHelper.format("File name is C:\\\\{}.", "App folder.zip"); + result = IgniteStringFormatter.format("File name is C:\\\\{}.", "App folder.zip"); assertEquals("File name is C:\\App folder.zip.", result); } @@ -124,31 +124,31 @@ public class LoggerHelperTest { */ @Test public void testTwoParameters() { - result = LoggerMessageHelper.format("Value {} is smaller than {}.", i1, i2); + result = IgniteStringFormatter.format("Value {} is smaller than {}.", i1, i2); assertEquals("Value 1 is smaller than 2.", result); - result = LoggerMessageHelper.format("Value {} is smaller than {}", i1, i2); + result = IgniteStringFormatter.format("Value {} is smaller than {}", i1, i2); assertEquals("Value 1 is smaller than 2", result); - result = LoggerMessageHelper.format("{}{}", i1, i2); + result = IgniteStringFormatter.format("{}{}", i1, i2); assertEquals("12", result); - result = LoggerMessageHelper.format("Val1={}, Val2={", i1, i2); + result = IgniteStringFormatter.format("Val1={}, Val2={", i1, i2); assertEquals("Val1=1, Val2={", result); - result = LoggerMessageHelper.format("Value {} is smaller than \\{}", i1, i2); + result = IgniteStringFormatter.format("Value {} is smaller than \\{}", i1, i2); assertEquals("Value 1 is smaller than {}", result); - result = LoggerMessageHelper.format("Value {} is smaller than \\{} tail", i1, i2); + result = IgniteStringFormatter.format("Value {} is smaller than \\{} tail", i1, i2); assertEquals("Value 1 is smaller than {} tail", result); - result = LoggerMessageHelper.format("Value {} is smaller than \\{", i1, i2); + result = IgniteStringFormatter.format("Value {} is smaller than \\{", i1, i2); assertEquals("Value 1 is smaller than \\{", result); - result = LoggerMessageHelper.format("Value {} is smaller than {tail", i1, i2); + result = IgniteStringFormatter.format("Value {} is smaller than {tail", i1, i2); assertEquals("Value 1 is smaller than {tail", result); - result = LoggerMessageHelper.format("Value \\{} is smaller than {}", i1, i2); + result = IgniteStringFormatter.format("Value \\{} is smaller than {}", i1, i2); assertEquals("Value {} is smaller than 1", result); } @@ -159,7 +159,7 @@ public class LoggerHelperTest { throw new IllegalStateException("a"); } }; - result = LoggerMessageHelper.format("Troublesome object {}", o); + result = IgniteStringFormatter.format("Troublesome object {}", o); assertEquals("Troublesome object Failed toString() invocation on an object of type [cls=" + o.getClass().getName() + ", errMsg=java.lang.IllegalStateException, errMsg=a]", result); } @@ -173,16 +173,16 @@ public class LoggerHelperTest { Object[] args = null; - result = LoggerMessageHelper.format(msg0, args); + result = IgniteStringFormatter.format(msg0, args); assertEquals(msg0, result); - result = LoggerMessageHelper.format(msg1, args); + result = IgniteStringFormatter.format(msg1, args); assertEquals(msg1, result); - result = LoggerMessageHelper.format(msg2, args); + result = IgniteStringFormatter.format(msg2, args); assertEquals(msg2, result); - result = LoggerMessageHelper.format(msg3, args); + result = IgniteStringFormatter.format(msg3, args); assertEquals(msg3, result); } @@ -191,25 +191,25 @@ public class LoggerHelperTest { */ @Test public void testArrayFormat() { - result = LoggerMessageHelper.format("Value {} is smaller than {} and {}.", ia0); + result = IgniteStringFormatter.format("Value {} is smaller than {} and {}.", ia0); assertEquals("Value 1 is smaller than 2 and 3.", result); - result = LoggerMessageHelper.format("{}{}{}", ia0); + result = IgniteStringFormatter.format("{}{}{}", ia0); assertEquals("123", result); - result = LoggerMessageHelper.format("Value {} is smaller than {}.", ia0); + result = IgniteStringFormatter.format("Value {} is smaller than {}.", ia0); assertEquals("Value 1 is smaller than 2.", result); - result = LoggerMessageHelper.format("Value {} is smaller than {}", ia0); + result = IgniteStringFormatter.format("Value {} is smaller than {}", ia0); assertEquals("Value 1 is smaller than 2", result); - result = LoggerMessageHelper.format("Val={}, {, Val={}", ia0); + result = IgniteStringFormatter.format("Val={}, {, Val={}", ia0); assertEquals("Val=1, {, Val=2", result); - result = LoggerMessageHelper.format("Val={}, {, Val={}", ia0); + result = IgniteStringFormatter.format("Val={}, {, Val={}", ia0); assertEquals("Val=1, {, Val=2", result); - result = LoggerMessageHelper.format("Val1={}, Val2={", ia0); + result = IgniteStringFormatter.format("Val1={}, Val2={", ia0); assertEquals("Val1=1, Val2={", result); } @@ -218,50 +218,50 @@ public class LoggerHelperTest { Integer p0 = i1; Integer[] p1 = new Integer[]{i2, i3}; - result = LoggerMessageHelper.format("{}{}", p0, p1); + result = IgniteStringFormatter.format("{}{}", p0, p1); assertEquals("1[2, 3]", result); // Integer[] - result = LoggerMessageHelper.format("{}{}", new Object[]{"a", p1}); + result = IgniteStringFormatter.format("{}{}", new Object[]{"a", p1}); assertEquals("a[2, 3]", result); // byte[] - result = LoggerMessageHelper.format("{}{}", new Object[]{"a", new byte[]{1, 2}}); + result = IgniteStringFormatter.format("{}{}", new Object[]{"a", new byte[]{1, 2}}); assertEquals("a[1, 2]", result); // int[] - result = LoggerMessageHelper.format("{}{}", new Object[]{"a", new int[]{1, 2}}); + result = IgniteStringFormatter.format("{}{}", new Object[]{"a", new int[]{1, 2}}); assertEquals("a[1, 2]", result); // float[] - result = LoggerMessageHelper.format("{}{}", new Object[]{"a", new float[]{1, 2}}); + result = IgniteStringFormatter.format("{}{}", new Object[]{"a", new float[]{1, 2}}); assertEquals("a[1.0, 2.0]", result); // double[] - result = LoggerMessageHelper.format("{}{}", new Object[]{"a", new double[]{1, 2}}); + result = IgniteStringFormatter.format("{}{}", new Object[]{"a", new double[]{1, 2}}); assertEquals("a[1.0, 2.0]", result); } @Test public void testMultiDimensionalArrayValues() { Integer[][] multiIntegerA = new Integer[][]{ia0, ia1}; - result = LoggerMessageHelper.format("{}{}", new Object[]{"a", multiIntegerA}); + result = IgniteStringFormatter.format("{}{}", new Object[]{"a", multiIntegerA}); assertEquals("a[[1, 2, 3], [10, 20, 30]]", result); int[][] multiIntA = new int[][]{{1, 2}, {10, 20}}; - result = LoggerMessageHelper.format("{}{}", new Object[]{"a", multiIntA}); + result = IgniteStringFormatter.format("{}{}", new Object[]{"a", multiIntA}); assertEquals("a[[1, 2], [10, 20]]", result); float[][] multiFloatA = new float[][]{{1, 2}, {10, 20}}; - result = LoggerMessageHelper.format("{}{}", new Object[]{"a", multiFloatA}); + result = IgniteStringFormatter.format("{}{}", new Object[]{"a", multiFloatA}); assertEquals("a[[1.0, 2.0], [10.0, 20.0]]", result); Object[][] multiOa = new Object[][]{ia0, ia1}; - result = LoggerMessageHelper.format("{}{}", new Object[]{"a", multiOa}); + result = IgniteStringFormatter.format("{}{}", new Object[]{"a", multiOa}); assertEquals("a[[1, 2, 3], [10, 20, 30]]", result); Object[][][] multiOa3 = new Object[][][]{multiOa, multiOa}; - result = LoggerMessageHelper.format("{}{}", new Object[]{"a", multiOa3}); + result = IgniteStringFormatter.format("{}{}", new Object[]{"a", multiOa3}); assertEquals("a[[[1, 2, 3], [10, 20, 30]], [[1, 2, 3], [10, 20, 30]]]", result); } @@ -269,14 +269,14 @@ public class LoggerHelperTest { public void testCyclicArrays() { Object[] cyclicA = new Object[1]; cyclicA[0] = cyclicA; - assertEquals("[[...]]", LoggerMessageHelper.format("{}", cyclicA)); + assertEquals("[[...]]", IgniteStringFormatter.format("{}", cyclicA)); Object[] a = new Object[2]; a[0] = i1; Object[] c = new Object[]{i3, a}; Object[] b = new Object[]{i2, c}; a[1] = b; - assertEquals("1[2, [3, [1, [...]]]]", LoggerMessageHelper.format("{}{}", a)); + assertEquals("1[2, [3, [1, [...]]]]", IgniteStringFormatter.format("{}{}", a)); } } diff --git a/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java b/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java index c73790d..48bb9e4 100644 --- a/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java +++ b/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java @@ -35,7 +35,7 @@ import org.apache.ignite.internal.thread.NamedThreadFactory; import org.apache.ignite.internal.util.IgniteSpinBusyLock; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.lang.IgniteInternalException; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.lang.NodeStoppingException; import org.apache.ignite.network.ClusterNode; import org.apache.ignite.network.ClusterService; @@ -193,7 +193,7 @@ public class Loza implements IgniteComponent { if (hasLocalRaft) { if (!raftServer.startRaftGroup(groupId, lsnrSupplier.get(), peers)) { - throw new IgniteInternalException(LoggerMessageHelper.format( + throw new IgniteInternalException(IgniteStringFormatter.format( "Raft group on the node is already started [node={}, raftGrp={}]", locNodeName, groupId @@ -262,7 +262,7 @@ public class Loza implements IgniteComponent { if (deltaNodes.stream().anyMatch(n -> locNodeName.equals(n.name()))) { if (!raftServer.startRaftGroup(groupId, lsnrSupplier.get(), peers)) { - throw new IgniteInternalException(LoggerMessageHelper.format( + throw new IgniteInternalException(IgniteStringFormatter.format( "Raft group on the node is already started [node={}, raftGrp={}]", locNodeName, groupId diff --git a/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java b/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java index 30f2c01..d3a0131 100644 --- a/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java +++ b/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; import org.apache.ignite.internal.raft.server.RaftServer; import org.apache.ignite.internal.thread.NamedThreadFactory; import org.apache.ignite.lang.IgniteInternalException; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.network.ClusterNode; import org.apache.ignite.network.ClusterService; import org.apache.ignite.network.NetworkAddress; @@ -210,7 +210,7 @@ public class JraftServerImpl implements RaftServer { /** {@inheritDoc} */ @Override public void stop() { - assert groups.isEmpty() : LoggerMessageHelper.format("Raft groups are still running {}", groups.keySet()); + assert groups.isEmpty() : IgniteStringFormatter.format("Raft groups are still running {}", groups.keySet()); rpcServer.shutdown(); diff --git a/modules/raft/src/main/java/org/apache/ignite/raft/jraft/disruptor/StripedDisruptor.java b/modules/raft/src/main/java/org/apache/ignite/raft/jraft/disruptor/StripedDisruptor.java index 2a95fea..7f9dc3a 100644 --- a/modules/raft/src/main/java/org/apache/ignite/raft/jraft/disruptor/StripedDisruptor.java +++ b/modules/raft/src/main/java/org/apache/ignite/raft/jraft/disruptor/StripedDisruptor.java @@ -29,7 +29,7 @@ import com.lmax.disruptor.dsl.ProducerType; import org.apache.ignite.internal.thread.NamedThreadFactory; import org.apache.ignite.lang.IgniteLogger; -import static org.apache.ignite.lang.LoggerMessageHelper.format; +import static org.apache.ignite.lang.IgniteStringFormatter.format; /** * Stripe Disruptor is a set of queues which process several independent groups in one queue (in the stripe). diff --git a/modules/raft/src/test/java/org/apache/ignite/disruptor/StripedDisruptorTest.java b/modules/raft/src/test/java/org/apache/ignite/disruptor/StripedDisruptorTest.java index 8cdd51e..496621b 100644 --- a/modules/raft/src/test/java/org/apache/ignite/disruptor/StripedDisruptorTest.java +++ b/modules/raft/src/test/java/org/apache/ignite/disruptor/StripedDisruptorTest.java @@ -25,7 +25,7 @@ import com.lmax.disruptor.RingBuffer; import java.util.ArrayList; import org.apache.ignite.internal.testframework.IgniteAbstractTest; import org.apache.ignite.internal.testframework.IgniteTestUtils; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.raft.jraft.disruptor.GroupAware; import org.apache.ignite.raft.jraft.disruptor.StripedDisruptor; import org.junit.jupiter.api.Test; @@ -70,10 +70,10 @@ public class StripedDisruptorTest extends IgniteAbstractTest { if (i % 10 == 0) { assertTrue(IgniteTestUtils.waitForCondition(() -> handler1.applied == finalInt + 1, 10_000), - LoggerMessageHelper.format("Batch was not commited [applied={}, expected={}, buffered={}]", + IgniteStringFormatter.format("Batch was not commited [applied={}, expected={}, buffered={}]", handler1.applied, finalInt + 1, handler1.batch)); assertTrue(IgniteTestUtils.waitForCondition(() -> handler2.applied == finalInt + 1, 10_000), - LoggerMessageHelper.format("Batch was not commited [applied={}, expected={}, buffered={}]", + IgniteStringFormatter.format("Batch was not commited [applied={}, expected={}, buffered={}]", handler2.applied, finalInt + 1, handler2.batch)); } } diff --git a/modules/raft/src/test/java/org/apache/ignite/internal/raft/server/impl/RaftServerImpl.java b/modules/raft/src/test/java/org/apache/ignite/internal/raft/server/impl/RaftServerImpl.java index f06911a..6c2b314 100644 --- a/modules/raft/src/test/java/org/apache/ignite/internal/raft/server/impl/RaftServerImpl.java +++ b/modules/raft/src/test/java/org/apache/ignite/internal/raft/server/impl/RaftServerImpl.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.function.BiConsumer; import org.apache.ignite.internal.raft.server.RaftServer; import org.apache.ignite.lang.IgniteLogger; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.lang.NodeStoppingException; import org.apache.ignite.network.ClusterService; import org.apache.ignite.network.NetworkAddress; @@ -140,7 +140,7 @@ public class RaftServerImpl implements RaftServer { /** {@inheritDoc} */ @Override public void stop() throws NodeStoppingException { - assert listeners.isEmpty() : LoggerMessageHelper.format("Raft groups are still running {}", listeners.keySet()); + assert listeners.isEmpty() : IgniteStringFormatter.format("Raft groups are still running {}", listeners.keySet()); if (readWorker != null) { readWorker.interrupt(); diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/AbstractBasicIntegrationTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/AbstractBasicIntegrationTest.java index 52c0b29..4675fd0 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/AbstractBasicIntegrationTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/AbstractBasicIntegrationTest.java @@ -36,7 +36,7 @@ import org.apache.ignite.internal.testframework.WorkDirectory; import org.apache.ignite.internal.testframework.WorkDirectoryExtension; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.lang.IgniteLogger; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.schema.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.TableDefinition; @@ -98,7 +98,7 @@ public class AbstractBasicIntegrationTest extends BaseIgniteAbstractTest { for (int i = 0; i < nodes(); i++) { String curNodeName = IgniteTestUtils.testNodeName(testInfo, i); - CLUSTER_NODES.add(IgnitionManager.start(curNodeName, LoggerMessageHelper.format(NODE_BOOTSTRAP_CFG, + CLUSTER_NODES.add(IgnitionManager.start(curNodeName, IgniteStringFormatter.format(NODE_BOOTSTRAP_CFG, metastorageNodes, BASE_PORT + i, connectNodeAddr diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/ItFunctionsTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/ItFunctionsTest.java index ff8ba2f..ad92262 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/ItFunctionsTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/calcite/ItFunctionsTest.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.function.LongFunction; import org.apache.ignite.internal.schema.configuration.SchemaConfigurationConverter; import org.apache.ignite.lang.IgniteException; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.schema.SchemaBuilders; import org.apache.ignite.schema.definition.ColumnType; import org.apache.ignite.schema.definition.TableDefinition; @@ -123,7 +123,7 @@ public class ItFunctionsTest extends AbstractBasicIntegrationTest { assertTrue( ex.getCause() instanceof IllegalArgumentException, - LoggerMessageHelper.format( + IgniteStringFormatter.format( "Expected cause is {}, but was {}", IllegalArgumentException.class.getSimpleName(), ex.getCause() == null ? null : ex.getCause().getClass().getSimpleName() diff --git a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgnitionImpl.java b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgnitionImpl.java index 0d3a81b..5241df7 100644 --- a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgnitionImpl.java +++ b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgnitionImpl.java @@ -29,7 +29,7 @@ import org.apache.ignite.Ignite; import org.apache.ignite.Ignition; import org.apache.ignite.lang.IgniteException; import org.apache.ignite.lang.IgniteLogger; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.utils.IgniteProperties; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -189,6 +189,6 @@ public class IgnitionImpl implements Ignition { String banner = String.join("\n", BANNER); - LOG.info(() -> LoggerMessageHelper.format("{}\n" + " ".repeat(22) + "Apache Ignite ver. {}\n", banner, ver), null); + LOG.info(() -> IgniteStringFormatter.format("{}\n" + " ".repeat(22) + "Apache Ignite ver. {}\n", banner, ver), null); } } diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaUtils.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaUtils.java index 8602b40..bb52c3a 100644 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaUtils.java +++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaUtils.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.schema.configuration.SchemaConfigurationConver import org.apache.ignite.internal.schema.configuration.SchemaDescriptorConverter; import org.apache.ignite.internal.schema.mapping.ColumnMapper; import org.apache.ignite.internal.schema.mapping.ColumnMapping; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.schema.definition.TableDefinition; /** @@ -117,7 +117,7 @@ public class SchemaUtils { // TODO: IGNITE-15774 Assertion just in case, proper validation should be implemented with the help of // TODO: configuration validators. assert droppedKeyCol.isEmpty() : - LoggerMessageHelper.format( + IgniteStringFormatter.format( "Dropping of key column is forbidden: [schemaVer={}, col={}]", newDesc.version(), droppedKeyCol.get() diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java index 5888d19..9d38a5b 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java @@ -87,7 +87,7 @@ import org.apache.ignite.lang.IgniteInternalException; import org.apache.ignite.lang.IgniteLogger; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.lang.IgniteUuidGenerator; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.lang.NodeStoppingException; import org.apache.ignite.lang.TableAlreadyExistsException; import org.apache.ignite.lang.TableNotFoundException; @@ -229,7 +229,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp // Empty assignments might be a valid case if tables are created from within cluster init HOCON // configuration, which is not supported now. assert ((ExtendedTableView) ctx.newValue()).assignments() != null : - LoggerMessageHelper.format("Table [id={}, name={}] has empty assignments.", tblId, tblName); + IgniteStringFormatter.format("Table [id={}, name={}] has empty assignments.", tblId, tblName); // TODO: IGNITE-15409 Listener with any placeholder should be used instead. ((ExtendedTableConfiguration) tablesCfg.tables().get(tblName)).schemas() @@ -761,7 +761,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp if (ex instanceof TableAlreadyExistsException) { tblFut.completeExceptionally(ex); } else { - LOG.error(LoggerMessageHelper.format("Table wasn't created [name={}]", name), ex); + LOG.error(IgniteStringFormatter.format("Table wasn't created [name={}]", name), ex); tblFut.completeExceptionally(ex); } @@ -866,7 +866,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp if (ex instanceof TableNotFoundException) { tblFut.completeExceptionally(ex); } else { - LOG.error(LoggerMessageHelper.format("Table wasn't altered [name={}]", name), ex); + LOG.error(IgniteStringFormatter.format("Table wasn't altered [name={}]", name), ex); tblFut.completeExceptionally(ex); } @@ -960,7 +960,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp if (ex instanceof TableNotFoundException) { dropTblFut.completeExceptionally(ex); } else { - LOG.error(LoggerMessageHelper.format("Table wasn't dropped [name={}]", name), ex); + LOG.error(IgniteStringFormatter.format("Table wasn't dropped [name={}]", name), ex); dropTblFut.completeExceptionally(ex); } diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java index fbcf3b3..65919a6 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.table.distributed.raft; -import static org.apache.ignite.lang.LoggerMessageHelper.format; +import static org.apache.ignite.lang.IgniteStringFormatter.format; import java.nio.file.Path; import java.util.ArrayList; diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java index 399c61c..b02b0da 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java @@ -62,7 +62,7 @@ import org.apache.ignite.internal.tx.TxManager; import org.apache.ignite.lang.IgniteLogger; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.lang.IgniteUuidGenerator; -import org.apache.ignite.lang.LoggerMessageHelper; +import org.apache.ignite.lang.IgniteStringFormatter; import org.apache.ignite.network.NetworkAddress; import org.apache.ignite.raft.client.Command; import org.apache.ignite.raft.client.Peer; @@ -347,7 +347,7 @@ public class InternalTableImpl implements InternalTable { public @NotNull Publisher<BinaryRow> scan(int p, @Nullable InternalTransaction tx) { if (p < 0 || p >= partitions) { throw new IllegalArgumentException( - LoggerMessageHelper.format( + IgniteStringFormatter.format( "Invalid partition [partition={}, minValue={}, maxValue={}].", p, 0, @@ -559,7 +559,7 @@ public class InternalTableImpl implements InternalTable { if (n <= 0) { cancel(); - subscriber.onError(new IllegalArgumentException(LoggerMessageHelper + subscriber.onError(new IllegalArgumentException(IgniteStringFormatter .format("Invalid requested amount of items [requested={}, minValue=1]", n)) ); } diff --git a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/TxManagerImpl.java b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/TxManagerImpl.java index 5786e81..acc54dd 100644 --- a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/TxManagerImpl.java +++ b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/TxManagerImpl.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.tx.impl; import static java.util.concurrent.CompletableFuture.completedFuture; import static java.util.concurrent.CompletableFuture.failedFuture; -import static org.apache.ignite.lang.LoggerMessageHelper.format; +import static org.apache.ignite.lang.IgniteStringFormatter.format; import java.nio.ByteBuffer; import java.util.HashMap;
