This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/master/pr-20767-665b36eccf80b63f8d391e3b67fafe040e1b33c8 in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 8b38911c0edaf02d23dbe301b2b2fbd7e1003a84 Author: voonhous <[email protected]> AuthorDate: Fri Nov 20 02:23:13 2026 +0000 refactor(common): use Lombok @Slf4j for loggers (#20767) Replace hand-declared SLF4J loggers in hudi-common (main and test) with Lombok @Slf4j: add the annotation, delete the field and the slf4j imports, and rename LOG/logger to log. No behavior change. Topic preserved: ArchivedTimelineV1 and ArchivedTimelineV2 log under their supertype HoodieArchivedTimeline, so they use @Slf4j with topic = "org.apache.hudi.common.table.timeline.HoodieArchivedTimeline". Category change: NativeTableMetadataFactory used the protected LOG inherited from TableMetadataFactory; it now has its own @Slf4j, so its one warn line logs under NativeTableMetadataFactory. Non-final static loggers converted (never reassigned): HoodieListData, TableMetadataFactory, HoodieTestDataGenerator (field named logger). Skipped (left hand-declared): - HoodieTableMetadata: interface. - SamplingLogger: logger is built from a dynamic name. - BaseHoodieQueueBasedExecutor: instance logger via getClass(). --- .../apache/hudi/common/data/HoodieListData.java | 8 +++--- .../engine/ExecutorServiceBasedEngineContext.java | 8 +++--- .../timeline/versioning/v1/ArchivedTimelineV1.java | 8 +++--- .../timeline/versioning/v2/ArchivedTimelineV2.java | 6 ++--- .../apache/hudi/common/util/CompactionUtils.java | 8 +++--- .../apache/hudi/common/util/TableServiceUtils.java | 6 ++--- .../hudi/metadata/NativeTableMetadataFactory.java | 5 +++- .../apache/hudi/metadata/TableMetadataFactory.java | 6 ++--- .../apache/hudi/TestReportJvmConfiguration.java | 30 ++++++++++------------ .../hudi/common/testutils/FileCreateUtilsBase.java | 6 ++--- .../common/testutils/HoodieTestDataGenerator.java | 11 ++++---- 11 files changed, 43 insertions(+), 59 deletions(-) diff --git a/hudi-common/src/main/java/org/apache/hudi/common/data/HoodieListData.java b/hudi-common/src/main/java/org/apache/hudi/common/data/HoodieListData.java index ff932aa0e2dc..afcd8d3be0a2 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/data/HoodieListData.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/data/HoodieListData.java @@ -25,8 +25,7 @@ import org.apache.hudi.common.function.SerializablePairFunction; import org.apache.hudi.common.util.ValidationUtils; import org.apache.hudi.common.util.collection.Pair; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import java.util.Iterator; import java.util.List; @@ -62,9 +61,8 @@ import static org.apache.hudi.common.function.FunctionWrapper.throwingMapWrapper * * @param <T> type of object. */ +@Slf4j public class HoodieListData<T> extends HoodieBaseListData<T> implements HoodieData<T> { - private static Logger LOG = LoggerFactory.getLogger(HoodieListData.class); - private HoodieListData(List<T> data, boolean lazy) { super(data, lazy); } @@ -109,7 +107,7 @@ public class HoodieListData<T> extends HoodieBaseListData<T> implements HoodieDa try { ((AutoCloseable) iterator).close(); } catch (Exception ex) { - LOG.warn("Failed to close the iterator", ex); + log.warn("Failed to close the iterator", ex); } } }); diff --git a/hudi-common/src/main/java/org/apache/hudi/common/engine/ExecutorServiceBasedEngineContext.java b/hudi-common/src/main/java/org/apache/hudi/common/engine/ExecutorServiceBasedEngineContext.java index c6ba0d736acf..6453aaf8b34a 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/engine/ExecutorServiceBasedEngineContext.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/engine/ExecutorServiceBasedEngineContext.java @@ -40,8 +40,7 @@ import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.keygen.KeyGenerator; import org.apache.hudi.storage.StorageConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import java.io.IOException; import java.util.ArrayList; @@ -69,10 +68,9 @@ import java.util.stream.Stream; * {@code ClassNotFoundException} that occurs when the common {@link ForkJoinPool} is used * because its workers do not inherit the submitting thread's context classloader. */ +@Slf4j public class ExecutorServiceBasedEngineContext extends HoodieEngineContext { - private static final Logger LOG = LoggerFactory.getLogger(ExecutorServiceBasedEngineContext.class); - // Lazy-initialized, daemon, fixed thread pool whose workers carry the correct classloader. // JLS ยง12.4.2 guarantees thread-safe initialization via class-loading locks. private static class PoolHolder { @@ -88,7 +86,7 @@ public class ExecutorServiceBasedEngineContext extends HoodieEngineContext { t.setDaemon(true); return t; }); - LOG.info("Created ExecutorServiceBasedEngineContext pool with {} threads", parallelism); + log.info("Created ExecutorServiceBasedEngineContext pool with {} threads", parallelism); return executor; } diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/v1/ArchivedTimelineV1.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/v1/ArchivedTimelineV1.java index ebda07e57378..0fd412eb6337 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/v1/ArchivedTimelineV1.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/v1/ArchivedTimelineV1.java @@ -28,10 +28,9 @@ import org.apache.hudi.common.util.Option; import org.apache.hudi.storage.StoragePath; import org.apache.hudi.storage.StoragePathInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.IndexedRecord; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.annotation.Nonnull; @@ -53,6 +52,7 @@ import java.util.stream.Collectors; import static org.apache.hudi.common.table.timeline.TimelineUtils.getInputStreamOptionLegacy; +@Slf4j(topic = "org.apache.hudi.common.table.timeline.HoodieArchivedTimeline") public class ArchivedTimelineV1 extends BaseTimelineV1 implements HoodieArchivedTimeline, HoodieInstantReader { private static final String HOODIE_COMMIT_ARCHIVE_LOG_FILE_PREFIX = "commits"; private static final String ACTION_TYPE_KEY = "actionType"; @@ -64,8 +64,6 @@ public class ArchivedTimelineV1 extends BaseTimelineV1 implements HoodieArchived readCommits = new HashMap<>(); private final ArchivedTimelineLoaderV1 timelineLoader = new ArchivedTimelineLoaderV1(); - private static final Logger LOG = LoggerFactory.getLogger(org.apache.hudi.common.table.timeline.HoodieArchivedTimeline.class); - /** * Loads all the archived instants. * Note that there is no lazy loading, so this may not work if the archived timeline range is really long. @@ -381,7 +379,7 @@ public Option<byte[]> getInstantDetails(HoodieInstant instant) { case HoodieTimeline.INDEXING_ACTION: return Option.of("hoodieIndexCommitMetadata"); default: - LOG.error(String.format("Unknown action in metadata (%s)", instant.getAction())); + log.error(String.format("Unknown action in metadata (%s)", instant.getAction())); return Option.empty(); } } diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/v2/ArchivedTimelineV2.java b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/v2/ArchivedTimelineV2.java index 2f8cdfe7d4e9..3b706fdb721d 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/v2/ArchivedTimelineV2.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/v2/ArchivedTimelineV2.java @@ -29,9 +29,8 @@ import org.apache.hudi.common.util.CollectionUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.StringUtils; +import lombok.extern.slf4j.Slf4j; import org.apache.avro.generic.GenericRecord; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -49,6 +48,7 @@ import java.util.function.Function; import static org.apache.hudi.common.table.timeline.InstantComparison.LESSER_THAN; import static org.apache.hudi.common.table.timeline.TimelineUtils.getInputStreamOptionLegacy; +@Slf4j(topic = "org.apache.hudi.common.table.timeline.HoodieArchivedTimeline") public class ArchivedTimelineV2 extends BaseTimelineV2 implements HoodieArchivedTimeline, HoodieInstantReader { public static final String INSTANT_TIME_ARCHIVED_META_FIELD = "instantTime"; public static final String COMPLETION_TIME_ARCHIVED_META_FIELD = "completionTime"; @@ -58,8 +58,6 @@ public class ArchivedTimelineV2 extends BaseTimelineV2 implements HoodieArchived private HoodieTableMetaClient metaClient; private final Map<String, byte[]> readCommits = new ConcurrentHashMap<>(); - private static final Logger LOG = LoggerFactory.getLogger(HoodieArchivedTimeline.class); - /** * Used for loading the archived timeline incrementally, the earliest loaded instant time get memorized * each time the timeline is loaded. The instant time is then used as the end boundary diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/CompactionUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/util/CompactionUtils.java index f1a7b2b77c9d..4f4c2e280995 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/CompactionUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/CompactionUtils.java @@ -34,8 +34,7 @@ import org.apache.hudi.common.table.timeline.versioning.compaction.CompactionV2M import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.exception.HoodieException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import java.io.IOException; import java.io.InputStream; @@ -51,9 +50,8 @@ import static org.apache.hudi.common.table.timeline.TimelineMetadataUtils.deseri /** * Helper class to generate compaction plan from FileGroup/FileSlice abstraction. */ +@Slf4j public class CompactionUtils { - private static final Logger LOG = LoggerFactory.getLogger(CompactionUtils.class); - public static final Integer COMPACTION_METADATA_VERSION_1 = CompactionV1MigrationHandler.VERSION; public static final Integer COMPACTION_METADATA_VERSION_2 = CompactionV2MigrationHandler.VERSION; public static final Integer LATEST_COMPACTION_METADATA_VERSION = COMPACTION_METADATA_VERSION_2; @@ -415,7 +413,7 @@ public class CompactionUtils { return Option.of(Pair.of(deltaCommitTimeline.findInstantsModifiedAfterByCompletionTime( lastLogCompaction.requestedTime()), lastLogCompaction)); } else { - LOG.info("Last log compaction instant {} is in pending state, returning empty value.", lastLogCompaction.requestedTime()); + log.info("Last log compaction instant {} is in pending state, returning empty value.", lastLogCompaction.requestedTime()); return Option.empty(); } } else { diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/TableServiceUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/util/TableServiceUtils.java index b5634d1cdc4e..42c17b12c676 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/TableServiceUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/TableServiceUtils.java @@ -23,8 +23,7 @@ import org.apache.hudi.common.table.timeline.HoodieInstant; import org.apache.hudi.common.table.timeline.HoodieTimeline; import org.apache.hudi.common.table.timeline.TimelineUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import java.util.Date; import java.util.List; @@ -33,10 +32,9 @@ import java.util.stream.Collectors; /** * Utility methods for table service operations (compaction, clustering, log compaction). */ +@Slf4j public class TableServiceUtils { - private static final Logger LOG = LoggerFactory.getLogger(TableServiceUtils.class); - /** * Find a stale inflight instant that has exceeded the max processing time. * This is used to detect failed table service jobs that should be retried. diff --git a/hudi-common/src/main/java/org/apache/hudi/metadata/NativeTableMetadataFactory.java b/hudi-common/src/main/java/org/apache/hudi/metadata/NativeTableMetadataFactory.java index 106b6b5c758b..7f7903ce98df 100644 --- a/hudi-common/src/main/java/org/apache/hudi/metadata/NativeTableMetadataFactory.java +++ b/hudi-common/src/main/java/org/apache/hudi/metadata/NativeTableMetadataFactory.java @@ -22,6 +22,9 @@ import org.apache.hudi.common.config.HoodieMetadataConfig; import org.apache.hudi.common.engine.HoodieEngineContext; import org.apache.hudi.storage.HoodieStorage; +import lombok.extern.slf4j.Slf4j; + +@Slf4j public class NativeTableMetadataFactory extends TableMetadataFactory { private static final NativeTableMetadataFactory INSTANCE = new NativeTableMetadataFactory(); @@ -38,7 +41,7 @@ public class NativeTableMetadataFactory extends TableMetadataFactory { if (metadata.isMetadataTableInitialized()) { return metadata; } - LOG.warn("Falling back to FileSystemBackedTableMetadata as metadata table is not initialized"); + log.warn("Falling back to FileSystemBackedTableMetadata as metadata table is not initialized"); } return createFSBackedTableMetadata(engineContext, storage, datasetBasePath); } diff --git a/hudi-common/src/main/java/org/apache/hudi/metadata/TableMetadataFactory.java b/hudi-common/src/main/java/org/apache/hudi/metadata/TableMetadataFactory.java index 037e256914de..21fca1c338b9 100644 --- a/hudi-common/src/main/java/org/apache/hudi/metadata/TableMetadataFactory.java +++ b/hudi-common/src/main/java/org/apache/hudi/metadata/TableMetadataFactory.java @@ -22,13 +22,11 @@ import org.apache.hudi.common.config.HoodieMetadataConfig; import org.apache.hudi.common.engine.HoodieEngineContext; import org.apache.hudi.storage.HoodieStorage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; +@Slf4j public abstract class TableMetadataFactory { - protected static Logger LOG = LoggerFactory.getLogger(TableMetadataFactory.class); - public HoodieTableMetadata create(HoodieEngineContext engineContext, HoodieStorage storage, HoodieMetadataConfig metadataConfig, diff --git a/hudi-common/src/test/java/org/apache/hudi/TestReportJvmConfiguration.java b/hudi-common/src/test/java/org/apache/hudi/TestReportJvmConfiguration.java index 57edd95e1c65..6acc1256bb18 100644 --- a/hudi-common/src/test/java/org/apache/hudi/TestReportJvmConfiguration.java +++ b/hudi-common/src/test/java/org/apache/hudi/TestReportJvmConfiguration.java @@ -18,17 +18,15 @@ package org.apache.hudi; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; import java.lang.management.MemoryUsage; +@Slf4j public class TestReportJvmConfiguration { - private static final Logger LOG = LoggerFactory.getLogger(TestReportJvmConfiguration.class); - @Test public void testReportMemoryUsage() { reportMemoryUsageWithMXBean(); @@ -41,15 +39,15 @@ public class TestReportJvmConfiguration { MemoryUsage heapMemoryUsage = memoryBean.getHeapMemoryUsage(); MemoryUsage nonHeapMemoryUsage = memoryBean.getNonHeapMemoryUsage(); - LOG.warn("Heap Memory Usage (MemoryMXBean):"); - LOG.warn(" Used: {} bytes", heapMemoryUsage.getUsed()); - LOG.warn(" Committed: {} bytes", heapMemoryUsage.getCommitted()); - LOG.warn(" Max: {} bytes", heapMemoryUsage.getMax()); + log.warn("Heap Memory Usage (MemoryMXBean):"); + log.warn(" Used: {} bytes", heapMemoryUsage.getUsed()); + log.warn(" Committed: {} bytes", heapMemoryUsage.getCommitted()); + log.warn(" Max: {} bytes", heapMemoryUsage.getMax()); - LOG.warn("Non-Heap Memory Usage (MemoryMXBean):"); - LOG.warn(" Used: {} bytes", nonHeapMemoryUsage.getUsed()); - LOG.warn(" Committed: {} bytes", nonHeapMemoryUsage.getCommitted()); - LOG.warn(" Max: {} bytes", nonHeapMemoryUsage.getMax()); + log.warn("Non-Heap Memory Usage (MemoryMXBean):"); + log.warn(" Used: {} bytes", nonHeapMemoryUsage.getUsed()); + log.warn(" Committed: {} bytes", nonHeapMemoryUsage.getCommitted()); + log.warn(" Max: {} bytes", nonHeapMemoryUsage.getMax()); } private void reportMemoryUsageWithRuntime() { @@ -59,9 +57,9 @@ public class TestReportJvmConfiguration { long freeMemory = runtime.freeMemory(); long usedMemory = totalMemory - freeMemory; - LOG.warn("Memory Usage (Runtime):"); - LOG.warn(" Total Memory: {} bytes", totalMemory); - LOG.warn(" Free Memory: {} bytes", freeMemory); - LOG.warn(" Used Memory: {} bytes", usedMemory); + log.warn("Memory Usage (Runtime):"); + log.warn(" Total Memory: {} bytes", totalMemory); + log.warn(" Free Memory: {} bytes", freeMemory); + log.warn(" Used Memory: {} bytes", usedMemory); } } diff --git a/hudi-common/src/test/java/org/apache/hudi/common/testutils/FileCreateUtilsBase.java b/hudi-common/src/test/java/org/apache/hudi/common/testutils/FileCreateUtilsBase.java index 683af14f14e9..ca44d0d978d8 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/testutils/FileCreateUtilsBase.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/testutils/FileCreateUtilsBase.java @@ -33,8 +33,7 @@ import org.apache.hudi.storage.HoodieStorage; import org.apache.hudi.storage.StoragePath; import org.apache.hudi.storage.StoragePathInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import java.io.IOException; import java.net.URI; @@ -53,10 +52,9 @@ import java.util.stream.Collectors; /** * Utils for creating dummy Hudi files in testing. */ +@Slf4j public class FileCreateUtilsBase { - protected static final Logger LOG = LoggerFactory.getLogger(FileCreateUtilsBase.class); - protected static final String WRITE_TOKEN = "1-0-1"; protected static final String BASE_FILE_EXTENSION = HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension(); /** An empty byte array */ diff --git a/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestDataGenerator.java b/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestDataGenerator.java index 67bdd8eee5e4..81cdc8768f65 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestDataGenerator.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestDataGenerator.java @@ -48,6 +48,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; +import lombok.extern.slf4j.Slf4j; import org.apache.avro.Conversions; import org.apache.avro.LogicalTypes; import org.apache.avro.Schema; @@ -57,8 +58,6 @@ import org.apache.avro.generic.GenericFixed; import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.IndexedRecord; import org.apache.hadoop.fs.Path; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.OutputStream; @@ -104,6 +103,7 @@ import static org.apache.hudi.common.util.ValidationUtils.checkState; * <p> * Test data uses a toy Uber trips, data model. */ +@Slf4j public class HoodieTestDataGenerator implements AutoCloseable { /** @@ -117,7 +117,6 @@ public class HoodieTestDataGenerator implements AutoCloseable { public static final int BYTES_PER_RECORD = (int) (1.2 * 1024); // with default bloom filter with 60,000 entries and 0.000000001 FPRate public static final int BLOOM_FILTER_BYTES = 323495; - private static Logger logger = LoggerFactory.getLogger(HoodieTestDataGenerator.class); public static final String NO_PARTITION_PATH = ""; public static final String DEFAULT_FIRST_PARTITION_PATH = "2016/03/15"; public static final String DEFAULT_SECOND_PARTITION_PATH = "2015/03/16"; @@ -287,7 +286,7 @@ public class HoodieTestDataGenerator implements AutoCloseable { this.numKeysBySchema = new HashMap<>(); this.numKeysBySchema.put(schema, keyPartitionMap.size()); - logger.info(String.format("Test DataGenerator's seed (%s)", seed)); + log.info(String.format("Test DataGenerator's seed (%s)", seed)); } ////////////////////////////////////////////////////////////////////////////////// @@ -1330,7 +1329,7 @@ Generate random record using TRIP_ENCODED_DECIMAL_SCHEMA index = (index + 1) % numExistingKeys; kp = existingKeys.get(index); } - logger.debug("key getting updated: {}", kp.key.getRecordKey()); + log.debug("key getting updated: {}", kp.key.getRecordKey()); used.add(kp); try { return new HoodieAvroIndexedRecord(kp.key, generateRandomValueAsPerSchema(schemaStr, kp.key, instantTime, false, timestamp)); @@ -1518,7 +1517,7 @@ Generate random record using TRIP_ENCODED_DECIMAL_SCHEMA ctor.setAccessible(true); return ctor.newInstance((Object) bytes); } catch (InvocationTargetException | InstantiationException | IllegalAccessException | NoSuchMethodException e) { - logger.info("Failed to generate pseudo-random UUID!"); + log.info("Failed to generate pseudo-random UUID!"); throw new HoodieException(e); } }
