fix

apache · Feb 10, 2025 · a522b6b · a522b6b
1 parent 07d45be
commit a522b6b
Show file tree

Hide file tree

Showing 30 changed files with 186 additions and 109 deletions.
diff --git a/.../paimon-flink-common/src/main/java/org/apache/paimon/flink/action/CloneActionFactory.java b/.../paimon-flink-common/src/main/java/org/apache/paimon/flink/action/CloneActionFactory.java
@@ -68,14 +68,14 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  clone --warehouse <warehouse_path> \n"
-                        + "[--database <database_name>] \n"
-                        + "[--table <table_name>] \n"
-                        + "[--catalog_conf <source-paimon-catalog-conf> [--catalog_conf <source-paimon-catalog-conf> ...]] \n"
-                        + "--target_warehouse <target_warehouse_path> \n"
-                        + "[--target_database <target_database_name>] \n"
-                        + "[--target_table <target_table_name>] \n"
-                        + "[--target_catalog_conf <target-paimon-catalog-conf> [--target_catalog_conf <target-paimon-catalog-conf> ...]] \n"
+                "  clone --warehouse <warehouse_path> \\\n"
+                        + "[--database <database_name>] \\\n"
+                        + "[--table <table_name>] \\\n"
+                        + "[--catalog_conf <source-paimon-catalog-conf> [--catalog_conf <source-paimon-catalog-conf> ...]] \\\n"
+                        + "--target_warehouse <target_warehouse_path> \\\n"
+                        + "[--target_database <target_database_name>] \\\n"
+                        + "[--target_table <target_table_name>] \\\n"
+                        + "[--target_catalog_conf <target-paimon-catalog-conf> [--target_catalog_conf <target-paimon-catalog-conf> ...]] \\\n"
                         + "[--parallelism <parallelism>]");
 
         System.out.println();

diff --git a/...aimon-flink-common/src/main/java/org/apache/paimon/flink/action/CompactActionFactory.java b/...aimon-flink-common/src/main/java/org/apache/paimon/flink/action/CompactActionFactory.java
@@ -101,12 +101,12 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  compact --warehouse <warehouse_path> --database <database_name> \n"
-                        + "--table <table_name> [--partition <partition_name>] \n"
-                        + "[--order_strategy <order_strategy>] \n"
-                        + "[--table_conf <key>=<value>] \n"
-                        + "[--order_by <order_columns>] \n"
-                        + "[--partition_idle_time <partition_idle_time>] \n"
+                "  compact --warehouse <warehouse_path> --database <database_name> \\\n"
+                        + "--table <table_name> [--partition <partition_name>] \\\n"
+                        + "[--order_strategy <order_strategy>] \\\n"
+                        + "[--table_conf <key>=<value>] \\\n"
+                        + "[--order_by <order_columns>] \\\n"
+                        + "[--partition_idle_time <partition_idle_time>] \\\n"
                         + "[--compact_strategy <compact_strategy>]");
         System.out.println(
                 "  compact --warehouse s3://path/to/warehouse --database <database_name> "

diff --git a/...ink-common/src/main/java/org/apache/paimon/flink/action/CompactDatabaseActionFactory.java b/...ink-common/src/main/java/org/apache/paimon/flink/action/CompactDatabaseActionFactory.java
@@ -70,11 +70,11 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  compact_database --warehouse <warehouse_path> --including_databases <database-name|name-regular-expr> \n"
-                        + "[--including_tables <paimon_table_name|name_regular_expr>] \n"
-                        + "[--excluding_tables <paimon_table_name|name_regular_expr>] \n"
-                        + "[--mode <compact_mode>] \n"
-                        + "[--partition_idle_time <partition_idle_time>] \n"
+                "  compact_database --warehouse <warehouse_path> --including_databases <database-name|name-regular-expr> \\\n"
+                        + "[--including_tables <paimon_table_name|name_regular_expr>] \\\n"
+                        + "[--excluding_tables <paimon_table_name|name_regular_expr>] \\\n"
+                        + "[--mode <compact_mode>] \\\n"
+                        + "[--partition_idle_time <partition_idle_time>] \\\n"
                         + "[--compact_strategy <compact_strategy>]");
         System.out.println(
                 "  compact_database --warehouse s3://path/to/warehouse --including_databases <database-name|name-regular-expr> "

diff --git a/...-flink-common/src/main/java/org/apache/paimon/flink/action/CreateBranchActionFactory.java b/...-flink-common/src/main/java/org/apache/paimon/flink/action/CreateBranchActionFactory.java
@@ -52,8 +52,12 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  create_branch --warehouse <warehouse_path> --database <database_name> "
-                        + "--table <table_name> --branch_name <branch_name> [--tag_name <tag_name>]");
+                "  create_branch \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--branch_name <branch_name> \\\n"
+                        + "[--tag_name <tag_name>]");
         System.out.println();
     }
 }
