firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

Implement #8010 : Remove gfix -cache option

Browse Source
This commit is contained in:
Vlad Khorsun 2024-04-28 14:07:44 +03:00
parent e96fc77d50
commit c9babd4703
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/alice/alice.cpp
View File

@ -427,7 +427,7 @@ int alice(Firebird::UtilSvc* uSvc)
}
}
if (table->in_sw_value & (sw_attach | sw_force | sw_tran | sw_cache))
if (table->in_sw_value & (sw_attach | sw_force | sw_tran /*| sw_cache*/))
{
if (--argc <= 0) {
ALICE_error(17); // msg 17: number of seconds required
@ -481,7 +481,7 @@ int alice(Firebird::UtilSvc* uSvc)
// put this here since to put it above overly complicates the parsing.
// can't use tbl_requires since it only looks backwards on command line.
if ((flags & sw_shut) && !(flags & ((sw_attach | sw_force | sw_tran | sw_cache))))
if ((flags & sw_shut) && !(flags & ((sw_attach | sw_force | sw_tran /*| sw_cache*/))))
{
ALICE_error(19); // msg 19: must specify type of shutdown
}

8
src/alice/aliceswi.h
View File

@ -52,7 +52,7 @@ const SINT64 sw_user = 0x0000000000200000L;
const SINT64 sw_password = 0x0000000000400000L;
const SINT64 sw_shut = 0x0000000000800000L;
const SINT64 sw_online = 0x0000000001000000L; // Byte 3, Bit 0
const SINT64 sw_cache = 0x0000000002000000L;
//const SINT64 sw_cache = 0x0000000002000000L;
const SINT64 sw_attach = 0x0000000004000000L;
const SINT64 sw_force = 0x0000000008000000L;
const SINT64 sw_tran = 0x0000000010000000L;
@ -100,7 +100,7 @@ enum alice_switches
IN_SW_ALICE_PASSWORD = 23,
IN_SW_ALICE_SHUT = 24,
IN_SW_ALICE_ONLINE = 25,
IN_SW_ALICE_CACHE = 26,
// IN_SW_ALICE_CACHE = 26,
IN_SW_ALICE_ATTACH = 27,
IN_SW_ALICE_FORCE = 28,
IN_SW_ALICE_TRAN = 29,
@ -165,9 +165,11 @@ static const Switches::in_sw_tab_t alice_in_sw_table[] =
{IN_SW_ALICE_COMMIT, isc_spb_rpr_commit_trans, "COMMIT", sw_commit,
0, ~(sw_commit | sw_auth_set | sw_nolinger), false, false, 29, 2, NULL},
// msg 29: \t-commit\t\tcommit transaction <tr / all>
/*
{IN_SW_ALICE_CACHE, 0, "CACHE", sw_cache,
sw_shut, 0, false, false, 30, 2, NULL},
// msg 30: \t-cache\t\tshutdown cache manager
*/
#ifdef DEV_BUILD
/*
{IN_SW_ALICE_DISABLE, 0, "DISABLE", sw_disable,
@ -247,7 +249,7 @@ static const Switches::in_sw_tab_t alice_in_sw_table[] =
0, ~(sw_sweep | sw_auth_set | sw_nolinger), false, true, 45, 2, NULL},
// msg 45: \t-sweep\t\tforce garbage collection
{IN_SW_ALICE_SHUT, isc_spb_prp_shutdown_mode, "SHUTDOWN", sw_shut,
0, ~(sw_shut | sw_attach | sw_cache | sw_force | sw_tran | sw_auth_set),
0, ~(sw_shut | sw_attach | /*sw_cache | */sw_force | sw_tran | sw_auth_set),
false, false, 46, 2, NULL},
// msg 46: \t-shut\t\tshutdown
{IN_SW_ALICE_TWO_PHASE, isc_spb_rpr_recover_two_phase, "TWO_PHASE", sw_two_phase,

2
src/alice/exe.cpp
View File

@ -256,8 +256,10 @@ static void buildDpb(Firebird::ClumpletWriter& dpb, const SINT64 switches)
UCHAR b = 0;
if (switches & sw_attach)
b |= isc_dpb_shut_attachment;
/*
else if (switches & sw_cache)
b |= isc_dpb_shut_cache;
*/
else if (switches & sw_force)
b |= isc_dpb_shut_force;
else if (switches & sw_tran)