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.

src/postgres/interface.c

@@ -174,11 +174,11 @@ Get info from pg_control
 PgControl
 pgControlFromBuffer(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_DEBUG_END();
+    ASSERT(controlFile != NULL);
 
     // Search for the version of PostgreSQL that uses this control file
     const PgInterface *interface = NULL;
@@ -220,7 +220,7 @@ pgControlFromBuffer(const Buffer *controlFile)
     if (result.pageSize != PG_PAGE_SIZE_DEFAULT)
         THROW_FMT(FormatError, "page size is %u but must be %u", result.pageSize, PG_PAGE_SIZE_DEFAULT);
 
-    FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
+    FUNCTION_LOG_RETURN(PG_CONTROL, result);
 }
 
 /***********************************************************************************************************************************
@@ -229,11 +229,11 @@ Get info from pg_control
 PgControl
 pgControlFromFile(const String *pgPath)
 {
-    FUNCTION_DEBUG_BEGIN(logLevelDebug);
-        FUNCTION_DEBUG_PARAM(STRING, pgPath);
+    FUNCTION_LOG_BEGIN(logLevelDebug);
+        FUNCTION_LOG_PARAM(STRING, pgPath);
+    FUNCTION_LOG_END();
 
-        FUNCTION_TEST_ASSERT(pgPath != NULL);
-    FUNCTION_DEBUG_END();
+    ASSERT(pgPath != NULL);
 
     PgControl result = {0};
 
@@ -248,7 +248,7 @@ pgControlFromFile(const String *pgPath)
     }
     MEM_CONTEXT_TEMP_END();
 
-    FUNCTION_DEBUG_RESULT(PG_CONTROL, result);
+    FUNCTION_LOG_RETURN(PG_CONTROL, result);
 }
 
 /***********************************************************************************************************************************
@@ -291,7 +291,7 @@ pgControlTestToBuffer(PgControl pgControl)
     // Generate pg_control
     interface->controlTest(pgControl, result);
 
-    FUNCTION_TEST_RESULT(BUFFER, result);
+    FUNCTION_TEST_RETURN(BUFFER, result);
 }
 
 #endif
@@ -302,11 +302,11 @@ Convert version string to version number
 unsigned int
 pgVersionFromStr(const String *version)
 {
-    FUNCTION_DEBUG_BEGIN(logLevelTrace);
-        FUNCTION_DEBUG_PARAM(STRING, version);
+    FUNCTION_LOG_BEGIN(logLevelTrace);
+        FUNCTION_LOG_PARAM(STRING, version);
+    FUNCTION_LOG_END();
 
-        FUNCTION_DEBUG_ASSERT(version != NULL);
-    FUNCTION_DEBUG_END();
+    ASSERT(version != NULL);
 
     unsigned int result = 0;
 
@@ -334,7 +334,7 @@ pgVersionFromStr(const String *version)
     }
     MEM_CONTEXT_TEMP_END();
 
-    FUNCTION_DEBUG_RESULT(UINT, result);
+    FUNCTION_LOG_RETURN(UINT, result);
 }
 
 /***********************************************************************************************************************************
@@ -343,14 +343,14 @@ Convert version number to string
 String *
 pgVersionToStr(unsigned int version)
 {
-    FUNCTION_DEBUG_BEGIN(logLevelTrace);
-        FUNCTION_DEBUG_PARAM(UINT, version);
-    FUNCTION_DEBUG_END();
+    FUNCTION_LOG_BEGIN(logLevelTrace);
+        FUNCTION_LOG_PARAM(UINT, version);
+    FUNCTION_LOG_END();
 
     String *result = version >= PG_VERSION_10 ?
         strNewFmt("%u", version / 10000) : strNewFmt("%u.%u", version / 10000, version % 10000 / 100);
 
-    FUNCTION_DEBUG_RESULT(STRING, result);
+    FUNCTION_LOG_RETURN(STRING, result);
 }
 
 /***********************************************************************************************************************************

src/postgres/interface.h

@@ -53,9 +53,9 @@ Macros for function logging
 ***********************************************************************************************************************************/
 String *pgControlToLog(const PgControl *pgControl);
 
-#define FUNCTION_DEBUG_PG_CONTROL_TYPE                                                                                             \
+#define FUNCTION_LOG_PG_CONTROL_TYPE                                                                                               \
     PgControl
-#define FUNCTION_DEBUG_PG_CONTROL_FORMAT(value, buffer, bufferSize)                                                                \
-    FUNCTION_DEBUG_STRING_OBJECT_FORMAT(&value, pgControlToLog, buffer, bufferSize)
+#define FUNCTION_LOG_PG_CONTROL_FORMAT(value, buffer, bufferSize)                                                                  \
+    FUNCTION_LOG_STRING_OBJECT_FORMAT(&value, pgControlToLog, buffer, bufferSize)
 
 #endif

src/postgres/interface/v083.c

@@ -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

src/postgres/interface/v084.c

@@ -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

src/postgres/interface/v090.c

@@ -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

src/postgres/interface/v091.c

@@ -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

src/postgres/interface/v092.c

@@ -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

src/postgres/interface/v093.c

@@ -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

src/postgres/interface/v094.c

@@ -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

src/postgres/interface/v095.c

@@ -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

src/postgres/interface/v096.c

@@ -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

src/postgres/interface/v100.c

@@ -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

src/postgres/interface/v110.c

@@ -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

src/postgres/pageChecksum.c

