From 784def9e8e9cf06148602b42c306a15190e34ddb Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 16 Jul 2001 19:07:40 +0000 Subject: [PATCH] More EXTEND INDEX removal. Martijn van Oosterhout --- src/backend/nodes/copyfuncs.c | 17 +---------------- src/backend/nodes/equalfuncs.c | 18 +----------------- src/backend/parser/gram.y | 3 +-- src/include/nodes/nodes.h | 3 +-- src/include/nodes/parsenodes.h | 15 +-------------- 5 files changed, 5 insertions(+), 51 deletions(-) diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index cd35fdeedf..2ea063f336 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.147 2001/07/12 18:02:59 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.148 2001/07/16 19:07:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2037,18 +2037,6 @@ _copyCommentStmt(CommentStmt *from) return newnode; } -static ExtendStmt * -_copyExtendStmt(ExtendStmt *from) -{ - ExtendStmt *newnode = makeNode(ExtendStmt); - - newnode->idxname = pstrdup(from->idxname); - Node_Copy(from, newnode, whereClause); - Node_Copy(from, newnode, rangetable); - - return newnode; -} - static FetchStmt * _copyFetchStmt(FetchStmt *from) { @@ -2796,9 +2784,6 @@ copyObject(void *from) case T_CommentStmt: retval = _copyCommentStmt(from); break; - case T_ExtendStmt: - retval = _copyExtendStmt(from); - break; case T_FetchStmt: retval = _copyFetchStmt(from); break; diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 6bc088577c..eb194f667f 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -20,7 +20,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.95 2001/07/12 18:02:59 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.96 2001/07/16 19:07:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -898,19 +898,6 @@ _equalCommentStmt(CommentStmt *a, CommentStmt *b) return true; } -static bool -_equalExtendStmt(ExtendStmt *a, ExtendStmt *b) -{ - if (!equalstr(a->idxname, b->idxname)) - return false; - if (!equal(a->whereClause, b->whereClause)) - return false; - if (!equal(a->rangetable, b->rangetable)) - return false; - - return true; -} - static bool _equalFetchStmt(FetchStmt *a, FetchStmt *b) { @@ -1940,9 +1927,6 @@ equal(void *a, void *b) case T_CommentStmt: retval = _equalCommentStmt(a, b); break; - case T_ExtendStmt: - retval = _equalExtendStmt(a, b); - break; case T_FetchStmt: retval = _equalFetchStmt(a, b); break; diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 99312049a8..00c66246ff 100644 --- 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.237 2001/07/16 05:06:58 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.238 2001/07/16 19:07:40 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -2469,7 +2469,6 @@ opt_class: class | /*EMPTY*/ { $$ = NULL; } ; - /***************************************************************************** * * QUERY: diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index fe2d035784..044cb5470b 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodes.h,v 1.91 2001/06/19 22:39:12 tgl Exp $ + * $Id: nodes.h,v 1.92 2001/07/16 19:07:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -158,7 +158,6 @@ typedef enum NodeTag T_DropStmt, T_TruncateStmt, T_CommentStmt, - T_ExtendStmt, T_FetchStmt, T_IndexStmt, T_ProcedureStmt, diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 73fab4f952..9fa703454f 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.135 2001/07/12 18:03:00 tgl Exp $ + * $Id: parsenodes.h,v 1.136 2001/07/16 19:07:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -465,19 +465,6 @@ typedef struct CommentStmt char *comment; /* The comment to insert */ } CommentStmt; -/* ---------------------- - * Extend Index Statement - * ---------------------- - */ -typedef struct ExtendStmt -{ - NodeTag type; - char *idxname; /* name of the index */ - Node *whereClause; /* qualifications */ - List *rangetable; /* range table, filled in by - * transformStmt() */ -} ExtendStmt; - /* ---------------------- * Begin Recipe Statement * ---------------------- -- 2.40.0