From f0a810c9b736b6b2803a34f542688530e9a4fe95 Mon Sep 17 00:00:00 2001 From: Nikolay Date: Mon, 25 Dec 2023 13:57:07 +0300 Subject: [PATCH] IGNITE-14823 Label abbrevation (#11134) --- modules/checkstyle/src/main/resources/abbrevations.csv | 2 +- .../internal/processors/odbc/ClientListenerMetrics.java | 6 +++--- .../control_utility/LongRunningTransactionsGenerator.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv index 71df5acaf27a5..c4aa9b3a1b6ba 100644 --- a/modules/checkstyle/src/main/resources/abbrevations.csv +++ b/modules/checkstyle/src/main/resources/abbrevations.csv @@ -34,7 +34,7 @@ index,idx initial,init initialize,init #iterator,iter -#label,lbl +label,lbl #local,loc #logger,log #loader,ldr diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerMetrics.java index 0e6f19b534387..b2044dda216b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerMetrics.java @@ -106,10 +106,10 @@ public ClientListenerMetrics(MetricRegistry mreg) { "The number of affinity-aware query requests that were sent not to the primary node"); for (byte clientType : CLI_TYPES) { - String clientLabel = clientTypeLabel(clientType); + String clientLbl = clientTypeLabel(clientType); - String labelAccepted = MetricUtils.metricName(clientLabel, METRIC_ACEPTED); - accepted[clientType] = mreg.intMetric(labelAccepted, + String lblAccepted = MetricUtils.metricName(clientLbl, METRIC_ACEPTED); + accepted[clientType] = mreg.intMetric(lblAccepted, "Number of successfully established sessions for the client type."); } } diff --git a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java index b0b88dee03cf8..7e4bc904cf8b7 100644 --- a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java +++ b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java @@ -59,7 +59,7 @@ public class LongRunningTransactionsGenerator extends IgniteAwareApplication { String keyPrefix = jsonNode.get("key_prefix") != null ? jsonNode.get("key_prefix").asText() : LOCKED_KEY_PREFIX; - String label = jsonNode.get("label") != null ? jsonNode.get("label").asText() : null; + String lbl = jsonNode.get("label") != null ? jsonNode.get("label").asText() : null; long expectedTopologyVersion = jsonNode.get("wait_for_topology_version") != null ? jsonNode.get("wait_for_topology_version").asLong() : -1L; @@ -124,7 +124,7 @@ public class LongRunningTransactionsGenerator extends IgniteAwareApplication { data.put(key, key); } - IgniteTransactions igniteTransactions = label != null ? ignite.transactions().withLabel(label) : + IgniteTransactions igniteTransactions = lbl != null ? ignite.transactions().withLabel(lbl) : ignite.transactions(); pool.execute(() -> {