Cleanup up code.
authorBruce Momjian <bruce@momjian.us>
Mon, 13 Apr 1998 21:07:15 +0000 (21:07 +0000)
committerBruce Momjian <bruce@momjian.us>
Mon, 13 Apr 1998 21:07:15 +0000 (21:07 +0000)
src/backend/executor/nodeAgg.c
src/backend/optimizer/plan/planner.c
src/backend/parser/gram.y

index c2b77c6e050a28fadb72930b7ea0b4e2b7afcfdf..84f3d1412f01920c270fc4b014c7ff754aed48c0 100644 (file)
@@ -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));
index 260bf230cf94982cd772fd342ee76f8688a06916..64549bfc98a8465f5459ddfb07ec4d1d648f678a 100644 (file)
@@ -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 *
index 850f9d5d833023e24f8dd772a820905e67bfd200..00bc90b343cf9a3917f2663c5ce077689cc05966 100644 (file)
@@ -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; }