From fac366983184143e058bea7b5cd896920b8f8361 Mon Sep 17 00:00:00 2001 From: ytwx1993 Date: Wed, 26 Jul 2023 09:50:44 +0800 Subject: [PATCH] =?UTF-8?q?contrib=E7=9B=AE=E5=BD=95=E4=B8=8B=E5=87=A0?= =?UTF-8?q?=E4=B8=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contrib/gauss_connector/gc_fdw.cpp | 4 ++-- contrib/pg_stat_statements/pg_stat_statements.cpp | 2 +- contrib/tablefunc/tablefunc.cpp | 4 ++-- contrib/tcn/tcn.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/gauss_connector/gc_fdw.cpp b/contrib/gauss_connector/gc_fdw.cpp index 15bcd2d80..567bc261f 100644 --- a/contrib/gauss_connector/gc_fdw.cpp +++ b/contrib/gauss_connector/gc_fdw.cpp @@ -163,8 +163,8 @@ static ForeignScan *gcGetForeignPlan(PlannerInfo *root, Oid foreigntableid, ForeignPath *best_path, List *tlist, - List *scan_clauses/*, - Plan *outer_plan*/); + List *scan_clauses, + Plan *outer_plan); static void gcBeginForeignScan(ForeignScanState* node, int eflags); static TupleTableSlot* gcIterateForeignScan(ForeignScanState* node); static VectorBatch* gcIterateVecForeignScan(VecForeignScanState* node); diff --git a/contrib/pg_stat_statements/pg_stat_statements.cpp b/contrib/pg_stat_statements/pg_stat_statements.cpp index 9ce5d9ca4..b91661ddc 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.cpp +++ b/contrib/pg_stat_statements/pg_stat_statements.cpp @@ -135,7 +135,7 @@ typedef struct pgssEntry { * Global shared state */ typedef struct pgssSharedState { - LWLockId lock; /* protects hashtable search/modification */ + LWLock* lock; /* protects hashtable search/modification */ int query_size; /* max query length in bytes */ double cur_median_usage; /* current median usage in hashtable */ } pgssSharedState; diff --git a/contrib/tablefunc/tablefunc.cpp b/contrib/tablefunc/tablefunc.cpp index a41c7b923..3cea76986 100644 --- a/contrib/tablefunc/tablefunc.cpp +++ b/contrib/tablefunc/tablefunc.cpp @@ -1435,9 +1435,9 @@ static bool compatCrosstabTupleDescs(TupleDesc ret_tupdesc, TupleDesc sql_tupdes * attribute [2] of the sql tuple should match attributes [1] to [natts] * of the return tuple */ - sql_attr = sql_tupdesc->attrs[2]; + sql_attr = &sql_tupdesc->attrs[2]; for (i = 1; i < ret_tupdesc->natts; i++) { - ret_attr = ret_tupdesc->attrs[i]; + ret_attr = &ret_tupdesc->attrs[i]; if (ret_attr->atttypid != sql_attr->atttypid) return false; diff --git a/contrib/tcn/tcn.cpp b/contrib/tcn/tcn.cpp index 33c7a684a..2e9c73f79 100644 --- a/contrib/tcn/tcn.cpp +++ b/contrib/tcn/tcn.cpp @@ -152,7 +152,7 @@ Datum triggered_change_notification(PG_FUNCTION_ARGS) int colno = index->indkey.values[i]; appendStringInfoCharMacro(payload, ','); - strcpy_quoted(payload, NameStr((tupdesc->attrs[colno - 1])->attname), '"'); + strcpy_quoted(payload, NameStr((tupdesc->attrs[colno - 1]).attname), '"'); appendStringInfoCharMacro(payload, '='); strcpy_quoted(payload, SPI_getvalue(trigtuple, tupdesc, colno), '\''); }