Skip to content

Fix #7269: Restore deferred primary key indexes #8170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 24, 2024
Merged

Fix #7269: Restore deferred primary key indexes #8170

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f07f33
fixed restore deferred primary key indexes
GeF0rs Jul 3, 2024
c669452
Merge branch 'FirebirdSQL:master' into fix/restore-deferred-PK-indexes
GeF0rs Aug 26, 2024
da66598
Merge branch 'FirebirdSQL:master' into fix/restore-deferred-PK-indexes
GeF0rs Aug 30, 2024
7f3bcf9
Merge branch 'FirebirdSQL:master' into fix/restore-deferred-PK-indexes
GeF0rs Sep 2, 2024
e467d5f
Extract function activateIndex
GeF0rs Sep 2, 2024
78b1877
Merge branch 'FirebirdSQL:master' into fix/restore-deferred-PK-indexes
GeF0rs Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 52 additions & 50 deletions src/burp/restore.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,48 @@ static inline void collect_missing_privs(BurpGlobals* tdgbl, USHORT type, const

} // namespace

bool activateIndex(BurpGlobals* tdgbl, const char* index_name, FbLocalStatus& local_status_vector)
{
bool fError = false;

Firebird::IRequest* req_handle = nullptr;
Firebird::ITransaction* activateIndexTran = nullptr;
START_TRANSACTION activateIndexTran;

FOR (TRANSACTION_HANDLE activateIndexTran REQUEST_HANDLE req_handle)
IND1 IN RDB$INDICES WITH IND1.RDB$INDEX_NAME EQ index_name
MODIFY IND1 USING
IND1.RDB$INDEX_INACTIVE = FALSE;
END_MODIFY;
END_FOR;

ON_ERROR
fError = true;
fb_utils::copyStatus(&local_status_vector, isc_status);
END_ERROR;

MISC_release_request_silent(req_handle);

if (!fError)
{
COMMIT activateIndexTran;
ON_ERROR
fError = true;
fb_utils::copyStatus(&local_status_vector, isc_status);
END_ERROR;
}

if (fError)
{
ROLLBACK activateIndexTran;
ON_ERROR
general_on_error();
END_ERROR;
return false;
}

return true;
}

int RESTORE_restore (const TEXT* file_name, const TEXT* database_name)
{
Expand All @@ -290,7 +332,6 @@ int RESTORE_restore (const TEXT* file_name, const TEXT* database_name)
**************************************/
Firebird::IRequest* req_handle1 = nullptr;
Firebird::IRequest* req_handle3 = nullptr;
Firebird::IRequest* req_handle5 = nullptr;
BASED_ON RDB$INDICES.RDB$INDEX_NAME index_name;

Firebird::DispatcherPtr provider;
Expand Down Expand Up @@ -388,30 +429,19 @@ int RESTORE_restore (const TEXT* file_name, const TEXT* database_name)
IDS.RDB$FOREIGN_KEY MISSING

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));
BURP_verbose(285, index_name);
// activating and creating deferred index %s
MODIFY IDS USING
IDS.RDB$INDEX_INACTIVE = FALSE;
END_MODIFY;
ON_ERROR
general_on_error();
END_ERROR;

SAVE
// existing ON_ERROR continues past error, beck
ON_ERROR
BURP_print (false, 173, index_name);
BURP_print_status(false, isc_status);
MODIFY IDS USING
IDS.RDB$INDEX_INACTIVE = TRUE;
END_MODIFY;
ON_ERROR
general_on_error ();
END_ERROR;
FbLocalStatus local_status_vector;

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_ERROR;
}
END_FOR;
ON_ERROR
general_on_error ();
Expand Down Expand Up @@ -447,39 +477,11 @@ int RESTORE_restore (const TEXT* file_name, const TEXT* database_name)
sizeof(index_name));
BURP_verbose(285, index_name);
// activating and creating deferred index %s

bool fError = false;
Firebird::ITransaction* activateIndexTran = nullptr;
FbLocalStatus local_status_vector;

START_TRANSACTION activateIndexTran;
FOR (TRANSACTION_HANDLE activateIndexTran REQUEST_HANDLE req_handle5)
IND1 IN RDB$INDICES WITH IND1.RDB$INDEX_NAME EQ IDS.RDB$INDEX_NAME
MODIFY IND1 USING
IND1.RDB$INDEX_INACTIVE = FALSE;
END_MODIFY;
END_FOR;
ON_ERROR
fError = true;
fb_utils::copyStatus(&local_status_vector, isc_status);
END_ERROR;
MISC_release_request_silent(req_handle5);

if (!fError)
if (!activateIndex(tdgbl, index_name, local_status_vector))
{
COMMIT activateIndexTran;
ON_ERROR
fError = true;
fb_utils::copyStatus(&local_status_vector, isc_status);
END_ERROR;
}
if (fError)
{
ROLLBACK activateIndexTran;
ON_ERROR
general_on_error ();
END_ERROR;
BURP_print (false, 173, index_name);
BURP_print(false, 173, index_name);
BURP_print_status(false, &local_status_vector);
tdgbl->flag_on_line = false;
}
Expand Down
Loading