From c94d96b30870f66043781bb59dc6691de42c25fb Mon Sep 17 00:00:00 2001 From: Vlad Khorsun Date: Sun, 16 Apr 2023 18:26:02 +0300 Subject: [PATCH] Improvement #7550 : Add support for -parallel in combination with gfix -icu --- doc/README.parallel_features | 2 +- src/alice/aliceswi.h | 4 ++-- src/include/firebird/impl/msg/gfix.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/README.parallel_features b/doc/README.parallel_features index c3dcb47695..44ee6fafc1 100644 --- a/doc/README.parallel_features +++ b/doc/README.parallel_features @@ -17,7 +17,7 @@ enabled. There are two ways to enable parallelism in user attachment: firebird.conf. For gfix utility there is new command-line switch -parallel that allows to -set number of parallel workers for the sweep task. For example: +set number of parallel workers for the "sweep" and "icu" tasks. For example: gfix -sweep -parallel 4 diff --git a/src/alice/aliceswi.h b/src/alice/aliceswi.h index 73ce96f8cd..8a0880b2aa 100644 --- a/src/alice/aliceswi.h +++ b/src/alice/aliceswi.h @@ -218,8 +218,8 @@ static const Switches::in_sw_tab_t alice_in_sw_table[] = sw_list, 0, false, false, 41, 2, NULL}, // msg 41: \t-prompt\t\tprompt for commit/rollback (-l) {IN_SW_ALICE_PARALLEL_WORKERS, isc_spb_rpr_par_workers, "PARALLEL", sw_parallel_workers, - sw_sweep, 0, false, false, 136, 3, NULL}, - // msg 136: -par(allel) parallel workers (-sweep) + sw_sweep | sw_icu, 0, false, false, 136, 3, NULL}, + // msg 136: -par(allel) parallel workers (-sweep, -icu) {IN_SW_ALICE_PASSWORD, 0, "PASSWORD", sw_password, 0, (sw_trusted_auth | sw_fetch_password), false, false, 42, 2, NULL}, diff --git a/src/include/firebird/impl/msg/gfix.h b/src/include/firebird/impl/msg/gfix.h index d1ba2d0d7b..f8f5135e0d 100644 --- a/src/include/firebird/impl/msg/gfix.h +++ b/src/include/firebird/impl/msg/gfix.h @@ -133,5 +133,5 @@ FB_IMPL_MSG_SYMBOL(GFIX, 132, gfix_opt_role, " -role set SQL ro FB_IMPL_MSG_SYMBOL(GFIX, 133, gfix_role_req, "SQL role name required") FB_IMPL_MSG_SYMBOL(GFIX, 134, gfix_opt_repl, " -repl(ica) replica mode ") FB_IMPL_MSG_SYMBOL(GFIX, 135, gfix_repl_mode_req, "replica mode (none / read_only / read_write) required") -FB_IMPL_MSG_SYMBOL(GFIX, 136, gfix_opt_parallel, " -par(allel) parallel workers (-sweep)") +FB_IMPL_MSG_SYMBOL(GFIX, 136, gfix_opt_parallel, " -par(allel) parallel workers (-sweep, -icu)") FB_IMPL_MSG_SYMBOL(GFIX, 137, gfix_opt_upgrade, " -up(grade) upgrade database ODS")