Skip to content

Commit ad49488

Browse files
bmomjianbmomjian
committed
Remove S*I comments from Stephan.
1 parent 050371f commit ad49488

File tree

13 files changed

+12
-58
lines changed

13 files changed

+12
-58
lines changed

‎src/backend/executor/execAmi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: execAmi.c,v 1.35 1999/05/25 16:08:34 momjian Exp $
8+
* $Id: execAmi.c,v 1.36 1999/07/13 21:17:31 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -38,7 +38,6 @@
3838
#include "executor/nodeNestloop.h"
3939
#include "executor/nodeHashjoin.h"
4040
#include "executor/nodeHash.h"
41-
/***S*I***/
4241
#include "executor/nodeGroup.h"
4342

4443
#include "executor/nodeAgg.h"

‎src/backend/nodes/readfuncs.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.64 1999/05/25 16:09:11 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.65 1999/07/13 21:17:31 momjian Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -168,7 +168,6 @@ _readQuery()
168168
token = lsptok(NULL, &length); /* skip :unionClause */
169169
local_node->unionClause = nodeRead(true);
170170

171-
/***S*I***/
172171
token = lsptok(NULL, &length); /* skip :intersectClause */
173172
local_node->intersectClause = nodeRead(true);
174173

‎src/backend/parser/analyze.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: analyze.c,v 1.110 1999/06/05 20:22:30 tgl Exp $
8+
* $Id: analyze.c,v 1.111 1999/07/13 21:17:32 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -26,7 +26,6 @@
2626
#include "parser/parse_node.h"
2727
#include "parser/parse_relation.h"
2828
#include "parser/parse_target.h"
29-
/***S*I***/
3029
#include "parser/parse_expr.h"
3130
#include "catalog/pg_type.h"
3231
#include "parse.h"
@@ -382,8 +381,6 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
382381
*/
383382
qry->unionall = stmt->unionall;
384383

385-
/***S*I***/
386-
387384
/*
388385
* Just hand through the unionClause and intersectClause. We will
389386
* handle it in the function Except_Intersect_Rewrite()
@@ -1022,8 +1019,6 @@ transformSelectStmt(ParseState *pstate, SelectStmt *stmt)
10221019
*/
10231020
qry->unionall = stmt->unionall;
10241021

1025-
/***S*I***/
1026-
10271022
/*
10281023
* Just hand through the unionClause and intersectClause. We will
10291024
* handle it in the function Except_Intersect_Rewrite()
@@ -1104,7 +1099,6 @@ transformCursorStmt(ParseState *pstate, SelectStmt *stmt)
11041099
return qry;
11051100
}
11061101

1107-
/***S*I***/
11081102
/* This function steps through the tree
11091103
* built up by the select_w_o_sort rule
11101104
* and builds a list of all SelectStmt Nodes found

‎src/backend/parser/gram.y

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.88 1999/07/09 21:59:59 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.89 1999/07/13 21:17:33 momjian Exp $
1414
*
1515
* HISTORY
1616
* AUTHOR DATE MAJOR EVENT
@@ -2465,7 +2465,6 @@ OptimizableStmt: SelectStmt
24652465
*
24662466
*****************************************************************************/
24672467

