Skip to content

Fix incorrect maximum size when reading dbb parameter values in SHOW DATABASE #8413

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 2 commits into from
Feb 3, 2025
Merged

Fix incorrect maximum size when reading dbb parameter values in SHOW DATABASE #8413

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f721f6
Fix incorrect maximum size when reading dbb parameter values
Jan 28, 2025
099c4e4
Cast transaction number to correct type
Jan 28, 2025
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
42 changes: 21 additions & 21 deletions src/isql/show.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,12 +438,12 @@ void SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
break;

case isc_info_page_size:
value_out = p.getInt();
value_out = p.getBigInt();
isqlGlob.printf("PAGE_SIZE %" SQUADFORMAT"%s", value_out, separator);
break;

case isc_info_db_size_in_pages:
value_out = p.getInt();
value_out = p.getBigInt();
if (translate)
{
IUTILS_msg_get(NUMBER_PAGES, msg, SafeArg() << value_out);
Expand All @@ -454,7 +454,7 @@ void SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
break;

case fb_info_pages_used:
value_out = p.getInt();
value_out = p.getBigInt();
if (translate)
{
IUTILS_msg_get(NUMBER_USED_PAGES, msg, SafeArg() << value_out);
Expand All @@ -465,7 +465,7 @@ void SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
break;

case fb_info_pages_free:
value_out = p.getInt();
value_out = p.getBigInt();
if (translate)
{
IUTILS_msg_get(NUMBER_FREE_PAGES, msg, SafeArg() << value_out);
Expand All @@ -476,7 +476,7 @@ void SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
break;

case fb_info_crypt_state:
value_out = p.getInt();
value_out = p.getBigInt();
if (translate)
{
Firebird::string s;
Expand Down Expand Up @@ -506,7 +506,7 @@ void SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
break;

case isc_info_sweep_interval:
value_out = p.getInt();
value_out = p.getBigInt();
if (translate)
{
IUTILS_msg_get(SWEEP_INTERV, msg, SafeArg() << value_out);
Expand All @@ -517,32 +517,32 @@ void SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
break;

case isc_info_forced_writes:
value_out = p.getInt();
value_out = p.getBigInt();
isqlGlob.printf("Forced Writes are %s%s", (value_out == 1 ? "ON" : "OFF"), separator);
break;

case isc_info_oldest_transaction :
value_out = p.getInt();
isqlGlob.printf("Transaction - oldest = %" SQUADFORMAT"%s", value_out, separator);
value_out = p.getBigInt();
isqlGlob.printf("Transaction - oldest = %" UQUADFORMAT"%s", static_cast<TraNumber>(value_out), separator);
break;

case isc_info_oldest_active :
value_out = p.getInt();
isqlGlob.printf("Transaction - oldest active = %" SQUADFORMAT"%s", value_out, separator);
value_out = p.getBigInt();
isqlGlob.printf("Transaction - oldest active = %" UQUADFORMAT"%s", static_cast<TraNumber>(value_out), separator);
break;

case isc_info_oldest_snapshot :
value_out = p.getInt();
isqlGlob.printf("Transaction - oldest snapshot = %" SQUADFORMAT"%s", value_out, separator);
value_out = p.getBigInt();
isqlGlob.printf("Transaction - oldest snapshot = %" UQUADFORMAT"%s", static_cast<TraNumber>(value_out), separator);
break;

case isc_info_next_transaction :
value_out = p.getInt();
isqlGlob.printf("Transaction - Next = %" SQUADFORMAT"%s", value_out, separator);
value_out = p.getBigInt();
isqlGlob.printf("Transaction - Next = %" UQUADFORMAT"%s", static_cast<TraNumber>(value_out), separator);
break;

case isc_info_base_level:
value_out = p.getInt();
value_out = p.getBigInt();
if (translate)
{
IUTILS_msg_get(BASE_LEVEL, msg, SafeArg() << value_out);
Expand All @@ -553,21 +553,21 @@ void SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
break;

case isc_info_limbo:
value_out = p.getInt();
value_out = p.getBigInt();
if (translate)
{
IUTILS_msg_get(LIMBO, msg, SafeArg() << value_out);
isqlGlob.printf("%s%s", msg, separator);
}
else
isqlGlob.printf("Transaction in limbo = %" SQUADFORMAT"%s", value_out, separator);
isqlGlob.printf("Transaction in limbo = %" UQUADFORMAT"%s", static_cast<TraNumber>(value_out), separator);
break;

case isc_info_ods_version:
isqlGlob.major_ods = p.getInt();
break;
case isc_info_ods_minor_version:
value_out = p.getInt();
value_out = p.getBigInt();
isqlGlob.printf("ODS = %" SLONGFORMAT".%" SQUADFORMAT"%s",
(SLONG) isqlGlob.major_ods, value_out, separator);
break;
Expand All @@ -578,7 +578,7 @@ void SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
break;

case fb_info_protocol_version:
value_out = p.getInt();
value_out = p.getBigInt();
if (value_out)
isqlGlob.printf("Protocol version = %" SQUADFORMAT"%s", value_out, separator);
else
Expand Down Expand Up @@ -656,7 +656,7 @@ void SHOW_dbb_parameters(Firebird::IAttachment* db_handle,

case fb_info_replica_mode:
{
value_out = p.getInt();
value_out = p.getBigInt();
const char* mode =
(value_out == fb_info_replica_none) ? "NONE" :
(value_out == fb_info_replica_read_only) ? "READ_ONLY" :
Expand Down
Loading