aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-04-13 21:07:15 +0000
committerBruce Momjian <bruce@momjian.us>1998-04-13 21:07:15 +0000
commit8eb08ae6b90cbde8197ed904148e3e309758ff46 (patch)
tree45fca742129b3b422c1f1bb6f589e78bad245423
parent0435ecf5d5644703841615e020ac20ef8234f6e2 (diff)
downloadpostgresql-8eb08ae6b90cbde8197ed904148e3e309758ff46.tar.gz
postgresql-8eb08ae6b90cbde8197ed904148e3e309758ff46.zip
Cleanup up code.
-rw-r--r--src/backend/executor/nodeAgg.c2
-rw-r--r--src/backend/optimizer/plan/planner.c6
-rw-r--r--src/backend/parser/gram.y3
3 files changed, 2 insertions, 9 deletions
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index c2b77c6e050..84f3d1412f0 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -111,7 +111,6 @@ ExecAgg(Agg *node)
isNull2 = FALSE;
- /***S*H***/
do {
@@ -486,7 +485,6 @@ ExecAgg(Agg *node)
* ----------------
*/
- /***S*H***/
}
while((ExecQual(fix_opids(node->plan.qual),econtext)!=true) &&
(node->plan.qual!=NULL));
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 260bf230cf9..64549bfc98a 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.25 1998/03/31 23:30:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.26 1998/04/13 21:07:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,8 +60,6 @@ make_groupPlan(List **tlist, bool tuplePerGroup,
*****************************************************************************/
-/***S*H***/ /* Anfang */
-
static List *
check_having_qual_for_aggs(Node *clause, List *subplanTargetList)
{
@@ -84,7 +82,6 @@ check_having_qual_for_aggs(Node *clause, List *subplanTargetList)
((Var *) clause)->varattno = subplanVar->resdom->resno;
return NIL;
}
- /***S*H***/
else if (is_funcclause(clause) || not_clause(clause) ||
or_clause(clause) || and_clause(clause))
{
@@ -165,7 +162,6 @@ check_having_qual_for_aggs(Node *clause, List *subplanTargetList)
return NIL;
}
}
-/***S*H***/ /* Ende */
Plan *
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 850f9d5d833..00bc90b343c 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.9 1998/04/08 06:38:57 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.10 1998/04/13 21:07:15 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -2542,7 +2542,6 @@ groupby: ColId
having_clause: HAVING a_expr
{
- /***S*H***/ /* elog(NOTICE, "HAVING not yet supported; ignore clause");*/
$$ = $2;
}
| /*EMPTY*/ { $$ = NULL; }