This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 1631b92a0b2 Fix some compile errors
1631b92a0b2 is described below
commit 1631b92a0b209be2677681e919641f80249f33b8
Author: Jinbao Chen <[email protected]>
AuthorDate: Tue Oct 7 23:39:47 2025 +0800
Fix some compile errors
---
src/backend/fts/ftsprobe.c | 14 +++++++-------
src/backend/optimizer/plan/planner.c | 4 ++--
src/backend/optimizer/util/clauses.c | 16 ++++++++--------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/backend/fts/ftsprobe.c b/src/backend/fts/ftsprobe.c
index 40d38278dad..fbc95c4742f 100644
--- a/src/backend/fts/ftsprobe.c
+++ b/src/backend/fts/ftsprobe.c
@@ -209,12 +209,12 @@ ftsConnectStart(fts_segment_info *ftsInfo)
static void
checkIfFailedDueToNormalRestart(fts_segment_info *ftsInfo)
{
- if (strstr(PQerrorMessage(ftsInfo->conn),
_(POSTMASTER_IN_RECOVERY_MSG)) ||
- strstr(PQerrorMessage(ftsInfo->conn),
_(POSTMASTER_IN_STARTUP_MSG)))
+ if (strstr(PQerrorMessage(ftsInfo->conn), (POSTMASTER_IN_RECOVERY_MSG))
||
+ strstr(PQerrorMessage(ftsInfo->conn),
(POSTMASTER_IN_STARTUP_MSG)))
{
XLogRecPtr tmpptr;
char *ptr = strstr(PQerrorMessage(ftsInfo->conn),
- _(POSTMASTER_IN_RECOVERY_DETAIL_MSG));
+ (POSTMASTER_IN_RECOVERY_DETAIL_MSG));
uint32 tmp_xlogid;
uint32 tmp_xrecoff;
@@ -269,7 +269,7 @@ checkIfFailedDueToNormalRestart(fts_segment_info *ftsInfo)
ftsInfo->mirror_cdbinfo->config->dbid);
}
}
- else if (strstr(PQerrorMessage(ftsInfo->conn),
_(POSTMASTER_IN_RESET_MSG)))
+ else if (strstr(PQerrorMessage(ftsInfo->conn),
(POSTMASTER_IN_RESET_MSG)))
{
ftsInfo->restart_state = PM_IN_RESETTING;
elog(LOG, "FTS: detected segment is in RESET state (content=%d)
"
@@ -1092,7 +1092,7 @@ processResponse(fts_context *context)
/* If primary is in resetting or making
progress in recovery, do not mark it down and promote mirror */
if (ftsInfo->restart_state == PM_IN_RESETTING)
{
-
Assert(strstr(PQerrorMessage(ftsInfo->conn), _(POSTMASTER_IN_RESET_MSG)));
+
Assert(strstr(PQerrorMessage(ftsInfo->conn), (POSTMASTER_IN_RESET_MSG)));
elogif(gp_log_fts >=
GPVARS_VERBOSITY_VERBOSE, LOG,
"FTS: detected segment is in
resetting mode "
"(content=%d) primary dbid=%d,
mirror dbid=%d",
@@ -1103,8 +1103,8 @@ processResponse(fts_context *context)
}
else if (ftsInfo->restart_state ==
PM_IN_RECOVERY_MAKING_PROGRESS)
{
-
Assert(strstr(PQerrorMessage(ftsInfo->conn), _(POSTMASTER_IN_RECOVERY_MSG)) ||
-
strstr(PQerrorMessage(ftsInfo->conn), _(POSTMASTER_IN_STARTUP_MSG)));
+
Assert(strstr(PQerrorMessage(ftsInfo->conn), (POSTMASTER_IN_RECOVERY_MSG)) ||
+
strstr(PQerrorMessage(ftsInfo->conn), (POSTMASTER_IN_STARTUP_MSG)));
elogif(gp_log_fts >=
GPVARS_VERBOSITY_VERBOSE, LOG,
"FTS: detected segment is in
recovery mode and making "
"progress (content=%d) primary
dbid=%d, mirror dbid=%d",
diff --git a/src/backend/optimizer/plan/planner.c
b/src/backend/optimizer/plan/planner.c
index 4e767aaea03..06a247fe7d3 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -1259,7 +1259,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
*/
if (rte->lateral && root->hasJoinRTEs)
rte->subquery = (Query *)
- flatten_join_alias_vars(root,
root->parse,
+ flatten_join_alias_vars(root->parse,
(Node *) rte->subquery);
}
else if (rte->rtekind == RTE_FUNCTION || rte->rtekind ==
RTE_TABLEFUNCTION)
@@ -1460,7 +1460,7 @@ preprocess_expression(PlannerInfo *root, Node *expr, int
kind)
kind == EXPRKIND_VALUES ||
kind == EXPRKIND_TABLESAMPLE ||
kind == EXPRKIND_TABLEFUNC))
- expr = flatten_join_alias_vars(root, root->parse, expr);
+ expr = flatten_join_alias_vars(root->parse, expr);
if (root->parse->hasFuncsWithExecRestrictions)
{
diff --git a/src/backend/optimizer/util/clauses.c
b/src/backend/optimizer/util/clauses.c
index 20a1c8a1d57..4bfb238e82c 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -5738,35 +5738,35 @@ flatten_join_alias_var_optimizer(Query *query, int
queryLevel)
if (NIL != targetList)
{
/*.MERGE16_FIXME: We should not use null here */
- queryNew->targetList = (List *) flatten_join_alias_vars(NULL,
queryNew, (Node *) targetList);
+ queryNew->targetList = (List *)
flatten_join_alias_vars(queryNew, (Node *) targetList);
list_free(targetList);
}
List * returningList = queryNew->returningList;
if (NIL != returningList)
{
- queryNew->returningList = (List *)
flatten_join_alias_vars(NULL, queryNew, (Node *) returningList);
+ queryNew->returningList = (List *)
flatten_join_alias_vars(queryNew, (Node *) returningList);
list_free(returningList);
}
Node *havingQual = queryNew->havingQual;
if (NULL != havingQual)
{
- queryNew->havingQual = flatten_join_alias_vars(NULL, queryNew,
havingQual);
+ queryNew->havingQual = flatten_join_alias_vars(queryNew,
havingQual);
pfree(havingQual);
}
List *scatterClause = queryNew->scatterClause;
if (NIL != scatterClause)
{
- queryNew->scatterClause = (List *)
flatten_join_alias_vars(NULL, queryNew, (Node *) scatterClause);
+ queryNew->scatterClause = (List *)
flatten_join_alias_vars(queryNew, (Node *) scatterClause);
list_free(scatterClause);
}
Node *limitOffset = queryNew->limitOffset;
if (NULL != limitOffset)
{
- queryNew->limitOffset = flatten_join_alias_vars(NULL, queryNew,
limitOffset);
+ queryNew->limitOffset = flatten_join_alias_vars(queryNew,
limitOffset);
pfree(limitOffset);
}
@@ -5783,17 +5783,17 @@ flatten_join_alias_var_optimizer(Query *query, int
queryLevel)
continue;
if (wc->startOffset)
- wc->startOffset = flatten_join_alias_vars(NULL,
queryNew, wc->startOffset);
+ wc->startOffset =
flatten_join_alias_vars(queryNew, wc->startOffset);
if (wc->endOffset)
- wc->endOffset = flatten_join_alias_vars(NULL,
queryNew, wc->endOffset);
+ wc->endOffset =
flatten_join_alias_vars(queryNew, wc->endOffset);
}
}
Node *limitCount = queryNew->limitCount;
if (NULL != limitCount)
{
- queryNew->limitCount = flatten_join_alias_vars(NULL, queryNew,
limitCount);
+ queryNew->limitCount = flatten_join_alias_vars(queryNew,
limitCount);
pfree(limitCount);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
