mirror of
https://github.com/postgres/postgres.git
synced 2025-06-11 20:28:21 +03:00
pgindent run for release 9.3
This is the first run of the Perl-based pgindent script. Also update pgindent instructions.
This commit is contained in:
@ -326,7 +326,7 @@ configure_remote_session(PGconn *conn)
|
||||
* anyway. However it makes the regression test outputs more predictable.
|
||||
*
|
||||
* We don't risk setting remote zone equal to ours, since the remote
|
||||
* server might use a different timezone database. Instead, use UTC
|
||||
* server might use a different timezone database. Instead, use UTC
|
||||
* (quoted, because very old servers are picky about case).
|
||||
*/
|
||||
do_sql_command(conn, "SET timezone = 'UTC'");
|
||||
|
@ -133,7 +133,7 @@ typedef struct PgFdwScanState
|
||||
|
||||
/* extracted fdw_private data */
|
||||
char *query; /* text of SELECT command */
|
||||
List *retrieved_attrs; /* list of retrieved attribute numbers */
|
||||
List *retrieved_attrs; /* list of retrieved attribute numbers */
|
||||
|
||||
/* for remote query execution */
|
||||
PGconn *conn; /* connection for the scan */
|
||||
@ -174,7 +174,7 @@ typedef struct PgFdwModifyState
|
||||
char *query; /* text of INSERT/UPDATE/DELETE command */
|
||||
List *target_attrs; /* list of target attribute numbers */
|
||||
bool has_returning; /* is there a RETURNING clause? */
|
||||
List *retrieved_attrs; /* attr numbers retrieved by RETURNING */
|
||||
List *retrieved_attrs; /* attr numbers retrieved by RETURNING */
|
||||
|
||||
/* info about parameters for prepared statement */
|
||||
AttrNumber ctidAttno; /* attnum of input resjunk ctid column */
|
||||
@ -192,7 +192,7 @@ typedef struct PgFdwAnalyzeState
|
||||
{
|
||||
Relation rel; /* relcache entry for the foreign table */
|
||||
AttInMetadata *attinmeta; /* attribute datatype conversion metadata */
|
||||
List *retrieved_attrs; /* attr numbers retrieved by query */
|
||||
List *retrieved_attrs; /* attr numbers retrieved by query */
|
||||
|
||||
/* collected sample rows */
|
||||
HeapTuple *rows; /* array of size targrows */
|
||||
@ -424,8 +424,8 @@ postgresGetForeignRelSize(PlannerInfo *root,
|
||||
|
||||
/*
|
||||
* If the table or the server is configured to use remote estimates,
|
||||
* identify which user to do remote access as during planning. This
|
||||
* should match what ExecCheckRTEPerms() does. If we fail due to lack of
|
||||
* identify which user to do remote access as during planning. This
|
||||
* should match what ExecCheckRTEPerms() does. If we fail due to lack of
|
||||
* permissions, the query would have failed at runtime anyway.
|
||||
*/
|
||||
if (fpinfo->use_remote_estimate)
|
||||
@ -447,7 +447,7 @@ postgresGetForeignRelSize(PlannerInfo *root,
|
||||
|
||||
/*
|
||||
* Identify which attributes will need to be retrieved from the remote
|
||||
* server. These include all attrs needed for joins or final output, plus
|
||||
* server. These include all attrs needed for joins or final output, plus
|
||||
* all attrs used in the local_conds. (Note: if we end up using a
|
||||
* parameterized scan, it's possible that some of the join clauses will be
|
||||
* sent to the remote and thus we wouldn't really need to retrieve the
|
||||
@ -921,7 +921,7 @@ postgresBeginForeignScan(ForeignScanState *node, int eflags)
|
||||
fsstate->query = strVal(list_nth(fsplan->fdw_private,
|
||||
FdwScanPrivateSelectSql));
|
||||
fsstate->retrieved_attrs = (List *) list_nth(fsplan->fdw_private,
|
||||
FdwScanPrivateRetrievedAttrs);
|
||||
FdwScanPrivateRetrievedAttrs);
|
||||
|
||||
/* Create contexts for batches of tuples and per-tuple temp workspace. */
|
||||
fsstate->batch_cxt = AllocSetContextCreate(estate->es_query_cxt,
|
||||
@ -1305,7 +1305,7 @@ postgresBeginForeignModify(ModifyTableState *mtstate,
|
||||
fmstate->has_returning = intVal(list_nth(fdw_private,
|
||||
FdwModifyPrivateHasReturning));
|
||||
fmstate->retrieved_attrs = (List *) list_nth(fdw_private,
|
||||
FdwModifyPrivateRetrievedAttrs);
|
||||
FdwModifyPrivateRetrievedAttrs);
|
||||
|
||||
/* Create context for per-tuple temp workspace. */
|
||||
fmstate->temp_cxt = AllocSetContextCreate(estate->es_query_cxt,
|
||||
@ -1903,7 +1903,7 @@ create_cursor(ForeignScanState *node)
|
||||
* Notice that we pass NULL for paramTypes, thus forcing the remote server
|
||||
* to infer types for all parameters. Since we explicitly cast every
|
||||
* parameter (see deparse.c), the "inference" is trivial and will produce
|
||||
* the desired result. This allows us to avoid assuming that the remote
|
||||
* the desired result. This allows us to avoid assuming that the remote
|
||||
* server has the same OIDs we do for the parameters' types.
|
||||
*
|
||||
* We don't use a PG_TRY block here, so be careful not to throw error
|
||||
@ -2488,7 +2488,7 @@ analyze_row_processor(PGresult *res, int row, PgFdwAnalyzeState *astate)
|
||||
astate->rows[pos] = make_tuple_from_result_row(res, row,
|
||||
astate->rel,
|
||||
astate->attinmeta,
|
||||
astate->retrieved_attrs,
|
||||
astate->retrieved_attrs,
|
||||
astate->temp_cxt);
|
||||
|
||||
MemoryContextSwitchTo(oldcontext);
|
||||
|
@ -71,6 +71,6 @@ extern void deparseDeleteSql(StringInfo buf, PlannerInfo *root,
|
||||
List **retrieved_attrs);
|
||||
extern void deparseAnalyzeSizeSql(StringInfo buf, Relation rel);
|
||||
extern void deparseAnalyzeSql(StringInfo buf, Relation rel,
|
||||
List **retrieved_attrs);
|
||||
List **retrieved_attrs);
|
||||
|
||||
#endif /* POSTGRES_FDW_H */
|
||||
|
Reference in New Issue
Block a user