You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by mi...@apache.org on 2022/06/10 11:56:12 UTC
[kafka] branch trunk updated: KAFKA-13947: Use %d formatting for integers rather than %s (#12267)
This is an automated email from the ASF dual-hosted git repository.
mimaison pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6c90f3335e KAFKA-13947: Use %d formatting for integers rather than %s (#12267)
6c90f3335e is described below
commit 6c90f3335ea3f8c786a45e599c0dd07ce2790487
Author: Christo Lolov <lo...@amazon.com>
AuthorDate: Fri Jun 10 12:55:52 2022 +0100
KAFKA-13947: Use %d formatting for integers rather than %s (#12267)
Reviewers: Mickael Maison <mi...@gmail.com>, Divij Vaidya <di...@amazon.com>, Kvicii <kv...@gmail.com>
---
.../apache/kafka/common/compress/KafkaLZ4BlockInputStream.java | 2 +-
.../kafka/common/security/oauthbearer/secured/Retry.java | 8 ++++----
.../java/org/apache/kafka/controller/QuorumController.java | 4 ++--
raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java | 10 +++++-----
raft/src/main/java/org/apache/kafka/raft/LeaderState.java | 4 ++--
.../src/main/java/org/apache/kafka/raft/ReplicatedCounter.java | 2 +-
.../java/org/apache/kafka/raft/internals/BatchAccumulator.java | 2 +-
.../kafka/streams/processor/internals/RepartitionTopics.java | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/clients/src/main/java/org/apache/kafka/common/compress/KafkaLZ4BlockInputStream.java b/clients/src/main/java/org/apache/kafka/common/compress/KafkaLZ4BlockInputStream.java
index e2fbd5ac04..037af8c8dc 100644
--- a/clients/src/main/java/org/apache/kafka/common/compress/KafkaLZ4BlockInputStream.java
+++ b/clients/src/main/java/org/apache/kafka/common/compress/KafkaLZ4BlockInputStream.java
@@ -173,7 +173,7 @@ public final class KafkaLZ4BlockInputStream extends InputStream {
in.getInt(); // TODO: verify this content checksum
return;
} else if (blockSize > maxBlockSize) {
- throw new IOException(String.format("Block size %s exceeded max: %s", blockSize, maxBlockSize));
+ throw new IOException(String.format("Block size %d exceeded max: %d", blockSize, maxBlockSize));
}
if (in.remaining() < blockSize) {
diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/Retry.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/Retry.java
index ffa56722f6..d0379ee485 100644
--- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/Retry.java
+++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/Retry.java
@@ -49,13 +49,13 @@ public class Retry<R> {
this.retryBackoffMaxMs = retryBackoffMaxMs;
if (this.retryBackoffMs < 0)
- throw new IllegalArgumentException(String.format("retryBackoffMs value (%s) must be non-negative", retryBackoffMs));
+ throw new IllegalArgumentException(String.format("retryBackoffMs value (%d) must be non-negative", retryBackoffMs));
if (this.retryBackoffMaxMs < 0)
- throw new IllegalArgumentException(String.format("retryBackoffMaxMs value (%s) must be non-negative", retryBackoffMaxMs));
+ throw new IllegalArgumentException(String.format("retryBackoffMaxMs value (%d) must be non-negative", retryBackoffMaxMs));
if (this.retryBackoffMaxMs < this.retryBackoffMs)
- throw new IllegalArgumentException(String.format("retryBackoffMaxMs value (%s) is less than retryBackoffMs value (%s)", retryBackoffMaxMs, retryBackoffMs));
+ throw new IllegalArgumentException(String.format("retryBackoffMaxMs value (%d) is less than retryBackoffMs value (%d)", retryBackoffMaxMs, retryBackoffMs));
}
public R execute(Retryable<R> retryable) throws ExecutionException {
@@ -88,7 +88,7 @@ public class Retry<R> {
if (waitMs <= 0)
break;
- String message = String.format("Attempt %s to make call resulted in an error; sleeping %s ms before retrying",
+ String message = String.format("Attempt %d to make call resulted in an error; sleeping %d ms before retrying",
currAttempt, waitMs);
log.warn(message, e);
diff --git a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java
index 0c6d665027..4a8c8c9661 100644
--- a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java
+++ b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java
@@ -489,7 +489,7 @@ public final class QuorumController implements Controller {
if (!snapshotRegistry.hasSnapshot(committedOffset)) {
throw new RuntimeException(
String.format(
- "Cannot generate a snapshot at committed offset %s because it does not exists in the snapshot registry.",
+ "Cannot generate a snapshot at committed offset %d because it does not exists in the snapshot registry.",
committedOffset
)
);
@@ -857,7 +857,7 @@ public final class QuorumController implements Controller {
if (isActiveController()) {
throw new IllegalStateException(
String.format(
- "Asked to load snapshot (%s) when it is the active controller (%s)",
+ "Asked to load snapshot (%s) when it is the active controller (%d)",
reader.snapshotId(),
curClaimEpoch
)
diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java
index 3479e05d32..53372728aa 100644
--- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java
+++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java
@@ -310,7 +310,7 @@ public class KafkaRaftClient<T> implements RaftClient<T> {
if (nextExpectedOffset < log.startOffset() && nextExpectedOffset < highWatermark) {
SnapshotReader<T> snapshot = latestSnapshot().orElseThrow(() -> new IllegalStateException(
String.format(
- "Snapshot expected since next offset of %s is %s, log start offset is %s and high-watermark is %s",
+ "Snapshot expected since next offset of %s is %d, log start offset is %d and high-watermark is %d",
listenerContext.listenerName(),
nextExpectedOffset,
log.startOffset(),
@@ -1034,7 +1034,7 @@ public class KafkaRaftClient<T> implements RaftClient<T> {
}
private static String listenerName(Listener<?> listener) {
- return String.format("%s@%s", listener.getClass().getTypeName(), System.identityHashCode(listener));
+ return String.format("%s@%d", listener.getClass().getTypeName(), System.identityHashCode(listener));
}
private boolean handleFetchResponse(
@@ -1261,7 +1261,7 @@ public class KafkaRaftClient<T> implements RaftClient<T> {
if (partitionSnapshot.position() > Integer.MAX_VALUE) {
throw new IllegalStateException(
String.format(
- "Trying to fetch a snapshot with size (%s) and a position (%s) larger than %s",
+ "Trying to fetch a snapshot with size (%d) and a position (%d) larger than %d",
snapshotSize,
partitionSnapshot.position(),
Integer.MAX_VALUE
@@ -1373,7 +1373,7 @@ public class KafkaRaftClient<T> implements RaftClient<T> {
if (snapshot.sizeInBytes() != partitionSnapshot.position()) {
throw new IllegalStateException(
String.format(
- "Received fetch snapshot response with an invalid position. Expected %s; Received %s",
+ "Received fetch snapshot response with an invalid position. Expected %d; Received %d",
snapshot.sizeInBytes(),
partitionSnapshot.position()
)
@@ -1400,7 +1400,7 @@ public class KafkaRaftClient<T> implements RaftClient<T> {
} else {
throw new IllegalStateException(
String.format(
- "Full log truncation expected but didn't happen. Snapshot of %s, log end offset %s, last fetched %s",
+ "Full log truncation expected but didn't happen. Snapshot of %s, log end offset %s, last fetched %d",
snapshot.snapshotId(),
log.endOffset(),
log.lastFetchedEpoch()
diff --git a/raft/src/main/java/org/apache/kafka/raft/LeaderState.java b/raft/src/main/java/org/apache/kafka/raft/LeaderState.java
index de08b7b1cc..8717d4e4d2 100644
--- a/raft/src/main/java/org/apache/kafka/raft/LeaderState.java
+++ b/raft/src/main/java/org/apache/kafka/raft/LeaderState.java
@@ -353,7 +353,7 @@ public class LeaderState<T> implements EpochState {
@Override
public String toString() {
return String.format(
- "ReplicaState(nodeId=%s, endOffset=%s, lastFetchTimestamp=%s, hasAcknowledgedLeader=%s)",
+ "ReplicaState(nodeId=%d, endOffset=%s, lastFetchTimestamp=%s, hasAcknowledgedLeader=%s)",
nodeId,
endOffset,
lastFetchTimestamp,
@@ -372,7 +372,7 @@ public class LeaderState<T> implements EpochState {
@Override
public String toString() {
return String.format(
- "Leader(localId=%s, epoch=%s, epochStartOffset=%s, highWatermark=%s, voterStates=%s)",
+ "Leader(localId=%d, epoch=%d, epochStartOffset=%d, highWatermark=%s, voterStates=%s)",
localId,
epoch,
epochStartOffset,
diff --git a/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java b/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java
index 66303c6e4d..c7702ba20a 100644
--- a/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java
+++ b/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java
@@ -91,7 +91,7 @@ public class ReplicatedCounter implements RaftClient.Listener<Integer> {
if (nextCommitted != committed + 1) {
throw new AssertionError(
String.format(
- "Expected next committed value to be %s, but instead found %s on node %s",
+ "Expected next committed value to be %d, but instead found %d on node %d",
committed + 1,
nextCommitted,
nodeId
diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/BatchAccumulator.java b/raft/src/main/java/org/apache/kafka/raft/internals/BatchAccumulator.java
index 7bfa44ac4a..77efd2f7e1 100644
--- a/raft/src/main/java/org/apache/kafka/raft/internals/BatchAccumulator.java
+++ b/raft/src/main/java/org/apache/kafka/raft/internals/BatchAccumulator.java
@@ -189,7 +189,7 @@ public class BatchAccumulator<T> implements Closeable {
if (bytesNeeded.isPresent() && bytesNeeded.getAsInt() > maxBatchSize) {
throw new RecordBatchTooLargeException(
String.format(
- "The total record(s) size of %s exceeds the maximum allowed batch size of %s",
+ "The total record(s) size of %d exceeds the maximum allowed batch size of %d",
bytesNeeded.getAsInt(),
maxBatchSize
)
diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java
index ad94bc88cf..b8698bc6e5 100644
--- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java
+++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java
@@ -118,7 +118,7 @@ public class RepartitionTopics {
return new StreamsException(
new MissingSourceTopicException(String.format(
- "Missing source topics %s for subtopology %s of topology %s",
+ "Missing source topics %s for subtopology %d of topology %s",
missingSourceTopics, subtopologyId, topologyName)),
new TaskId(subtopologyId, 0, topologyName));
}).collect(Collectors.toCollection(LinkedList::new));