Merge branch 'DBTOOLS-1988_loading_param' into 'master'

DBTOOLS-1988: Added loading param

See merge request codekeeper/pgcodekeeper-cli!30

Author: AXEPOH

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Added the `--parallel-load` parameter. When specified, databases are loaded in parallel; by default, loading is performed sequentially.
+
 ### Changed
 
 - Updated the JUnit library version from 5.x to version 6.

CHANGELOG.ru.md

@@ -9,6 +9,8 @@
 
 ### Добавлено
 
+- Добавлен параметр `--parallel-load`. При его указании загрузка баз данных выполняется параллельно, по умолчанию загрузка выполняется последовательно.
+
 ### Изменено
 
 - Обновлена версия библиотеки JUnit с 5.x до 6 версии.
@@ -20,7 +22,7 @@
 ### Добавлено
 
 - Добавлена обработка комментариев для ограничений NOT NULL в PostgreSQL.
-- Добавлена параметр `--cluster-name` для добавления в скрипт миграции синтаксиса ON CLUSTER для таблиц в ClickHouse (экспериментально).
+- Добавлен параметр `--cluster-name` для добавления в скрипт миграции синтаксиса ON CLUSTER для таблиц в ClickHouse (экспериментально).
 - Добавлен поиск файлов .pgcodekeeperignore и .pgcodekeeperignoreschema при чтении проекта. Это позволяет не использовать параметры `--ignore-list (-I)` и `--ignore-schema` с файлами проекта.
 
 ### Изменено

src/main/java/org/pgcodekeeper/cli/Application.java

@@ -24,9 +24,6 @@
 import org.pgcodekeeper.core.DangerStatement;
 import org.pgcodekeeper.core.api.PgCodeKeeperApi;
 import org.pgcodekeeper.core.database.api.loader.ILoader;
-import org.pgcodekeeper.core.database.ch.ChDatabaseProvider;
-import org.pgcodekeeper.core.database.ms.MsDatabaseProvider;
-import org.pgcodekeeper.core.database.pg.PgDatabaseProvider;
 import org.pgcodekeeper.core.settings.DiffSettings;
 import org.pgcodekeeper.core.utils.FileUtils;
 import org.pgcodekeeper.core.utils.UnixPrintWriter;

src/main/java/org/pgcodekeeper/cli/CliArgs.java

@@ -83,6 +83,7 @@ enum CliMode {
         this.graphDepth = DEFAULT_DEPTH;
         this.dbType = PG;
         this.mode = CliMode.DIFF;
+        this.parallelLoad = false;
     }
     // SONAR-ON
 
