(kafka) branch trunk updated: MINOR: Reuse KafkaConfig to create MetadataLogConfig (#15788)

[ch...@apache.org]

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

chia7712 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 78c7f08e206 MINOR: Reuse KafkaConfig to create MetadataLogConfig (#15788)
78c7f08e206 is described below

commit 78c7f08e206e7cdde2dc8870702159c3f3276e8d
Author: Johnny Hsu <44...@users.noreply.github.com>
AuthorDate: Tue Apr 30 08:04:16 2024 +0800

    MINOR: Reuse KafkaConfig to create MetadataLogConfig (#15788)
    
    Reviewers: Omnia Ibrahim <o....@gmail.com>, Kuan-Po (Cooper) Tseng <br...@gmail.com>, Chia-Ping Tsai <ch...@gmail.com>
---
 core/src/main/scala/kafka/MetadataLogConfig.scala  | 18 +++++++++---------
 core/src/main/scala/kafka/server/KafkaConfig.scala |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/src/main/scala/kafka/MetadataLogConfig.scala b/core/src/main/scala/kafka/MetadataLogConfig.scala
index 54ebd1ccf0d..20b5b23539e 100755
--- a/core/src/main/scala/kafka/MetadataLogConfig.scala
+++ b/core/src/main/scala/kafka/MetadataLogConfig.scala
@@ -16,8 +16,8 @@
  */
 package kafka.raft
 
-import org.apache.kafka.common.config.AbstractConfig
-import org.apache.kafka.server.config.{KRaftConfigs, ServerLogConfigs}
+import org.apache.kafka.server.config.ServerLogConfigs
+import kafka.server.KafkaConfig
 
 final case class MetadataLogConfig(
   logSegmentBytes: Int,
@@ -32,17 +32,17 @@ final case class MetadataLogConfig(
 )
 
 object MetadataLogConfig {
-  def apply(config: AbstractConfig, maxBatchSizeInBytes: Int, maxFetchSizeInBytes: Int): MetadataLogConfig = {
+  def apply(config: KafkaConfig, maxBatchSizeInBytes: Int, maxFetchSizeInBytes: Int): MetadataLogConfig = {
     new MetadataLogConfig(
-      config.getInt(KRaftConfigs.METADATA_LOG_SEGMENT_BYTES_CONFIG),
-      config.getInt(KRaftConfigs.METADATA_LOG_SEGMENT_MIN_BYTES_CONFIG),
-      config.getLong(KRaftConfigs.METADATA_LOG_SEGMENT_MILLIS_CONFIG),
-      config.getLong(KRaftConfigs.METADATA_MAX_RETENTION_BYTES_CONFIG),
-      config.getLong(KRaftConfigs.METADATA_MAX_RETENTION_MILLIS_CONFIG),
+      config.metadataLogSegmentBytes,
+      config.metadataLogSegmentMinBytes,
+      config.metadataLogSegmentMillis,
+      config.metadataRetentionBytes,
+      config.metadataRetentionMillis,
       maxBatchSizeInBytes,
       maxFetchSizeInBytes,
       ServerLogConfigs.LOG_DELETE_DELAY_MS_DEFAULT,
-      config.getInt(KRaftConfigs.NODE_ID_CONFIG)
+      config.metadataNodeIDConfig
     )
   }
 }
diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala
index 00a53ffa5cc..76d0d9d3c7e 100755
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -812,6 +812,8 @@ class KafkaConfig private(doLog: Boolean, val props: java.util.Map[_, _], dynami
   def metadataLogSegmentMillis = getLong(KRaftConfigs.METADATA_LOG_SEGMENT_MILLIS_CONFIG)
   def metadataRetentionBytes = getLong(KRaftConfigs.METADATA_MAX_RETENTION_BYTES_CONFIG)
   def metadataRetentionMillis = getLong(KRaftConfigs.METADATA_MAX_RETENTION_MILLIS_CONFIG)
+  def metadataNodeIDConfig = getInt(KRaftConfigs.NODE_ID_CONFIG)
+  def metadataLogSegmentMinBytes = getInt(KRaftConfigs.METADATA_LOG_SEGMENT_MIN_BYTES_CONFIG)
   val serverMaxStartupTimeMs = getLong(KRaftConfigs.SERVER_MAX_STARTUP_TIME_MS_CONFIG)
 
   def numNetworkThreads = getInt(KafkaConfig.NumNetworkThreadsProp)