@@ -64,7 +64,6 @@ minimize register spilling. For less sophisticated compilers it might be benefic
 ***********************************************************************************************************************************/
 #include <string.h>
 
-#include "common/assert.h"
 #include "common/debug.h"
 #include "common/error.h"
 #include "common/log.h"
@@ -140,10 +139,10 @@ pageChecksumBlock(const unsigned char *page, unsigned int pageSize)
     FUNCTION_TEST_BEGIN();
         FUNCTION_TEST_PARAM(UCHARP, page);
         FUNCTION_TEST_PARAM(UINT, pageSize);
-
-        FUNCTION_TEST_ASSERT(page != NULL);
     FUNCTION_TEST_END();
 
+    ASSERT(page != NULL);
+
     uint32_t sums[N_SUMS];
     uint32_t (*dataArray)[N_SUMS] = (uint32_t (*)[N_SUMS])page;
     uint32_t result = 0;
@@ -166,7 +165,7 @@ pageChecksumBlock(const unsigned char *page, unsigned int pageSize)
     for (i = 0; i < N_SUMS; i++)
         result ^= sums[i];
 
-    FUNCTION_TEST_RESULT(UINT32, result);
+    FUNCTION_TEST_RETURN(UINT32, result);
 }
 
 /***********************************************************************************************************************************
@@ -182,10 +181,10 @@ pageChecksum(const unsigned char *page, unsigned int blockNo, unsigned int pageS
         FUNCTION_TEST_PARAM(UCHARP, page);
         FUNCTION_TEST_PARAM(UINT, blockNo);
         FUNCTION_TEST_PARAM(UINT, pageSize);
-
-        FUNCTION_TEST_ASSERT(page != NULL);
     FUNCTION_TEST_END();
 
+    ASSERT(page != NULL);
+
     // Save pd_checksum and temporarily set it to zero, so that the checksum calculation isn't affected by the old checksum stored
     // on the page. Restore it after, because actually updating the checksum is NOT part of the API of this function.
     PageHeader pageHeader = (PageHeader)page;
@@ -199,7 +198,7 @@ pageChecksum(const unsigned char *page, unsigned int blockNo, unsigned int pageS
     checksum ^= blockNo;
 
     // Reduce to a uint16 with an offset of one. That avoids checksums of zero, which seems like a good idea.
-    FUNCTION_TEST_RESULT(UINT16, (uint16_t)(checksum % 65535 + 1));
+    FUNCTION_TEST_RETURN(UINT16, (uint16_t)(checksum % 65535 + 1));
 }
 
 /***********************************************************************************************************************************
@@ -215,11 +214,11 @@ pageChecksumTest(
         FUNCTION_TEST_PARAM(UINT, pageSize);
         FUNCTION_TEST_PARAM(UINT32, ignoreWalId);
         FUNCTION_TEST_PARAM(UINT32, ignoreWalOffset);
-
-        FUNCTION_TEST_ASSERT(page != NULL);
     FUNCTION_TEST_END();
 
-    FUNCTION_TEST_RESULT(
+    ASSERT(page != NULL);
+
+    FUNCTION_TEST_RETURN(
         BOOL,
         // This is a new page so don't test checksum
         ((PageHeader)page)->pd_upper == 0 ||
@@ -237,18 +236,18 @@ pageChecksumBufferTest(
     const unsigned char *pageBuffer, unsigned int pageBufferSize, unsigned int blockNoBegin, unsigned int pageSize,
     uint32_t ignoreWalId, uint32_t ignoreWalOffset)
 {
-    FUNCTION_DEBUG_BEGIN(logLevelTrace);
-        FUNCTION_DEBUG_PARAM(UCHARP, pageBuffer);
-        FUNCTION_DEBUG_PARAM(UINT, pageBufferSize);
-        FUNCTION_DEBUG_PARAM(UINT, blockNoBegin);
-        FUNCTION_DEBUG_PARAM(UINT, pageSize);
-        FUNCTION_DEBUG_PARAM(UINT32, ignoreWalId);
-        FUNCTION_DEBUG_PARAM(UINT32, ignoreWalOffset);
+    FUNCTION_LOG_BEGIN(logLevelTrace);
+        FUNCTION_LOG_PARAM(UCHARP, pageBuffer);
+        FUNCTION_LOG_PARAM(UINT, pageBufferSize);
+        FUNCTION_LOG_PARAM(UINT, blockNoBegin);
+        FUNCTION_LOG_PARAM(UINT, pageSize);
+        FUNCTION_LOG_PARAM(UINT32, ignoreWalId);
+        FUNCTION_LOG_PARAM(UINT32, ignoreWalOffset);
+    FUNCTION_LOG_END();
 
-        FUNCTION_TEST_ASSERT(pageBuffer != NULL);
-        FUNCTION_DEBUG_ASSERT(pageBufferSize > 0);
-        FUNCTION_DEBUG_ASSERT(pageBufferSize % pageSize == 0);
-    FUNCTION_DEBUG_END();
+    ASSERT(pageBuffer != NULL);
+    ASSERT(pageBufferSize > 0);
+    ASSERT(pageBufferSize % pageSize == 0);
 
     bool result = true;
 
@@ -265,5 +264,5 @@ pageChecksumBufferTest(
         }
     }
 
-    FUNCTION_DEBUG_RESULT(BOOL, result);
+    FUNCTION_LOG_RETURN(BOOL, result);
 }