diff --git a/...mon-flink-common/src/main/java/org/apache/paimon/flink/action/CreateTagActionFactory.java b/...mon-flink-common/src/main/java/org/apache/paimon/flink/action/CreateTagActionFactory.java
@@ -49,8 +49,12 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  create_tag --warehouse <warehouse_path> --database <database_name> "
-                        + "--table <table_name> --tag_name <tag_name> [--snapshot <snapshot_id>]");
+                "  create_tag \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--tag_name <tag_name> \\\n"
+                        + "[--snapshot <snapshot_id>]");
         System.out.println();
     }
 }
diff --git a/...mon/src/main/java/org/apache/paimon/flink/action/CreateTagFromTimestampActionFactory.java b/...mon/src/main/java/org/apache/paimon/flink/action/CreateTagFromTimestampActionFactory.java
@@ -60,12 +60,12 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  create_tag_from_timestamp --warehouse <warehouse_path> \n"
-                        + "--database <database_name> \n"
-                        + "--table <table_name> \n"
-                        + "--tag <tag> \n"
-                        + "--timestamp <timestamp> \n"
-                        + "[--timeRetained <duration>] \n"
+                "  create_tag_from_timestamp --warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--tag <tag> \\\n"
+                        + "--timestamp <timestamp> \\\n"
+                        + "[--timeRetained <duration>] \\\n"
                         + "[--options <key>=<value>,<key>=<value>,...]");
     }
 }
diff --git a/...mon/src/main/java/org/apache/paimon/flink/action/CreateTagFromWatermarkActionFactory.java b/...mon/src/main/java/org/apache/paimon/flink/action/CreateTagFromWatermarkActionFactory.java
@@ -62,12 +62,13 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  create_tag_from_watermark --warehouse <warehouse_path> \n"
-                        + "--database <database_name> \n"
-                        + "--table <table_name> \n"
-                        + "--tag <tag> \n"
-                        + "--watermark <watermark> \n"
-                        + "[--timeRetained <duration>] \n"
+                "  create_tag_from_watermark \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--tag <tag> \\\n"
+                        + "--watermark <watermark> \\\n"
+                        + "[--timeRetained <duration>] \\\n"
                         + "[--options <key>=<value>,<key>=<value>,...]");
     }
 }
diff --git a/...paimon-flink-common/src/main/java/org/apache/paimon/flink/action/DeleteActionFactory.java b/...paimon-flink-common/src/main/java/org/apache/paimon/flink/action/DeleteActionFactory.java
@@ -56,8 +56,11 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  delete --warehouse <warehouse_path> --database <database_name> "
-                        + "--table <table_name> --where <filter_spec>");
+                "  delete \\\n"
+                        + " --warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--where <filter_spec>");
         System.out.println("  delete --path <table_path> --where <filter_spec>");
         System.out.println();
 

diff --git a/...-flink-common/src/main/java/org/apache/paimon/flink/action/DeleteBranchActionFactory.java b/...-flink-common/src/main/java/org/apache/paimon/flink/action/DeleteBranchActionFactory.java
@@ -50,8 +50,11 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  delete_branch --warehouse <warehouse_path> --database <database_name> "
-                        + "--table <table_name> --branch_name <branch_name>");
+                "  delete_branch \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--branch_name <branch_name>");
         System.out.println();
     }
 }
diff --git a/...mon-flink-common/src/main/java/org/apache/paimon/flink/action/DeleteTagActionFactory.java b/...mon-flink-common/src/main/java/org/apache/paimon/flink/action/DeleteTagActionFactory.java
@@ -50,8 +50,11 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  delete_tag --warehouse <warehouse_path> --database <database_name> "
-                        + "--table <table_name> --tag_name <tag_name>");
+                "  delete_tag \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--tag_name <tag_name>");
         System.out.println();
     }
 }
diff --git a/...flink-common/src/main/java/org/apache/paimon/flink/action/DropPartitionActionFactory.java b/...flink-common/src/main/java/org/apache/paimon/flink/action/DropPartitionActionFactory.java
@@ -58,8 +58,11 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  drop_partition --warehouse <warehouse_path> --database <database_name> "
-                        + "--table <table_name> --partition <partition_name> [--partition <partition_name> ...]");
+                "  drop_partition \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--partition <partition_name> [--partition <partition_name> ...]");
         System.out.println(
                 "  drop_partition --path <table_path> --partition <partition_name> [--partition <partition_name> ...]");
         System.out.println();

