Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7cf952e

Browse files
bmomjianbmomjian
committed
Fix comments that were mis-wrapped, for Tom Lane.
1 parent 4e911c8 commit 7cf952e

File tree

30 files changed

+205
-130
lines changed

30 files changed

+205
-130
lines changed

‎contrib/spi/refint.c

+18-8
Original file line numberDiff line numberDiff line change
@@ -399,19 +399,29 @@ check_foreign_key(PG_FUNCTION_ARGS)
399399
{
400400
relname = args2[0];
401401

402-
/*
403-
* For 'R'estrict action we construct SELECT query - SELECT 1
404-
* FROM _referencing_relation_ WHERE Fkey1 = $1 [AND Fkey2 =
405-
* $2 [...]] - to check is tuple referenced or not.
402+
/*---------
403+
* For 'R'estrict action we construct SELECT query:
404+
*
405+
* SELECT 1
406+
* FROM _referencing_relation_
407+
* WHERE Fkey1 = $1 [AND Fkey2 = $2 [...]]
408+
*
409+
* to check is tuple referenced or not.
410+
*---------
406411
*/
407412
if (action == 'r')
408413

409414
sprintf(sql, "select 1 from %s where ", relname);
410415

411-
/*
412-
* For 'C'ascade action we construct DELETE query - DELETE
413-
* FROM _referencing_relation_ WHERE Fkey1 = $1 [AND Fkey2 =
414-
* $2 [...]] - to delete all referencing tuples.
416+
/*---------
417+
* For 'C'ascade action we construct DELETE query
418+
*
419+
* DELETE
420+
* FROM _referencing_relation_
421+
* WHERE Fkey1 = $1 [AND Fkey2 = $2 [...]]
422+
*
423+
* to delete all referencing tuples.
424+
*---------
415425
*/
416426

417427
/*

‎src/backend/access/gist/gistscan.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,10 @@ gistrescan(PG_FUNCTION_ARGS)
143143
for (i = 0; i < s->numberOfKeys; i++)
144144
{
145145

146-
/*
146+
/*----------
147147
* s->keyData[i].sk_procedure =
148-
* index_getprocid(s->relation, 1, GIST_CONSISTENT_PROC);
148+
* index_getprocid(s->relation, 1, GIST_CONSISTENT_PROC);
149+
*----------
149150
*/
150151
s->keyData[i].sk_procedure
151152
= RelationGetGISTStrategy(s->relation, s->keyData[i].sk_attno,

‎src/backend/access/hash/hashsearch.c

+11-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.25 2001/01/24 19:42:47 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.26 2001/03/23 04:49:51 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -334,9 +334,11 @@ _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, Buffer metabuf)
334334
while (offnum > maxoff)
335335
{
336336

337-
/*
338-
* either this page is empty (maxoff ==
339-
* InvalidOffsetNumber) or we ran off the end.
337+
/*--------
338+
* either this page is empty
339+
* (maxoff == InvalidOffsetNumber)
340+
* or we ran off the end.
341+
*--------
340342
*/
341343
_hash_readnext(rel, &buf, &page, &opaque);
342344
if (BufferIsInvalid(buf))
@@ -382,9 +384,11 @@ _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, Buffer metabuf)
382384
while (offnum < FirstOffsetNumber)
383385
{
384386

385-
/*
386-
* either this page is empty (offnum ==
387-
* InvalidOffsetNumber) or we ran off the end.
387+
/*---------
388+
* either this page is empty
389+
* (offnum == InvalidOffsetNumber)
390+
* or we ran off the end.
391+
*---------
388392
*/
389393
_hash_readprev(rel, &buf, &page, &opaque);
390394
if (BufferIsInvalid(buf))

‎src/backend/access/heap/tuptoaster.c

+9-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.19 2001/03/22 06:16:07 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.20 2001/03/23 04:49:51 momjian Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -458,9 +458,10 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup)
458458
int32 biggest_size = MAXALIGN(sizeof(varattrib));
459459
Datum old_value;
460460

461-
/*
462-
* Search for the biggest yet inlined attribute with attstorage =
463-
* 'x' or 'e'
461+
/*------
462+
* Search for the biggest yet inlined attribute with
463+
* attstorage equals 'x' or 'e'
464+
*------
464465
*/
465466
for (i = 0; i < numAttrs; i++)
466467
{
@@ -572,9 +573,10 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup)
572573
int32 biggest_size = MAXALIGN(sizeof(varattrib));
573574
Datum old_value;
574575

575-
/*
576-
* Search for the biggest yet inlined attribute with attstorage =
577-
* 'm'
576+
/*--------
577+
* Search for the biggest yet inlined attribute with
578+
* attstorage = 'm'
579+
*--------
578580
*/
579581
for (i = 0; i < numAttrs; i++)
580582
{

‎src/backend/access/nbtree/nbtsearch.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.65 2001/03/22 06:16:07 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.66 2001/03/23 04:49:51 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -584,8 +584,10 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
584584

585585
/*
586586
* At this point we are positioned at the first item >= scan key, or
587-
* possibly at the end of a page on which all the existing items are <
588-
* scan key and we know that everything on later pages is >= scan key.
587+
* possibly at the end of a page on which all the existing items are
588+
* greater than the scan key and we know that everything on later pages
589+
* is less than or equal to scan key.
590+
*
589591
* We could step forward in the latter case, but that'd be a waste of
590592
* time if we want to scan backwards. So, it's now time to examine
591593
* the scan strategy to find the exact place to start the scan.

‎src/backend/access/nbtree/nbtutils.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.43 2001/03/22 03:59:15 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.44 2001/03/23 04:49:52 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -412,8 +412,8 @@ _bt_orderkeys(Relation relation, BTScanOpaque so)
412412
if (DatumGetBool(test))
413413
xform[j].sk_argument = cur->sk_argument;
414414
else if (j == (BTEqualStrategyNumber - 1))
415-
so->qual_ok = false; /* key == a && key == b, but a !=
416-
* b */
415+
so->qual_ok = false;
416+
/* key == a && key == b, but a != b */
417417
}
418418
else
419419
{

‎src/backend/commands/_deadcode/version.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* doesn't work! - jolly 8/19/95
1111
*
1212
*
13-
* $Id: version.c,v 1.25 2001/01/24 19:42:53 momjian Exp $
13+
* $Id: version.c,v 1.26 2001/03/23 04:49:52 momjian Exp $
1414
*
1515
* NOTES
1616
* At the point the version is defined, 2 physical relations are created
@@ -77,9 +77,12 @@ static void
7777
eval_as_new_xact(char *query)
7878
{
7979

80-
/*
80+
/*------
8181
* WARNING! do not uncomment the following lines WARNING!
82-
* CommitTransactionCommand(); StartTransactionCommand();
82+
*
83+
* CommitTransactionCommand();
84+
* StartTransactionCommand();
85+
*------
8386
*/
8487
CommandCounterIncrement();
8588
pg_exec_query(query);

‎src/backend/commands/command.c

+7-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.124 2001/03/22 06:16:11 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.125 2001/03/23 04:49:52 momjian Exp $
1212
*
1313
* NOTES
1414
* The PerformAddAttribute() code, like most of the relation
@@ -1034,11 +1034,13 @@ AlterTableDropColumn(const char *relationName,
10341034
ScanKeyEntryInitialize(&scankeys[0], 0x0, Anum_pg_attrdef_adrelid,
10351035
F_OIDEQ, ObjectIdGetDatum(myrelid));
10361036

1037-
/*
1037+
/*--------
10381038
* Oops pg_attrdef doesn't have (adrelid,adnum) index
1039-
* ScanKeyEntryInitialize(&scankeys[1], 0x0, Anum_pg_attrdef_adnum,
1040-
* F_INT2EQ, Int16GetDatum(attnum)); sysscan =
1041-
* systable_beginscan(adrel, AttrDefaultIndex, 2, scankeys);
1039+
*
1040+
* ScanKeyEntryInitialize(&scankeys[1], 0x0, Anum_pg_attrdef_adnum,
1041+
* F_INT2EQ, Int16GetDatum(attnum));
1042+
* sysscan = systable_beginscan(adrel, AttrDefaultIndex, 2, scankeys);
1043+
*--------
10421044
*/
10431045
sysscan = systable_beginscan(adrel, AttrDefaultIndex, 1, scankeys);
10441046
while (HeapTupleIsValid(tup = systable_getnext(sysscan)))

‎src/backend/executor/execQual.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.84 2001/03/22 03:59:26 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.85 2001/03/23 04:49:53 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1499,8 +1499,9 @@ ExecTargetList(List *targetlist,
14991499
* and another array that holds the isDone status for each targetlist
15001500
* item. The isDone status is needed so that we can iterate,
15011501
* generating multiple tuples, when one or more tlist items return
1502-
* sets. (We expect the caller to call us again if we return *isDone
1503-
* = ExprMultipleResult.)
1502+
* sets. (We expect the caller to call us again if we return:
1503+
*
1504+
* isDone = ExprMultipleResult.)
15041505
*/
15051506
if (nodomains > NPREALLOCDOMAINS)
15061507
{

‎src/backend/executor/nodeLimit.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeLimit.c,v 1.5 2001/03/22 06:16:13 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeLimit.c,v 1.6 2001/03/23 04:49:53 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -79,8 +79,8 @@ ExecLimit(Limit *node)
7979
* tuple in the offset region before we can return NULL.
8080
* Otherwise we won't be correctly aligned to start going forward
8181
* again. So, although you might think we can quit when position
82-
* = offset + 1, we have to fetch a subplan tuple first, and then
83-
* exit when position = offset.
82+
* equals offset + 1, we have to fetch a subplan tuple first, and
83+
* then exit when position = offset.
8484
*/
8585
if (ScanDirectionIsForward(direction))
8686
{

‎src/backend/executor/nodeMergejoin.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.44 2001/03/22 06:16:13 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.45 2001/03/23 04:49:53 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -240,10 +240,11 @@ MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext)
240240
break;
241241
}
242242

243-
/*
243+
/*-----------
244244
* ok, the compare clause failed so we test if the keys are
245-
* equal... if key1 != key2, we return false. otherwise key1 =
246-
* key2 so we move on to the next pair of keys.
245+
* equal... if key1 != key2, we return false. otherwise
246+
* key1 = key2 so we move on to the next pair of keys.
247+
*-----------
247248
*/
248249
const_value = ExecEvalExpr((Node *) lfirst(eqclause),
249250
econtext,

‎src/backend/optimizer/path/clausesel.c

+11-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.42 2001/03/22 03:59:34 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.43 2001/03/23 04:49:53 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -297,9 +297,11 @@ addRangeClause(RangeQueryClause **rqlist, Node *clause,
297297
else
298298
{
299299

300-
/*
301-
* We have found two similar clauses, such as x < y AND x
302-
* < z. Keep only the more restrictive one.
300+
/*------
301+
* We have found two similar clauses, such as
302+
* x < y AND x < z.
303+
* Keep only the more restrictive one.
304+
*------
303305
*/
304306
if (rqelem->lobound > s2)
305307
rqelem->lobound = s2;
@@ -315,9 +317,11 @@ addRangeClause(RangeQueryClause **rqlist, Node *clause,
315317
else
316318
{
317319

318-
/*
319-
* We have found two similar clauses, such as x > y AND x
320-
* > z. Keep only the more restrictive one.
320+
/*------
321+
* We have found two similar clauses, such as
322+
* x > y AND x > z.
323+
* Keep only the more restrictive one.
324+
*------
321325
*/
322326
if (rqelem->hibound > s2)
323327
rqelem->hibound = s2;

‎src/backend/optimizer/path/indxpath.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.103 2001/03/22 03:59:35 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.104 2001/03/23 04:49:53 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -1986,9 +1986,10 @@ prefix_quals(Var *leftop, Oid expr_op,
19861986
expr = make_opclause(op, leftop, (Var *) con);
19871987
result = makeList1(expr);
19881988

1989-
/*
1990-
* If we can create a string larger than the prefix, we can say "x <
1991-
* greaterstr".
1989+
/*-------
1990+
* If we can create a string larger than the prefix, we can say
1991+
* "x < greaterstr".
1992+
*-------
19921993
*/
19931994
greaterstr = make_greater_string(prefix, datatype);
19941995
if (greaterstr)

‎src/backend/rewrite/rewriteDefine.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.60 2001/03/22 06:16:16 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.61 2001/03/23 04:49:54 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -130,10 +130,14 @@ ValidateRule(int event_type,
130130

131131
#ifdef NOT_USED
132132

133-
/*
133+
/*---------
134134
* on retrieve to class.attribute do instead nothing is converted to
135-
* 'on retrieve to class.attribute do instead retrieve (attribute =
136-
* NULL)' --- this is also a terrible hack that works well -- glass
135+
* 'on retrieve to class.attribute do instead:
136+
*
137+
* retrieve (attribute = NULL)'
138+
*
139+
* this is also a terrible hack that works well -- glass
140+
*---------
137141
*/
138142
if (is_instead && !*action && eslot_string && event_type == CMD_SELECT)
139143
{

‎src/backend/storage/ipc/ipc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.65 2001/03/22 06:16:16 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.66 2001/03/23 04:49:54 momjian Exp $
1212
*
1313
* NOTES
1414
*
@@ -404,7 +404,7 @@ IpcSemaphoreLock(IpcSemaphoreId semId, int sem, bool interruptOK)
404404
* and entering the semop() call. If a cancel/die interrupt occurs in
405405
* that window, we would fail to notice it until after we acquire the
406406
* lock (or get another interrupt to escape the semop()). We can
407-
* avoid this problem by temporarily setting ImmediateInterruptOK =
407+
* avoid this problem by temporarily setting ImmediateInterruptOK to
408408
* true before we do CHECK_FOR_INTERRUPTS; then, a die() interrupt in
409409
* this interval will execute directly. However, there is a huge
410410
* pitfall: there is another window of a few instructions after the

0 commit comments

Comments
 (0)