mirror of
https://github.com/postgres/postgres.git
synced 2025-08-24 09:27:52 +03:00
pgindent run on all C files. Java run to follow. initdb/regression
tests pass.
This commit is contained in:
@@ -216,5 +216,4 @@ inspectOpNode(Expr *expr)
|
||||
secondExpr = lsecond(expr->args);
|
||||
return (firstExpr && secondExpr && nodeTag(firstExpr) == T_Var && nodeTag(secondExpr) == T_Const);
|
||||
}
|
||||
|
||||
#endif /* ENABLE_KEY_SET_QUERY */
|
||||
|
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.29 2001/03/22 03:59:38 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.30 2001/10/25 05:49:33 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -157,7 +157,6 @@ canonicalize_qual(Expr *qual, bool removeAndFlag)
|
||||
*/
|
||||
if (cnfok)
|
||||
{
|
||||
|
||||
/*
|
||||
* Normalize into conjunctive normal form, and clean up the
|
||||
* result.
|
||||
@@ -166,7 +165,6 @@ canonicalize_qual(Expr *qual, bool removeAndFlag)
|
||||
}
|
||||
else if (dnfok)
|
||||
{
|
||||
|
||||
/*
|
||||
* Normalize into disjunctive normal form, and clean up the
|
||||
* result.
|
||||
@@ -260,7 +258,6 @@ dnfify(Expr *qual)
|
||||
|
||||
return newqual;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/*--------------------
|
||||
@@ -539,7 +536,6 @@ push_nots(Expr *qual)
|
||||
}
|
||||
else if (not_clause((Node *) qual))
|
||||
{
|
||||
|
||||
/*
|
||||
* Another 'not' cancels this 'not', so eliminate the 'not' and
|
||||
* stop negating this branch. But search the subexpression for
|
||||
@@ -549,7 +545,6 @@ push_nots(Expr *qual)
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
/*
|
||||
* We don't know how to negate anything else, place a 'not' at
|
||||
* this level.
|
||||
@@ -959,7 +954,6 @@ count_bool_nodes(Expr *qual,
|
||||
}
|
||||
else if (contain_subplans((Node *) qual))
|
||||
{
|
||||
|
||||
/*
|
||||
* charge extra for subexpressions containing sub-SELECTs, to
|
||||
* discourage us from rearranging them in a way that might
|
||||
|
@@ -15,7 +15,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.43 2001/09/06 02:07:42 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.44 2001/10/25 05:49:33 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -49,7 +49,6 @@ preprocess_targetlist(List *tlist,
|
||||
Index result_relation,
|
||||
List *range_table)
|
||||
{
|
||||
|
||||
/*
|
||||
* Sanity check: if there is a result relation, it'd better be a real
|
||||
* relation not a subquery. Else parser or rewriter messed up.
|
||||
@@ -175,7 +174,6 @@ expand_targetlist(List *tlist, int command_type,
|
||||
|
||||
if (new_tle == NULL)
|
||||
{
|
||||
|
||||
/*
|
||||
* Didn't find a matching tlist entry, so make one.
|
||||
*
|
||||
@@ -203,7 +201,8 @@ expand_targetlist(List *tlist, int command_type,
|
||||
/*
|
||||
* Set attributes are represented as OIDs no
|
||||
* matter what the set element type is, and
|
||||
* the element type's default is irrelevant too.
|
||||
* the element type's default is irrelevant
|
||||
* too.
|
||||
*/
|
||||
hasdefault = false;
|
||||
typedefault = (Datum) 0;
|
||||
@@ -335,7 +334,6 @@ process_matched_tle(TargetEntry *src_tle,
|
||||
|
||||
if (prior_tle == NULL)
|
||||
{
|
||||
|
||||
/*
|
||||
* Normal case where this is the first assignment to the
|
||||
* attribute.
|
||||
|
@@ -14,7 +14,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.66 2001/08/14 17:12:57 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.67 2001/10/25 05:49:34 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -275,7 +275,7 @@ generate_nonunion_plan(SetOperationStmt *op, Query *parse,
|
||||
*
|
||||
* The tlist for an Append plan isn't important as far as the Append is
|
||||
* concerned, but we must make it look real anyway for the benefit of
|
||||
* the next plan level up. In fact, it has to be real enough that the
|
||||
* the next plan level up. In fact, it has to be real enough that the
|
||||
* flag column is shown as a variable not a constant, else setrefs.c
|
||||
* will get confused.
|
||||
*/
|
||||
@@ -358,7 +358,7 @@ recurse_union_children(Node *setOp, Query *parse,
|
||||
*
|
||||
* colTypes: column datatypes for non-junk columns
|
||||
* flag: -1 if no flag column needed, 0 or 1 to create a const flag column,
|
||||
* 2 to create a variable flag column
|
||||
* 2 to create a variable flag column
|
||||
* hack_constants: true to copy up constants (see comments in code)
|
||||
* input_tlist: targetlist of this node's input node
|
||||
* refnames_tlist: targetlist to take column names from
|
||||
@@ -538,7 +538,7 @@ find_all_inheritors(Oid parentrel)
|
||||
* If not, return NIL.
|
||||
*
|
||||
* When dup_parent is false, the initially given RT index is part of the
|
||||
* returned list (if any). When dup_parent is true, the given RT index
|
||||
* returned list (if any). When dup_parent is true, the given RT index
|
||||
* is *not* in the returned list; a duplicate RTE will be made for the
|
||||
* parent table.
|
||||
*
|
||||
@@ -571,6 +571,7 @@ expand_inherted_rtentry(Query *parse, Index rti, bool dup_parent)
|
||||
return NIL;
|
||||
/* Scan for all members of inheritance set */
|
||||
inhOIDs = find_all_inheritors(parentOID);
|
||||
|
||||
/*
|
||||
* Check that there's at least one descendant, else treat as no-child
|
||||
* case. This could happen despite above has_subclass() check, if
|
||||
@@ -582,7 +583,7 @@ expand_inherted_rtentry(Query *parse, Index rti, bool dup_parent)
|
||||
if (dup_parent)
|
||||
inhRTIs = NIL;
|
||||
else
|
||||
inhRTIs = makeListi1(rti); /* include original RTE in result */
|
||||
inhRTIs = makeListi1(rti); /* include original RTE in result */
|
||||
|
||||
foreach(l, inhOIDs)
|
||||
{
|
||||
@@ -728,10 +729,10 @@ adjust_inherited_attrs_mutator(Node *node,
|
||||
/*
|
||||
* BUT: although we don't need to recurse into subplans, we do need to
|
||||
* make sure that they are copied, not just referenced as
|
||||
* expression_tree_mutator will do by default. Otherwise we'll have the
|
||||
* same subplan node referenced from each arm of the inheritance APPEND
|
||||
* plan, which will cause trouble in the executor. This is a kluge
|
||||
* that should go away when we redesign querytrees.
|
||||
* expression_tree_mutator will do by default. Otherwise we'll have
|
||||
* the same subplan node referenced from each arm of the inheritance
|
||||
* APPEND plan, which will cause trouble in the executor. This is a
|
||||
* kluge that should go away when we redesign querytrees.
|
||||
*/
|
||||
if (is_subplan(node))
|
||||
{
|
||||
|
Reference in New Issue
Block a user