diff --git a/...nk-common/src/main/java/org/apache/paimon/flink/action/ExpirePartitionsActionFactory.java b/...nk-common/src/main/java/org/apache/paimon/flink/action/ExpirePartitionsActionFactory.java
@@ -53,9 +53,15 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  expire_partitions --warehouse <warehouse_path> --database <database_name> "
-                        + "--table <table_name> --tag_name <tag_name> --expiration_time <expiration_time> --timestamp_formatter <timestamp_formatter>"
-                        + "[--timestamp_pattern <timestamp_pattern>] [--expire_strategy <expire_strategy>]");
+                "  expire_partitions \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--tag_name <tag_name> \\\n"
+                        + "--expiration_time <expiration_time> \\\n"
+                        + "--timestamp_formatter <timestamp_formatter> \\\n"
+                        + "[--timestamp_pattern <timestamp_pattern>] \\\n"
+                        + "[--expire_strategy <expire_strategy>]");
         System.out.println();
     }
 }
diff --git a/...ink-common/src/main/java/org/apache/paimon/flink/action/ExpireSnapshotsActionFactory.java b/...ink-common/src/main/java/org/apache/paimon/flink/action/ExpireSnapshotsActionFactory.java
@@ -67,6 +67,13 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  expire_snapshots --warehouse <warehouse_path> --database <database> --table <table> --retain_max <max> --retain_min <min> --older_than <older_than> --max_delete <max_delete>");
+                "  expire_snapshots \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database> \\\n"
+                        + "--table <table> \\\n"
+                        + "--retain_max <max> \\\n"
+                        + "--retain_min <min> \\\n"
+                        + "--older_than <older_than> \\\n"
+                        + "--max_delete <max_delete>");
     }
 }
diff --git a/...on-flink-common/src/main/java/org/apache/paimon/flink/action/ExpireTagsActionFactory.java b/...on-flink-common/src/main/java/org/apache/paimon/flink/action/ExpireTagsActionFactory.java
@@ -50,9 +50,9 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  expire_tags --warehouse <warehouse_path> \n"
-                        + "--database <database> \n"
-                        + "--table <table> \n"
+                "  expire_tags --warehouse <warehouse_path> \\\n"
+                        + "--database <database> \\\n"
+                        + "--table <table> \\\n"
                         + "[--older_than <older_than>]");
     }
 }
diff --git a/...n-flink-common/src/main/java/org/apache/paimon/flink/action/FastForwardActionFactory.java b/...n-flink-common/src/main/java/org/apache/paimon/flink/action/FastForwardActionFactory.java
@@ -50,8 +50,11 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  fast_forward --warehouse <warehouse_path> --database <database_name> "
-                        + "--table <table_name> --branch_name <branch_name>");
+                "  fast_forward \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--branch_name <branch_name>");
         System.out.println();
     }
 }
diff --git a/...k-common/src/main/java/org/apache/paimon/flink/action/MarkPartitionDoneActionFactory.java b/...k-common/src/main/java/org/apache/paimon/flink/action/MarkPartitionDoneActionFactory.java
@@ -58,8 +58,11 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  mark_partition_done --warehouse <warehouse_path> --database <database_name> "
-                        + "--table <table_name> --partition <partition_name> [--partition <partition_name> ...]");
+                "  mark_partition_done \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <table_name> \\\n"
+                        + "--partition <partition_name> [--partition <partition_name> ...]");
         System.out.println(
                 "  mark_partition_done --path <table_path> --partition <partition_name> [--partition <partition_name> ...]");
         System.out.println();

