From 8eb08ae6b90cbde8197ed904148e3e309758ff46 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 13 Apr 1998 21:07:15 +0000 Subject: [PATCH] Cleanup up code. --- src/backend/executor/nodeAgg.c | 2 -- src/backend/optimizer/plan/planner.c | 6 +----- src/backend/parser/gram.y | 3 +-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index c2b77c6e05..84f3d1412f 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 260bf230cf..64549bfc98 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 850f9d5d83..00bc90b343 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; }