You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ro...@apache.org on 2023/12/13 03:45:58 UTC

(pinot) branch master updated: fix multiple instances where the number of placeholders did not match the number of arguments to logging methods (#12134)

This is an automated email from the ASF dual-hosted git repository.

rongr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new 05afb65ec7 fix multiple instances where the number of placeholders did not match the number of arguments to logging methods (#12134)
05afb65ec7 is described below

commit 05afb65ec74388b8254714cd115d9ff225f55e4b
Author: Tim Veil <32...@users.noreply.github.com>
AuthorDate: Tue Dec 12 22:45:53 2023 -0500

    fix multiple instances where the number of placeholders did not match the number of arguments to logging methods (#12134)
    
    * fix multiple instances where the number of placeholders did not match the number of arguments to logging methods.  fixes #12132
    
    ---------
    
    Co-authored-by: Xiaotian (Jackie) Jiang <17...@users.noreply.github.com>
---
 .../apache/pinot/controller/helix/core/SegmentDeletionManager.java    | 2 +-
 .../pinot/core/data/manager/realtime/RealtimeSegmentDataManager.java  | 2 +-
 .../core/data/manager/realtime/SegmentBuildTimeLeaseExtender.java     | 4 ++--
 .../plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java
index 8fcaff84f0..8a0af22a2c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java
@@ -154,7 +154,7 @@ public class SegmentDeletionManager {
         }
       }
     } catch (Exception e) {
-      LOGGER.warn("Caught exception while checking helix states for table {} " + tableName, e);
+      LOGGER.warn("Caught exception while checking helix states for table: {}", tableName, e);
       segmentsToDelete.clear();
       segmentsToDelete.addAll(segmentIds);
       segmentsToRetryLater.clear();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeSegmentDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeSegmentDataManager.java
index 0f880c5f22..d68c11f8e6 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeSegmentDataManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/RealtimeSegmentDataManager.java
@@ -379,7 +379,7 @@ public class RealtimeSegmentDataManager extends SegmentDataManager {
         }
         return false;
       default:
-        _segmentLogger.error("Illegal state {}" + _state.toString());
+        _segmentLogger.error("Illegal state: {}", _state);
         throw new RuntimeException("Illegal state to consume");
     }
   }
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentBuildTimeLeaseExtender.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentBuildTimeLeaseExtender.java
index 19dee37401..397a78305e 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentBuildTimeLeaseExtender.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/SegmentBuildTimeLeaseExtender.java
@@ -102,7 +102,7 @@ public class SegmentBuildTimeLeaseExtender {
       Future future = entry.getValue();
       boolean cancelled = future.cancel(true);
       if (!cancelled) {
-        LOGGER.warn("Task could not be cancelled for {}" + entry.getKey());
+        LOGGER.warn("Task could not be cancelled for {}", entry.getKey());
       }
     }
     _segmentToFutureMap.clear();
@@ -133,7 +133,7 @@ public class SegmentBuildTimeLeaseExtender {
     if (future != null) {
       boolean cancelled = future.cancel(true);
       if (!cancelled) {
-        LOGGER.warn("Task could not be cancelled for {}" + segmentId);
+        LOGGER.warn("Task could not be cancelled for {}", segmentId);
       }
     }
     _segmentToFutureMap.remove(segmentId);
diff --git a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java
index 0b09bf6d35..7a194ac895 100644
--- a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java
+++ b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java
@@ -859,8 +859,8 @@ public class MergeRollupTaskGenerator extends BaseTaskGenerator {
       if (v == null) {
         LOGGER.info(
             "Creating the gauge metric for tracking the merge/roll-up number buckets to process for table: {} "
-                + "and mergeLevel: {}.(bufferTimeMs={}, bucketTimeMs={}, numTimeBucketsToProcess={})"
-                + tableNameWithType, mergeLevel, bufferTimeMs, bucketTimeMs, finalCount);
+                + "and mergeLevel: {}.(bufferTimeMs={}, bucketTimeMs={}, numTimeBucketsToProcess={})",
+                tableNameWithType, mergeLevel, bufferTimeMs, bucketTimeMs, finalCount);
         controllerMetrics.setOrUpdateGauge(getMetricNameForNumBucketsToProcess(tableNameWithType, mergeLevel),
             () -> _tableNumberBucketsToProcess.get(tableNameWithType).getOrDefault(mergeLevel, finalCount));
       }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org