The attached patch removes the last remnants of support for

bmomjian · bmomjian · commit 6e9893047e40 · 2002-07-30T16:55:45.000Z
'tioga recipes', whatever those are -- Peter E. killed most
of it a couple days ago, but this patch removes the rest. Most
of it was #ifdef'ed out anyway.

Neil Conway
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.350 2002/07/29 22:14:10 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.351 2002/07/30 16:55:44 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -2950,23 +2950,6 @@ opt_class:	any_name
 			| /*EMPTY*/								{ $$ = NIL; }
 		;
 
-/*****************************************************************************
- *
- *		QUERY:
- *				execute recipe <recipeName>
- *
- *****************************************************************************/
-
-/* NOT USED
-RecipeStmt:  EXECUTE RECIPE recipe_name
-				{
-					RecipeStmt *n = makeNode(RecipeStmt);
-					n->recipeName = $3;
-					$$ = (Node *)n;
-				}
-		;
-*/
-
 /*****************************************************************************
  *
  *		QUERY:
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.275 2002/07/30 05:35:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.276 2002/07/30 16:55:45 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1693,7 +1693,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.275 $ $Date: 2002/07/30 05:35:53 $\n");
+		puts("$Revision: 1.276 $ $Date: 2002/07/30 16:55:45 $\n");
 	}
 
 	/*
@@ -2352,12 +2352,6 @@ CreateCommandTag(Node *parsetree)
 			tag = "EXPLAIN";
 			break;
 
-#ifdef NOT_USED
-		case T_RecipeStmt:
-			tag = "EXECUTE RECIPE";
-			break;
-#endif
-
 		case T_VariableSetStmt:
 			tag = "SET";
 			break;
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.166 2002/07/29 22:14:11 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.167 2002/07/30 16:55:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -674,17 +674,6 @@ ProcessUtility(Node *parsetree,
 			ExplainQuery((ExplainStmt *) parsetree, dest);
 			break;
 
-#ifdef NOT_USED
-
-		case T_RecipeStmt:
-			{
-				RecipeStmt *stmt = (RecipeStmt *) parsetree;
-
-				beginRecipe(stmt);
-			}
-			break;
-#endif
-
 		case T_VariableSetStmt:
 			{
 				VariableSetStmt *n = (VariableSetStmt *) parsetree;
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsenodes.h,v 1.195 2002/07/29 22:14:11 tgl Exp $
+ * $Id: parsenodes.h,v 1.196 2002/07/30 16:55:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1226,16 +1226,6 @@ typedef struct CommentStmt
 	char	   *comment;		/* Comment to insert, or NULL to remove */
 } CommentStmt;
 
-/* ----------------------
- *		Begin Recipe Statement
- * ----------------------
- */
-typedef struct RecipeStmt
-{
-	NodeTag		type;
-	char	   *recipeName;		/* name of the recipe */
-} RecipeStmt;
-
 /* ----------------------
  *		Fetch Statement
  * ----------------------

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.275 2002/07/30 05:35:53 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.276 2002/07/30 16:55:45 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -1693,7 +1693,7 @@ PostgresMain(int argc, char argv[], const char username)`
`1693`	`1693`	`if (!IsUnderPostmaster)`
`1694`	`1694`	`{`
`1695`	`1695`	`puts("\nPOSTGRES backend interactive interface ");`
`1696`		`- puts("$Revision: 1.275 $ $Date: 2002/07/30 05:35:53 $\n");`
	`1696`	`+ puts("$Revision: 1.276 $ $Date: 2002/07/30 16:55:45 $\n");`
`1697`	`1697`	`}`
`1698`	`1698`
`1699`	`1699`	`/*`
`@@ -2352,12 +2352,6 @@ CreateCommandTag(Node *parsetree)`
`2352`	`2352`	`tag = "EXPLAIN";`
`2353`	`2353`	`break;`
`2354`	`2354`
`2355`		`-#ifdef NOT_USED`
`2356`		`- case T_RecipeStmt:`
`2357`		`- tag = "EXECUTE RECIPE";`
`2358`		`- break;`
`2359`		`-#endif`
`2360`		`-`
`2361`	`2355`	`case T_VariableSetStmt:`
`2362`	`2356`	`tag = "SET";`
`2363`	`2357`	`break;`