mirror of
https://github.com/postgres/postgres.git
synced 2025-11-09 06:21:09 +03:00
New pgindent run with fixes suggested by Tom. Patch manually reviewed,
initdb/regression tests pass.
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.14 2001/10/25 05:49:27 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.15 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -54,13 +54,13 @@ typedef struct _teePlanInfo
|
||||
char *tpi_relName;
|
||||
Query *tpi_parsetree;
|
||||
Plan *tpi_plan;
|
||||
} TeePlanInfo;
|
||||
} TeePlanInfo;
|
||||
|
||||
typedef struct _teeInfo
|
||||
{
|
||||
int num;
|
||||
TeePlanInfo *val;
|
||||
} TeeInfo;
|
||||
} TeeInfo;
|
||||
|
||||
QueryTreeList *appendQlist(QueryTreeList * q1, QueryTreeList * q2);
|
||||
void OffsetVarAttno(Node *node, int varno, int offset);
|
||||
@@ -186,7 +186,7 @@ beginRecipe(RecipeStmt *stmt)
|
||||
|
||||
#ifdef DEBUG_RECIPE
|
||||
elog(NOTICE, "beginRecipe: eyes[%d] = %s\n", i, e->nodeName);
|
||||
#endif /* DEBUG_RECIPE */
|
||||
#endif /* DEBUG_RECIPE */
|
||||
|
||||
qList = tg_parseSubQuery(r, e->inNodes->val[0], teeInfo);
|
||||
|
||||
@@ -835,7 +835,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
|
||||
|
||||
#ifdef DEBUG_RECIPE
|
||||
elog(NOTICE, "calling parser with %s", elem->src);
|
||||
#endif /* DEBUG_RECIPE */
|
||||
#endif /* DEBUG_RECIPE */
|
||||
|
||||
parameterCount = getParamTypes(elem, typev);
|
||||
|
||||
@@ -878,7 +878,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
|
||||
|
||||
#ifdef DEBUG_RECIPE
|
||||
elog(NOTICE, "calling parser with %s", newquery);
|
||||
#endif /* DEBUG_RECIPE */
|
||||
#endif /* DEBUG_RECIPE */
|
||||
|
||||
qList = parser(newquery, typev, parameterCount);
|
||||
if (qList->len > 1)
|
||||
@@ -1315,4 +1315,4 @@ replaceTeeScans(Plan *plan, Query *parsetree, TeeInfo * teeInfo)
|
||||
}
|
||||
|
||||
|
||||
#endif /* TIOGA */
|
||||
#endif /* TIOGA */
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: recipe.h,v 1.5 2001/10/28 06:25:43 momjian Exp $
|
||||
* $Id: recipe.h,v 1.6 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -17,4 +17,4 @@
|
||||
|
||||
extern void beginRecipe(RecipeStmt *stmt);
|
||||
|
||||
#endif /* RECIPE_H */
|
||||
#endif /* RECIPE_H */
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
* doesn't work! - jolly 8/19/95
|
||||
*
|
||||
*
|
||||
* $Id: version.c,v 1.28 2001/10/28 06:25:43 momjian Exp $
|
||||
* $Id: version.c,v 1.29 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
* NOTES
|
||||
* At the point the version is defined, 2 physical relations are created
|
||||
@@ -287,7 +287,7 @@ VersionDelete(char *vname, char *bname, char *snapshot)
|
||||
vname, vname, vname, bname, bname, snapshot, bname);
|
||||
|
||||
eval_as_new_xact(rule_buf);
|
||||
#endif /* OLD_REWRITE */
|
||||
#endif /* OLD_REWRITE */
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -338,7 +338,7 @@ VersionReplace(char *vname, char *bname, char *snapshot)
|
||||
vname, vname, vname, attr_list, bname, bname, snapshot, vname, bname);
|
||||
|
||||
eval_as_new_xact(rule_buf);
|
||||
#endif /* OLD_REWRITE */
|
||||
#endif /* OLD_REWRITE */
|
||||
/* printf("%s\n",rule_buf); */
|
||||
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.149 2001/11/02 16:30:29 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.150 2001/11/05 17:46:24 momjian Exp $
|
||||
*
|
||||
* NOTES
|
||||
* The PerformAddAttribute() code, like most of the relation
|
||||
@@ -819,7 +819,7 @@ typedef struct SysScanDescData
|
||||
IndexScanDesc iscan;
|
||||
HeapTupleData tuple;
|
||||
Buffer buffer;
|
||||
} SysScanDescData, *SysScanDesc;
|
||||
} SysScanDescData, *SysScanDesc;
|
||||
|
||||
static void *
|
||||
systable_beginscan(Relation rel, const char *indexRelname, int nkeys, ScanKey entry)
|
||||
@@ -1017,7 +1017,7 @@ RemoveColumnReferences(Oid reloid, int attnum, bool checkonly, HeapTuple reltup)
|
||||
|
||||
return checkok;
|
||||
}
|
||||
#endif /* _DROP_COLUMN_HACK__ */
|
||||
#endif /* _DROP_COLUMN_HACK__ */
|
||||
|
||||
/*
|
||||
* ALTER TABLE DROP COLUMN
|
||||
@@ -1174,7 +1174,7 @@ AlterTableDropColumn(const char *relationName,
|
||||
heap_close(rel, NoLock);
|
||||
#else
|
||||
elog(ERROR, "ALTER TABLE / DROP COLUMN is not implemented");
|
||||
#endif /* _DROP_COLUMN_HACK__ */
|
||||
#endif /* _DROP_COLUMN_HACK__ */
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.64 2001/10/25 05:49:25 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.65 2001/11/05 17:46:24 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -227,7 +227,7 @@ AttributeAndRelationRemove(Oid typeOid)
|
||||
}
|
||||
heap_close(rel, RowExclusiveLock);
|
||||
}
|
||||
#endif /* NOTYET */
|
||||
#endif /* NOTYET */
|
||||
|
||||
/*
|
||||
* TypeRemove
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.60 2001/11/02 16:30:29 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.61 2001/11/05 17:46:24 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -258,8 +258,8 @@ renamerel(const char *oldrelname, const char *newrelname)
|
||||
return; /* all done... */
|
||||
|
||||
/*
|
||||
* Grab an exclusive lock on the target table or index, which we will NOT
|
||||
* release until end of transaction.
|
||||
* Grab an exclusive lock on the target table or index, which we will
|
||||
* NOT release until end of transaction.
|
||||
*/
|
||||
targetrelation = relation_openr(oldrelname, AccessExclusiveLock);
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.66 2001/10/28 06:25:42 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.67 2001/11/05 17:46:24 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -38,7 +38,7 @@
|
||||
#endif
|
||||
#else /* INT64_IS_BUSTED */
|
||||
#define SEQ_MAXVALUE ((int64) 0x7FFFFFFF)
|
||||
#endif /* INT64_IS_BUSTED */
|
||||
#endif /* INT64_IS_BUSTED */
|
||||
|
||||
#define SEQ_MINVALUE (-SEQ_MAXVALUE)
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.89 2001/11/04 19:55:31 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.90 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -101,12 +101,13 @@ write_password_file(Relation rel)
|
||||
str_n = DatumGetCString(DirectFunctionCall1(nameout, datum_n));
|
||||
|
||||
datum_p = heap_getattr(tuple, Anum_pg_shadow_passwd, dsc, &null_p);
|
||||
|
||||
/*
|
||||
* It can be argued that people having a null password shouldn't
|
||||
* be allowed to connect under password authentication, because
|
||||
* they need to have a password set up first. If you think assuming an
|
||||
* empty password in that case is better, change this logic to look
|
||||
* something like the code for valuntil.
|
||||
* they need to have a password set up first. If you think
|
||||
* assuming an empty password in that case is better, change this
|
||||
* logic to look something like the code for valuntil.
|
||||
*/
|
||||
if (null_p)
|
||||
{
|
||||
@@ -132,9 +133,9 @@ write_password_file(Relation rel)
|
||||
elog(ERROR, "Invalid user password '%s'", str_p);
|
||||
|
||||
/*
|
||||
* The extra columns we emit here are not really necessary. To remove
|
||||
* them, the parser in backend/libpq/crypt.c would need to be
|
||||
* adjusted.
|
||||
* The extra columns we emit here are not really necessary. To
|
||||
* remove them, the parser in backend/libpq/crypt.c would need to
|
||||
* be adjusted.
|
||||
*/
|
||||
fprintf(fp,
|
||||
"%s"
|
||||
@@ -168,8 +169,8 @@ write_password_file(Relation rel)
|
||||
FreeFile(fp);
|
||||
|
||||
/*
|
||||
* Rename the temp file to its final name, deleting the old pg_pwd.
|
||||
* We expect that rename(2) is an atomic action.
|
||||
* Rename the temp file to its final name, deleting the old pg_pwd. We
|
||||
* expect that rename(2) is an atomic action.
|
||||
*/
|
||||
if (rename(tempname, filename))
|
||||
elog(ERROR, "rename %s to %s: %m", tempname, filename);
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.211 2001/10/28 06:25:43 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.212 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -860,7 +860,7 @@ full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt)
|
||||
Irel = (Relation *) NULL;
|
||||
activate_indexes_of_a_table(RelationGetRelid(onerel), false);
|
||||
}
|
||||
#endif /* NOT_USED */
|
||||
#endif /* NOT_USED */
|
||||
|
||||
/* Clean/scan index relation(s) */
|
||||
if (Irel != (Relation *) NULL)
|
||||
@@ -912,7 +912,7 @@ full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt)
|
||||
#ifdef NOT_USED
|
||||
if (reindex)
|
||||
activate_indexes_of_a_table(RelationGetRelid(onerel), true);
|
||||
#endif /* NOT_USED */
|
||||
#endif /* NOT_USED */
|
||||
|
||||
/* update shared free space map with final free space info */
|
||||
vac_update_fsm(onerel, &fraged_pages, vacrelstats->rel_pages);
|
||||
|
||||
Reference in New Issue
Block a user