From e3cec20ccda58929fc2375087def3b2a2af30fc4 Mon Sep 17 00:00:00 2001
From: Jan Wieck <JanWieck@Yahoo.com>
Date: Tue, 28 Dec 1999 13:40:53 +0000
Subject: [PATCH] Removed LZTEXT datatype as discussed.
Jan
---
src/backend/utils/adt/Makefile | 4 ++--
src/backend/utils/adt/lztext.c | 2 +-
src/backend/utils/cache/relcache.c | 6 ++---
src/include/catalog/pg_amop.h | 12 +---------
src/include/catalog/pg_amproc.h | 3 +--
src/include/catalog/pg_opclass.h | 4 +---
src/include/catalog/pg_operator.h | 11 +--------
src/include/catalog/pg_proc.h | 38 +-----------------------------
src/include/catalog/pg_rewrite.h | 6 ++---
src/include/catalog/pg_type.h | 7 +-----
src/include/utils/builtins.h | 18 +-------------
src/include/utils/lztext.h | 2 +-
12 files changed, 17 insertions(+), 96 deletions(-)
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 4c07c55a486..9aba1272648 100644
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -4,7 +4,7 @@
# Makefile for utils/adt
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.29 1999/12/13 22:34:33 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.30 1999/12/28 13:40:48 wieck Exp $
#
#-------------------------------------------------------------------------
@@ -35,7 +35,7 @@ OBJS = acl.o arrayfuncs.o arrayutils.o bool.o cash.o char.o chunk.o \
regexp.o regproc.o ruleutils.o selfuncs.o sets.o \
tid.o timestamp.o varchar.o varlena.o version.o \
network.o mac.o inet_net_ntop.o inet_net_pton.o \
- ri_triggers.o pg_lzcompress.o lztext.o
+ ri_triggers.o pg_lzcompress.o
all: SUBSYS.o
diff --git a/src/backend/utils/adt/lztext.c b/src/backend/utils/adt/lztext.c
index ef31094fb51..4cc6667e305 100644
--- a/src/backend/utils/adt/lztext.c
+++ b/src/backend/utils/adt/lztext.c
@@ -1,7 +1,7 @@
/* ----------
* lztext.c -
*
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/lztext.c,v 1.4 1999/11/25 01:28:04 wieck Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/lztext.c,v 1.5 1999/12/28 13:40:48 wieck Exp $
*
* Text type with internal LZ compressed representation. Uses the
* standard PostgreSQL compression method.
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 007adfb01f0..ffdc3cfa9dc 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.82 1999/12/16 22:19:54 wieck Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.83 1999/12/28 13:40:49 wieck Exp $
*
*-------------------------------------------------------------------------
*/
@@ -674,8 +674,8 @@ RelationBuildRuleLock(Relation relation)
Anum_pg_rewrite_ev_qual, pg_rewrite_tupdesc,
&isnull);
- ruleaction = PointerGetDatum(lztextout((lztext *) DatumGetPointer(ruleaction)));
- rule_evqual_string = PointerGetDatum(lztextout((lztext *) DatumGetPointer(rule_evqual_string)));
+ ruleaction = PointerGetDatum(textout((text *) DatumGetPointer(ruleaction)));
+ rule_evqual_string = PointerGetDatum(textout((text *) DatumGetPointer(rule_evqual_string)));
rule->actions = (List *) stringToNode(DatumGetPointer(ruleaction));
rule->qual = (Node *) stringToNode(DatumGetPointer(rule_evqual_string));
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index ef499d7afdc..e2ee4b30cfc 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_amop.h,v 1.25 1999/11/25 01:28:05 wieck Exp $
+ * $Id: pg_amop.h,v 1.26 1999/12/28 13:40:50 wieck Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -348,16 +348,6 @@ DATA(insert OID = 0 ( 403 1768 1752 3 btreesel btreenpage ));
DATA(insert OID = 0 ( 403 1768 1757 4 btreesel btreenpage ));
DATA(insert OID = 0 ( 403 1768 1756 5 btreesel btreenpage ));
-/*
- * nbtree lztext
- */
-
-DATA(insert OID = 0 ( 403 1663 1659 1 btreesel btreenpage ));
-DATA(insert OID = 0 ( 403 1663 1660 2 btreesel btreenpage ));
-DATA(insert OID = 0 ( 403 1663 1657 3 btreesel btreenpage ));
-DATA(insert OID = 0 ( 403 1663 1662 4 btreesel btreenpage ));
-DATA(insert OID = 0 ( 403 1663 1661 5 btreesel btreenpage ));
-
/*
* hash table _ops
*/
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index ebc52c502b6..e37f434a9e8 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -9,7 +9,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_amproc.h,v 1.17 1999/12/08 11:37:38 momjian Exp $
+ * $Id: pg_amproc.h,v 1.18 1999/12/28 13:40:50 wieck Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -98,7 +98,6 @@ DATA(insert OID = 0 (403 810 836 1));
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 1663 1636 1));
/* hash */
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index d43ed0991cc..deb13cc4407 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_opclass.h,v 1.24 1999/12/08 11:17:20 momjian Exp $
+ * $Id: pg_opclass.h,v 1.25 1999/12/28 13:40:50 wieck Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -117,7 +117,5 @@ DATA(insert OID = 652 ( cidr_ops 650 ));
DESCR("");
DATA(insert OID = 1768 ( numeric_ops 1700 ));
DESCR("");
-DATA(insert OID = 1663 ( lztext_ops 1625 ));
-DESCR("");
#endif /* PG_OPCLASS_H */
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index b572b0b01a3..c161bce8c16 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_operator.h,v 1.62 1999/11/25 01:28:05 wieck Exp $
+ * $Id: pg_operator.h,v 1.63 1999/12/28 13:40:50 wieck Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -687,15 +687,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 intltsel intltjoinsel ));
-DATA(insert OID = 1660 ( "<=" PGUID 0 b t f 1625 1625 16 1662 1661 0 0 lztext_le intltsel intltjoinsel ));
-DATA(insert OID = 1661 ( ">" PGUID 0 b t f 1625 1625 16 1659 1660 0 0 lztext_gt intgtsel intgtjoinsel ));
-DATA(insert OID = 1662 ( ">=" PGUID 0 b t f 1625 1625 16 1660 1659 0 0 lztext_ge intgtsel intgtjoinsel ));
-
-
/*
* function prototypes
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 05cdd7f6b3e..be62e108d4a 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_proc.h,v 1.109 1999/12/12 05:57:36 momjian Exp $
+ * $Id: pg_proc.h,v 1.110 1999/12/28 13:40:50 wieck Exp $
*
* NOTES
* The script catalog/genbki.sh reads this file and generates .bki
@@ -2340,42 +2340,6 @@ DESCR("larger of two numbers");
DATA(insert OID = 1769 ( numeric_cmp PGUID 11 f t t 2 f 23 "1700 1700" 100 0 0 100 numeric_cmp - ));
DESCR("compare two numbers");
-/* OID's 1625 - 1639 LZTEXT data type */
-DATA(insert OID = 1626 ( lztextin PGUID 11 f t t 1 f 1625 "0" 100 0 0 100 lztextin - ));
-DESCR("(internal)");
-DATA(insert OID = 1627 ( lztextout PGUID 11 f t t 1 f 23 "0" 100 0 0 100 lztextout - ));
-DESCR("(internal)");
-DATA(insert OID = 1628 ( lztext_text PGUID 11 f t t 1 f 25 "1625" 100 0 0 100 lztext_text -));
-DESCR("convert lztext to text");
-DATA(insert OID = 1629 ( text PGUID 11 f t t 1 f 25 "1625" 100 0 0 100 lztext_text -));
-DESCR("convert lztext to text");
-DATA(insert OID = 1630 ( text_lztext PGUID 11 f t t 1 f 1625 "25" 100 0 0 100 text_lztext -));
-DESCR("convert text to lztext");
-DATA(insert OID = 1631 ( lztext PGUID 11 f t t 1 f 1625 "25" 100 0 0 100 text_lztext -));
-DESCR("convert text to lztext");
-DATA(insert OID = 1632 ( lztextlen PGUID 11 f t t 1 f 23 "1625" 100 0 1 0 lztextlen - ));
-DESCR("length");
-DATA(insert OID = 1633 ( length PGUID 11 f t t 1 f 23 "1625" 100 0 1 0 lztextlen - ));
-DESCR("length");
-DATA(insert OID = 1634 ( lztextoctetlen PGUID 11 f t t 1 f 23 "1625" 100 0 1 0 lztextoctetlen - ));
-DESCR("octet length");
-DATA(insert OID = 1635 ( octet_length PGUID 11 f 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 2 f 23 "1625 1625" 100 0 1 0 lztext_cmp - ));
-DESCR("compare lztext vs. lztext");
-DATA(insert OID = 1637 ( lztext_eq PGUID 11 f 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 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 2 f 16 "1625 1625" 100 0 1 0 lztext_gt - ));
-DESCR("greater-than");
-DATA(insert OID = 1654 ( lztext_ge PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_ge - ));
-DESCR("greater-than-or-equal");
-DATA(insert OID = 1655 ( lztext_lt PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_lt - ));
-DESCR("lower-than");
-DATA(insert OID = 1656 ( lztext_le PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_le - ));
-DESCR("lower-than-or-equal");
-
/*
* prototypes for functions pg_proc.c
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index e9a4d4ecd2b..76fa8c076d2 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_rewrite.h,v 1.8 1999/11/18 13:56:30 wieck Exp $
+ * $Id: pg_rewrite.h,v 1.9 1999/12/28 13:40:50 wieck Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -37,8 +37,8 @@ CATALOG(pg_rewrite)
Oid ev_class;
int2 ev_attr;
bool is_instead;
- lztext ev_qual; /* Compressed text */
- lztext ev_action; /* Compressed text */
+ 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 f154d016cef..1db7273c61c 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_type.h,v 1.71 1999/11/17 21:21:51 wieck Exp $
+ * $Id: pg_type.h,v 1.72 1999/12/28 13:40:50 wieck Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -382,11 +382,6 @@ DATA(insert OID = 1296 ( timestamp PGUID 4 19 t b t \054 0 0 timestamp_in time
DESCR("date time timezone, limited-range ISO-formated date and time");
#define TIMESTAMPOID 1296
-/* OIDS 1625 - 1639 */
-DATA(insert OID = 1625 ( lztext PGUID -1 -1 f b t \054 0 0 lztextin lztextout lztextin lztextout i _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 _null_ ));
DESCR("numeric(precision, decimal), arbitrary precision number");
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 94a1b61ffc0..4486131d416 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: builtins.h,v 1.92 1999/12/16 01:25:14 momjian Exp $
+ * $Id: builtins.h,v 1.93 1999/12/28 13:40:52 wieck Exp $
*
* NOTES
* This should normally only be included by fmgr.h.
@@ -30,7 +30,6 @@
#include "utils/int8.h"
#include "utils/nabstime.h"
#include "utils/numeric.h"
-#include "utils/lztext.h"
#include "access/heapam.h" /* for HeapTuple */
/*
@@ -633,19 +632,4 @@ HeapTuple RI_FKey_setnull_upd(FmgrInfo *proinfo);
HeapTuple RI_FKey_setdefault_del(FmgrInfo *proinfo);
HeapTuple RI_FKey_setdefault_upd(FmgrInfo *proinfo);
-/* lztext.c */
-lztext *lztextin(char *str);
-char *lztextout(lztext *lz);
-text *lztext_text(lztext *lz);
-lztext *text_lztext(text *txt);
-int32 lztextlen(lztext *lz);
-int32 lztextoctetlen(lztext *lz);
-int32 lztext_cmp(lztext *lz1, lztext *lz2);
-bool lztext_eq(lztext *lz1, lztext *lz2);
-bool lztext_ne(lztext *lz1, lztext *lz2);
-bool lztext_gt(lztext *lz1, lztext *lz2);
-bool lztext_ge(lztext *lz1, lztext *lz2);
-bool lztext_lt(lztext *lz1, lztext *lz2);
-bool lztext_le(lztext *lz1, lztext *lz2);
-
#endif /* BUILTINS_H */
diff --git a/src/include/utils/lztext.h b/src/include/utils/lztext.h
index c83280661c7..a10ab34cd1e 100644
--- a/src/include/utils/lztext.h
+++ b/src/include/utils/lztext.h
@@ -1,7 +1,7 @@
/* ----------
* lztext.h
*
- * $Header: /cvsroot/pgsql/src/include/utils/Attic/lztext.h,v 1.1 1999/11/17 21:21:51 wieck Exp $
+ * $Header: /cvsroot/pgsql/src/include/utils/Attic/lztext.h,v 1.2 1999/12/28 13:40:53 wieck Exp $
*
* Definitions for the lztext compressed data type
* ----------
--
GitLab