firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:40:38 +01:00
Code Issues

Additional patch for #7269 (PR #8170):

Browse Source 
- move more duplicated code into activateIndex,
- cache request that modifies RDB$INDICES.RDB$INDEX_INACTIVE.
This commit is contained in:
Vlad Khorsun 2024-10-24 14:26:05 +03:00
parent 178d83a75e
commit d2f4cf6fee
2 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/burp/burp.h
View File

@ -1154,6 +1154,7 @@ public:
Firebird::IRequest* handles_get_type_req_handle1; Firebird::IRequest* handles_get_type_req_handle1;
Firebird::IRequest* handles_get_user_privilege_req_handle1; Firebird::IRequest* handles_get_user_privilege_req_handle1;
Firebird::IRequest* handles_get_view_req_handle1; Firebird::IRequest* handles_get_view_req_handle1;
Firebird::IRequest* handles_activateIndex_req_handle1;
// The handles_put.. are for backup. // The handles_put.. are for backup.
Firebird::IRequest* handles_put_index_req_handle1; Firebird::IRequest* handles_put_index_req_handle1;

43
src/burp/restore.epp
View File

@ -275,15 +275,18 @@ static inline void collect_missing_privs(BurpGlobals* tdgbl, USHORT type, const
} // namespace } // namespace
bool activateIndex(BurpGlobals* tdgbl, const char* index_name, FbLocalStatus& local_status_vector) void activateIndex(BurpGlobals* tdgbl, const char* index_name)
{ {
bool fError = false; BURP_verbose(285, index_name);
// activating and creating deferred index %s
Firebird::IRequest* req_handle = nullptr; bool fError = false;
Firebird::ITransaction* activateIndexTran = nullptr; FbLocalStatus local_status_vector;
ITransaction* activateIndexTran = nullptr;
START_TRANSACTION activateIndexTran; START_TRANSACTION activateIndexTran;
FOR (TRANSACTION_HANDLE activateIndexTran REQUEST_HANDLE req_handle) FOR (TRANSACTION_HANDLE activateIndexTran REQUEST_HANDLE tdgbl->handles_activateIndex_req_handle1)
IND1 IN RDB$INDICES WITH IND1.RDB$INDEX_NAME EQ index_name IND1 IN RDB$INDICES WITH IND1.RDB$INDEX_NAME EQ index_name
MODIFY IND1 USING MODIFY IND1 USING
IND1.RDB$INDEX_INACTIVE = FALSE; IND1.RDB$INDEX_INACTIVE = FALSE;
@ -295,8 +298,6 @@ bool activateIndex(BurpGlobals* tdgbl, const char* index_name, FbLocalStatus& lo
fb_utils::copyStatus(&local_status_vector, isc_status); fb_utils::copyStatus(&local_status_vector, isc_status);
END_ERROR; END_ERROR;
MISC_release_request_silent(req_handle);
if (!fError) if (!fError)
{ {
COMMIT activateIndexTran; COMMIT activateIndexTran;
@ -308,14 +309,15 @@ bool activateIndex(BurpGlobals* tdgbl, const char* index_name, FbLocalStatus& lo
if (fError) if (fError)
{ {
BURP_print(false, 173, index_name);
BURP_print_status(false, &local_status_vector);
tdgbl->flag_on_line = false;
ROLLBACK activateIndexTran; ROLLBACK activateIndexTran;
ON_ERROR ON_ERROR
general_on_error(); general_on_error();
END_ERROR; END_ERROR;
return false;
} }
return true;
} }
int RESTORE_restore (const TEXT* file_name, const TEXT* database_name) int RESTORE_restore (const TEXT* file_name, const TEXT* database_name)
@ -431,17 +433,8 @@ int RESTORE_restore (const TEXT* file_name, const TEXT* database_name)
MISC_terminate(IDS.RDB$INDEX_NAME, index_name, MISC_terminate(IDS.RDB$INDEX_NAME, index_name,
(ULONG)MISC_symbol_length(IDS.RDB$INDEX_NAME, sizeof(IDS.RDB$INDEX_NAME)), (ULONG)MISC_symbol_length(IDS.RDB$INDEX_NAME, sizeof(IDS.RDB$INDEX_NAME)),
sizeof(index_name)); sizeof(index_name));
BURP_verbose(285, index_name);
// activating and creating deferred index %s
FbLocalStatus local_status_vector; activateIndex(tdgbl, index_name);
if (!activateIndex(tdgbl, index_name, local_status_vector))
{
BURP_print(false, 173, index_name);
BURP_print_status(false, &local_status_vector);
tdgbl->flag_on_line = false;
}
END_FOR; END_FOR;
ON_ERROR ON_ERROR
general_on_error (); general_on_error ();
@ -475,16 +468,8 @@ int RESTORE_restore (const TEXT* file_name, const TEXT* database_name)
MISC_terminate(IDS.RDB$INDEX_NAME, index_name, MISC_terminate(IDS.RDB$INDEX_NAME, index_name,
(ULONG) MISC_symbol_length(IDS.RDB$INDEX_NAME, sizeof(IDS.RDB$INDEX_NAME)), (ULONG) MISC_symbol_length(IDS.RDB$INDEX_NAME, sizeof(IDS.RDB$INDEX_NAME)),
sizeof(index_name)); sizeof(index_name));
BURP_verbose(285, index_name);
// activating and creating deferred index %s
FbLocalStatus local_status_vector;
if (!activateIndex(tdgbl, index_name, local_status_vector)) activateIndex(tdgbl, index_name);
{
BURP_print(false, 173, index_name);
BURP_print_status(false, &local_status_vector);
tdgbl->flag_on_line = false;
}
END_FOR; END_FOR;
ON_ERROR ON_ERROR
general_on_error (); general_on_error ();