This is an automated email from the ASF dual-hosted git repository.
rafsun42 pushed a commit to branch PG13
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG13 by this push:
new 5cccca95 Fix DockerHub warning messages for PG13_latest (#1386)
5cccca95 is described below
commit 5cccca95d93c6abee0419bbb116427d2503d896f
Author: John Gemignani <[email protected]>
AuthorDate: Wed Nov 8 15:29:30 2023 -0800
Fix DockerHub warning messages for PG13_latest (#1386)
Fixed DockerHub warning messages for the build PG13_latest. These
were due to Assert statements that used variables that were not
used for anything else. I changed them to ifs with error log outputs
instead.
---
src/backend/parser/cypher_analyze.c | 8 +++++++-
src/backend/parser/cypher_clause.c | 31 +++++++++++++++++++++++++++----
src/backend/utils/adt/agtype_gin.c | 5 ++++-
3 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/src/backend/parser/cypher_analyze.c
b/src/backend/parser/cypher_analyze.c
index 60ef2d7d..54e9859d 100644
--- a/src/backend/parser/cypher_analyze.c
+++ b/src/backend/parser/cypher_analyze.c
@@ -801,7 +801,13 @@ static Query *analyze_cypher_and_coerce(List *stmt,
RangeTblFunction *rtfunc,
pnsi = addRangeTableEntryForSubquery(pstate, subquery, makeAlias("_", NIL),
lateral, true);
rtindex = list_length(pstate->p_rtable);
- Assert(rtindex == 1); // rte is the only RangeTblEntry in pstate
+ // rte is the only RangeTblEntry in pstate
+ if (rtindex !=1 )
+ {
+ ereport(ERROR,
+ (errcode(ERRCODE_DATATYPE_MISMATCH),
+ errmsg("invalid value for rtindex")));
+ }
addNSItemToQuery(pstate, pnsi, true, true, true);
query->targetList = expandNSItemAttrs(pstate, pnsi, 0, -1);
diff --git a/src/backend/parser/cypher_clause.c
b/src/backend/parser/cypher_clause.c
index a33b9b19..5b3e54c0 100644
--- a/src/backend/parser/cypher_clause.c
+++ b/src/backend/parser/cypher_clause.c
@@ -1340,7 +1340,14 @@ static Query *transform_cypher_unwind(cypher_parsestate
*cpstate,
pnsi = transform_prev_cypher_clause(cpstate, clause->prev, true);
rtindex = list_length(pstate->p_rtable);
- Assert(rtindex == 1); // rte is the first RangeTblEntry in pstate
+ // rte is the first RangeTblEntry in pstate
+ if (rtindex != 1)
+ {
+ ereport(ERROR,
+ (errcode(ERRCODE_DATATYPE_MISMATCH),
+ errmsg("invalid value for rtindex")));
+ }
+
query->targetList = expandNSItemAttrs(pstate, pnsi, 0, -1);
}
@@ -2314,7 +2321,12 @@ static Query
*transform_cypher_clause_with_where(cypher_parsestate *cpstate,
NULL, true);
Assert(pnsi != NULL);
rtindex = list_length(pstate->p_rtable);
- Assert(rtindex == 1); // rte is the only RangeTblEntry in pstate
+ if (rtindex != 1)
+ {
+ ereport(ERROR,
+ (errcode(ERRCODE_DATATYPE_MISMATCH),
+ errmsg("invalid value for rtindex")));
+ }
/*
* add all the target entries in pnsi to the current target list to
pass
@@ -2587,7 +2599,13 @@ static Query
*transform_cypher_match_pattern(cypher_parsestate *cpstate,
pnsi = transform_prev_cypher_clause(cpstate, clause->prev, true);
rte = pnsi->p_rte;
rtindex = list_length(pstate->p_rtable);
- Assert(rtindex == 1); // rte is the first RangeTblEntry in pstate
+ // rte is the first RangeTblEntry in pstate
+ if (rtindex != 1)
+ {
+ ereport(ERROR,
+ (errcode(ERRCODE_DATATYPE_MISMATCH),
+ errmsg("invalid value for rtindex")));
+ }
/*
* add all the target entries in rte to the current target list to
pass
@@ -6990,7 +7008,12 @@ static void handle_prev_clause(cypher_parsestate
*cpstate, Query *query,
// rte is the first RangeTblEntry in pstate
if (first_rte)
{
- Assert(rtindex == 1);
+ if (rtindex != 1)
+ {
+ ereport(ERROR,
+ (errcode(ERRCODE_DATATYPE_MISMATCH),
+ errmsg("invalid value for rtindex")));
+ }
}
// add all the rte's attributes to the current queries targetlist
diff --git a/src/backend/utils/adt/agtype_gin.c
b/src/backend/utils/adt/agtype_gin.c
index 1a1f267a..ceceeaa6 100644
--- a/src/backend/utils/adt/agtype_gin.c
+++ b/src/backend/utils/adt/agtype_gin.c
@@ -242,7 +242,10 @@ Datum gin_extract_agtype_query(PG_FUNCTION_ARGS)
/* it should be WAGT_BEGIN_ARRAY */
itok = agtype_iterator_next(&it, &elem, true);
- Assert(itok == WAGT_BEGIN_ARRAY);
+ if (itok != WAGT_BEGIN_ARRAY)
+ {
+ elog(ERROR, "unexpected iterator token: %d", itok);
+ }
while (WAGT_END_ARRAY != agtype_iterator_next(&it, &elem, true))
{
