Remove useless assertions

We don't need Assert(IsA(foo, String)) right before running
strVal(foo), since strVal() already does the assertion internally (via
castNode()).

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index ef5b34a31269da1cc75f0ae9d181b3bb6d2c7940..701bd73f5eeb4de3bf32ff03bf9e3b9456ac9af1 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -8271,7 +8271,6 @@ ATExecSetStorage(Relation rel, const char *colName, Node *newValue, LOCKMODE loc
    AttrNumber  attnum;
    ObjectAddress address;
 
-   Assert(IsA(newValue, String));
    storagemode = strVal(newValue);
 
    if (pg_strcasecmp(storagemode, "plain") == 0)
@@ -16171,7 +16170,6 @@ ATExecSetCompression(AlteredTableInfo *tab,
    char        cmethod;
    ObjectAddress address;
 
-   Assert(IsA(newValue, String));
    compression = strVal(newValue);
 
    attrel = table_open(AttributeRelationId, RowExclusiveLock);

diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 4f5e7c7ccb23ee66a3d6d6d4170f5d977e4b958c..a8757a90bf8300c43b6966cfe0b69ee6ea7f6c2d 100644 (file)
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -3577,7 +3577,6 @@ replace_domain_constraint_value(ParseState *pstate, ColumnRef *cref)
        Node       *field1 = (Node *) linitial(cref->fields);
        char       *colname;
 
-       Assert(IsA(field1, String));
        colname = strVal(field1);
        if (strcmp(colname, "value") == 0)
        {

diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index f9460ae506c05a246879ee01c2d12b4fb40527f1..076226868f39f3d7cdca31bb3619ece6364d1617 100644 (file)
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -318,12 +318,10 @@ sql_fn_post_column_ref(ParseState *pstate, ColumnRef *cref, Node *var)
        nnames--;
 
    field1 = (Node *) linitial(cref->fields);
-   Assert(IsA(field1, String));
    name1 = strVal(field1);
    if (nnames > 1)
    {
        subfield = (Node *) lsecond(cref->fields);
-       Assert(IsA(subfield, String));
        name2 = strVal(subfield);
    }
 

diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 1dbdba93daae4e5955e4a9202da8cf6b8a1f5e18..b1cc6a382f1831c1979fdd312156a61f7dfb39bf 100644 (file)
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -631,7 +631,6 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
            {
                Node       *field1 = (Node *) linitial(cref->fields);
 
-               Assert(IsA(field1, String));
                colname = strVal(field1);
 
                /* Try to identify as an unqualified column */
@@ -664,7 +663,6 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
                Node       *field1 = (Node *) linitial(cref->fields);
                Node       *field2 = (Node *) lsecond(cref->fields);
 
-               Assert(IsA(field1, String));
                relname = strVal(field1);
 
                /* Locate the referenced nsitem */
@@ -685,7 +683,6 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
                    break;
                }
 
-               Assert(IsA(field2, String));
                colname = strVal(field2);
 
                /* Try to identify as a column of the nsitem */
@@ -712,9 +709,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
                Node       *field2 = (Node *) lsecond(cref->fields);
                Node       *field3 = (Node *) lthird(cref->fields);
 
-               Assert(IsA(field1, String));
                nspname = strVal(field1);
-               Assert(IsA(field2, String));
                relname = strVal(field2);
 
                /* Locate the referenced nsitem */
@@ -735,7 +730,6 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
                    break;
                }
 
-               Assert(IsA(field3, String));
                colname = strVal(field3);
 
                /* Try to identify as a column of the nsitem */
@@ -764,11 +758,8 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
                Node       *field4 = (Node *) lfourth(cref->fields);
                char       *catname;
 
-               Assert(IsA(field1, String));
                catname = strVal(field1);
-               Assert(IsA(field2, String));
                nspname = strVal(field2);
-               Assert(IsA(field3, String));
                relname = strVal(field3);
 
                /*
@@ -798,7 +789,6 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
                    break;
                }
 
-               Assert(IsA(field4, String));
                colname = strVal(field4);
 
                /* Try to identify as a column of the nsitem */

diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index b791c23f0666b232c65f8980cb33760116473ba6..61fbdf0686e7e406c400b79b5b4b51fbcf6b320f 100644 (file)
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -1213,7 +1213,6 @@ resolve_column_ref(ParseState *pstate, PLpgSQL_expr *expr,
            {
                Node       *field1 = (Node *) linitial(cref->fields);
 
-               Assert(IsA(field1, String));
                name1 = strVal(field1);
                nnames_scalar = 1;
                nnames_wholerow = 1;
@@ -1224,7 +1223,6 @@ resolve_column_ref(ParseState *pstate, PLpgSQL_expr *expr,
                Node       *field1 = (Node *) linitial(cref->fields);
                Node       *field2 = (Node *) lsecond(cref->fields);
 
-               Assert(IsA(field1, String));
                name1 = strVal(field1);
 
                /* Whole-row reference? */
@@ -1236,7 +1234,6 @@ resolve_column_ref(ParseState *pstate, PLpgSQL_expr *expr,
                    break;
                }
 
-               Assert(IsA(field2, String));
                name2 = strVal(field2);
                colname = name2;
                nnames_scalar = 2;
@@ -1250,9 +1247,7 @@ resolve_column_ref(ParseState *pstate, PLpgSQL_expr *expr,
                Node       *field2 = (Node *) lsecond(cref->fields);
                Node       *field3 = (Node *) lthird(cref->fields);
 
-               Assert(IsA(field1, String));
                name1 = strVal(field1);
-               Assert(IsA(field2, String));
                name2 = strVal(field2);
 
                /* Whole-row reference? */
@@ -1264,7 +1259,6 @@ resolve_column_ref(ParseState *pstate, PLpgSQL_expr *expr,
                    break;
                }
 
-               Assert(IsA(field3, String));
                name3 = strVal(field3);
                colname = name3;
                nnames_field = 2;