From 195f78e43c34c5d744d693cd143219a22a569a1b Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 21 Nov 1997 19:12:41 +0000
Subject: [PATCH] More archive cleanup.
---
src/include/nodes/parsenodes.h | 4 +---
src/include/parser/parsetree.h | 11 +----------
src/include/utils/rel.h | 4 +---
src/interfaces/libpgtcl/pgtclCmds.c | 16 ++++------------
4 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index b2f70de1b4e..9775f99b127 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: parsenodes.h,v 1.32 1997/11/21 18:12:28 momjian Exp $
+ * $Id: parsenodes.h,v 1.33 1997/11/21 19:12:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -62,8 +62,6 @@ typedef struct Query
/* internal to planner */
List *base_relation_list_; /* base relation list */
List *join_relation_list_; /* list of relations generated by
- * joins */
- bool query_is_archival_; /* archival query flag */
} Query;
diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h
index a5662cd9d79..0d2f83bbb2a 100644
--- a/src/include/parser/parsetree.h
+++ b/src/include/parser/parsetree.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: parsetree.h,v 1.3 1997/09/07 04:59:38 momjian Exp $
+ * $Id: parsetree.h,v 1.4 1997/11/21 19:12:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,16 +30,7 @@
* ^^^^^^^^^^
* range table:
* (rtentry ...)
- *
* rtentry:
- * note: this might be wrong, I don't understand how
- * rt_time / rt_archive_time work together. anyways it
- * looks something like:
- *
- * (relname ? relid timestuff flags rulelocks)
- * or (new/cur relname relid timestuff flags rulelocks)
- *
- * someone who knows more should correct this -cim 6/9/91
* ----------------
*/
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 951e12d6f30..2de7b31671d 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rel.h,v 1.13 1997/10/28 15:11:43 vadim Exp $
+ * $Id: rel.h,v 1.14 1997/11/21 19:12:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -77,8 +77,6 @@ typedef Relation *RelationPtr;
#define InvalidRelation ((Relation)NULL)
-typedef char ArchiveMode;
-
/*
* RelationIsValid --
* True iff relation descriptor is valid.
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c
index 99c2c1f4609..1af5aafdfb3 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.c
+++ b/src/interfaces/libpgtcl/pgtclCmds.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.18 1997/10/30 17:29:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.19 1997/11/21 19:12:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1000,7 +1000,7 @@ Pg_lo_creat
syntax:
pg_lo_creat conn mode
-mode can be any OR'ing together of INV_READ, INV_WRITE, and INV_ARCHIVE,
+mode can be any OR'ing together of INV_READ, INV_WRITE
for now, we don't support any additional storage managers.
***********************************/
@@ -1038,14 +1038,10 @@ Pg_lo_creat(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
{
mode = INV_WRITE;
}
- else if (strcmp(modeWord, "INV_ARCHIVE") == 0)
- {
- mode = INV_ARCHIVE;
- }
else
{
Tcl_AppendResult(interp,
- "invalid mode argument to Pg_lo_creat\nmode argument must be some OR'd combination of INV_READ, INV_WRITE, and INV_ARCHIVE",
+ "invalid mode argument to Pg_lo_creat\nmode argument must be some OR'd combination of INV_READ, and INV_WRITE",
0);
return TCL_ERROR;
}
@@ -1060,14 +1056,10 @@ Pg_lo_creat(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
{
mode |= INV_WRITE;
}
- else if (strcmp(modeWord, "INV_ARCHIVE") == 0)
- {
- mode |= INV_ARCHIVE;
- }
else
{
Tcl_AppendResult(interp,
- "invalid mode argument to Pg_lo_creat\nmode argument must be some OR'd combination of INV_READ, INV_WRITE, and INV_ARCHIVE",
+ "invalid mode argument to Pg_lo_creat\nmode argument must be some OR'd combination of INV_READ, and INV_WRITE",
0);
return TCL_ERROR;
}
--
GitLab