database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-24 00:23:06 +03:00
Code Activity

Remove AssertArg and AssertState

Browse Source 
These don't offer anything over plain Assert, and their usage had
already been declared obsolescent.

Author: Nathan Bossart <nathandbossart@gmail.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://www.postgresql.org/message-id/20221009210148.GA900071@nathanxps13
This commit is contained in:
Peter Eisentraut
2022-10-28 09:19:06 +02:00
parent d37aa3d358
commit b1099eca8f
44 changed files with 162 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/backend/utils/mmgr/mcxt.c
View File

@@ -258,7 +258,7 @@ BogusGetChunkSpace(void *pointer)
void
MemoryContextInit(void)
{
AssertState(TopMemoryContext == NULL);
Assert(TopMemoryContext == NULL);
/*
* First, initialize TopMemoryContext, which is the parent of all others.
@@ -302,7 +302,7 @@ MemoryContextInit(void)
void
MemoryContextReset(MemoryContext context)
{
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
/* save a function call in common case where there are no children */
if (context->firstchild != NULL)
@@ -321,7 +321,7 @@ MemoryContextReset(MemoryContext context)
void
MemoryContextResetOnly(MemoryContext context)
{
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
/* Nothing to do if no pallocs since startup or last reset */
if (!context->isReset)
@@ -354,7 +354,7 @@ MemoryContextResetChildren(MemoryContext context)
{
MemoryContext child;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
for (child = context->firstchild; child != NULL; child = child->nextchild)
{
@@ -375,7 +375,7 @@ MemoryContextResetChildren(MemoryContext context)
void
MemoryContextDelete(MemoryContext context)
{
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
/* We had better not be deleting TopMemoryContext ... */
Assert(context != TopMemoryContext);
/* And not CurrentMemoryContext, either */
@@ -420,7 +420,7 @@ MemoryContextDelete(MemoryContext context)
void
MemoryContextDeleteChildren(MemoryContext context)
{
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
/*
* MemoryContextDelete will delink the child from me, so just iterate as
@@ -450,7 +450,7 @@ void
MemoryContextRegisterResetCallback(MemoryContext context,
MemoryContextCallback *cb)
{
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
/* Push onto head so this will be called before older registrants. */
cb->next = context->reset_cbs;
@@ -493,7 +493,7 @@ MemoryContextCallResetCallbacks(MemoryContext context)
void
MemoryContextSetIdentifier(MemoryContext context, const char *id)
{
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
context->ident = id;
}
@@ -518,8 +518,8 @@ MemoryContextSetIdentifier(MemoryContext context, const char *id)
void
MemoryContextSetParent(MemoryContext context, MemoryContext new_parent)
{
AssertArg(MemoryContextIsValid(context));
AssertArg(context != new_parent);
Assert(MemoryContextIsValid(context));
Assert(context != new_parent);
/* Fast path if it's got correct parent already */
if (new_parent == context->parent)
@@ -545,7 +545,7 @@ MemoryContextSetParent(MemoryContext context, MemoryContext new_parent)
/* And relink */
if (new_parent)
{
AssertArg(MemoryContextIsValid(new_parent));
Assert(MemoryContextIsValid(new_parent));
context->parent = new_parent;
context->prevchild = NULL;
context->nextchild = new_parent->firstchild;
@@ -575,7 +575,7 @@ MemoryContextSetParent(MemoryContext context, MemoryContext new_parent)
void
MemoryContextAllowInCriticalSection(MemoryContext context, bool allow)
{
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
context->allowInCritSection = allow;
}
@@ -612,7 +612,7 @@ GetMemoryChunkSpace(void *pointer)
MemoryContext
MemoryContextGetParent(MemoryContext context)
{
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
return context->parent;
}
@@ -624,7 +624,7 @@ MemoryContextGetParent(MemoryContext context)
bool
MemoryContextIsEmpty(MemoryContext context)
{
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
/*
* For now, we consider a memory context nonempty if it has any children;
@@ -645,7 +645,7 @@ MemoryContextMemAllocated(MemoryContext context, bool recurse)
{
Size total = context->mem_allocated;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
if (recurse)
{
@@ -737,7 +737,7 @@ MemoryContextStatsInternal(MemoryContext context, int level,
MemoryContext child;
int ichild;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
/* Examine the context itself */
context->methods->stats(context,
@@ -902,7 +902,7 @@ MemoryContextCheck(MemoryContext context)
{
MemoryContext child;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
context->methods->check(context);
for (child = context->firstchild; child != NULL; child = child->nextchild)
@@ -995,7 +995,7 @@ MemoryContextAlloc(MemoryContext context, Size size)
{
void *ret;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocSizeIsValid(size))
@@ -1038,7 +1038,7 @@ MemoryContextAllocZero(MemoryContext context, Size size)
{
void *ret;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocSizeIsValid(size))
@@ -1076,7 +1076,7 @@ MemoryContextAllocZeroAligned(MemoryContext context, Size size)
{
void *ret;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocSizeIsValid(size))
@@ -1111,7 +1111,7 @@ MemoryContextAllocExtended(MemoryContext context, Size size, int flags)
{
void *ret;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!((flags & MCXT_ALLOC_HUGE) != 0 ? AllocHugeSizeIsValid(size) :
@@ -1202,7 +1202,7 @@ palloc(Size size)
void *ret;
MemoryContext context = CurrentMemoryContext;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocSizeIsValid(size))
@@ -1233,7 +1233,7 @@ palloc0(Size size)
void *ret;
MemoryContext context = CurrentMemoryContext;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocSizeIsValid(size))
@@ -1266,7 +1266,7 @@ palloc_extended(Size size, int flags)
void *ret;
MemoryContext context = CurrentMemoryContext;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!((flags & MCXT_ALLOC_HUGE) != 0 ? AllocHugeSizeIsValid(size) :
@@ -1406,7 +1406,7 @@ MemoryContextAllocHuge(MemoryContext context, Size size)
{
void *ret;
AssertArg(MemoryContextIsValid(context));
Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocHugeSizeIsValid(size))