You've already forked pgbackrest
mirror of
https://github.com/pgbackrest/pgbackrest.git
synced 2025-07-05 00:28:52 +02:00
Rename FUNCTION_DEBUG_* and consolidate ASSERT_* macros for consistency.
Rename FUNCTION_DEBUG_* macros to FUNCTION_LOG_* to more accurately reflect what they do. Further rename FUNCTION_DEBUG_RESULT* macros to FUNCTION_LOG_RETURN* to make it clearer that they return from the function as well as logging. Leave FUNCTION_TEST_* macros as they are. Consolidate the various ASSERT* macros into a single ASSERT macro that is always compiled out of production builds. It was difficult to figure out when an assert would be checked with all the different types in play. When ASSERTs are compiled in they will always be checked regardless of the log level -- tying these two concepts together was not a good idea.
This commit is contained in:
@ -18,13 +18,13 @@ pgInterfaceIs083(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl083(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs083(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs083(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -51,7 +51,7 @@ pgInterfaceControl083(const Buffer *controlFile)
|
||||
result.pageSize = controlData->blcksz;
|
||||
result.walSegmentSize = controlData->xlog_seg_size;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -75,7 +75,7 @@ pgInterfaceControlTest083(PgControl pgControl, Buffer *buffer)
|
||||
controlData->blcksz = pgControl.pageSize;
|
||||
controlData->xlog_seg_size = pgControl.walSegmentSize;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,13 +18,13 @@ pgInterfaceIs084(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl084(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs084(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs084(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -51,7 +51,7 @@ pgInterfaceControl084(const Buffer *controlFile)
|
||||
result.pageSize = controlData->blcksz;
|
||||
result.walSegmentSize = controlData->xlog_seg_size;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -75,7 +75,7 @@ pgInterfaceControlTest084(PgControl pgControl, Buffer *buffer)
|
||||
controlData->blcksz = pgControl.pageSize;
|
||||
controlData->xlog_seg_size = pgControl.walSegmentSize;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,13 +18,13 @@ pgInterfaceIs090(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl090(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs090(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs090(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -51,7 +51,7 @@ pgInterfaceControl090(const Buffer *controlFile)
|
||||
result.pageSize = controlData->blcksz;
|
||||
result.walSegmentSize = controlData->xlog_seg_size;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -75,7 +75,7 @@ pgInterfaceControlTest090(PgControl pgControl, Buffer *buffer)
|
||||
controlData->blcksz = pgControl.pageSize;
|
||||
controlData->xlog_seg_size = pgControl.walSegmentSize;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,13 +18,13 @@ pgInterfaceIs091(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl091(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs091(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs091(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -51,7 +51,7 @@ pgInterfaceControl091(const Buffer *controlFile)
|
||||
result.pageSize = controlData->blcksz;
|
||||
result.walSegmentSize = controlData->xlog_seg_size;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -75,7 +75,7 @@ pgInterfaceControlTest091(PgControl pgControl, Buffer *buffer)
|
||||
controlData->blcksz = pgControl.pageSize;
|
||||
controlData->xlog_seg_size = pgControl.walSegmentSize;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,13 +18,13 @@ pgInterfaceIs092(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl092(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs092(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs092(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -51,7 +51,7 @@ pgInterfaceControl092(const Buffer *controlFile)
|
||||
result.pageSize = controlData->blcksz;
|
||||
result.walSegmentSize = controlData->xlog_seg_size;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -75,7 +75,7 @@ pgInterfaceControlTest092(PgControl pgControl, Buffer *buffer)
|
||||
controlData->blcksz = pgControl.pageSize;
|
||||
controlData->xlog_seg_size = pgControl.walSegmentSize;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,13 +18,13 @@ pgInterfaceIs093(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl093(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs093(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs093(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -53,7 +53,7 @@ pgInterfaceControl093(const Buffer *controlFile)
|
||||
|
||||
result.pageChecksum = controlData->data_checksum_version != 0;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -79,7 +79,7 @@ pgInterfaceControlTest093(PgControl pgControl, Buffer *buffer)
|
||||
|
||||
controlData->data_checksum_version = pgControl.pageChecksum;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,13 +18,13 @@ pgInterfaceIs094(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl094(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs094(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs094(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -53,7 +53,7 @@ pgInterfaceControl094(const Buffer *controlFile)
|
||||
|
||||
result.pageChecksum = controlData->data_checksum_version != 0;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -79,7 +79,7 @@ pgInterfaceControlTest094(PgControl pgControl, Buffer *buffer)
|
||||
|
||||
controlData->data_checksum_version = pgControl.pageChecksum;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,13 +18,13 @@ pgInterfaceIs095(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl095(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs095(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs095(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -53,7 +53,7 @@ pgInterfaceControl095(const Buffer *controlFile)
|
||||
|
||||
result.pageChecksum = controlData->data_checksum_version != 0;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -79,7 +79,7 @@ pgInterfaceControlTest095(PgControl pgControl, Buffer *buffer)
|
||||
|
||||
controlData->data_checksum_version = pgControl.pageChecksum;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,13 +18,13 @@ pgInterfaceIs096(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl096(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs096(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs096(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -53,7 +53,7 @@ pgInterfaceControl096(const Buffer *controlFile)
|
||||
|
||||
result.pageChecksum = controlData->data_checksum_version != 0;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -79,7 +79,7 @@ pgInterfaceControlTest096(PgControl pgControl, Buffer *buffer)
|
||||
|
||||
controlData->data_checksum_version = pgControl.pageChecksum;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,13 +18,13 @@ pgInterfaceIs100(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl100(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs100(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs100(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -53,7 +53,7 @@ pgInterfaceControl100(const Buffer *controlFile)
|
||||
|
||||
result.pageChecksum = controlData->data_checksum_version != 0;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -79,7 +79,7 @@ pgInterfaceControlTest100(PgControl pgControl, Buffer *buffer)
|
||||
|
||||
controlData->data_checksum_version = pgControl.pageChecksum;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,13 +18,13 @@ pgInterfaceIs110(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_TEST_BEGIN();
|
||||
FUNCTION_TEST_PARAM(BUFFER, controlFile);
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_END();
|
||||
|
||||
ASSERT(controlFile != NULL);
|
||||
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
|
||||
FUNCTION_TEST_RESULT(
|
||||
FUNCTION_TEST_RETURN(
|
||||
BOOL, controlData->pg_control_version == PG_CONTROL_VERSION && controlData->catalog_version_no == CATALOG_VERSION_NO);
|
||||
}
|
||||
|
||||
@ -34,12 +34,12 @@ Get information from pg_control in a common format
|
||||
PgControl
|
||||
pgInterfaceControl110(const Buffer *controlFile)
|
||||
{
|
||||
FUNCTION_DEBUG_BEGIN(logLevelTrace);
|
||||
FUNCTION_DEBUG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_BEGIN(logLevelTrace);
|
||||
FUNCTION_LOG_PARAM(BUFFER, controlFile);
|
||||
FUNCTION_LOG_END();
|
||||
|
||||
FUNCTION_TEST_ASSERT(controlFile != NULL);
|
||||
FUNCTION_TEST_ASSERT(pgInterfaceIs110(controlFile));
|
||||
FUNCTION_DEBUG_END();
|
||||
ASSERT(controlFile != NULL);
|
||||
ASSERT(pgInterfaceIs110(controlFile));
|
||||
|
||||
PgControl result = {0};
|
||||
ControlFileData *controlData = (ControlFileData *)bufPtr(controlFile);
|
||||
@ -53,7 +53,7 @@ pgInterfaceControl110(const Buffer *controlFile)
|
||||
|
||||
result.pageChecksum = controlData->data_checksum_version != 0;
|
||||
|
||||
FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
|
||||
FUNCTION_LOG_RETURN(PG_CONTROL, result);
|
||||
}
|
||||
|
||||
/***********************************************************************************************************************************
|
||||
@ -79,7 +79,7 @@ pgInterfaceControlTest110(PgControl pgControl, Buffer *buffer)
|
||||
|
||||
controlData->data_checksum_version = pgControl.pageChecksum;
|
||||
|
||||
FUNCTION_TEST_RESULT_VOID();
|
||||
FUNCTION_TEST_RETURN_VOID();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user