diff --git a/...mon-flink-common/src/main/java/org/apache/paimon/flink/action/MergeIntoActionFactory.java b/...mon-flink-common/src/main/java/org/apache/paimon/flink/action/MergeIntoActionFactory.java
@@ -116,22 +116,23 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  merge_into --warehouse <warehouse_path>\n"
-                        + "             --database <database_name>\n"
-                        + "             --table <target_table_name>\n"
-                        + "             [--target_as <target_table_alias>]\n"
-                        + "             [--source_sql <sql> ...]\n"
-                        + "             --source_table <source_table_name>\n"
-                        + "             --on <merge_condition>\n"
-                        + "             --merge_actions <matched-upsert,matched-delete,not-matched-insert,not-matched-by-source-upsert,not-matched-by-source-delete>\n"
-                        + "             --matched_upsert_condition <matched_condition>\n"
-                        + "             --matched_upsert_set <upsert_changes>\n"
-                        + "             --matched_delete_condition <matched_condition>\n"
-                        + "             --not_matched_insert_condition <not_matched_condition>\n"
-                        + "             --not_matched_insert_values <insert_values>\n"
-                        + "             --not_matched_by_source_upsert_condition <not_matched_by_source_condition>\n"
-                        + "             --not_matched_by_source_upsert_set <not_matched_upsert_changes>\n"
-                        + "             --not_matched_by_source_delete_condition <not_matched_by_source_condition>");
+                "  merge_into \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--database <database_name> \\\n"
+                        + "--table <target_table_name> \\\n"
+                        + "[--target_as <target_table_alias>] \\\n"
+                        + "[--source_sql <sql> ...] \\\n"
+                        + "--source_table <source_table_name> \\\n"
+                        + "--on <merge_condition> \\\n"
+                        + "--merge_actions <matched-upsert,matched-delete,not-matched-insert,not-matched-by-source-upsert,not-matched-by-source-delete> \\\n"
+                        + "--matched_upsert_condition <matched_condition> \\\n"
+                        + "--matched_upsert_set <upsert_changes> \\\n"
+                        + "--matched_delete_condition <matched_condition> \\\n"
+                        + "--not_matched_insert_condition <not_matched_condition> \\\n"
+                        + "--not_matched_insert_values <insert_values> \\\n"
+                        + "--not_matched_by_source_upsert_condition <not_matched_by_source_condition> \\\n"
+                        + "--not_matched_by_source_upsert_set <not_matched_upsert_changes> \\\n"
+                        + "--not_matched_by_source_delete_condition <not_matched_by_source_condition>");
 
         System.out.println("  matched_upsert_set format:");
         System.out.println(
@@ -185,12 +186,13 @@ public void printHelp() {
 
         System.out.println("Examples:");
         System.out.println(
-                "  merge_into --path hdfs:///path/to/T\n"
-                        + "             --source_table S\n"
-                        + "             --on \"T.k = S.k\"\n"
-                        + "             --merge_actions matched-upsert\n"
-                        + "             --matched_upsert_condition \"T.v <> S.v\"\n"
-                        + "             --matched_upsert_set \"v = S.v\"");
+                "  merge_into \\\n"
+                        + "--path hdfs:///path/to/T \\\n"
+                        + "--source_table S \\\n"
+                        + "--on \"T.k = S.k\" \\\n"
+                        + "--merge_actions matched-upsert \\\n"
+                        + "--matched_upsert_condition \"T.v <> S.v\" \\\n"
+                        + "--matched_upsert_set \"v = S.v\"");
         System.out.println(
                 "  It will find matched rows of target table that meet condition (T.k = S.k), then update T.v with S.v where (T.v <> S.v).");
     }

diff --git a/...ink-common/src/main/java/org/apache/paimon/flink/action/MigrateDatabaseActionFactory.java b/...ink-common/src/main/java/org/apache/paimon/flink/action/MigrateDatabaseActionFactory.java
@@ -57,9 +57,11 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  migrate_database --warehouse <warehouse_path> --source_type hive "
-                        + "--database <database_name> "
-                        + "[--catalog_conf <key>=<value] "
+                "  migrate_database \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--source_type hive \\\n"
+                        + "--database <database_name> \\\n"
+                        + "[--catalog_conf <key>=<value] \\\n"
                         + "[--options <key>=<value>,<key>=<value>,...]");
     }
 }
diff --git a/...n-flink-common/src/main/java/org/apache/paimon/flink/action/MigrateFileActionFactory.java b/...n-flink-common/src/main/java/org/apache/paimon/flink/action/MigrateFileActionFactory.java
@@ -71,11 +71,13 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  migrate_file --warehouse <warehouse_path> --source_type hive \n"
-                        + "--source_table <database.table_name> \n"
-                        + "--target_table <database.table_name> \n"
-                        + "--delete_origin true \n"
-                        + "[--catalog_conf <key>=<value] \n"
+                "  migrate_file \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--source_type hive \\\n"
+                        + "--source_table <database.table_name> \\\n"
+                        + "--target_table <database.table_name> \\\n"
+                        + "--delete_origin true \\\n"
+                        + "[--catalog_conf <key>=<value] \\\n"
                         + "[--options <key>=<value>,<key>=<value>,...]");
     }
 }
diff --git a/...-flink-common/src/main/java/org/apache/paimon/flink/action/MigrateTableActionFactory.java b/...-flink-common/src/main/java/org/apache/paimon/flink/action/MigrateTableActionFactory.java
@@ -56,10 +56,11 @@ public void printHelp() {
 
         System.out.println("Syntax:");
         System.out.println(
-                "  migrate_table --warehouse <warehouse_path> \n"
-                        + "--source_type hive \n"
-                        + "--table <database.table_name> \n"
-                        + "[--catalog_conf <key>=<value] \n"
+                "  migrate_table \\\n"
+                        + "--warehouse <warehouse_path> \\\n"
+                        + "--source_type hive \\\n"
+                        + "--table <database.table_name> \\\n"
+                        + "[--catalog_conf <key>=<value] \\\n"
                         + "[--options <key>=<value>,<key>=<value>,...]");
     }
 }