Skip to content

Commit 2b286c4

Browse files
Marina Polyakovakovdb75
Marina Polyakova
authored andcommitted
Remove AssertArg and AssertState
See the commit b1099eca8f38ff5cfaf0901bb91cb6a22f909bc6 (Remove AssertArg and AssertState) in PostgreSQL 16.
1 parent 8ccd9e8 commit 2b286c4

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

src/compat/pg_compat.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ McxtStatsInternal(MemoryContext context, int level,
234234
MemoryContextCounters local_totals;
235235
MemoryContext child;
236236

237-
AssertArg(MemoryContextIsValid(context));
237+
Assert(MemoryContextIsValid(context));
238238

239239
/* Examine the context itself */
240240
#if PG_VERSION_NUM >= 140000

src/init.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ find_inheritance_children_array(Oid parent_relid,
569569
char *
570570
build_check_constraint_name_relid_internal(Oid relid)
571571
{
572-
AssertArg(OidIsValid(relid));
572+
Assert(OidIsValid(relid));
573573
return build_check_constraint_name_relname_internal(get_rel_name(relid));
574574
}
575575

@@ -580,7 +580,7 @@ build_check_constraint_name_relid_internal(Oid relid)
580580
char *
581581
build_check_constraint_name_relname_internal(const char *relname)
582582
{
583-
AssertArg(relname != NULL);
583+
Assert(relname != NULL);
584584
return psprintf("pathman_%s_check", relname);
585585
}
586586

@@ -591,7 +591,7 @@ build_check_constraint_name_relname_internal(const char *relname)
591591
char *
592592
build_sequence_name_relid_internal(Oid relid)
593593
{
594-
AssertArg(OidIsValid(relid));
594+
Assert(OidIsValid(relid));
595595
return build_sequence_name_relname_internal(get_rel_name(relid));
596596
}
597597

@@ -602,7 +602,7 @@ build_sequence_name_relid_internal(Oid relid)
602602
char *
603603
build_sequence_name_relname_internal(const char *relname)
604604
{
605-
AssertArg(relname != NULL);
605+
Assert(relname != NULL);
606606
return psprintf("%s_seq", relname);
607607
}
608608

@@ -613,7 +613,7 @@ build_sequence_name_relname_internal(const char *relname)
613613
char *
614614
build_update_trigger_name_internal(Oid relid)
615615
{
616-
AssertArg(OidIsValid(relid));
616+
Assert(OidIsValid(relid));
617617
return psprintf("%s_upd_trig", get_rel_name(relid));
618618
}
619619

@@ -624,7 +624,7 @@ build_update_trigger_name_internal(Oid relid)
624624
char *
625625
build_update_trigger_func_name_internal(Oid relid)
626626
{
627-
AssertArg(OidIsValid(relid));
627+
Assert(OidIsValid(relid));
628628
return psprintf("%s_upd_trig_func", get_rel_name(relid));
629629
}
630630

src/nodes_common.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ transform_plans_into_states(RuntimeAppendState *scan_state,
5959
ChildScanCommon child;
6060
PlanState *ps;
6161

62-
AssertArg(selected_plans);
62+
Assert(selected_plans);
6363
child = selected_plans[i];
6464

6565
/* Create new node since this plan hasn't been used yet */

src/partition_creation.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2035,7 +2035,7 @@ build_partitioning_expression(Oid parent_relid,
20352035
if (columns)
20362036
{
20372037
/* Column list should be empty */
2038-
AssertArg(*columns == NIL);
2038+
Assert(*columns == NIL);
20392039
extract_column_names(expr, columns);
20402040
}
20412041

src/pg_pathman.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ append_child_relation(PlannerInfo *root,
696696
#endif
697697

698698
/* Here and below we assume that parent RelOptInfo exists */
699-
AssertState(parent_rel);
699+
Assert(parent_rel);
700700

701701
/* Adjust join quals for this child */
702702
child_rel->joininfo = (List *) adjust_appendrel_attrs_compat(root,

src/relation_info.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ invalidate_psin_entry(PartStatusInfo *psin)
304304
void
305305
close_pathman_relation_info(PartRelationInfo *prel)
306306
{
307-
AssertArg(prel);
307+
Assert(prel);
308308

309309
(void) resowner_prel_del(prel);
310310
}

0 commit comments

Comments
 (0)