database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

pgindent run for 9.0

Browse Source
This commit is contained in:
Bruce Momjian
2010-02-26 02:01:40 +00:00
parent 16040575a0
commit 65e806cba1
403 changed files with 6786 additions and 6530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/backend/utils/misc/guc.c
View File

@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.542 2010/02/25 13:26:15 mha Exp $
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.543 2010/02/26 02:01:14 momjian Exp $
*
*--------------------------------------------------------------------
*/
@@ -119,7 +119,7 @@ extern bool fullPageWrites;
extern int vacuum_defer_cleanup_age;
extern int ssl_renegotiation_limit;
int trace_recovery_messages = LOG;
int trace_recovery_messages = LOG;
#ifdef TRACE_SORT
extern bool trace_sort;
@@ -1215,8 +1215,8 @@ static struct config_bool ConfigureNamesBool[] =
{
{"recovery_connections", PGC_POSTMASTER, WAL_SETTINGS,
gettext_noop("During recovery, allows connections and queries. "
" During normal running, causes additional info to be written"
" to WAL to enable hot standby mode on WAL standby nodes."),
" During normal running, causes additional info to be written"
" to WAL to enable hot standby mode on WAL standby nodes."),
NULL
},
&XLogRequestRecoveryConnections,
@@ -1248,7 +1248,7 @@ static struct config_bool ConfigureNamesBool[] =
{"lo_compat_privileges", PGC_SUSET, COMPAT_OPTIONS_PREVIOUS,
gettext_noop("Enables backward compatibility mode for privilege checks on large objects"),
gettext_noop("Skips privilege checks when reading or modifying large objects, "
"for compatibility with PostgreSQL releases prior to 9.0.")
"for compatibility with PostgreSQL releases prior to 9.0.")
},
&lo_compat_privileges,
false, NULL, NULL
@@ -2614,9 +2614,9 @@ static struct config_string ConfigureNamesString[] =
{
{"application_name", PGC_USERSET, LOGGING,
gettext_noop("Sets the application name to be reported in statistics and logs."),
NULL,
GUC_IS_NAME | GUC_REPORT | GUC_NOT_IN_SAMPLE
gettext_noop("Sets the application name to be reported in statistics and logs."),
NULL,
GUC_IS_NAME | GUC_REPORT | GUC_NOT_IN_SAMPLE
},
&application_name,
"", assign_application_name, NULL
@@ -4687,16 +4687,16 @@ set_config_option(const char *name, const char *value,
if (changeVal && !is_newvalue_equal(record, value))
ereport(elevel,
(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
errmsg("parameter \"%s\" cannot be changed without restarting the server",
name)));
errmsg("parameter \"%s\" cannot be changed without restarting the server",
name)));
return true;
}
if (context != PGC_POSTMASTER)
{
ereport(elevel,
(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
errmsg("parameter \"%s\" cannot be changed without restarting the server",
name)));
errmsg("parameter \"%s\" cannot be changed without restarting the server",
name)));
return false;
}
break;
@@ -4758,20 +4758,20 @@ set_config_option(const char *name, const char *value,
/*
* Disallow changing GUC_NOT_WHILE_SEC_REST values if we are inside a
* security restriction context. We can reject this regardless of
* the GUC context or source, mainly because sources that it might be
* reasonable to override for won't be seen while inside a function.
* security restriction context. We can reject this regardless of the GUC
* context or source, mainly because sources that it might be reasonable
* to override for won't be seen while inside a function.
*
* Note: variables marked GUC_NOT_WHILE_SEC_REST should usually be marked
* GUC_NO_RESET_ALL as well, because ResetAllOptions() doesn't check this.
* An exception might be made if the reset value is assumed to be "safe".
*
* Note: this flag is currently used for "session_authorization" and
* "role". We need to prohibit changing these inside a local userid
* "role". We need to prohibit changing these inside a local userid
* context because when we exit it, GUC won't be notified, leaving things
* out of sync. (This could be fixed by forcing a new GUC nesting level,
* but that would change behavior in possibly-undesirable ways.) Also,
* we prohibit changing these in a security-restricted operation because
* but that would change behavior in possibly-undesirable ways.) Also, we
* prohibit changing these in a security-restricted operation because
* otherwise RESET could be used to regain the session user's privileges.
*/
if (record->flags & GUC_NOT_WHILE_SEC_REST)
@@ -4779,8 +4779,8 @@ set_config_option(const char *name, const char *value,
if (InLocalUserIdChange())
{
/*
* Phrasing of this error message is historical, but it's the
* most common case.
* Phrasing of this error message is historical, but it's the most
* common case.
*/
ereport(elevel,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
@@ -6132,8 +6132,8 @@ ShowAllGUCConfig(DestReceiver *dest)
int i;
TupOutputState *tstate;
TupleDesc tupdesc;
Datum values[3];
bool isnull[3] = { false, false, false };
Datum values[3];
bool isnull[3] = {false, false, false};
/* need a tuple descriptor representing three TEXT columns */
tupdesc = CreateTemplateTupleDesc(3, false);
@@ -6150,7 +6150,7 @@ ShowAllGUCConfig(DestReceiver *dest)
for (i = 0; i < num_guc_variables; i++)
{
struct config_generic *conf = guc_variables[i];
char *setting;
char *setting;
if ((conf->flags & GUC_NO_SHOW_ALL) ||
((conf->flags & GUC_SUPERUSER_ONLY) && !am_superuser))
@@ -7591,7 +7591,7 @@ assign_transaction_read_only(bool newval, bool doit, GucSource source)
{
ereport(GUC_complaint_elevel(source),
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("cannot set transaction read-write mode during recovery")));
errmsg("cannot set transaction read-write mode during recovery")));
/* source == PGC_S_OVERRIDE means do it anyway, eg at xact abort */
if (source != PGC_S_OVERRIDE)
return false;

76
src/backend/utils/misc/rbtree.c
View File

@@ -13,14 +13,14 @@
*
* Red-black trees are a type of balanced binary tree wherein (1) any child of
* a red node is always black, and (2) every path from root to leaf traverses
* an equal number of black nodes. From these properties, it follows that the
* an equal number of black nodes. From these properties, it follows that the
* longest path from root to leaf is only about twice as long as the shortest,
* so lookups are guaranteed to run in O(lg n) time.
*
* Copyright (c) 1996-2009, PostgreSQL Global Development Group
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/rbtree.c,v 1.2 2010/02/11 22:17:27 tgl Exp $
* $PostgreSQL: pgsql/src/backend/utils/misc/rbtree.c,v 1.3 2010/02/26 02:01:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,7 +35,7 @@
/*
* Values for RBNode->iteratorState
*/
#define InitialState (0)
#define InitialState (0)
#define FirstStepDone (1)
#define SecondStepDone (2)
#define ThirdStepDone (3)
@@ -49,13 +49,13 @@
typedef struct RBNode
{
uint32 iteratorState:2,
color: 1 ,
unused: 29;
color: 1,
unused:29;
struct RBNode *left;
struct RBNode *right;
struct RBNode *parent;
void *data;
} RBNode;
} RBNode;
struct RBTree
{
@@ -86,7 +86,7 @@ RBNode sentinel = {InitialState, RBBLACK, 0, RBNIL, RBNIL, NULL, NULL};
RBTree *
rb_create(rb_comparator comparator, rb_appendator appendator,
rb_freefunc freefunc, void *arg)
rb_freefunc freefunc, void *arg)
{
RBTree *tree = palloc(sizeof(RBTree));
@@ -94,6 +94,7 @@ rb_create(rb_comparator comparator, rb_appendator appendator,
tree->comparator = comparator;
tree->appendator = appendator;
tree->freefunc = freefunc;
tree->arg = arg;
return tree;
@@ -205,10 +206,10 @@ rb_rotate_right(RBTree *rb, RBNode *x)
/*
* Maintain Red-Black tree balance after inserting node x.
*
* The newly inserted node is always initially marked red. That may lead to
* The newly inserted node is always initially marked red. That may lead to
* a situation where a red node has a red child, which is prohibited. We can
* always fix the problem by a series of color changes and/or "rotations",
* which move the problem progressively higher up in the tree. If one of the
* which move the problem progressively higher up in the tree. If one of the
* two red nodes is the root, we can always fix the problem by changing the
* root from red to black.
*
@@ -219,8 +220,8 @@ static void
rb_insert_fixup(RBTree *rb, RBNode *x)
{
/*
* x is always a red node. Initially, it is the newly inserted node.
* Each iteration of this loop moves it higher up in the tree.
* x is always a red node. Initially, it is the newly inserted node. Each
* iteration of this loop moves it higher up in the tree.
*/
while (x != rb->root && x->parent->color == RBRED)
{
@@ -234,11 +235,11 @@ rb_insert_fixup(RBTree *rb, RBNode *x)
* grandparent still has a problem.
*
* If the uncle is black, we will perform one or two "rotations" to
* balance the tree. Either x or x->parent will take the grandparent's
* position in the tree and recolored black, and the original
* grandparent will be recolored red and become a child of that node.
* This always leaves us with a valid red-black tree, so the loop
* will terminate.
* balance the tree. Either x or x->parent will take the
* grandparent's position in the tree and recolored black, and the
* original grandparent will be recolored red and become a child of
* that node. This always leaves us with a valid red-black tree, so
* the loop will terminate.
*/
if (x->parent == x->parent->parent->left)
{
@@ -250,6 +251,7 @@ rb_insert_fixup(RBTree *rb, RBNode *x)
x->parent->color = RBBLACK;
y->color = RBBLACK;
x->parent->parent->color = RBRED;
x = x->parent->parent;
}
else
@@ -265,6 +267,7 @@ rb_insert_fixup(RBTree *rb, RBNode *x)
/* recolor and rotate */
x->parent->color = RBBLACK;
x->parent->parent->color = RBRED;
rb_rotate_right(rb, x->parent->parent);
}
}
@@ -279,6 +282,7 @@ rb_insert_fixup(RBTree *rb, RBNode *x)
x->parent->color = RBBLACK;
y->color = RBBLACK;
x->parent->parent->color = RBRED;
x = x->parent->parent;
}
else
@@ -291,6 +295,7 @@ rb_insert_fixup(RBTree *rb, RBNode *x)
}
x->parent->color = RBBLACK;
x->parent->parent->color = RBRED;
rb_rotate_left(rb, x->parent->parent);
}
}
@@ -355,6 +360,7 @@ rb_insert(RBTree *rb, void *data)
x->left = RBNIL;
x->right = RBNIL;
x->color = RBRED;
x->iteratorState = InitialState;
/* insert node in tree */
@@ -392,11 +398,11 @@ rb_delete_fixup(RBTree *rb, RBNode *x)
while (x != rb->root && x->color == RBBLACK)
{
/*
* Left and right cases are symmetric. Any nodes that are children
* of x have a black-height one less than the remainder of the nodes
* in the tree. We rotate and recolor nodes to move the problem up
* the tree: at some stage we'll either fix the problem, or reach the
* root (where the black-height is allowed to decrease).
* Left and right cases are symmetric. Any nodes that are children of
* x have a black-height one less than the remainder of the nodes in
* the tree. We rotate and recolor nodes to move the problem up the
* tree: at some stage we'll either fix the problem, or reach the root
* (where the black-height is allowed to decrease).
*/
if (x == x->parent->left)
{
@@ -406,6 +412,7 @@ rb_delete_fixup(RBTree *rb, RBNode *x)
{
w->color = RBBLACK;
x->parent->color = RBRED;
rb_rotate_left(rb, x->parent);
w = x->parent->right;
}
@@ -413,6 +420,7 @@ rb_delete_fixup(RBTree *rb, RBNode *x)
if (w->left->color == RBBLACK && w->right->color == RBBLACK)
{
w->color = RBRED;
x = x->parent;
}
else
@@ -421,14 +429,16 @@ rb_delete_fixup(RBTree *rb, RBNode *x)
{
w->left->color = RBBLACK;
w->color = RBRED;
rb_rotate_right(rb, w);
w = x->parent->right;
}
w->color = x->parent->color;
x->parent->color = RBBLACK;
w->right->color = RBBLACK;
rb_rotate_left(rb, x->parent);
x = rb->root; /* Arrange for loop to terminate. */
x = rb->root; /* Arrange for loop to terminate. */
}
}
else
@@ -439,6 +449,7 @@ rb_delete_fixup(RBTree *rb, RBNode *x)
{
w->color = RBBLACK;
x->parent->color = RBRED;
rb_rotate_right(rb, x->parent);
w = x->parent->left;
}
@@ -446,6 +457,7 @@ rb_delete_fixup(RBTree *rb, RBNode *x)
if (w->right->color == RBBLACK && w->left->color == RBBLACK)
{
w->color = RBRED;
x = x->parent;
}
else
@@ -454,14 +466,16 @@ rb_delete_fixup(RBTree *rb, RBNode *x)
{
w->right->color = RBBLACK;
w->color = RBRED;
rb_rotate_left(rb, w);
w = x->parent->left;
}
w->color = x->parent->color;
x->parent->color = RBBLACK;
w->left->color = RBBLACK;
rb_rotate_right(rb, x->parent);
x = rb->root; /* Arrange for loop to terminate. */
x = rb->root; /* Arrange for loop to terminate. */
}
}
}
@@ -519,9 +533,8 @@ rb_delete_node(RBTree *rb, RBNode *z)
}
/*
* If we removed the tree successor of z rather than z itself, then
* attach the data for the removed node to the one we were supposed to
* remove.
* If we removed the tree successor of z rather than z itself, then attach
* the data for the removed node to the one we were supposed to remove.
*/
if (y != z)
z->data = y->data;
@@ -550,7 +563,8 @@ rb_delete(RBTree *rb, void *data)
{
/* found node to delete */
if (rb->freefunc)
rb->freefunc(node->data);
rb->freefunc (node->data);
node->data = NULL;
rb_delete_node(rb, node);
return;
@@ -756,16 +770,16 @@ rb_begin_iterate(RBTree *rb, RBOrderControl ctrl)
switch (ctrl)
{
case LeftRightWalk: /* visit left, then self, then right */
case LeftRightWalk: /* visit left, then self, then right */
iterator->iterate = rb_left_right_iterator;
break;
case RightLeftWalk: /* visit right, then self, then left */
case RightLeftWalk: /* visit right, then self, then left */
iterator->iterate = rb_right_left_iterator;
break;
case DirectWalk: /* visit self, then left, then right */
case DirectWalk: /* visit self, then left, then right */
iterator->iterate = rb_direct_iterator;
break;
case InvertedWalk: /* visit left, then right, then self */
case InvertedWalk: /* visit left, then right, then self */
iterator->iterate = rb_inverted_iterator;
break;
default: