fix

Author: jerry-024

paimon-core/src/main/java/org/apache/paimon/table/format/FormatTableFileWrite.java

@@ -102,7 +102,7 @@ private FormatTableRecordWriter createWriter(BinaryRow partition) {
                 fileIO,
                 fileFormat,
                 options.targetFileSize(false),
-                pathFactory.createFormatTableDataFilePathFactory(partition),
+                pathFactory.createFormatTableDataFilePathFactory(partition, options.formatTablePartitionOnlyValueInPath()),
                 rowType,
                 options.fileCompression());
     }

paimon-core/src/main/java/org/apache/paimon/utils/FileStorePathFactory.java

@@ -173,9 +173,9 @@ public DataFilePathFactory createDataFilePathFactory(BinaryRow partition, int bu
                 createExternalPathProvider(partition, bucket));
     }
 
-    public DataFilePathFactory createFormatTableDataFilePathFactory(BinaryRow partition) {
+    public DataFilePathFactory createFormatTableDataFilePathFactory(BinaryRow partition, boolean onlyValue) {
         return new DataFilePathFactory(
-                partitionPath(partition),
+                partitionPath(partition, onlyValue),
                 formatIdentifier,
                 dataFilePrefix,
                 changelogFilePrefix,
@@ -184,6 +184,14 @@ public DataFilePathFactory createFormatTableDataFilePathFactory(BinaryRow partit
                 createExternalPartitionPathProvider(partition));
     }
 
+    private ExternalPathProvider createExternalPartitionPathProvider(BinaryRow partition, boolean onlyValue) {
+        if (externalPaths == null || externalPaths.isEmpty()) {
+            return null;
+        }
+
+        return new ExternalPathProvider(externalPaths, partitionPath(partition, onlyValue));
+    }
+
     private ExternalPathProvider createExternalPartitionPathProvider(BinaryRow partition) {
         if (externalPaths == null || externalPaths.isEmpty()) {
             return null;
@@ -192,9 +200,9 @@ private ExternalPathProvider createExternalPartitionPathProvider(BinaryRow parti
         return new ExternalPathProvider(externalPaths, partitionPath(partition));
     }
 
-    public Path partitionPath(BinaryRow partition) {
+    private Path partitionPath(BinaryRow partition, boolean onlyValue) {
         Path relativeBucketPath = null;
-        String partitionPath = getPartitionString(partition);
+        String partitionPath = getPartitionString(partition, onlyValue);
         if (!partitionPath.isEmpty()) {
             relativeBucketPath = new Path(partitionPath);
         }
@@ -207,6 +215,10 @@ public Path partitionPath(BinaryRow partition) {
         return relativeBucketPath != null ? new Path(root, relativeBucketPath) : root;
     }
 
+    public Path partitionPath(BinaryRow partition) {
+        return partitionPath(partition, false);
+    }
+
     @Nullable
     private ExternalPathProvider createExternalPathProvider(BinaryRow partition, int bucket) {
         if (externalPaths == null || externalPaths.isEmpty()) {
@@ -248,6 +260,17 @@ public String getPartitionString(BinaryRow partition) {
                                 partition, "Partition row data is null. This is unexpected.")));
     }
 
+    public String getPartitionString(BinaryRow partition, boolean onlyValue) {
+        return PartitionPathUtils.generatePartitionPathUtil(
+                partitionComputer.generatePartValues(
+                        Preconditions.checkNotNull(
+                                partition, "Partition row data is null. This is unexpected.")),
+                onlyValue
+                );
+    }
+
+
+
     // @TODO, need to be changed
     public List<Path> getHierarchicalPartitionPath(BinaryRow partition) {
         return PartitionPathUtils.generateHierarchicalPartitionPaths(

paimon-core/src/test/java/org/apache/paimon/catalog/CatalogTestBase.java

@@ -611,27 +611,7 @@ public void testFormatTableOnlyPartitionValueRead() throws Exception {
                                 dtPartitionValue,
                                 BinaryString.fromString(dt2PartitionValue));
             }
-            FormatWriterFactory factory =
-                    (buildFileFormatFactory(format)
-                                    .create(
-                                            new FileFormatFactory.FormatContext(
-                                                    new Options(), 1024, 1024)))
-                            .createWriterFactory(table.rowType());
-            Path partitionPath =
-                    new Path(
-                            String.format(
-                                    "%s/%s/%s",
-                                    table.location(), dtPartitionValue, dt2PartitionValue));
-            DataFilePathFactory dataFilePathFactory =
-                    new DataFilePathFactory(
-                            partitionPath,
-                            format,
-                            "data",
-                            "change",
-                            true,
-                            compressionType.value(),
-                            null);
-            write(factory, dataFilePathFactory.newPath(), compressionType.value(), datas);
+            writeAndCheckCommitFormatTable(table, datas, null);
             Map<String, String> partitionSpec = new HashMap<>();
             partitionSpec.put("dt", "" + dtPartitionValue);
             partitionSpec.put("dt2", dt2PartitionValue);