Changed pg_rewrite attributes ev_qual and ev_action to the new

compressed lztext data type.

Jan

diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index c2dacaa8483107591e770844f3f24b287b5bbae2..048dfc8d88d9a5ecbb8a54e2d6b5a3997594142d 100644 (file)
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -11,6 +11,7 @@
 
 #include "postgres.h"
 
+#include "utils/builtins.h"
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
@@ -27,7 +28,6 @@
 #include "miscadmin.h"
 #include "rewrite/rewriteRemove.h"
 #include "utils/acl.h"
-#include "utils/builtins.h"
 #include "utils/syscache.h"
 
 #include "../backend/parser/parse.h"

diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 4d7fa3a47a46931acb4e6378782a7624c8831e40..49ca4526c3c3a0254b37f4f52020993a60d76cec 100644 (file)
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.39 1999/11/07 23:08:12 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.40 1999/11/18 13:56:27 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,13 +15,13 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
+#include "utils/builtins.h"
 #include "catalog/pg_rewrite.h"
 #include "lib/stringinfo.h"
 #include "parser/parse_relation.h"
 #include "rewrite/rewriteDefine.h"
 #include "rewrite/rewriteSupport.h"
 #include "tcop/tcopprot.h"
-#include "utils/builtins.h"
 
 Oid                    LastOidProcessed = InvalidOid;
 

diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index 412915253da8574cb4d791774e8940edb5a118c8..d8645e1d129753de4ce9e3fd9b4a55ce426e8b30 100644 (file)
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.31 1999/11/07 23:08:13 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.32 1999/11/18 13:56:27 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,7 @@
 
 #include "postgres.h"
 
+#include "utils/builtins.h"
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_rewrite.h"

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 18480b9fc3c3061f9160cdf20ed95d5f58d47ead..d6d2ee4b4e9e001e2f8188a113aa19f4219f3dbc 100644 (file)
--- 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.78 1999/11/17 23:51:21 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.79 1999/11/18 13:56:28 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,6 +36,7 @@
 
 #include "postgres.h"
 
+#include "utils/builtins.h"
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/istrat.h"
@@ -53,7 +54,6 @@
 #include "lib/hasht.h"
 #include "miscadmin.h"
 #include "storage/smgr.h"
-#include "utils/builtins.h"
 #include "utils/catcache.h"
 #include "utils/relcache.h"
 #include "utils/temprel.h"
@@ -679,8 +679,8 @@ RelationBuildRuleLock(Relation relation)
                                                         Anum_pg_rewrite_ev_qual, pg_rewrite_tupdesc,
                                                                                  &isnull);
 
-               ruleaction = PointerGetDatum(textout((struct varlena *) DatumGetPointer(ruleaction)));
-               rule_evqual_string = PointerGetDatum(textout((struct varlena *) DatumGetPointer(rule_evqual_string)));
+               ruleaction = PointerGetDatum(lztextout((lztext *) DatumGetPointer(ruleaction)));
+               rule_evqual_string = PointerGetDatum(lztextout((lztext *) DatumGetPointer(rule_evqual_string)));
 
                rule->actions = (List *) stringToNode(DatumGetPointer(ruleaction));
                rule->qual = (Node *) stringToNode(DatumGetPointer(rule_evqual_string));

diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 476fce4db8c424d5840d05b22c41753fdb5ca1f5..aa532d99bd35e8e413717aa2173562343470889a 100644 (file)
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.39 1999/11/16 04:13:59 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.40 1999/11/18 13:56:29 wieck Exp $
  *
  * NOTES
  *       These routines allow the parser/planner/executor to perform
@@ -19,6 +19,7 @@
  */
 #include "postgres.h"
 
+#include "utils/builtins.h"
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_aggregate.h"

diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index 86d3b721b9c46f17e7581c971e9b3e83e0bc6a97..e9a4d4ecd2b9c530329c9dd30fe3dbbdd867bb0b 100644 (file)
--- 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.7 1999/02/13 23:21:14 momjian Exp $
+ * $Id: pg_rewrite.h,v 1.8 1999/11/18 13:56:30 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;
-       text            ev_qual;                /* VARLENA */
-       text            ev_action;              /* VARLENA */
+       lztext          ev_qual;                /* Compressed text */
+       lztext          ev_action;              /* Compressed text */
 } FormData_pg_rewrite;
 
 /* ----------------