@@ -261,6 +262,9 @@ enum CliMode {
     @Option(name = "--cluster-name", metaVar = CliArgsLocalizationsBundle.NAME, usage = "cluster-name")
     private String clusterName;
 
+    @Option(name = "--parallel-load", aliases = "-par", usage = "parallel-load")
+    private boolean parallelLoad;
+
     CliMode getMode() {
         return mode;
     }
@@ -503,6 +507,11 @@ public String getClusterName() {
         return clusterName;
     }
 
+    @Override
+    public boolean isParallelLoad() {
+        return parallelLoad;
+    }
+
     @Override
     public CliArgs copy() {
         var args = new CliArgs();
@@ -558,6 +567,7 @@ public CliArgs copy() {
         args.usingTypeCastOff = usingTypeCastOff;
         args.provider = provider;
         args.clusterName = clusterName;
+        args.parallelLoad = parallelLoad;
         return args;
     }
 
@@ -609,20 +619,13 @@ public boolean parse(String[] args) throws CmdLineException {
             oldSrc = outputTarget;
         }
 
+        provider = switch (dbType) {
+            case "PG" -> new PgDatabaseProvider();
+            case "MS" -> new MsDatabaseProvider();
+            case "CH" -> new ChDatabaseProvider();
+            default -> throw new IllegalArgumentException(Messages.CliArgs_db_type);
+        };
 
-        switch (dbType) {
-            case "PG":
-                provider = new PgDatabaseProvider();
-                break;
-            case "MS":
-                provider = new MsDatabaseProvider();
-                break;
-            case "CH":
-                provider = new ChDatabaseProvider();
-                break;
-            default:
-                throw new IllegalArgumentException(Messages.CliArgs_db_type);
-        }
         return true;
     }
 
@@ -632,7 +635,7 @@ private void checkParams() throws CmdLineException {
         }
 
         if (CliMode.DIFF == mode) {
-            if (dbType.equals(PG) && addTransaction && concurrentlyMode) {
+            if (PG.equals(dbType) && addTransaction && concurrentlyMode) {
                 badArgs(Messages.CliArgs_error_concurrently_mode_wrong_option);
             }
             if (runOnTarget && !oldSrc.startsWith(URL_START_JDBC)) {

src/main/java/org/pgcodekeeper/cli/PgDiffCli.java

@@ -28,7 +28,6 @@
 import java.util.Collections;
 import java.util.List;
 
-
 public final class PgDiffCli {
 
     private final CliArgs arguments;
@@ -70,7 +69,6 @@ public String createDiff() throws InterruptedException, IOException {
                 arguments.getSourceLibXmls(), arguments.getSourceLibs(), arguments.getSourceLibsWithoutPriv());
         var newDbLoader = getDatabaseLoader(arguments.getNewSrc(),
                 arguments.getTargetLibXmls(), arguments.getTargetLibs(), arguments.getTargetLibsWithoutPriv());
-
         var script = PgCodeKeeperApi.diff(arguments.getProvider(), oldDbLoader, newDbLoader, diffSettings);
 
         assertErrorsEmpty();

src/main/java/org/pgcodekeeper/cli/localizations/CliArgsLocalizationsBundle.java

@@ -99,7 +99,8 @@ protected Object[][] getContents() {
                 {"graph-reverse", Messages.CliArgs_graph_reverse}, //$NON-NLS-1$
                 {"graph-name", Messages.CliArgs_graph_name}, //$NON-NLS-1$
                 {"graph-filter-object", Messages.CliArgs_graph_filter_object}, //$NON-NLS-1$
-                {"graph-invert-filter", Messages.CliArgs_graph_invert_filter} //$NON-NLS-1$
+                {"graph-invert-filter", Messages.CliArgs_graph_invert_filter}, //$NON-NLS-1$
+                {"parallel-load", Messages.CliArgs_use_parallel_load} //$NON-NLS-1$
         };
     }
 }

src/main/java/org/pgcodekeeper/cli/localizations/Messages.java

@@ -82,6 +82,7 @@ public class Messages {
     public static String CliArgs_tgt_lib_xml;
     public static String CliArgs_time_zone;
     public static String CliArgs_update_project;
+    public static String CliArgs_use_parallel_load;
     public static String CliArgs_using_off;
     public static String CliArgs_Version;
     public static String Main_cach_clear;

src/main/resources/org/pgcodekeeper/cli/localizations/messages.properties

@@ -60,6 +60,7 @@ CliArgs_tgt_lib_no_priv = add library dependency to destination without privileg
 CliArgs_tgt_lib_xml = add xml with library dependencies to target\nspecify multiple times to use several library xml's
 CliArgs_time_zone = use this timezone when working with database, also add SET TIMEZONE statement to the script
 CliArgs_update_project = update an existing project in parse mode
+CliArgs_use_parallel_load = use parallel database loading
 CliArgs_using_off = do not print USING expression for ALTER COLUMN TYPE
 Main_cach_clear = Library cache cleared
 Main_danger_statements = Script contains dangerous statements: %s. Use --allow-danger-ddl to override.

src/main/resources/org/pgcodekeeper/cli/localizations/messages_ru_RU.properties

@@ -60,6 +60,7 @@ CliArgs_tgt_lib_no_priv = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043
 CliArgs_tgt_lib_xml = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C xml \u0441 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u0447\u043D\u044B\u043C\u0438 \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u044F\u043C\u0438 \u043A \u043F\u0440\u0438\u0435\u043C\u043D\u0438\u043A\u0443\n\u0443\u043A\u0430\u0436\u0438\u0442\u0435 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0440\u0430\u0437, \u0447\u0442\u043E\u0431\u044B \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E xml \u0441 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430\u043C\u0438
 CliArgs_time_zone = \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0439 \u0447\u0430\u0441\u043E\u0432\u043E\u0439 \u043F\u043E\u044F\u0441 \u043F\u0440\u0438 \u0440\u0430\u0431\u043E\u0442\u0435 \u0441 \u0431\u0430\u0437\u043E\u0439 \u0434\u0430\u043D\u043D\u044B\u0445, \u0430 \u0442\u0430\u043A\u0436\u0435 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440 SET TIMEZONE \u0432 \u0441\u043A\u0440\u0438\u043F\u0442
 CliArgs_update_project = \u043E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044E\u0449\u0438\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0432 \u0440\u0435\u0436\u0438\u043C\u0435 parse
+CliArgs_use_parallel_load = \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043F\u0430\u0440\u0430\u043B\u043B\u0435\u043B\u044C\u043D\u0443\u044E \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0443 \u0411\u0414
 CliArgs_using_off = \u043D\u0435 \u043F\u0435\u0447\u0430\u0442\u0430\u0442\u044C \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 USING \u0434\u043B\u044F ALTER COLUMN TYPE
 Main_cach_clear = \u041A\u044D\u0448 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A \u043E\u0447\u0438\u0449\u0435\u043D
 Main_danger_statements = \u0421\u043A\u0440\u0438\u043F\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u043E\u043F\u0430\u0441\u043D\u044B\u0435 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u044B: %s. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 --allow-danger-ddl \u0434\u043B\u044F \u043F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u044F.

src/test/resources/org/pgcodekeeper/cli/usage_check.txt

@@ -86,6 +86,7 @@ Usage
  --out-charset <charset>                : output charset (default: UTF-8)
  --output (-o) <path>                   : script output file or parser output
                                           directory
+ --parallel-load (-par)                 : use parallel database loading
  --post-script <path>                   : POST script file path or directory
                                           with POST scripts
                                           nested directories are loaded