2468-
/***S*I***/
24692468
/* This rule used 'opt_column_list' between 'relation_name' and 'insert_rest'
24702469
* originally. When the second rule of 'insert_rest' was changed to use
24712470
* the new 'SelectStmt' rule (for INTERSECT and EXCEPT) it produced a shift/reduce
@@ -2500,10 +2499,8 @@ insert_rest: VALUES '(' res_target_list2 ')'
25002499
$$->groupClause = NIL;
25012500
$$->havingClause = NULL;
25022501
$$->unionClause = NIL;
2503-
/***S*I***/
25042502
$$->intersectClause = NIL;
25052503
}
2506-
/***S*I***/
25072504
/* We want the full power of SelectStatements including INTERSECT and EXCEPT
25082505
* for insertion */
25092506
| SelectStmt
@@ -2534,7 +2531,6 @@ insert_rest: VALUES '(' res_target_list2 ')'
25342531
$$->groupClause = NIL;
25352532
$$->havingClause = NULL;
25362533
$$->unionClause = NIL;
2537-
/***S*I***/
25382534
$$->intersectClause = NIL;
25392535
}
25402536
| '(' columnList ')' SelectStmt
@@ -2646,7 +2642,6 @@ UpdateStmt: UPDATE relation_name
26462642
* CURSOR STATEMENTS
26472643
*
26482644
*****************************************************************************/
2649-
/***S*I***/
26502645
CursorStmt: DECLARE name opt_cursor CURSOR FOR SelectStmt
26512646
{
26522647
SelectStmt *n;
@@ -2685,7 +2680,6 @@ opt_cursor: BINARY { $$ = TRUE; }
26852680
* SELECT STATEMENTS
26862681
*
26872682
*****************************************************************************/
2688-
/***S*I***/
26892683
/* The new 'SelectStmt' rule adapted for the optional use of INTERSECT EXCEPT and UNION
26902684
* accepts the use of '(' and ')' to select an order of set operations.
26912685
*
@@ -2770,7 +2764,6 @@ SelectStmt: select_clause sort_clause for_update_clause opt_select_limit
27702764
}
27712765
;
27722766

2773-
/***S*I***/
27742767
/* This rule parses Select statements including UNION INTERSECT and EXCEPT.
27752768
* '(' and ')' can be used to specify the order of the operations
27762769
* (UNION EXCEPT INTERSECT). Without the use of '(' and ')' we want the
@@ -2812,7 +2805,6 @@ select_clause: '(' select_clause ')'
28122805
}
28132806
;
28142807

2815-
/***S*I***/
28162808
SubSelect: SELECT opt_unique res_target_list2
28172809
result from_clause where_clause
28182810
group_clause having_clause
@@ -2821,7 +2813,6 @@ SubSelect: SELECT opt_unique res_target_list2
28212813
n->unique = $2;
28222814
n->unionall = FALSE;
28232815
n->targetList = $3;
2824-
/***S*I***/
28252816
/* This is new: Subselects support the INTO clause
28262817
* which allows queries that are not part of the
28272818
* SQL92 standard and should not be formulated!

‎src/backend/parser/keywords.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.57 1999/05/12 07:22:52 thomas Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.58 1999/07/13 21:17:34 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -92,7 +92,6 @@ static ScanKeyword ScanKeywords[] = {
9292
{"else", ELSE},
9393
{"encoding", ENCODING},
9494
{"end", END_TRANS},
95-
/***S*I***/
9695
{"except", EXCEPT},
9796
{"exclusive", EXCLUSIVE},
9897
{"execute", EXECUTE},
@@ -123,7 +122,6 @@ static ScanKeyword ScanKeywords[] = {
123122
{"insensitive", INSENSITIVE},
124123
{"insert", INSERT},
125124
{"instead", INSTEAD},
126-
/***S*I***/
127125
{"intersect", INTERSECT},
128126
{"interval", INTERVAL},
129127
{"into", INTO},

‎src/backend/rewrite/rewriteHandler.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.48 1999/07/11 17:54:30 tgl Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.49 1999/07/13 21:17:35 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -24,7 +24,6 @@
2424
#include "parser/parse_relation.h"
2525
#include "nodes/parsenodes.h"
2626

27-
/***S*I***/
2827
#include "parser/parse_node.h"
2928
#include "parser/parse_target.h"
3029

@@ -1692,7 +1691,6 @@ apply_RIR_view(Node **nodePtr, int rt_index, RangeTblEntry *rte, List *tlist, in
16921691
modified,
16931692
sublevels_up + 1);
16941693

1695-
/***S*I***/
16961694
tmp_lefthand = sub->lefthand;
16971695
foreach(tmp_oper, sub->oper)
16981696
{
@@ -2709,8 +2707,6 @@ QueryRewrite(Query *parsetree)
27092707
List *rewritten,
27102708
*rewritten_item;
27112709

2712-
/***S*I***/
2713-
27142710
/*
27152711
* Rewrite Union, Intersect and Except Queries to normal Union Queries
27162712
* using IN and NOT IN subselects
@@ -2741,7 +2737,6 @@ QueryRewrite(Query *parsetree)
27412737
return rewritten;
27422738
}
27432739

2744-
/***S*I***/
27452740
/* This function takes two targetlists as arguments and checks if the
27462741
* targetlists are compatible (i.e. both select for the same number of
27472742
* attributes and the types are compatible */
@@ -2817,7 +2812,6 @@ check_targetlists_are_compatible(List *prev_target, List *current_target)
28172812
}
28182813
}
28192814

2820-
/***S*I***/
28212815
/* Rewrites UNION INTERSECT and EXCEPT queries to semantiacally equivalent
28222816
* queries that use IN and NOT IN subselects.
28232817
*

‎src/backend/rewrite/rewriteManip.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.32 1999/05/26 12:55:48 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.33 1999/07/13 21:17:36 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -163,8 +163,6 @@ OffsetVarNodes(Node *node, int offset, int sublevels_up)
163163
offset,
164164
sublevels_up + 1);
165165

166-
/***S*I***/
167-
168166
/*
169167
* Make sure the first argument of sub->oper points to the
170168
* same var as sub->lefthand does otherwise we will run
@@ -383,8 +381,6 @@ ChangeVarNodes(Node *node, int rt_index, int new_index, int sublevels_up)
383381
new_index,
384382
sublevels_up + 1);
385383

386-
/***S*I***/
387-
388384
/*
389385
* Make sure the first argument of sub->oper points to the
390386
* same var as sub->lefthand does otherwise we will run
@@ -481,7 +477,6 @@ AddQual(Query *parsetree, Node *qual)
481477
if (qual == NULL)
482478
return;
483479

484-
/***S*I***/
485480
/* INTERSECT want's the original, but we need to copy - Jan */
486481
/* copy = qual; */
487482
copy = copyObject(qual);
@@ -504,7 +499,6 @@ AddHavingQual(Query *parsetree, Node *havingQual)
504499
if (havingQual == NULL)
505500
return;
506501

507-
/***S*I***/
508502
/* INTERSECT want's the original, but we need to copy - Jan */
509503
/* copy = havingQual; */
510504
copy = copyObject(havingQual);
@@ -525,7 +519,6 @@ AddNotHavingQual(Query *parsetree, Node *havingQual)
525519
if (havingQual == NULL)
526520
return;
527521

528-
/***S*I***/
529522
/* INTERSECT want's the original, but we need to copy - Jan */
530523
/* copy = (Node *) make_notclause((Expr *)havingQual); */
531524
copy = (Node *) make_notclause((Expr *) copyObject(havingQual));
@@ -542,7 +535,6 @@ AddNotQual(Query *parsetree, Node *qual)
542535
if (qual == NULL)
543536
return;
544537

545-
/***S*I***/
546538
/* INTERSECT want's the original, but we need to copy - Jan */
547539
/* copy = (Node *) make_notclause((Expr *)qual); */
548540
copy = (Node *) make_notclause((Expr *) copyObject(qual));
@@ -1098,7 +1090,6 @@ nodeHandleViewRule(Node **nodePtr,
10981090
lfirst(sublink->lefthand);
10991091

11001092

1101-
/***S*I***/
11021093
/* INTERSECT want's this - Jan */
11031094

11041095
/*

‎src/include/executor/nodeGroup.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: nodeGroup.h,v 1.10 1999/05/25 16:13:55 momjian Exp $
9+
* $Id: nodeGroup.h,v 1.11 1999/07/13 21:17:37 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -23,7 +23,6 @@ extern int ExecCountSlotsGroup(Group *node);
2323
extern void ExecEndGroup(Group *node);
2424
extern void ExecReScanGroup(Group *node, ExprContext *exprCtxt, Plan *parent);
2525

26-
/***S*I***/
2726
extern void ExecReScanGroup(Group *node, ExprContext *exprCtxt, Plan *parent);
2827

2928

‎src/include/nodes/parsenodes.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: parsenodes.h,v 1.74 1999/05/25 22:42:57 momjian Exp $
9+
* $Id: parsenodes.h,v 1.75 1999/07/13 21:17:38 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -60,7 +60,6 @@ typedef struct Query
6060
* BY */
6161
Node *havingQual; /* qualification of each group */
6262

63-
/***S*I***/
6463
List *intersectClause;
6564

6665
List *unionClause; /* unions are linked under the previous
@@ -613,7 +612,6 @@ typedef struct InsertStmt
613612
Node *havingClause; /* having conditional-expression */
614613
List *unionClause; /* union subselect parameters */
615614
bool unionall; /* union without unique sort */
616-
/***S*I***/
617615
List *intersectClause;
618616
List *forUpdate; /* FOR UPDATE clause */
619617
} InsertStmt;
@@ -656,7 +654,6 @@ typedef struct SelectStmt
656654
Node *whereClause; /* qualifications */
657655
List *groupClause; /* group by clause */
658656
Node *havingClause; /* having conditional-expression */
659-
/***S*I***/
660657
List *intersectClause;
661658
List *exceptClause;
662659

‎src/include/parser/analyze.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: analyze.h,v 1.7 1999/05/25 16:14:24 momjian Exp $
8+
* $Id: analyze.h,v 1.8 1999/07/13 21:17:40 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -16,7 +16,6 @@
1616

1717
extern List *parse_analyze(List *pl, ParseState *parentParseState);
1818

19-
/***S*I***/
2019
extern void create_select_list(Node *ptr, List **select_list, bool *unionall_present);
2120
extern Node *A_Expr_to_Expr(Node *ptr, bool *intersect_present);
2221

‎src/include/utils/elog.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: elog.h,v 1.10 1999/02/13 23:22:18 momjian Exp $
9+
* $Id: elog.h,v 1.11 1999/07/13 21:17:42 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -29,7 +29,6 @@
2929
#define ABORTX 0x4000 /* abort process after logging */
3030
#endif
3131

32-
/***S*I***/
3332
/* Increase this to be able to use postmaster -d 3 with complex
3433
* view definitions (which are transformed to very, very large INSERT statements
3534
* and if -d 3 is used the query string of these statements is printed using

0 commit comments

Comments
 (0)