This is an automated email from the ASF dual-hosted git repository.
vbalaji pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new bac6ea7b26b [MINOR] Removed FSUtils.makeBaseFileName without fileExt
param (#10963)
bac6ea7b26b is described below
commit bac6ea7b26b19b5887823ed552c44d2c9f2bb5d4
Author: Vova Kolmakov <[email protected]>
AuthorDate: Sat Apr 6 04:46:54 2024 +0700
[MINOR] Removed FSUtils.makeBaseFileName without fileExt param (#10963)
---
.../cli/commands/TestFileSystemViewCommand.java | 8 +-
.../cli/functional/CLIFunctionalTestHarness.java | 3 +
.../org/apache/hudi/HoodieTestCommitGenerator.java | 3 +-
.../TestFlinkSizeBasedClusteringPlanStrategy.java | 4 +-
.../TestHoodieJavaClientOnCopyOnWriteStorage.java | 3 +-
.../commit/TestJavaCopyOnWriteActionExecutor.java | 3 +-
.../TestHoodieClientOnCopyOnWriteStorage.java | 2 +-
...TestSparkBuildClusteringGroupsForPartition.java | 8 +-
.../commit/TestCopyOnWriteActionExecutor.java | 2 +-
.../java/org/apache/hudi/common/fs/FSUtils.java | 6 -
.../org/apache/hudi/common/fs/TestFSUtils.java | 11 +-
.../hudi/common/model/TestHoodieWriteStat.java | 4 +-
.../view/TestHoodieTableFSViewWithClustering.java | 8 +-
.../table/view/TestHoodieTableFileSystemView.java | 188 ++++++++++-----------
.../table/view/TestIncrementalFSViewSync.java | 2 +-
.../common/testutils/HoodieCommonTestHarness.java | 3 +
.../hudi/common/testutils/HoodieTestTable.java | 3 +-
.../hudi/common/util/TestClusteringUtils.java | 2 +-
.../hudi/hive/testutils/HiveTestCluster.java | 3 +-
.../apache/hudi/hive/testutils/HiveTestUtil.java | 7 +-
.../functional/TestHoodieSnapshotCopier.java | 20 ++-
21 files changed, 155 insertions(+), 138 deletions(-)
diff --git
a/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestFileSystemViewCommand.java
b/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestFileSystemViewCommand.java
index 8089fc1286e..7bafe2f432f 100644
---
a/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestFileSystemViewCommand.java
+++
b/hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestFileSystemViewCommand.java
@@ -101,11 +101,11 @@ public class TestFileSystemViewCommand extends
CLIFunctionalTestHarness {
// Write date files and log file
String testWriteToken = "2-0-2";
Files.createFile(Paths.get(nonpartitionedTablePath, FSUtils
- .makeBaseFileName(commitTime1, testWriteToken, fileId1)));
+ .makeBaseFileName(commitTime1, testWriteToken, fileId1,
BASE_FILE_EXTENSION)));
Files.createFile(Paths.get(nonpartitionedTablePath, FSUtils
.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime1,
0, testWriteToken)));
Files.createFile(Paths.get(nonpartitionedTablePath, FSUtils
- .makeBaseFileName(commitTime2, testWriteToken, fileId1)));
+ .makeBaseFileName(commitTime2, testWriteToken, fileId1,
BASE_FILE_EXTENSION)));
Files.createFile(Paths.get(nonpartitionedTablePath, FSUtils
.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime2,
0, testWriteToken)));
@@ -144,11 +144,11 @@ public class TestFileSystemViewCommand extends
CLIFunctionalTestHarness {
// Write date files and log file
String testWriteToken = "1-0-1";
Files.createFile(Paths.get(fullPartitionPath, FSUtils
- .makeBaseFileName(commitTime1, testWriteToken, fileId1)));
+ .makeBaseFileName(commitTime1, testWriteToken, fileId1,
BASE_FILE_EXTENSION)));
Files.createFile(Paths.get(fullPartitionPath, FSUtils
.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime1,
0, testWriteToken)));
Files.createFile(Paths.get(fullPartitionPath, FSUtils
- .makeBaseFileName(commitTime2, testWriteToken, fileId1)));
+ .makeBaseFileName(commitTime2, testWriteToken, fileId1,
BASE_FILE_EXTENSION)));
Files.createFile(Paths.get(fullPartitionPath, FSUtils
.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime2,
0, testWriteToken)));
diff --git
a/hudi-cli/src/test/java/org/apache/hudi/cli/functional/CLIFunctionalTestHarness.java
b/hudi-cli/src/test/java/org/apache/hudi/cli/functional/CLIFunctionalTestHarness.java
index 6d6335ab0fb..7c72417504b 100644
---
a/hudi-cli/src/test/java/org/apache/hudi/cli/functional/CLIFunctionalTestHarness.java
+++
b/hudi-cli/src/test/java/org/apache/hudi/cli/functional/CLIFunctionalTestHarness.java
@@ -21,6 +21,7 @@ package org.apache.hudi.cli.functional;
import org.apache.hudi.client.SparkRDDReadClient;
import org.apache.hudi.client.common.HoodieSparkEngineContext;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.table.view.FileSystemViewStorageConfig;
import org.apache.hudi.testutils.HoodieClientTestUtils;
import org.apache.hudi.testutils.providers.SparkProvider;
@@ -40,6 +41,8 @@ import java.nio.file.Paths;
public class CLIFunctionalTestHarness implements SparkProvider {
+ protected static final String BASE_FILE_EXTENSION =
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension();
+
protected static int timelineServicePort =
FileSystemViewStorageConfig.REMOTE_PORT_NUM.defaultValue();
protected static transient TimelineService timelineService;
diff --git
a/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/HoodieTestCommitGenerator.java
b/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/HoodieTestCommitGenerator.java
index edb3617ea9e..296cb162a42 100644
---
a/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/HoodieTestCommitGenerator.java
+++
b/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/HoodieTestCommitGenerator.java
@@ -24,6 +24,7 @@ import org.apache.hudi.common.model.HoodieCommitMetadata;
import org.apache.hudi.common.model.HoodieFileFormat;
import org.apache.hudi.common.model.HoodiePartitionMetadata;
import org.apache.hudi.common.model.HoodieWriteStat;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.timeline.HoodieTimeline;
import org.apache.hudi.common.testutils.InProcessTimeGenerator;
@@ -111,7 +112,7 @@ public class HoodieTestCommitGenerator {
}
public static String getBaseFilename(String instantTime, String fileId) {
- return FSUtils.makeBaseFileName(instantTime, BASE_FILE_WRITE_TOKEN,
fileId);
+ return FSUtils.makeBaseFileName(instantTime, BASE_FILE_WRITE_TOKEN,
fileId, HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension());
}
public static String getLogFilename(String instantTime, String fileId) {
diff --git
a/hudi-client/hudi-flink-client/src/test/java/org/apache/hudi/table/action/cluster/strategy/TestFlinkSizeBasedClusteringPlanStrategy.java
b/hudi-client/hudi-flink-client/src/test/java/org/apache/hudi/table/action/cluster/strategy/TestFlinkSizeBasedClusteringPlanStrategy.java
index 97f12abf322..50a3233bf37 100644
---
a/hudi-client/hudi-flink-client/src/test/java/org/apache/hudi/table/action/cluster/strategy/TestFlinkSizeBasedClusteringPlanStrategy.java
+++
b/hudi-client/hudi-flink-client/src/test/java/org/apache/hudi/table/action/cluster/strategy/TestFlinkSizeBasedClusteringPlanStrategy.java
@@ -25,6 +25,7 @@ import org.apache.hudi.common.fs.FSUtils;
import org.apache.hudi.common.model.FileSlice;
import org.apache.hudi.common.model.HoodieBaseFile;
import org.apache.hudi.common.model.HoodieFileGroupId;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.config.HoodieClusteringConfig;
import org.apache.hudi.config.HoodieWriteConfig;
import org.apache.hudi.table.HoodieFlinkCopyOnWriteTable;
@@ -90,7 +91,8 @@ public class TestFlinkSizeBasedClusteringPlanStrategy {
private FileSlice generateFileSlice(String partitionPath, String fileId,
String baseInstant) {
FileSlice fs = new FileSlice(new HoodieFileGroupId(partitionPath, fileId),
baseInstant);
- fs.setBaseFile(new HoodieBaseFile(FSUtils.makeBaseFileName(baseInstant,
"1-0-1", fileId)));
+ fs.setBaseFile(new HoodieBaseFile(FSUtils.makeBaseFileName(baseInstant,
"1-0-1", fileId,
+
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension())));
return fs;
}
}
diff --git
a/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/client/functional/TestHoodieJavaClientOnCopyOnWriteStorage.java
b/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/client/functional/TestHoodieJavaClientOnCopyOnWriteStorage.java
index a591134517f..9749eb55e1e 100644
---
a/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/client/functional/TestHoodieJavaClientOnCopyOnWriteStorage.java
+++
b/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/client/functional/TestHoodieJavaClientOnCopyOnWriteStorage.java
@@ -50,6 +50,7 @@ import
org.apache.hudi.common.model.HoodieReplaceCommitMetadata;
import org.apache.hudi.common.model.HoodieWriteStat;
import org.apache.hudi.common.model.IOType;
import org.apache.hudi.common.model.WriteConcurrencyMode;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.marker.MarkerType;
import org.apache.hudi.common.table.timeline.HoodieActiveTimeline;
@@ -1526,7 +1527,7 @@ public class TestHoodieJavaClientOnCopyOnWriteStorage
extends HoodieJavaClientTe
Option<Path> markerFilePath = WriteMarkersFactory.get(
cfg.getMarkersType(), getHoodieTable(metaClient, cfg), instantTime)
.create(partitionPath,
- FSUtils.makeBaseFileName(instantTime, "1-0-1",
UUID.randomUUID().toString()),
+ FSUtils.makeBaseFileName(instantTime, "1-0-1",
UUID.randomUUID().toString(),
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension()),
IOType.MERGE);
if (!enableOptimisticConsistencyGuard) {
Exception e = assertThrows(HoodieCommitException.class, () -> {
diff --git
a/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/table/action/commit/TestJavaCopyOnWriteActionExecutor.java
b/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/table/action/commit/TestJavaCopyOnWriteActionExecutor.java
index bda362931c7..87e690bfca0 100644
---
a/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/table/action/commit/TestJavaCopyOnWriteActionExecutor.java
+++
b/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/table/action/commit/TestJavaCopyOnWriteActionExecutor.java
@@ -28,6 +28,7 @@ import org.apache.hudi.common.model.HoodieAvroRecord;
import org.apache.hudi.common.model.HoodieKey;
import org.apache.hudi.common.model.HoodieRecord;
import org.apache.hudi.common.model.HoodieTableType;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.testutils.HoodieTestDataGenerator;
import org.apache.hudi.common.testutils.HoodieTestUtils;
@@ -105,7 +106,7 @@ public class TestJavaCopyOnWriteActionExecutor extends
HoodieJavaClientTestHarne
}).collect(Collectors.toList()).get(0);
assertEquals(newPathWithWriteToken.getKey().toString(),
Paths.get(this.basePath, partitionPath,
- FSUtils.makeBaseFileName(instantTime,
newPathWithWriteToken.getRight(), fileName)).toString());
+ FSUtils.makeBaseFileName(instantTime,
newPathWithWriteToken.getRight(), fileName,
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension())).toString());
}
private HoodieWriteConfig makeHoodieClientConfig() {
diff --git
a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieClientOnCopyOnWriteStorage.java
b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieClientOnCopyOnWriteStorage.java
index 61f73207aeb..cff783ebd53 100644
---
a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieClientOnCopyOnWriteStorage.java
+++
b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieClientOnCopyOnWriteStorage.java
@@ -2629,7 +2629,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends
HoodieClientTestBase {
Option<Path> markerFilePath = WriteMarkersFactory.get(
cfg.getMarkersType(), getHoodieTable(metaClient, cfg), instantTime)
.create(partitionPath,
- FSUtils.makeBaseFileName(instantTime, "1-0-1",
UUID.randomUUID().toString()),
+ FSUtils.makeBaseFileName(instantTime, "1-0-1",
UUID.randomUUID().toString(), BASE_FILE_EXTENSION),
IOType.MERGE);
if (!enableOptimisticConsistencyGuard) {
Exception e = assertThrows(HoodieCommitException.class, () -> {
diff --git
a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/action/cluster/strategy/TestSparkBuildClusteringGroupsForPartition.java
b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/action/cluster/strategy/TestSparkBuildClusteringGroupsForPartition.java
index cb2fd4eebb5..ada5f4954ab 100644
---
a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/action/cluster/strategy/TestSparkBuildClusteringGroupsForPartition.java
+++
b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/action/cluster/strategy/TestSparkBuildClusteringGroupsForPartition.java
@@ -25,6 +25,7 @@ import org.apache.hudi.common.fs.FSUtils;
import org.apache.hudi.common.model.FileSlice;
import org.apache.hudi.common.model.HoodieBaseFile;
import org.apache.hudi.common.model.HoodieFileGroupId;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.config.HoodieClusteringConfig;
import org.apache.hudi.config.HoodieWriteConfig;
import org.apache.hudi.table.HoodieSparkCopyOnWriteTable;
@@ -41,6 +42,9 @@ import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestSparkBuildClusteringGroupsForPartition {
+
+ protected static final String BASE_FILE_EXTENSION =
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension();
+
@Mock
HoodieSparkCopyOnWriteTable table;
@Mock
@@ -109,13 +113,13 @@ public class TestSparkBuildClusteringGroupsForPartition {
private FileSlice generateFileSlice(String partitionPath, String fileId,
String baseInstant) {
FileSlice fs = new FileSlice(new HoodieFileGroupId(partitionPath, fileId),
baseInstant);
- fs.setBaseFile(new HoodieBaseFile(FSUtils.makeBaseFileName(baseInstant,
"1-0-1", fileId)));
+ fs.setBaseFile(new HoodieBaseFile(FSUtils.makeBaseFileName(baseInstant,
"1-0-1", fileId, BASE_FILE_EXTENSION)));
return fs;
}
private FileSlice generateFileSliceWithLen(String partitionPath, String
fileId, String baseInstant, long fileLen) {
FileSlice fs = new FileSlice(new HoodieFileGroupId(partitionPath, fileId),
baseInstant);
- HoodieBaseFile hoodieBaseFile = new
HoodieBaseFile(FSUtils.makeBaseFileName(baseInstant, "1-0-1", fileId));
+ HoodieBaseFile hoodieBaseFile = new
HoodieBaseFile(FSUtils.makeBaseFileName(baseInstant, "1-0-1", fileId,
BASE_FILE_EXTENSION));
hoodieBaseFile.setFileLen(fileLen);
fs.setBaseFile(hoodieBaseFile);
return fs;
diff --git
a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/action/commit/TestCopyOnWriteActionExecutor.java
b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/action/commit/TestCopyOnWriteActionExecutor.java
index 4574b34393d..f40ba3be02e 100644
---
a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/action/commit/TestCopyOnWriteActionExecutor.java
+++
b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/action/commit/TestCopyOnWriteActionExecutor.java
@@ -130,7 +130,7 @@ public class TestCopyOnWriteActionExecutor extends
HoodieClientTestBase implemen
}).collect().get(0);
assertEquals(newPathWithWriteToken.getKey().toString(),
Paths.get(this.basePath, partitionPath,
- FSUtils.makeBaseFileName(instantTime,
newPathWithWriteToken.getRight(), fileName)).toString());
+ FSUtils.makeBaseFileName(instantTime,
newPathWithWriteToken.getRight(), fileName, BASE_FILE_EXTENSION)).toString());
}
private HoodieWriteConfig makeHoodieClientConfig() {
diff --git a/hudi-common/src/main/java/org/apache/hudi/common/fs/FSUtils.java
b/hudi-common/src/main/java/org/apache/hudi/common/fs/FSUtils.java
index d84c677e341..44e153dcce0 100644
--- a/hudi-common/src/main/java/org/apache/hudi/common/fs/FSUtils.java
+++ b/hudi-common/src/main/java/org/apache/hudi/common/fs/FSUtils.java
@@ -142,12 +142,6 @@ public class FSUtils {
return String.format("%d-%d-%d", taskPartitionId, stageId, taskAttemptId);
}
- // TODO: this should be removed
- public static String makeBaseFileName(String instantTime, String writeToken,
String fileId) {
- return String.format("%s_%s_%s%s", fileId, writeToken, instantTime,
- HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension());
- }
-
public static String makeBaseFileName(String instantTime, String writeToken,
String fileId, String fileExtension) {
return String.format("%s_%s_%s%s", fileId, writeToken, instantTime,
fileExtension);
}
diff --git
a/hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java
b/hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java
index 350d1a02072..7d5e1de93a9 100644
--- a/hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java
+++ b/hudi-common/src/test/java/org/apache/hudi/common/fs/TestFSUtils.java
@@ -21,7 +21,6 @@ package org.apache.hudi.common.fs;
import org.apache.hudi.common.config.SerializableConfiguration;
import org.apache.hudi.common.engine.HoodieLocalEngineContext;
import org.apache.hudi.common.model.HoodieLogFile;
-import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.cdc.HoodieCDCUtils;
import org.apache.hudi.common.table.timeline.HoodieActiveTimeline;
@@ -75,7 +74,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestFSUtils extends HoodieCommonTestHarness {
private static final String TEST_WRITE_TOKEN = "1-0-1";
- private static final String BASE_FILE_EXTENSION =
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension();
@Rule
public final EnvironmentVariables environmentVariables = new
EnvironmentVariables();
@@ -94,7 +92,8 @@ public class TestFSUtils extends HoodieCommonTestHarness {
public void testMakeDataFileName() {
String instantTime = HoodieActiveTimeline.formatDate(new Date());
String fileName = UUID.randomUUID().toString();
- assertEquals(FSUtils.makeBaseFileName(instantTime, TEST_WRITE_TOKEN,
fileName), fileName + "_" + TEST_WRITE_TOKEN + "_" + instantTime +
BASE_FILE_EXTENSION);
+ assertEquals(FSUtils.makeBaseFileName(instantTime, TEST_WRITE_TOKEN,
fileName, BASE_FILE_EXTENSION),
+ fileName + "_" + TEST_WRITE_TOKEN + "_" + instantTime +
BASE_FILE_EXTENSION);
}
@Test
@@ -169,7 +168,7 @@ public class TestFSUtils extends HoodieCommonTestHarness {
public void testGetCommitTime() {
String instantTime = HoodieActiveTimeline.formatDate(new Date());
String fileName = UUID.randomUUID().toString();
- String fullFileName = FSUtils.makeBaseFileName(instantTime,
TEST_WRITE_TOKEN, fileName);
+ String fullFileName = FSUtils.makeBaseFileName(instantTime,
TEST_WRITE_TOKEN, fileName, BASE_FILE_EXTENSION);
assertEquals(instantTime, FSUtils.getCommitTime(fullFileName));
// test log file name
fullFileName = FSUtils.makeLogFileName(fileName,
HOODIE_LOG.getFileExtension(), instantTime, 1, TEST_WRITE_TOKEN);
@@ -180,7 +179,7 @@ public class TestFSUtils extends HoodieCommonTestHarness {
public void testGetFileNameWithoutMeta() {
String instantTime = HoodieActiveTimeline.formatDate(new Date());
String fileName = UUID.randomUUID().toString();
- String fullFileName = FSUtils.makeBaseFileName(instantTime,
TEST_WRITE_TOKEN, fileName);
+ String fullFileName = FSUtils.makeBaseFileName(instantTime,
TEST_WRITE_TOKEN, fileName, BASE_FILE_EXTENSION);
assertEquals(fileName, FSUtils.getFileId(fullFileName));
}
@@ -375,7 +374,7 @@ public class TestFSUtils extends HoodieCommonTestHarness {
final String LOG_EXTENSION = "." + LOG_STR;
// data file name
- String dataFileName = FSUtils.makeBaseFileName(instantTime, writeToken,
fileId);
+ String dataFileName = FSUtils.makeBaseFileName(instantTime, writeToken,
fileId, BASE_FILE_EXTENSION);
assertEquals(instantTime, FSUtils.getCommitTime(dataFileName));
assertEquals(fileId, FSUtils.getFileId(dataFileName));
diff --git
a/hudi-common/src/test/java/org/apache/hudi/common/model/TestHoodieWriteStat.java
b/hudi-common/src/test/java/org/apache/hudi/common/model/TestHoodieWriteStat.java
index e8a7205f769..d6c3cf7fbb0 100644
---
a/hudi-common/src/test/java/org/apache/hudi/common/model/TestHoodieWriteStat.java
+++
b/hudi-common/src/test/java/org/apache/hudi/common/model/TestHoodieWriteStat.java
@@ -19,6 +19,7 @@
package org.apache.hudi.common.model;
import org.apache.hudi.common.fs.FSUtils;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.table.timeline.HoodieActiveTimeline;
import org.apache.hadoop.fs.Path;
@@ -46,7 +47,8 @@ public class TestHoodieWriteStat {
Path basePath = new Path(basePathString);
Path partitionPath = new Path(basePath, partitionPathString);
- Path finalizeFilePath = new Path(partitionPath,
FSUtils.makeBaseFileName(instantTime, writeToken, fileName));
+ Path finalizeFilePath = new Path(partitionPath,
FSUtils.makeBaseFileName(instantTime, writeToken, fileName,
+ HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension()));
HoodieWriteStat writeStat = new HoodieWriteStat();
writeStat.setPath(basePath, finalizeFilePath);
assertEquals(finalizeFilePath, new Path(basePath, writeStat.getPath()));
diff --git
a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFSViewWithClustering.java
b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFSViewWithClustering.java
index e9546f8f9d1..26f9c3f0761 100644
---
a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFSViewWithClustering.java
+++
b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFSViewWithClustering.java
@@ -124,10 +124,10 @@ public class TestHoodieTableFSViewWithClustering extends
HoodieCommonTestHarness
// Only one commit
String commitTime1 = "1";
- String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1);
- String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2);
- String fileName3 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId3);
- String fileName4 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId4);
+ String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1, BASE_FILE_EXTENSION);
+ String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2, BASE_FILE_EXTENSION);
+ String fileName3 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId3, BASE_FILE_EXTENSION);
+ String fileName4 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId4, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath1 + "/" +
fileName1).createNewFile();
new File(basePath + "/" + partitionPath1 + "/" +
fileName2).createNewFile();
new File(basePath + "/" + partitionPath2 + "/" +
fileName3).createNewFile();
diff --git
a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFileSystemView.java
b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFileSystemView.java
index 165a565da22..f5cee136d2e 100644
---
a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFileSystemView.java
+++
b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestHoodieTableFileSystemView.java
@@ -313,8 +313,8 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String fileId1 = UUID.randomUUID().toString();
String fileId2 = UUID.randomUUID().toString();
String commitTime1 = "1";
- String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1);
- String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2);
+ String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1, BASE_FILE_EXTENSION);
+ String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath + "/" + fileName1).createNewFile();
new File(basePath + "/" + partitionPath + "/" + fileName2).createNewFile();
HoodieActiveTimeline commitTimeline = metaClient.getActiveTimeline();
@@ -343,8 +343,8 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String fileId1 = UUID.randomUUID().toString();
String fileId2 = UUID.randomUUID().toString();
String commitTime1 = "1";
- String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1);
- String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2);
+ String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1, BASE_FILE_EXTENSION);
+ String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath1 + "/" +
fileName1).createNewFile();
new File(basePath + "/" + partitionPath1 + "/" +
fileName2).createNewFile();
@@ -356,8 +356,8 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String fileId3 = UUID.randomUUID().toString();
String fileId4 = UUID.randomUUID().toString();
String commitTime2 = "2";
- String fileName3 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId3);
- String fileName4 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId4);
+ String fileName3 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId3, BASE_FILE_EXTENSION);
+ String fileName4 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId4, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath2 + "/" +
fileName3).createNewFile();
new File(basePath + "/" + partitionPath2 + "/" +
fileName4).createNewFile();
@@ -394,8 +394,8 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String fileId1 = UUID.randomUUID().toString();
String fileId2 = UUID.randomUUID().toString();
String commitTime1 = "1";
- String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1);
- String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2);
+ String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1, BASE_FILE_EXTENSION);
+ String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath1 + "/" +
fileName1).createNewFile();
new File(basePath + "/" + partitionPath1 + "/" +
fileName2).createNewFile();
@@ -407,8 +407,8 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String fileId3 = UUID.randomUUID().toString();
String fileId4 = UUID.randomUUID().toString();
String commitTime2 = "2";
- String fileName3 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId3);
- String fileName4 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId4);
+ String fileName3 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId3, BASE_FILE_EXTENSION);
+ String fileName4 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId4, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath2 + "/" +
fileName3).createNewFile();
new File(basePath + "/" + partitionPath2 + "/" +
fileName4).createNewFile();
@@ -515,7 +515,7 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String deltaInstantTime2 = "30"; // 30 -> 50
String deltaInstantTime3 = "35"; // 35 -> 90
- String baseFile1 = FSUtils.makeBaseFileName(instantTime1,
TEST_WRITE_TOKEN, fileId);
+ String baseFile1 = FSUtils.makeBaseFileName(instantTime1,
TEST_WRITE_TOKEN, fileId, BASE_FILE_EXTENSION);
String deltaFile1 =
FSUtils.makeLogFileName(fileId, HoodieLogFile.DELTA_EXTENSION,
deltaInstantTime1, 0, TEST_WRITE_TOKEN);
String deltaFile2 =
@@ -556,7 +556,7 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
// schedules a compaction
String compactionInstantTime1 = metaClient.createNewInstantTime(); // 60
-> 80
- String compactionFile1 = FSUtils.makeBaseFileName(compactionInstantTime1,
TEST_WRITE_TOKEN, fileId);
+ String compactionFile1 = FSUtils.makeBaseFileName(compactionInstantTime1,
TEST_WRITE_TOKEN, fileId, BASE_FILE_EXTENSION);
List<Pair<String, FileSlice>> partitionFileSlicesPairs = new ArrayList<>();
partitionFileSlicesPairs.add(Pair.of(partitionPath, fileSlices.get(0)));
HoodieCompactionPlan compactionPlan =
@@ -781,7 +781,7 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String dataFileName = null;
if (!skipCreatingDataFile) {
- dataFileName = FSUtils.makeBaseFileName(instantTime1, TEST_WRITE_TOKEN,
fileId);
+ dataFileName = FSUtils.makeBaseFileName(instantTime1, TEST_WRITE_TOKEN,
fileId, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath + "/" +
dataFileName).createNewFile();
}
String fileName1 =
@@ -820,7 +820,7 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
checkExternalFile(srcFileStatus,
fileSlice.getBaseFile().get().getBootstrapBaseFile(), testBootstrap);
}
String compactionRequestedTime = "4";
- String compactDataFileName =
FSUtils.makeBaseFileName(compactionRequestedTime, TEST_WRITE_TOKEN, fileId);
+ String compactDataFileName =
FSUtils.makeBaseFileName(compactionRequestedTime, TEST_WRITE_TOKEN, fileId,
BASE_FILE_EXTENSION);
List<Pair<String, FileSlice>> partitionFileSlicesPairs = new ArrayList<>();
partitionFileSlicesPairs.add(Pair.of(partitionPath, fileSlices.get(0)));
HoodieCompactionPlan compactionPlan =
@@ -955,12 +955,12 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
final String orphanFileId2 = UUID.randomUUID().toString();
final String invalidInstantId = "INVALIDTIME";
String inflightDeltaInstantTime = "7";
- String orphanDataFileName = FSUtils.makeBaseFileName(invalidInstantId,
TEST_WRITE_TOKEN, orphanFileId1);
+ String orphanDataFileName = FSUtils.makeBaseFileName(invalidInstantId,
TEST_WRITE_TOKEN, orphanFileId1, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath + "/" +
orphanDataFileName).createNewFile();
String orphanLogFileName =
FSUtils.makeLogFileName(orphanFileId2, HoodieLogFile.DELTA_EXTENSION,
invalidInstantId, 0, TEST_WRITE_TOKEN);
new File(basePath + "/" + partitionPath + "/" +
orphanLogFileName).createNewFile();
- String inflightDataFileName =
FSUtils.makeBaseFileName(inflightDeltaInstantTime, TEST_WRITE_TOKEN,
inflightFileId1);
+ String inflightDataFileName =
FSUtils.makeBaseFileName(inflightDeltaInstantTime, TEST_WRITE_TOKEN,
inflightFileId1, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath + "/" +
inflightDataFileName).createNewFile();
String inflightLogFileName = FSUtils.makeLogFileName(inflightFileId2,
HoodieLogFile.DELTA_EXTENSION,
inflightDeltaInstantTime, 0, TEST_WRITE_TOKEN);
@@ -1115,7 +1115,7 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
// Only one commit, but is not safe
String commitTime1 = "1";
- String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId);
+ String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath + "/" + fileName1).createNewFile();
refreshFsView();
assertFalse(roView.getLatestBaseFiles(partitionPath).anyMatch(dfile ->
dfile.getFileId().equals(fileId)),
@@ -1131,7 +1131,7 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
// Do another commit, but not safe
String commitTime2 = "2";
- String fileName2 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId);
+ String fileName2 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath + "/" + fileName2).createNewFile();
refreshFsView();
assertEquals(fileName1, roView.getLatestBaseFiles(partitionPath)
@@ -1165,22 +1165,22 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String fileId3 = UUID.randomUUID().toString();
String fileId4 = UUID.randomUUID().toString();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)).createNewFile();
new File(fullPartitionPath
+ FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION,
commitTime4, 0, TEST_WRITE_TOKEN))
.createNewFile();
new File(fullPartitionPath
+ FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION,
commitTime4, 1, TEST_WRITE_TOKEN))
.createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
new File(fullPartitionPath
+ FSUtils.makeLogFileName(fileId2, HoodieLogFile.DELTA_EXTENSION,
commitTime3, 0, TEST_WRITE_TOKEN))
.createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)).createNewFile();
new File(fullPartitionPath
+ FSUtils.makeLogFileName(fileId4, HoodieLogFile.DELTA_EXTENSION,
commitTime4, 0, TEST_WRITE_TOKEN))
.createNewFile();
@@ -1233,9 +1233,9 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
for (HoodieBaseFile status : dataFileList) {
filenames.add(status.getFileName());
}
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1)));
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2)));
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)));
filenames = new HashSet<>();
List<HoodieLogFile> logFilesList =
rtView.getLatestFileSlicesBeforeOrOn("2016/05/01", commitTime4, true)
@@ -1262,12 +1262,12 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
}
if (!isLatestFileSliceOnly) {
assertEquals(3, dataFiles.size());
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1)));
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2)));
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)));
} else {
assertEquals(1, dataFiles.size());
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)));
}
logFilesList = rtView.getLatestFileSlicesBeforeOrOn("2016/05/01",
commitTime3, true)
@@ -1293,13 +1293,13 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String fileId2 = UUID.randomUUID().toString();
String fileId3 = UUID.randomUUID().toString();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)).createNewFile();
new File(basePath + "/.hoodie/" + commitTime1 + ".commit").createNewFile();
new File(basePath + "/.hoodie/" + commitTime2 + ".commit").createNewFile();
@@ -1324,22 +1324,22 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
Set<String> expFileNames = new HashSet<>();
if (fileId.equals(fileId1)) {
if (!isLatestFileSliceOnly) {
- expFileNames.add(FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1));
+ expFileNames.add(FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION));
}
- expFileNames.add(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1));
+ expFileNames.add(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION));
assertEquals(expFileNames, filenames);
} else if (fileId.equals(fileId2)) {
if (!isLatestFileSliceOnly) {
- expFileNames.add(FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2));
- expFileNames.add(FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2));
+ expFileNames.add(FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION));
+ expFileNames.add(FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION));
}
- expFileNames.add(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2));
+ expFileNames.add(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION));
assertEquals(expFileNames, filenames);
} else {
if (!isLatestFileSliceOnly) {
- expFileNames.add(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3));
+ expFileNames.add(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION));
}
- expFileNames.add(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3));
+ expFileNames.add(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION));
assertEquals(expFileNames, filenames);
}
}
@@ -1362,21 +1362,21 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String fileId2 = UUID.randomUUID().toString();
String fileId3 = UUID.randomUUID().toString();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)).createNewFile();
new File(fullPartitionPath
+ FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION,
commitTime1, 0, TEST_WRITE_TOKEN))
.createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId1)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
new File(fullPartitionPath
+ FSUtils.makeLogFileName(fileId2, HoodieLogFile.DELTA_EXTENSION,
commitTime3, 0, TEST_WRITE_TOKEN))
.createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)).createNewFile();
new File(basePath + "/.hoodie/" + commitTime1 + ".commit").createNewFile();
new File(basePath + "/.hoodie/" + commitTime2 + ".commit").createNewFile();
@@ -1399,10 +1399,10 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
filenames.add(status.getFileName());
}
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId1)));
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)));
if (!isLatestFileSliceOnly) {
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)));
}
List<FileSlice> slices =
@@ -1443,13 +1443,13 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String fileId2 = UUID.randomUUID().toString();
String fileId3 = UUID.randomUUID().toString();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3)).createNewFile();
- new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)).createNewFile();
+ new File(fullPartitionPath + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)).createNewFile();
new File(basePath + "/.hoodie/" + commitTime1 + ".commit").createNewFile();
new File(basePath + "/.hoodie/" + commitTime2 + ".commit").createNewFile();
@@ -1469,8 +1469,8 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
for (HoodieBaseFile status : dataFiles) {
filenames.add(status.getFileName());
}
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1)));
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)));
} else {
assertEquals(0, dataFiles.size());
}
@@ -1494,30 +1494,30 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String fileId2 = UUID.randomUUID().toString();
String fileId3 = UUID.randomUUID().toString();
- new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1))
+ new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION))
.createNewFile();
new File(fullPartitionPath + "/"
+ FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION,
commitTime1, 0, TEST_WRITE_TOKEN))
.createNewFile();
- new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1))
+ new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION))
.createNewFile();
new File(fullPartitionPath + "/"
+ FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION,
commitTime4, 0, TEST_WRITE_TOKEN))
.createNewFile();
- new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2))
+ new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime1,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION))
.createNewFile();
- new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2))
+ new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime2,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION))
.createNewFile();
new File(fullPartitionPath + "/"
+ FSUtils.makeLogFileName(fileId2, HoodieLogFile.DELTA_EXTENSION,
commitTime2, 0, TEST_WRITE_TOKEN))
.createNewFile();
- new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2))
+ new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION))
.createNewFile();
- new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3))
+ new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION))
.createNewFile();
- new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3))
+ new File(fullPartitionPath + "/" + FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION))
.createNewFile();
new File(basePath + "/.hoodie/" + commitTime1 + ".commit").createNewFile();
@@ -1564,9 +1564,9 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
for (HoodieBaseFile status : statuses1) {
filenames.add(status.getFileName());
}
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1)));
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2)));
- assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId1, BASE_FILE_EXTENSION)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime3,
TEST_WRITE_TOKEN, fileId2, BASE_FILE_EXTENSION)));
+ assertTrue(filenames.contains(FSUtils.makeBaseFileName(commitTime4,
TEST_WRITE_TOKEN, fileId3, BASE_FILE_EXTENSION)));
}
@Test
@@ -1587,15 +1587,15 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
String deltaInstantTime2 = "4";
String fileId = UUID.randomUUID().toString();
- String dataFileName = FSUtils.makeBaseFileName(instantTime1,
TEST_WRITE_TOKEN, fileId);
+ String dataFileName = FSUtils.makeBaseFileName(instantTime1,
TEST_WRITE_TOKEN, fileId, BASE_FILE_EXTENSION);
new File(fullPartitionPath1 + dataFileName).createNewFile();
String fileName1 =
FSUtils.makeLogFileName(fileId, HoodieLogFile.DELTA_EXTENSION,
instantTime1, 0, TEST_WRITE_TOKEN);
new File(fullPartitionPath1 + fileName1).createNewFile();
- new File(fullPartitionPath2 + FSUtils.makeBaseFileName(instantTime1,
TEST_WRITE_TOKEN, fileId)).createNewFile();
+ new File(fullPartitionPath2 + FSUtils.makeBaseFileName(instantTime1,
TEST_WRITE_TOKEN, fileId, BASE_FILE_EXTENSION)).createNewFile();
new File(fullPartitionPath2 + fileName1).createNewFile();
- new File(fullPartitionPath3 + FSUtils.makeBaseFileName(instantTime1,
TEST_WRITE_TOKEN, fileId)).createNewFile();
+ new File(fullPartitionPath3 + FSUtils.makeBaseFileName(instantTime1,
TEST_WRITE_TOKEN, fileId, BASE_FILE_EXTENSION)).createNewFile();
new File(fullPartitionPath3 + fileName1).createNewFile();
HoodieActiveTimeline commitTimeline = metaClient.getActiveTimeline();
@@ -1634,7 +1634,7 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
partitionFileSlicesPairs.add(Pair.of(partitionPath3, fileSlices.get(0)));
String compactionRequestedTime = "2";
- String compactDataFileName =
FSUtils.makeBaseFileName(compactionRequestedTime, TEST_WRITE_TOKEN, fileId);
+ String compactDataFileName =
FSUtils.makeBaseFileName(compactionRequestedTime, TEST_WRITE_TOKEN, fileId,
BASE_FILE_EXTENSION);
HoodieCompactionPlan compactionPlan =
CompactionUtils.buildFromFileSlices(partitionFileSlicesPairs,
Option.empty(), Option.empty());
@@ -1751,8 +1751,8 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
"No commit, should not find any data file");
// Only one commit
String commitTime1 = "1";
- String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1);
- String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2);
+ String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1, BASE_FILE_EXTENSION);
+ String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath1 + "/" +
fileName1).createNewFile();
new File(basePath + "/" + partitionPath1 + "/" +
fileName2).createNewFile();
@@ -1768,8 +1768,8 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
// create commit2 - fileId1 is replaced. new file groups fileId3,fileId4
are created.
String fileId3 = UUID.randomUUID().toString();
String fileId4 = UUID.randomUUID().toString();
- String fileName3 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId3);
- String fileName4 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId4);
+ String fileName3 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId3, BASE_FILE_EXTENSION);
+ String fileName4 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId4, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath1 + "/" +
fileName3).createNewFile();
new File(basePath + "/" + partitionPath1 + "/" +
fileName4).createNewFile();
@@ -1850,10 +1850,10 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
// Only one commit
String commitTime1 = "1";
- String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1);
- String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2);
- String fileName3 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId3);
- String fileName4 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId4);
+ String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1, BASE_FILE_EXTENSION);
+ String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2, BASE_FILE_EXTENSION);
+ String fileName3 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId3, BASE_FILE_EXTENSION);
+ String fileName4 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId4, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath1 + "/" +
fileName1).createNewFile();
new File(basePath + "/" + partitionPath1 + "/" +
fileName2).createNewFile();
new File(basePath + "/" + partitionPath2 + "/" +
fileName3).createNewFile();
@@ -1913,9 +1913,9 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
"No commit, should not find any data file");
// Only one commit
String commitTime1 = "1";
- String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1);
- String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2);
- String fileName3 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId3);
+ String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1, BASE_FILE_EXTENSION);
+ String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2, BASE_FILE_EXTENSION);
+ String fileName3 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId3, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath1 + "/" +
fileName1).createNewFile();
new File(basePath + "/" + partitionPath1 + "/" +
fileName2).createNewFile();
new File(basePath + "/" + partitionPath1 + "/" +
fileName3).createNewFile();
@@ -2027,8 +2027,8 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
// first insert commit
String commitTime1 = "1";
- String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1);
- String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2);
+ String fileName1 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId1, BASE_FILE_EXTENSION);
+ String fileName2 = FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN,
fileId2, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath + "/" + fileName1).createNewFile();
new File(basePath + "/" + partitionPath + "/" + fileName2).createNewFile();
@@ -2052,7 +2052,7 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
// replace commit
String commitTime2 = "2";
- String fileName3 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId3);
+ String fileName3 = FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN,
fileId3, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath + "/" + fileName3).createNewFile();
HoodieInstant instant2 = new HoodieInstant(true,
HoodieTimeline.REPLACE_COMMIT_ACTION, commitTime2);
@@ -2077,7 +2077,7 @@ public class TestHoodieTableFileSystemView extends
HoodieCommonTestHarness {
// another insert commit
String commitTime3 = "3";
- String fileName4 = FSUtils.makeBaseFileName(commitTime3, TEST_WRITE_TOKEN,
fileId4);
+ String fileName4 = FSUtils.makeBaseFileName(commitTime3, TEST_WRITE_TOKEN,
fileId4, BASE_FILE_EXTENSION);
new File(basePath + "/" + partitionPath + "/" + fileName4).createNewFile();
HoodieInstant instant3 = new HoodieInstant(true,
HoodieTimeline.COMMIT_ACTION, commitTime3);
diff --git
a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestIncrementalFSViewSync.java
b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestIncrementalFSViewSync.java
index 852f916c1a4..91fcad23720 100644
---
a/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestIncrementalFSViewSync.java
+++
b/hudi-common/src/test/java/org/apache/hudi/common/table/view/TestIncrementalFSViewSync.java
@@ -967,7 +967,7 @@ public class TestIncrementalFSViewSync extends
HoodieCommonTestHarness {
try {
java.nio.file.Path filePath = Paths.get(basePath, p, deltaCommit
? FSUtils.makeLogFileName(f, ".log", instant, 0, TEST_WRITE_TOKEN)
- : FSUtils.makeBaseFileName(instant, TEST_WRITE_TOKEN, f));
+ : FSUtils.makeBaseFileName(instant, TEST_WRITE_TOKEN, f,
BASE_FILE_EXTENSION));
Files.createFile(filePath);
HoodieWriteStat w = new HoodieWriteStat();
w.setFileId(f);
diff --git
a/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieCommonTestHarness.java
b/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieCommonTestHarness.java
index a1a3864a6a9..bda5b38c517 100644
---
a/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieCommonTestHarness.java
+++
b/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieCommonTestHarness.java
@@ -19,6 +19,7 @@
package org.apache.hudi.common.testutils;
import org.apache.hudi.common.model.HoodieTableType;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.timeline.HoodieTimeline;
import org.apache.hudi.common.table.view.HoodieTableFileSystemView;
@@ -35,6 +36,8 @@ import java.net.URI;
*/
public class HoodieCommonTestHarness {
+ protected static final String BASE_FILE_EXTENSION =
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension();
+
protected String tableName;
protected String basePath;
protected URI baseUri;
diff --git
a/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestTable.java
b/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestTable.java
index a23a106b5ca..94060d999af 100644
---
a/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestTable.java
+++
b/hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestTable.java
@@ -120,6 +120,7 @@ import static
org.apache.hudi.common.testutils.FileCreateUtils.createRollbackFil
import static
org.apache.hudi.common.testutils.FileCreateUtils.createSavepointCommit;
import static
org.apache.hudi.common.testutils.FileCreateUtils.deleteSavepointCommit;
import static org.apache.hudi.common.testutils.FileCreateUtils.logFileName;
+import static
org.apache.hudi.common.testutils.HoodieCommonTestHarness.BASE_FILE_EXTENSION;
import static org.apache.hudi.common.util.CleanerUtils.convertCleanMetadata;
import static org.apache.hudi.common.util.CommitUtils.buildMetadata;
import static org.apache.hudi.common.util.CommitUtils.getCommitActionType;
@@ -555,7 +556,7 @@ public class HoodieTestTable {
if (newFileId.isPresent() && !StringUtils.isNullOrEmpty(newFileId.get())) {
HoodieWriteStat writeStat = new HoodieWriteStat();
writeStat.setPartitionPath(partition);
- writeStat.setPath(partition + "/" +
FSUtils.makeBaseFileName(instantTime, "1-0-1", newFileId.get()));
+ writeStat.setPath(partition + "/" +
FSUtils.makeBaseFileName(instantTime, "1-0-1", newFileId.get(),
BASE_FILE_EXTENSION));
writeStat.setFileId(newFileId.get());
writeStat.setTotalWriteBytes(1);
writeStat.setFileSizeInBytes(1);
diff --git
a/hudi-common/src/test/java/org/apache/hudi/common/util/TestClusteringUtils.java
b/hudi-common/src/test/java/org/apache/hudi/common/util/TestClusteringUtils.java
index 881ebf1fa06..72630787c13 100644
---
a/hudi-common/src/test/java/org/apache/hudi/common/util/TestClusteringUtils.java
+++
b/hudi-common/src/test/java/org/apache/hudi/common/util/TestClusteringUtils.java
@@ -263,7 +263,7 @@ public class TestClusteringUtils extends
HoodieCommonTestHarness {
private FileSlice generateFileSlice(String partitionPath, String fileId,
String baseInstant) {
FileSlice fs = new FileSlice(new HoodieFileGroupId(partitionPath, fileId),
baseInstant);
- fs.setBaseFile(new HoodieBaseFile(FSUtils.makeBaseFileName(baseInstant,
"1-0-1", fileId)));
+ fs.setBaseFile(new HoodieBaseFile(FSUtils.makeBaseFileName(baseInstant,
"1-0-1", fileId, BASE_FILE_EXTENSION)));
return fs;
}
diff --git
a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestCluster.java
b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestCluster.java
index 362ad1453c4..e92c7aedb50 100644
---
a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestCluster.java
+++
b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestCluster.java
@@ -27,6 +27,7 @@ import org.apache.hudi.common.model.HoodieAvroPayload;
import org.apache.hudi.common.model.HoodieCommitMetadata;
import org.apache.hudi.common.model.HoodieTableType;
import org.apache.hudi.common.model.HoodieWriteStat;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.timeline.HoodieTimeline;
import org.apache.hudi.common.testutils.InProcessTimeGenerator;
@@ -203,7 +204,7 @@ public class HiveTestCluster implements BeforeAllCallback,
AfterAllCallback, Bef
// Create 5 files
String fileId = UUID.randomUUID().toString();
Path filePath = new Path(partPath.toString() + "/" + FSUtils
- .makeBaseFileName(commitTime, "1-0-1", fileId));
+ .makeBaseFileName(commitTime, "1-0-1", fileId,
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension()));
generateParquetData(filePath, isParquetSchemaSimple);
HoodieWriteStat writeStat = new HoodieWriteStat();
writeStat.setFileId(fileId);
diff --git
a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestUtil.java
b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestUtil.java
index 328e6efda08..c7ce2dd22e1 100644
---
a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestUtil.java
+++
b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/HiveTestUtil.java
@@ -36,6 +36,7 @@ import
org.apache.hudi.common.model.HoodieReplaceCommitMetadata;
import org.apache.hudi.common.model.HoodieTableType;
import org.apache.hudi.common.model.HoodieWriteStat;
import org.apache.hudi.common.model.WriteOperationType;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.log.HoodieLogFormat;
import org.apache.hudi.common.table.log.HoodieLogFormat.Writer;
@@ -391,7 +392,8 @@ public class HiveTestUtil {
FileCreateUtils.createPartitionMetaFile(basePath, partitionPath);
List<HoodieWriteStat> writeStats = new ArrayList<>();
String fileId = UUID.randomUUID().toString();
- Path filePath = new Path(partPath.toString() + "/" +
FSUtils.makeBaseFileName(instantTime, "1-0-1", fileId));
+ Path filePath = new Path(partPath.toString() + "/"
+ + FSUtils.makeBaseFileName(instantTime, "1-0-1", fileId,
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension()));
Schema schema = SchemaTestUtil.getSchemaFromResource(HiveTestUtil.class,
schemaFileName);
generateParquetDataWithSchema(filePath, schema);
HoodieWriteStat writeStat = new HoodieWriteStat();
@@ -530,7 +532,8 @@ public class HiveTestUtil {
for (int i = 0; i < 5; i++) {
// Create 5 files
String fileId = UUID.randomUUID().toString();
- Path filePath = new Path(partPath.toString() + "/" +
FSUtils.makeBaseFileName(instantTime, "1-0-1", fileId));
+ Path filePath = new Path(partPath.toString() + "/"
+ + FSUtils.makeBaseFileName(instantTime, "1-0-1", fileId,
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension()));
generateParquetData(filePath, isParquetSchemaSimple);
HoodieWriteStat writeStat = new HoodieWriteStat();
writeStat.setFileId(fileId);
diff --git
a/hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestHoodieSnapshotCopier.java
b/hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestHoodieSnapshotCopier.java
index eb1ac22d69a..9facedb8141 100644
---
a/hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestHoodieSnapshotCopier.java
+++
b/hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestHoodieSnapshotCopier.java
@@ -20,6 +20,7 @@ package org.apache.hudi.utilities.functional;
import org.apache.hudi.common.config.HoodieMetadataConfig;
import org.apache.hudi.common.fs.FSUtils;
+import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.testutils.HoodieTestDataGenerator;
import org.apache.hudi.common.testutils.HoodieTestUtils;
import org.apache.hudi.hadoop.fs.HadoopFSUtils;
@@ -45,6 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@Tag("functional")
public class TestHoodieSnapshotCopier extends FunctionalTestHarness {
+ private static final String BASE_FILE_EXTENSION =
HoodieTableConfig.BASE_FILE_FORMAT.defaultValue().getFileExtension();
private static final String TEST_WRITE_TOKEN = "1-0-1";
private String basePath;
@@ -100,27 +102,27 @@ public class TestHoodieSnapshotCopier extends
FunctionalTestHarness {
HoodieTestDataGenerator.writePartitionMetadataDeprecated(fs, new String[]
{"2016/05/01", "2016/05/02", "2016/05/06"},
basePath);
// Make commit1
- File file11 = new File(basePath + "/2016/05/01/" +
FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN, "id11"));
+ File file11 = new File(basePath + "/2016/05/01/" +
FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN, "id11",
BASE_FILE_EXTENSION));
file11.createNewFile();
- File file12 = new File(basePath + "/2016/05/02/" +
FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN, "id12"));
+ File file12 = new File(basePath + "/2016/05/02/" +
FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN, "id12",
BASE_FILE_EXTENSION));
file12.createNewFile();
- File file13 = new File(basePath + "/2016/05/06/" +
FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN, "id13"));
+ File file13 = new File(basePath + "/2016/05/06/" +
FSUtils.makeBaseFileName(commitTime1, TEST_WRITE_TOKEN, "id13",
BASE_FILE_EXTENSION));
file13.createNewFile();
// Make commit2
- File file21 = new File(basePath + "/2016/05/01/" +
FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN, "id21"));
+ File file21 = new File(basePath + "/2016/05/01/" +
FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN, "id21",
BASE_FILE_EXTENSION));
file21.createNewFile();
- File file22 = new File(basePath + "/2016/05/02/" +
FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN, "id22"));
+ File file22 = new File(basePath + "/2016/05/02/" +
FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN, "id22",
BASE_FILE_EXTENSION));
file22.createNewFile();
- File file23 = new File(basePath + "/2016/05/06/" +
FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN, "id23"));
+ File file23 = new File(basePath + "/2016/05/06/" +
FSUtils.makeBaseFileName(commitTime2, TEST_WRITE_TOKEN, "id23",
BASE_FILE_EXTENSION));
file23.createNewFile();
// Make commit3
- File file31 = new File(basePath + "/2016/05/01/" +
FSUtils.makeBaseFileName(commitTime3, TEST_WRITE_TOKEN, "id31"));
+ File file31 = new File(basePath + "/2016/05/01/" +
FSUtils.makeBaseFileName(commitTime3, TEST_WRITE_TOKEN, "id31",
BASE_FILE_EXTENSION));
file31.createNewFile();
- File file32 = new File(basePath + "/2016/05/02/" +
FSUtils.makeBaseFileName(commitTime3, TEST_WRITE_TOKEN, "id32"));
+ File file32 = new File(basePath + "/2016/05/02/" +
FSUtils.makeBaseFileName(commitTime3, TEST_WRITE_TOKEN, "id32",
BASE_FILE_EXTENSION));
file32.createNewFile();
- File file33 = new File(basePath + "/2016/05/06/" +
FSUtils.makeBaseFileName(commitTime3, TEST_WRITE_TOKEN, "id33"));
+ File file33 = new File(basePath + "/2016/05/06/" +
FSUtils.makeBaseFileName(commitTime3, TEST_WRITE_TOKEN, "id33",
BASE_FILE_EXTENSION));
file33.createNewFile();
// Do a snapshot copy
