hudi-agent commented on code in PR #19755:
URL: https://github.com/apache/hudi/pull/19755#discussion_r3863806539
##########
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieWriteHandle.java:
##########
@@ -311,11 +311,16 @@ protected HoodieLogFormat.Writer createLogWriter(String
instantTime, String file
Option<HoodieLogFile> latestLogFile = fileSliceOpt.isPresent()
? fileSliceOpt.get().getLatestLogFile()
: Option.empty();
+ // Target a new log file version (latest + 1) instead of reopening the
latest log file.
+ // Creating a fresh version avoids relying on append support and on
locating the latest log slice.
+ int logFileVersion = latestLogFile
+ .map(logFile -> logFile.getLogVersion() + 1)
+ .orElse(HoodieLogFile.LOGFILE_BASE_VERSION);
return HoodieLogFormatWriter.builder()
.withParentPath(FSUtils.constructAbsolutePath(hoodieTable.getMetaClient().getBasePath(),
partitionPath))
Review Comment:
🤖 Now that this targets a fresh version (latest + 1) rather than reopening
the latest file, should `withFileSize` be `0L` to match the v8+ path above?
Passing the previous log file's size seeds `HoodieLogFile.getFileSize()` on a
file that actually starts empty. It looks harmless today (rollover uses
`outputStream.getPos()`, and write stats use `result.size()`), but the stale
initial size is a bit inconsistent with the intent.
<sub><i>⚠️ AI-generated; verify before applying. React 👍/👎 to flag
quality.</i></sub>
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/io/TestHoodieAppendHandle.java:
##########
@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hudi.io;
+
+import org.apache.hudi.common.engine.LocalTaskContextSupplier;
+import org.apache.hudi.common.engine.TaskContextSupplier;
+import org.apache.hudi.common.model.FileSlice;
+import org.apache.hudi.common.model.HoodieLogFile;
+import org.apache.hudi.common.table.HoodieTableVersion;
+import org.apache.hudi.common.table.log.HoodieLogFormat;
+import org.apache.hudi.common.table.view.SyncableFileSystemView;
+import org.apache.hudi.common.testutils.HoodieCommonTestHarness;
+import org.apache.hudi.common.util.HoodieStorageUtils;
+import org.apache.hudi.common.util.Option;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.table.HoodieTable;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.util.stream.Stream;
+
+import static
org.apache.hudi.common.testutils.HoodieTestDataGenerator.TRIP_EXAMPLE_SCHEMA;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class TestHoodieAppendHandle extends HoodieCommonTestHarness {
+
+ private static final String TEST_INSTANT_TIME = "20231201120000";
+ private static final String TEST_PARTITION_PATH = "partition1";
+ private static final String TEST_FILE_ID = "file-001";
+
+ @Mock
+ private HoodieTable<Object, Object, Object, Object> mockHoodieTable;
+
+ private HoodieWriteConfig writeConfig;
+
+ private TaskContextSupplier taskContextSupplier;
+
+ @BeforeEach
+ public void setUp() throws IOException {
+ initPath();
+ initMetaClient();
+
+ writeConfig = HoodieWriteConfig.newBuilder()
+ .withPath(basePath)
+ .withSchema(TRIP_EXAMPLE_SCHEMA)
+ .withMarkersType("DIRECT")
+ .build();
+ taskContextSupplier = new LocalTaskContextSupplier();
+
+ mockMethodsNeededByConstructor();
+ }
+
+ @AfterEach
+ public void cleanUp() {
+ cleanMetaClient();
+ }
+
+ private void mockMethodsNeededByConstructor() {
Review Comment:
🤖 nit: `mockMethodsNeededByConstructor` reads as an explanation of *why*
rather than a name — could you rename it to something like `stubTableMocks()`
or `initMockTable()`?
<sub><i>⚠️ AI-generated; verify before applying. React 👍/👎 to flag
quality.</i></sub>
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/io/TestHoodieAppendHandle.java:
##########
@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hudi.io;
+
+import org.apache.hudi.common.engine.LocalTaskContextSupplier;
+import org.apache.hudi.common.engine.TaskContextSupplier;
+import org.apache.hudi.common.model.FileSlice;
+import org.apache.hudi.common.model.HoodieLogFile;
+import org.apache.hudi.common.table.HoodieTableVersion;
+import org.apache.hudi.common.table.log.HoodieLogFormat;
+import org.apache.hudi.common.table.view.SyncableFileSystemView;
+import org.apache.hudi.common.testutils.HoodieCommonTestHarness;
+import org.apache.hudi.common.util.HoodieStorageUtils;
+import org.apache.hudi.common.util.Option;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.table.HoodieTable;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.util.stream.Stream;
+
+import static
org.apache.hudi.common.testutils.HoodieTestDataGenerator.TRIP_EXAMPLE_SCHEMA;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class TestHoodieAppendHandle extends HoodieCommonTestHarness {
+
+ private static final String TEST_INSTANT_TIME = "20231201120000";
+ private static final String TEST_PARTITION_PATH = "partition1";
+ private static final String TEST_FILE_ID = "file-001";
+
+ @Mock
+ private HoodieTable<Object, Object, Object, Object> mockHoodieTable;
+
+ private HoodieWriteConfig writeConfig;
+
+ private TaskContextSupplier taskContextSupplier;
+
+ @BeforeEach
+ public void setUp() throws IOException {
+ initPath();
+ initMetaClient();
+
+ writeConfig = HoodieWriteConfig.newBuilder()
+ .withPath(basePath)
+ .withSchema(TRIP_EXAMPLE_SCHEMA)
+ .withMarkersType("DIRECT")
+ .build();
+ taskContextSupplier = new LocalTaskContextSupplier();
+
+ mockMethodsNeededByConstructor();
+ }
+
+ @AfterEach
+ public void cleanUp() {
+ cleanMetaClient();
+ }
+
+ private void mockMethodsNeededByConstructor() {
+ when(mockHoodieTable.getConfig()).thenReturn(writeConfig);
+ when(mockHoodieTable.getMetaClient()).thenReturn(metaClient);
+ }
+
+ private static Stream<Arguments> versionsSixAndAbove() {
Review Comment:
🤖 nit: `versionsSixAndAbove` implies it covers all table versions ≥ 6, but
only three specific ones are listed — something like `preAndPostV8Versions()`
or `tableVersionsUnderTest()` would be more accurate and make it clear why
SEVEN (if it exists) is absent.
<sub><i>⚠️ AI-generated; verify before applying. React 👍/👎 to flag
quality.</i></sub>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
