[core] Skip partition-specific table-default options for non-partitioned tables (apache#7681)

Author: XiaoHongbo-Hope

paimon-core/src/main/java/org/apache/paimon/schema/SchemaValidation.java

@@ -204,13 +204,6 @@ public static void validateTableSchema(TableSchema schema) {
                             CoreOptions.STREAMING_READ_APPEND_OVERWRITE.key()));
         }
 
-        if (schema.options().containsKey(CoreOptions.PARTITION_EXPIRATION_TIME.key())) {
-            if (schema.partitionKeys().isEmpty()) {
-                throw new IllegalArgumentException(
-                        "Can not set 'partition.expiration-time' for non-partitioned table.");
-            }
-        }
-
         String recordLevelTimeField = options.recordLevelTimeField();
         if (recordLevelTimeField != null) {
             Optional<DataField> field =

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

@@ -2159,4 +2159,47 @@ private void baseAlterTable(Map<String, String> initOptions) throws Exception {
                 .satisfies(anyCauseMatches("Cannot change nullability of primary key"));
         catalog.dropTable(identifier, false);
     }
+
+    @Test
+    void testTableDefaultPartitionOptionsOnNonPartitionedTable() throws Exception {
+        Catalog root =
+                catalog instanceof DelegateCatalog ? DelegateCatalog.rootCatalog(catalog) : catalog;
+        if (!(root instanceof AbstractCatalog)) {
+            return;
+        }
+        ((AbstractCatalog) root).tableDefaultOptions.put("partition.expiration-time", "7d");
+
+        catalog.createDatabase("test_db_default", false);
+        Identifier identifier = Identifier.create("test_db_default", "non_partitioned");
+        Schema schema =
+                Schema.newBuilder()
+                        .column("id", DataTypes.INT())
+                        .column("name", DataTypes.STRING())
+                        .build();
+        assertThatCode(() -> catalog.createTable(identifier, schema, false))
+                .doesNotThrowAnyException();
+    }
+
+    @Test
+    void testTableDefaultPartitionOptionsOnPartitionedTable() throws Exception {
+        Catalog root =
+                catalog instanceof DelegateCatalog ? DelegateCatalog.rootCatalog(catalog) : catalog;
+        if (!(root instanceof AbstractCatalog)) {
+            return;
+        }
+        ((AbstractCatalog) root).tableDefaultOptions.put("partition.expiration-time", "7d");
+
+        catalog.createDatabase("test_db_default_partitioned", false);
+        Identifier identifier = Identifier.create("test_db_default_partitioned", "partitioned");
+        Schema schema =
+                Schema.newBuilder()
+                        .column("id", DataTypes.INT())
+                        .column("pt", DataTypes.STRING())
+                        .partitionKeys("pt")
+                        .build();
+        catalog.createTable(identifier, schema, false);
+
+        assertThat(catalog.getTable(identifier).options())
+                .containsEntry("partition.expiration-time", "7d");
+    }
 }

paimon-core/src/test/java/org/apache/paimon/operation/PartitionExpireTest.java

@@ -83,6 +83,7 @@
 import static org.apache.paimon.CoreOptions.WRITE_ONLY;
 import static org.apache.paimon.CoreOptions.createCommitUser;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /** Test for {@link PartitionExpire}. */
@@ -158,7 +159,7 @@ public PartitionModification partitionModification() {
     @Test
     public void testNonPartitionedTable() {
         SchemaManager schemaManager = new SchemaManager(LocalFileIO.create(), path);
-        assertThatThrownBy(
+        assertThatCode(
                         () ->
                                 schemaManager.createTable(
                                         new Schema(
@@ -168,8 +169,7 @@ public void testNonPartitionedTable() {
                                                 Collections.singletonMap(
                                                         PARTITION_EXPIRATION_TIME.key(), "1 d"),
                                                 "")))
-                .hasMessageContaining(
-                        "Can not set 'partition.expiration-time' for non-partitioned table");
+                .doesNotThrowAnyException();
     }
 
     @Test