Type lztext is toast.

(Sorry, couldn't help it...)

Removed type filename as well, since it's unused and probably useless.
INITDB FORCED, because pg_rewrite columns are now plain text again.

10 files changed, 13 insertions, 112 deletions

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 80be91a70f..0a8b0d43cc 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catversion.h,v 1.37 2000/07/17 03:05:23 tgl Exp $
+ * $Id: catversion.h,v 1.38 2000/07/30 22:13:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200007161
+#define CATALOG_VERSION_NO	200007301
 
 #endif
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index ff79f1d533..9176820bc0 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_amop.h,v 1.34 2000/06/19 03:54:45 tgl Exp $
+ * $Id: pg_amop.h,v 1.35 2000/07/30 22:13:59 tgl Exp $
  *
  * NOTES
  *	 the genbki.sh script reads this file and generates .bki
@@ -350,16 +350,6 @@ DATA(insert OID = 0 (  403 1690   91 3 ));
 DATA(insert OID = 0 (  403 1690 1695 4 ));
 DATA(insert OID = 0 (  403 1690   59 5 ));
 
-/*
- *	  nbtree lztext
- */
-
-DATA(insert OID = 0 (  403 1663 1659 1 ));
-DATA(insert OID = 0 (  403 1663 1660 2 ));
-DATA(insert OID = 0 (  403 1663 1657 3 ));
-DATA(insert OID = 0 (  403 1663 1662 4 ));
-DATA(insert OID = 0 (  403 1663 1661 5 ));
-
 
 /*
  *	hash table _ops
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index fda508e602..7b03f3c9b2 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_amproc.h,v 1.23 2000/06/19 03:54:45 tgl Exp $
+ * $Id: pg_amproc.h,v 1.24 2000/07/30 22:13:59 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -98,7 +98,6 @@ DATA(insert OID = 0 (403  935  926 1));
 DATA(insert OID = 0 (403  652  926 1));
 DATA(insert OID = 0 (403 1768 1769 1));
 DATA(insert OID = 0 (403 1690 1693 1));
-DATA(insert OID = 0 (403 1663 1636 1));
 DATA(insert OID = 0 (403 1399 1358 1));
 
 
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index d75bdcb52c..277301d77d 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_opclass.h,v 1.34 2000/07/04 06:11:54 tgl Exp $
+ * $Id: pg_opclass.h,v 1.35 2000/07/30 22:13:59 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -115,8 +115,6 @@ DATA(insert OID = 652  (	cidr_ops		650   ));
 DESCR("");
 DATA(insert OID = 1768 (	numeric_ops    1700   ));
 DESCR("");
-DATA(insert OID = 1663 (	lztext_ops	   1625   ));
-DESCR("");
 DATA(insert OID = 1690 (	bool_ops		 16   ));
 DESCR("");
 DATA(insert OID = 1399 (	timetz_ops	   1266   ));
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index e8881bf037..a63b789989 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_operator.h,v 1.78 2000/07/28 05:07:42 tgl Exp $
+ * $Id: pg_operator.h,v 1.79 2000/07/30 22:13:59 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -135,7 +135,6 @@ DATA(insert OID = 395 (  "="	   PGUID 0 b t f  1022	1022  16  395 0  0	0 array_e
 DATA(insert OID = 396 (  "="	   PGUID 0 b t f  1023	1023  16  396 0  0	0 array_eq eqsel eqjoinsel ));
 DATA(insert OID = 397 (  "="	   PGUID 0 b t f  1024	1024  16  397 0  0	0 array_eq eqsel eqjoinsel ));
 DATA(insert OID = 398 (  "="	   PGUID 0 b t f  1025	1025  16  398 0  0	0 array_eq eqsel eqjoinsel ));
-DATA(insert OID = 399 (  "="	   PGUID 0 b t f  1026	1026  16  399 0  0	0 array_eq eqsel eqjoinsel ));
 DATA(insert OID = 400 (  "="	   PGUID 0 b t f  1027	1027  16  400 0  0	0 array_eq eqsel eqjoinsel ));
 DATA(insert OID = 401 (  "="	   PGUID 0 b t f  1034	1034  16  401 0  0	0 array_eq eqsel eqjoinsel ));
 
@@ -708,14 +707,6 @@ DATA(insert OID = 1761 (  "/"	   PGUID 0 b t f 1700 1700 1700    0	0 0 0 numeric
 DATA(insert OID = 1762 (  "%"	   PGUID 0 b t f 1700 1700 1700    0	0 0 0 numeric_mod - - ));
 DATA(insert OID = 1763 (  "@"	   PGUID 0 l t f	0 1700 1700    0	0 0 0 numeric_abs - - ));
 
-/* LZTEXT type */
-DATA(insert OID = 1657 (  "="	 PGUID 0 b t f 1625 1625   16 1657 1658 1659 1659 lztext_eq eqsel eqjoinsel ));
-DATA(insert OID = 1658 (  "<>"		 PGUID 0 b t f 1625 1625   16 1658 1657 0 0 lztext_ne neqsel neqjoinsel ));
-DATA(insert OID = 1659 (  "<"	 PGUID 0 b t f 1625 1625   16 1661 1662 0 0 lztext_lt scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1660 (  "<="		 PGUID 0 b t f 1625 1625   16 1662 1661 0 0 lztext_le scalarltsel scalarltjoinsel ));
-DATA(insert OID = 1661 (  ">"	 PGUID 0 b t f 1625 1625   16 1659 1660 0 0 lztext_gt scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1662 (  ">="		 PGUID 0 b t f 1625 1625   16 1660 1659 0 0 lztext_ge scalargtsel scalargtjoinsel ));
-
 DATA(insert OID = 1784 (  "="	  PGUID 0 b t f 1560 1560	16 1784 1785 1786 1786 biteq eqsel eqjoinsel ));
 DATA(insert OID = 1785 (  "<>"	  PGUID 0 b t f 1560 1560	16 1785 1784	0	 0 bitne neqsel neqjoinsel ));
 DATA(insert OID = 1786 (  "<"	  PGUID 0 b t f 1560 1560	16 1787 1789	0	 0 bitlt scalarltsel scalarltjoinsel ));
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index a75e7880f7..6b833400c0 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.152 2000/07/30 20:43:44 tgl Exp $
+ * $Id: pg_proc.h,v 1.153 2000/07/30 22:14:01 tgl Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -981,11 +981,6 @@ DESCR("array");
 DATA(insert OID = 751 (  array_out		   PGUID 12 f t t t 2 f 23 "0 26" 100 0 0 100	array_out - ));
 DESCR("array");
 
-DATA(insert OID = 752 (  filename_in	   PGUID 11 f t t t 1 f 605 "0" 100 0 0 100  filename_in - ));
-DESCR("(internal)");
-DATA(insert OID = 753 (  filename_out	   PGUID 11 f t t t 2 f 23  "0 26" 100 0 0 100  filename_out - ));
-DESCR("(internal)");
-
 DATA(insert OID = 760 (  smgrin			   PGUID 12 f t f t 1 f 210 "0" 100 0 0 100  smgrin - ));
 DESCR("storage manager(internal)");
 DATA(insert OID = 761 (  smgrout		   PGUID 12 f t f t 1 f 23  "0" 100 0 0 100  smgrout - ));
@@ -2044,38 +2039,6 @@ DATA(insert OID = 1623 (  varchar			PGUID 12 f t t t 1 f 1043 "20" 100 0 0 100
 DESCR("convert int8 to varchar");
 DATA(insert OID = 1624 (  mul_d_interval	PGUID 12 f t t t 2 f 1186 "701 1186" 100 0 0 100	mul_d_interval - ));
 
-/* OID's 1625 - 1639 LZTEXT data type */
-DATA(insert OID = 1626 ( lztextin			  PGUID 11 f t t t 1 f 1625 "0" 100 0 0 100  lztextin - ));
-DESCR("(internal)");
-DATA(insert OID = 1627 ( lztextout			  PGUID 11 f t t t 1 f 23 "0" 100 0 0 100  lztextout - ));
-DESCR("(internal)");
-DATA(insert OID = 1629 ( text				  PGUID 11 f t t t 1 f 25 "1625" 100 0 0 100	lztext_text -));
-DESCR("convert lztext to text");
-DATA(insert OID = 1631 ( lztext				  PGUID 12 f t t t 1 f 1625 "25" 100 0 0 100	text_lztext -));
-DESCR("convert text to lztext");
-DATA(insert OID = 1632 ( lztext				  PGUID 14 f t t t 1 f 1625 "1625" 100 0 0 100  "select $1" -));
-DESCR("convert text to lztext");
-DATA(insert OID = 1633 ( char_length		  PGUID 11 f t t t 1 f 23 "1625" 100 0 1 0  lztextlen - ));
-DESCR("length");
-DATA(insert OID = 1634 ( length				  PGUID 11 f t t t 1 f 23 "1625" 100 0 1 0  lztextlen - ));
-DESCR("length");
-DATA(insert OID = 1635 ( octet_length		  PGUID 11 f t t t 1 f 23 "1625" 100 0 1 0  lztextoctetlen - ));
-DESCR("octet length");
-DATA(insert OID = 1636 ( lztext_cmp			  PGUID 11 f t t t 2 f 23 "1625 1625" 100 0 1 0  lztext_cmp - ));
-DESCR("compare lztext");
-DATA(insert OID = 1637 ( lztext_eq			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_eq - ));
-DESCR("equal");
-DATA(insert OID = 1638 ( lztext_ne			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_ne - ));
-DESCR("not equal");
-DATA(insert OID = 1639 ( lztext_gt			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_gt - ));
-DESCR("greater-than");
-DATA(insert OID = 1664 ( lztext_ge			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_ge - ));
-DESCR("greater-than-or-equal");
-DATA(insert OID = 1665 ( lztext_lt			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_lt - ));
-DESCR("less-than");
-DATA(insert OID = 1656 ( lztext_le			  PGUID 11 f t t t 2 f 16 "1625 1625" 100 0 1 0  lztext_le - ));
-DESCR("less-than-or-equal");
-
 DATA(insert OID = 1689 (  update_pg_pwd       PGUID 12 f t f t 0 f 0  ""  100 0 0 100  update_pg_pwd - ));
 DESCR("update pg_pwd file");
 
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index 09e0fa7c49..3de2c82b09 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_rewrite.h,v 1.11 2000/02/27 12:02:34 wieck Exp $
+ * $Id: pg_rewrite.h,v 1.12 2000/07/30 22:14:02 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -38,8 +38,9 @@ CATALOG(pg_rewrite)
 	Oid			ev_class;
 	int2		ev_attr;
 	bool		is_instead;
-	lztext		ev_qual;
-	lztext		ev_action;
+	/* NB: remaining fields must be accessed via heap_getattr */
+	text		ev_qual;
+	text		ev_action;
 } FormData_pg_rewrite;
 
 /* ----------------
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 0dfc5c9f19..7b9f702922 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.95 2000/07/29 18:46:00 tgl Exp $
+ * $Id: pg_type.h,v 1.96 2000/07/30 22:14:02 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -276,8 +276,6 @@ DESCR("geometric box '(lower left,upper right)'");
 DATA(insert OID = 604 (  polygon   PGUID -1  -1 f b t \054 0   0 poly_in poly_out poly_in poly_out d x _null_ ));
 DESCR("geometric polygon '(pt1,...)'");
 #define POLYGONOID		604
-DATA(insert OID = 605 (  filename  PGUID 256 -1 f b t \054 0  18 filename_in filename_out filename_in filename_out i p _null_ ));
-DESCR("filename used in system tables");
 
 DATA(insert OID = 628 (  line	   PGUID 32  48 f b t \054 0 701 line_in line_out line_in line_out d p _null_ ));
 DESCR("geometric line '(pt1,pt2)'");
@@ -354,7 +352,6 @@ DATA(insert OID = 1022 (  _float8	 PGUID -1  -1 f b t \054 0 701 array_in array_
 DATA(insert OID = 1023 (  _abstime	 PGUID -1  -1 f b t \054 0 702 array_in array_out array_in array_out i x _null_ ));
 DATA(insert OID = 1024 (  _reltime	 PGUID -1  -1 f b t \054 0 703 array_in array_out array_in array_out i x _null_ ));
 DATA(insert OID = 1025 (  _tinterval PGUID -1  -1 f b t \054 0 704 array_in array_out array_in array_out i x _null_ ));
-DATA(insert OID = 1026 (  _filename  PGUID -1  -1 f b t \054 0 605 array_in array_out array_in array_out i x _null_ ));
 DATA(insert OID = 1027 (  _polygon	 PGUID -1  -1 f b t \054 0 604 array_in array_out array_in array_out d x _null_ ));
 /*
  *	Note: the size of aclitem needs to match sizeof(AclItem) in acl.h.
@@ -412,9 +409,6 @@ DESCR("fixed-length bit string");
 DATA(insert OID = 1563 ( _varbit	 PGUID	-1 -1 f b t \054 0	1562 array_in array_out array_in array_out i x _null_ ));
 
 /* OIDS 1600 - 1699 */
-DATA(insert OID = 1625 ( lztext		 PGUID -1  -1 f b t \054 0	0 lztextin lztextout lztextin lztextout i x _null_ ));
-DESCR("variable-length string, stored compressed");
-#define LZTEXTOID	  1625
 
 /* OIDS 1700 - 1799 */
 DATA(insert OID = 1700 ( numeric	   PGUID -1  -1 f b t \054 0  0 numeric_in numeric_out numeric_in numeric_out i m _null_ ));
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 4d5aeff643..dfbc422993 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.126 2000/07/29 18:46:05 tgl Exp $
+ * $Id: builtins.h,v 1.127 2000/07/30 22:14:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include "storage/itemptr.h"
 #include "utils/inet.h"
 #include "utils/numeric.h"
-#include "utils/lztext.h"
 
 /*
  *		Defined in adt/
@@ -562,21 +561,6 @@ extern Datum int2_sum(PG_FUNCTION_ARGS);
 extern Datum int4_sum(PG_FUNCTION_ARGS);
 extern Datum int8_sum(PG_FUNCTION_ARGS);
 
-/* lztext.c */
-extern lztext  *lztextin(char *str);
-extern char	   *lztextout(lztext *lz);
-extern text	   *lztext_text(lztext *lz);
-extern Datum	text_lztext(PG_FUNCTION_ARGS);
-extern int32	lztextlen(lztext *lz);
-extern int32	lztextoctetlen(lztext *lz);
-extern int32	lztext_cmp(lztext *lz1, lztext *lz2);
-extern bool		lztext_eq(lztext *lz1, lztext *lz2);
-extern bool		lztext_ne(lztext *lz1, lztext *lz2);
-extern bool		lztext_gt(lztext *lz1, lztext *lz2);
-extern bool		lztext_ge(lztext *lz1, lztext *lz2);
-extern bool		lztext_lt(lztext *lz1, lztext *lz2);
-extern bool		lztext_le(lztext *lz1, lztext *lz2);
-
 /* ri_triggers.c */
 extern Datum RI_FKey_check_ins(PG_FUNCTION_ARGS);
 extern Datum RI_FKey_check_upd(PG_FUNCTION_ARGS);
diff --git a/src/include/utils/lztext.h b/src/include/utils/lztext.h
deleted file mode 100644
index be57c7478b..0000000000
--- a/src/include/utils/lztext.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ----------
- * lztext.h
- *
- * $Header: /cvsroot/pgsql/src/include/utils/Attic/lztext.h,v 1.4 2000/07/03 23:10:14 wieck Exp $
- *
- *	Definitions for the lztext compressed data type
- * ----------
- */
-
-#ifndef _LZTEXT_H_
-#define _LZTEXT_H_
-
-/* ----------
- * The internal storage format of an LZ compressed text field is varattrib
- * ----------
- */
-typedef varattrib lztext;
-
-#endif	 /* _LZTEXT_H_ */